hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,001 Commits 268 Branches 107 Tags
53b8ca40872a04579822b23e2b51b43b30cc652f
Commit Graph

318 Commits

Author SHA1 Message Date
Nicolas Le Goff
54a5d6578c Replace getter and setter for user & user notif setting value 2014-02-19 17:28:53 +01:00
Nicolas Le Goff
c156f842c7 Remove User_Adapter 2014-02-19 17:28:53 +01:00
Nicolas Le Goff
6053a03b87 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	tests/Alchemy/Tests/Phrasea/Application/ApiTestCase.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2014-02-11 09:02:29 +01:00
Romain Neutron
b56edae725 Fix #1686 : Fix jquery ui usage 2014-02-10 23:30:23 +01:00
Romain Neutron
74ee94ec97 Merge branch '3.8' 
Conflicts:
	templates/web/common/drop_down_options.html.twig
 2014-01-23 08:23:47 +01:00
Nicolas Le Goff
95360b5e55 Fix #1665 In admin setup panel, selecting the option in the editor list does not work 2014-01-22 16:11:32 +01:00
Romain Neutron
d7b4e61c10 Make search engine a real service 2014-01-07 16:45:58 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Romain Neutron
09c74afab6 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
	lib/classes/User/Adapter.php
	lib/classes/caption/Field/Value.php
	lib/classes/collection.php
	lib/classes/module/report/filter.php
	lib/classes/task/period/ftp.php
	templates/web/common/dialog_export.html.twig
	templates/web/report/ajax_dashboard_content_child.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
 2013-12-18 12:12:58 +01:00
Romain Neutron
9d42d5b64d Merge pull request #843 from romainneutron/fix-1622 
[3.8] Fix #1622 : Sanitize captions display
 2013-12-18 01:48:35 -08:00
Romain Neutron
f0d632073b Fix #1622 : Sanitize captions display 2013-12-17 18:31:56 +01:00
Romain Neutron
c0c640aaee Fix #1626 : FTP test displays empty message 2013-12-17 11:57:50 +01:00
Romain Neutron
aac9138b18 Fix division by 0 in case a thumbnail has a width or height equal to 0 2013-12-11 11:44:29 +01:00
Romain Neutron
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +01:00
Romain Neutron
e9e9d149a1 Locale simplification 2013-12-03 20:05:20 +01:00
Romain Neutron
2ba164701d Use symfony translator 2013-12-03 20:02:40 +01:00
Romain Neutron
16c1930ca0 Update templates to fit the new translator 2013-12-03 20:02:40 +01:00
Romain Neutron
e7421e1fdd Fix twig tags 2013-12-03 20:02:39 +01:00
Romain Neutron
4f31cfeefc Merge branch '3.8' 
Conflicts:
	bower.json
	templates/web/common/index_bootstrap.html.twig
	templates/web/common/menubar.html.twig
	templates/web/login/layout/base-layout.html.twig
	templates/web/prod/Baskets/Reorder.html.twig
 2013-12-02 18:17:38 +01:00
Romain Neutron
7285717b80 Merge pull request #815 from nlegoff/menubar 
[3.8] Add block to override menu bar title
 2013-11-28 07:15:09 -08:00
Nicolas Le Goff
7bbf00ff4b Wrap technical data into blocks 2013-11-28 13:29:25 +01:00
Nicolas Le Goff
e2fcd816cc Add block to override menu bar title 2013-11-28 12:38:24 +01:00
Nicolas Le Goff
86b4e83054 Fix #1590 IE popup Error message: "A script on this page is causing Internet Explorer to run slowly" 2013-11-26 14:42:08 +01:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Romain Neutron
8abc87f084 Fix menubar in case no modules are defined 2013-10-29 18:41:44 +01:00
Romain Neutron
96ac795d8d Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/classes/Feed/Entry/Item.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
 2013-10-28 18:21:15 +01:00
Romain Neutron
5e386a48d1 Fix #1538 : Email are not sent anymore 2013-10-25 17:57:01 +02:00
Romain Neutron
a805c94524 Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php
 2013-10-21 19:05:37 +02:00
Nicolas Le Goff
f9cd105e51 Fix #1497 Resizing images is not working on tablet in paysage mode 2013-10-18 16:11:54 +02:00
Romain Neutron
084ad221dc Merge branch '3.8' 2013-09-05 14:38:55 +02:00
Nicolas Le Goff
ed514432ca Fix translation issues 2013-09-05 14:29:42 +02:00
Romain Neutron
8b3e06ec4c Fix ftp connection test experience 2013-08-30 13:37:45 +02:00
Nicolas Le Goff
6a8312ca64 Add FtpCredentials entity 2013-08-23 12:09:50 +02:00
Nicolas Le Goff
7d8e93bddd Fix assets path 2013-08-17 17:12:57 +02:00
Nicolas Le Goff
74fc121fb6 Add grunt build-assets task 2013-08-17 17:12:57 +02:00
Nicolas Le Goff
307a6af069 Fix #1413 Add possibility to delete a persistent session 2013-08-08 12:26:39 +02:00
Romain Neutron
87620d64ce Fix #1362 : Fix video display 2013-07-23 16:01:28 +02:00
Romain Neutron
bb45954bd1 Merge pull request #515 from romainneutron/fix-1338 
Fix 1338
 2013-07-17 08:30:11 -07:00
Romain Neutron
c6dabf54af Merge pull request #516 from romainneutron/fix-1334 
Fix #1334 : Technical informations display is not grouped in caption whenever the option is selected
 2013-07-17 08:29:43 -07:00
Romain Neutron
cdd1a21c71 Fix #1302 : redirect mechanism does not work as expected 2013-07-17 14:35:39 +02:00
Romain Neutron
12797c1d66 Fix #1334 : Technical informations display is not grouped in caption whenever the option is selected 2013-07-17 14:04:35 +02:00
Romain Neutron
5c22b69d98 Fix #1338 : Fix notices display in admin 2013-07-17 13:38:30 +02:00
Nicolas Le Goff
83c5f8c8e7 Fix #1330 Can not bootstrap i18n without json3 dependency on IE7 2013-07-12 19:28:14 +02:00
Romain Neutron
b326758ff3 Fix #1305 : Classic does not work 2013-07-11 17:12:05 +02:00
Nicolas Le Goff
5e151e632a adressed comment's 2013-07-04 02:49:11 +02:00
Nicolas Le Goff
e20e21a3d9 Add geonames module 2013-07-03 20:16:21 +02:00
Nicolas Le Goff
a64c70ae8d Login page geonames plugin integration 2013-07-03 18:34:34 +02:00
Romain Neutron
4720a46b66 Update geoname server service provider 2013-07-02 15:04:33 +02:00
Romain Neutron
7a241bd103 Merge pull request #425 from nlegoff/fix_847 
[3.8] Fix #847 About link in lightbox
 2013-06-25 01:25:58 -07:00
Nicolas Le Goff
0bc951baba Fix #847 About link in lightbox 2013-06-24 16:16:42 +02:00