hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,853 Commits 268 Branches 107 Tags
142b02799cbe303634dc832e77cdfe5eb22441e9
Commit Graph

1185 Commits

Author SHA1 Message Date
Romain Neutron
142b02799c Merge branch '3.8' 2013-11-20 16:05:55 +01:00
Romain Neutron
0dde2f1388 Image should not be executables 2013-11-20 16:05:46 +01:00
Romain Neutron
3451895515 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-14 17:52:52 +01:00
Romain Neutron
84c444c186 Fix editing default user settings 2013-11-14 13:29:49 +01:00
Romain Neutron
dca6667052 Merge branch '3.8' 2013-11-13 17:07:45 +01:00
Romain Neutron
694aecf752 Merge pull request #781 from nlegoff/fix1570_bis 
[3.8] Fix #1570 Remove accept tou link if there are no TOU
 2013-11-12 11:16:53 -08:00
Nicolas Le Goff
7c36829f11 Fix #1570 Remove accept tou link if there are no TOU 2013-11-12 19:59:54 +01:00
Romain Neutron
432252f5f8 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/User/Adapter.php
	lib/classes/eventsmanager/broker.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/uploadquarantine.php
	lib/classes/eventsmanager/notify/validationdone.php
	templates/web/admin/index.html.twig
 2013-11-12 19:19:13 +01:00
Romain Neutron
7e75591d1a Remove demo file 2013-11-12 17:49:58 +01:00
Romain Neutron
1a2487d398 Fix JS codestyle 2013-11-12 15:07:16 +01:00
Romain Neutron
9f2f1a4217 Fix #1573 : Propose rights reset prior apply template 
Conflicts:
	templates/web/admin/index.html.twig
 2013-11-12 13:29:30 +01:00
Romain Neutron
3cf2cbd6f1 Merge branch '3.8' 2013-11-12 13:26:15 +01:00
Romain Neutron
9fa95db23c Fix JS codestyle 2013-11-12 12:49:23 +01:00
Romain Neutron
89fb774f96 Merge branch '3.8' 2013-11-12 12:10:40 +01:00
Romain Neutron
dc5c12a592 Fix JS code style 2013-11-11 11:25:52 +01:00
Romain Neutron
2072f9e0e0 Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-08 19:04:26 +01:00
Romain Neutron
ea6b93b88a Fix typo 2013-11-08 18:48:58 +01:00
Nicolas Le Goff
b24b4fdb00 Fix #1578 Checks field source validation 2013-11-08 18:48:58 +01:00
Romain Neutron
fec01341b6 Fix #1574 : Set correct date sort on advanced search reset 2013-11-07 18:34:36 +01:00
Romain Neutron
f39af8b64e Merge branch '3.8' 2013-11-06 11:26:47 +01:00
Romain Neutron
664513ab4c Merge pull request #762 from nlegoff/fix_ie 
[3.8] Fix #1564 Fields selection in advanced search is broken
 2013-11-05 09:05:14 -08:00
Nicolas Le Goff
ad4213684e Add danger class to filters input if no colls are selected in advanced search 2013-11-05 15:49:53 +01:00
Romain Neutron
f27fa53d4c Merge branch '3.8' 
Conflicts:
	.travis.yml
	templates/web/setup/wrapper.html.twig
	tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
 2013-11-05 15:20:35 +01:00
Nicolas Le Goff
311f2557d3 Enhance CSS selector for IE performance 2013-11-05 14:50:27 +01:00
Nicolas Le Goff
81d464b3b0 Hide non available fields 2013-11-05 14:36:33 +01:00
Romain Neutron
c0e4257f82 Merge pull request #751 from nlegoff/fix_ie_edit 
[3.8] Fix #1152 On IE7 editing box is broken
 2013-11-05 03:30:56 -08:00
Romain Neutron
ed3f31b01d Fix #1563 : Explicitely declare the default environment to be Application::ENV_PROD 2013-11-05 10:53:32 +01:00
Romain Neutron
2f1fa857cd Merge pull request #753 from romainneutron/fix-error-handler 
[3.8] Use symfony/debug error handler instead of the deprecated one
 2013-11-05 01:51:24 -08:00
Nicolas Le Goff
d7e108d375 Fix #1152 On IE7 editing on dialog box is broken 2013-11-04 18:16:18 +01:00
Romain Neutron
beb409e932 Use symfony/debug error handler instead of the deprecated one 2013-11-04 13:02:54 +01:00
Nicolas Le Goff
409a43db0c Fix field edition for vocabulary 2013-10-31 17:56:47 +01:00
Romain Neutron
38264a0ae7 Merge branch '3.8' 
Conflicts:
	bower.json
	lib/classes/task/manager.php
	lib/conf.d/minifyGroupsConfig.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2013-10-31 13:57:21 +01:00
Nicolas Le Goff
7b256eae61 Fix setting cookie 2013-10-28 18:41:41 +01:00
Nicolas Le Goff
ae653edad0 Sets selected field according to current user langage 2013-10-28 14:16:21 +01:00
Nicolas Le Goff
303247f551 Fix lng settings from cookie 2013-10-28 14:16:20 +01:00
Nicolas Le Goff
555ec03708 Update jquery cookie dependency 2013-10-28 14:16:20 +01:00
Romain Neutron
212b09afa2 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Permalink.php
 2013-10-25 18:50:15 +02:00
Nicolas Le Goff
65147550d4 Fix input colors in IE 2013-10-24 20:14:37 +02:00
Romain Neutron
762f758705 Merge branch '3.8' 
Conflicts:
	bower.json
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/eventsmanager/notify/feed.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
 2013-10-24 14:05:04 +02:00
Romain Neutron
22b2dddcf8 Fix #1532 : Add checkbox on feed creation to disable email notifications 2013-10-22 11:09:29 +02:00
Nicolas Le Goff
6e59e7aae6 Fix #1518 Can not edit tags in metadatas settings 2013-10-21 18:39:19 +02:00
Romain Neutron
f7dfe893b4 Merge branch '3.8' 
Conflicts:
	bower.json
 2013-10-15 19:11:39 +02:00
Romain Neutron
cc75ef5ac6 Merge pull request #698 from nlegoff/fix_login_css 
[3.8] Enhance CSS for homepage customization
 2013-10-15 09:57:06 -07:00
Romain Neutron
3e03343825 Merge pull request #692 from nlegoff/fix1522 
[3.8] Fix #1522 issue with jquery ui & multiselect plugin in report
 2013-10-15 09:56:40 -07:00
Nicolas Le Goff
1d04c418cd Remove jquery multiselect plugin 2013-10-15 15:06:52 +02:00
Nicolas Le Goff
358ef398a5 Enhance login css 2013-10-15 15:02:02 +02:00
Romain Neutron
457b5ef3f0 Merge pull request #693 from nlegoff/fix1518 
[3.8] Fix #1518 Can not edit tags in metadatas settings
 2013-10-10 09:07:00 -07:00
Nicolas Le Goff
bb836ad360 Fix #1518 Can not edit tags in metadatas settings 2013-10-10 16:45:19 +02:00
Nicolas Le Goff
d4b7280c81 Fix #1522 Issue with jquery ui tabs & multiselect 2013-10-10 16:20:20 +02:00
Romain Neutron
7e8a34c599 Merge branch '3.8' 
Conflicts:
	bin/developer
	build-env.sh
	composer.json
	composer.lock
 2013-10-10 13:42:42 +02:00