hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 22:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,778 Commits 268 Branches 107 Tags
d7a68dbec36d2b90a0ff42b42c73df5aec8889f1
Commit Graph

992 Commits

Author SHA1 Message Date
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
a2899f6934 Insight recommendations 2013-11-12 17:58:03 +01:00
Romain Neutron
80f6209591 Merge pull request #773 from romainneutron/fix-1573 
[3.8] Fix #1573 : Propose rights reset prior apply template
 2013-11-12 07:52:16 -08:00
Romain Neutron
bea211074b Fix #1571 : Cleanup user settings, fix user settings calls 2013-11-12 15:16:54 +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
Nicolas Le Goff
4cef82083c Add ACL Manipulator 2013-11-08 17:51:14 +01:00
Nicolas Le Goff
43a2e75c0f Fix tests 2013-11-05 15:33:01 +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
1c27778001 Merge branch '3.8' 
Conflicts:
	tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
 2013-10-31 17:56:48 +01:00
Romain Neutron
f9e597658d Merge pull request #745 from romainneutron/master-CS 
[3.9] Fix CS
 2013-10-31 09:27:46 -07:00
Romain Neutron
664339e3ec Merge pull request #742 from romainneutron/fix-1555 
Fix #1555 : API sessions remain open
 2013-10-31 08:35:00 -07:00
Romain Neutron
4ca6170cae Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
 2013-10-31 15:52:12 +01:00
Romain Neutron
5abb0665ee Merge pull request #740 from romainneutron/fix-1558 
[3.8] Fix #1558 : Do not restrict thesaurus browsing to thesaurus admins
 2013-10-31 07:31:55 -07:00
Romain Neutron
24a6dce598 Fix #1555 : API sessions remains open 2013-10-31 15:19:24 +01:00
Romain Neutron
13dd86c67f Fix CS 2013-10-31 14:22:41 +01:00
Romain Neutron
ea7523f1db Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Publications.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Share.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/record/adapter.php
	lib/classes/task/Scheduler.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/cindexer.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2013-10-31 14:01:44 +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
Romain Neutron
4c5548120d Fix #1558 : Do not restrict thesaurus browsing to thesaurus admins 2013-10-31 12:11:21 +01:00
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
c7542292c9 Declare root controllers as services, remove "call" methods 2013-10-30 19:19:27 +01:00
Romain Neutron
0d43b831bf Declare tests controllers as services, remove "call" methods 2013-10-30 19:18:05 +01:00
Romain Neutron
64cbe2a57d Remove user comments in root controllers 2013-10-30 19:16:51 +01:00
Romain Neutron
9f086f4f05 Declare user controllers as services, remove "call" methods 2013-10-30 19:16:25 +01:00
Romain Neutron
ee2393e0f6 Declare thesaurus controllers as services, remove "call" methods 2013-10-30 19:15:07 +01:00
Romain Neutron
1689d937d7 Remove deprecated comments in root controllers 2013-10-30 19:12:48 +01:00
Romain Neutron
b52bb95071 Declare root controllers as services, remove "call" methods 2013-10-30 19:11:59 +01:00
Romain Neutron
e1db81baae Declare report controllers as services, remove "call" methods 2013-10-30 19:01:31 +01:00
Romain Neutron
5f015b924f Declare API controllers as services, remove "call" methods 2013-10-30 18:59:15 +01:00
Romain Neutron
9f1136c653 Remove deprecated comments in client controllers 2013-10-30 18:57:45 +01:00
Romain Neutron
f21fcf4b40 Declare client controllers as services, remove "call" methods 2013-10-30 18:56:52 +01:00
Romain Neutron
de05dcd113 Remove deprecated comments in prod controllers 2013-10-30 18:52:41 +01:00
Romain Neutron
1af022b84f Declare prod controllers as services, remove "call" methods 2013-10-30 18:47:40 +01:00
Romain Neutron
6d5bb5853b Remove deprecated comments in admin controllers 2013-10-30 18:30:44 +01:00
Romain Neutron
a9cee6d4d8 Declare admin controllers as services, remove "call" methods 2013-10-30 18:22:44 +01:00
Romain Neutron
9ee3e7c9f7 Move converters to model namespace 2013-10-30 13:06:14 +01:00
Romain Neutron
2c8a411c0b Merge pull request #729 from nlegoff/fix_inscript 
[3.8] Fix auto collection inscription selection
 2013-10-29 11:10:39 -07:00
Romain Neutron
5d2dd07caa Fix latest rebase 2013-10-29 18:56:01 +01:00
Romain Neutron
ea485311fc Refactor converter declaration 2013-10-29 18:46:37 +01:00
Romain Neutron
6ef6387abf Address comments 2013-10-29 18:46:36 +01:00
Romain Neutron
992d520a67 Update task converter to avoid service initialization on load 2013-10-29 18:46:36 +01:00
Romain Neutron
58c402ac2b Update unit tests and legacy 2013-10-29 18:46:34 +01:00
Romain Neutron
55327a4644 Update task creation 2013-10-29 18:42:47 +01:00
Romain Neutron
fafc7c334c Use Job Id instead of classname in DB 2013-10-29 18:42:46 +01:00
Romain Neutron
598475e5b5 Rewrite task manager web test 2013-10-29 18:41:44 +01:00
Romain Neutron
3eff45ad52 Fix converter to throw Http exception 2013-10-29 18:41:44 +01:00
Romain Neutron
b41e84d9db Declare Converter NotFoundException 2013-10-29 18:41:43 +01:00
Romain Neutron
be3eb529c1 Add task converter 2013-10-29 18:41:42 +01:00
Nicolas Le Goff
8b50062011 Fix tests 2013-10-29 18:23:21 +01:00
Romain Neutron
08ce909730 Move doctrine repositories to Phrasea namespace 2013-10-29 17:30:11 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00