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

2163 Commits

Author SHA1 Message Date
Romain Neutron
d7a68dbec3 Remove http_request 2013-11-12 19:39:22 +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
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
cc574ac7bd Bump to 3.8.1 alpha 3 2013-11-12 15:16:55 +01: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
Romain Neutron
cab32f870c Merge pull request #765 from nlegoff/reset_sys_admin_right 
[3.9] Add ACL manipulator && Refactor reset sys admin rights
 2013-11-11 01:45:55 -08: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
Nicolas Le Goff
4cef82083c Add ACL Manipulator 2013-11-08 17:51:14 +01:00
Romain Neutron
b5e944caf0 Fix #1579 : Update old geonames server address 2013-11-08 11:52:43 +01:00
Romain Neutron
95b0c24d4b Use semver for Phraseanet version numbers 2013-11-07 17:49:39 +01:00
Romain Neutron
f39af8b64e Merge branch '3.8' 2013-11-06 11:26:47 +01:00
Romain Neutron
675520c623 Merge pull request #739 from nlegoff/user_manip 
[3.9] User notifications are set with user manipulator
 2013-11-05 09:05:45 -08:00
Romain Neutron
db4286c506 Merge pull request #754 from romainneutron/decouple-cache 
[3.9] Decouple Phraseanet cache factory and cache connection factory
 2013-11-05 08:08:56 -08:00
Romain Neutron
3fbd4a7daa Merge pull request #734 from nlegoff/acl_service 
[3.9] Add ACL as a service
 2013-11-05 08:08:09 -08:00
Romain Neutron
05485308ae Fix #1567 : Disallow a user to remove himself from DB 2013-11-05 15:51:50 +01:00
Nicolas Le Goff
5c9427ae3b Add user notification throught user manipulator 2013-11-05 15:36:39 +01:00
Nicolas Le Goff
43a2e75c0f Fix tests 2013-11-05 15:33:01 +01:00
Romain Neutron
19462d160c Decouple Phraseanet cache factory and cache connection factory 2013-11-05 15:22:46 +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
Romain Neutron
68cba5d061 Merge pull request #755 from romainneutron/fix-disconnection 
[3.8] Fix disconnection on session delete
 2013-11-05 06:07:27 -08:00
Romain Neutron
c158637875 Merge pull request #756 from romainneutron/fix-memcached-cache 
[3.8] Add cache provider for memcached extension
 2013-11-05 06:07:08 -08:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Nicolas Le Goff
21eec6dbbe Add ACL Service 2013-11-05 12:21:42 +01: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
ab512540ca Add cache provider for memcached extension 2013-11-04 19:11:36 +01:00
Romain Neutron
50913c00ab Fix disconnection on session delete 2013-11-04 19:10:45 +01:00
Romain Neutron
97988de0da Remove locale on request finish, not on kernel terminate 2013-11-04 13:29:16 +01:00
Romain Neutron
fdde1ebd8a Fix entities namespace 2013-11-04 11:56:30 +01:00
Romain Neutron
f11bf65c35 Fix entities namespace 2013-11-04 11:26:52 +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
1201bf2f78 Fix camelcase issue in LogFileFactory file name 2013-10-31 15:27:14 +01:00
Romain Neutron
24a6dce598 Fix #1555 : API sessions remains open 2013-10-31 15:19:24 +01:00
Romain Neutron
f0053d1a1f Merge pull request #743 from romainneutron/fix-1544 
[3.8] Fix #1544 : Upgrade data from 3.5 does not work
 2013-10-31 06:45:51 -07:00
Romain Neutron
ab3fa1f465 Add Task proxy 2013-10-31 14:25:59 +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
fe3aabd6d1 Fix #1544 : Upgrade data from 3.5 does not work 2013-10-31 13:15:27 +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