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,854 Commits 268 Branches 107 Tags
051d9f4035ddd03da583f6a4d0747da2bc11da50
Commit Graph

41 Commits

Author SHA1 Message Date
Romain Neutron
051d9f4035 Remove license comments 2013-11-20 16:49:29 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +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
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
9b471fdf76 Fix CS 2013-10-31 11:53:30 +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
55327a4644 Update task creation 2013-10-29 18:42:47 +01:00
Romain Neutron
92fe657e80 Fix #1528 : Restrict collection ordering on available collections 2013-10-15 14:14:44 +02:00
Romain Neutron
eb590780ca Fix CS 2013-09-30 18:26:32 +02:00
Romain Neutron
7cca109633 Tweak code 2013-08-07 14:22:54 +02:00
Nicolas Le Goff
61581c5c99 adressed @romainneutron's comments 2013-08-07 12:01:58 +02:00
Nicolas Le Goff
d4bc24c055 Fix #1403 Wron g calculation for detailled view 2013-08-06 19:12:12 +02:00
Nicolas Le Goff
d413394027 Fix #1380 Add default settings for periodic tasks 2013-08-06 19:12:10 +02:00
Nicolas Le Goff
bfffa8de60 Fix #1327 & #1326 Can not delete or empty collection 2013-08-05 14:53:25 +02:00
Romain Neutron
0ab927ec97 Fix #1243 Phraseanet enabled languages is now configurable 2013-07-17 21:22:01 +02:00
Romain Neutron
a6e7d3e762 Fix #1338 : Fix collection order setting 2013-07-17 13:38:48 +02:00
Romain Neutron
5dd11c4076 Fix #1285 : Duplicate rights on create collection does not work 2013-07-11 15:16:07 +02:00
Romain Neutron
2d8e53bef2 Reload tree after databox unmount 2013-07-10 14:36:48 +02:00
Romain Neutron
3f47cc248d Remove registry's GV_RootPath calls 2013-06-19 19:25:16 +02:00
Romain Neutron
f9b4978569 Merge pull request #390 from romainneutron/databox-labels 
[3.8] Add labels to databoxes
 2013-06-13 07:41:05 -07:00
Romain Neutron
11a55bbd43 Add labels to databoxes 2013-06-13 09:45:43 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
76413165ff Update authentication to service provider 2013-05-29 14:22:51 +02:00
Romain Neutron
c184278b40 Fix doc blocks 2013-01-29 18:34:50 +01:00
Romain Neutron
53206af159 Fix CS lib/Alchemy 2013-01-29 16:38:00 +01:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
dff686c87d Merge branch '3.7' 2013-01-09 11:25:14 +01:00
Romain Neutron
13b67dfe37 Update Firewall API 2012-10-04 15:44:53 +02:00
Romain Neutron
0565bce475 Remove user variable assignment 2012-10-04 15:44:49 +02:00
Romain Neutron
58af2b4c9c Remove get_registry method 2012-10-04 15:44:49 +02:00
Romain Neutron
3a21ed1f0a Cleanup controllers 2012-10-04 15:44:48 +02:00
Romain Neutron
abc4d81521 Update controllers 2012-10-04 15:42:54 +02:00
Romain Neutron
afbb28a025 Update admin controllers 2012-10-04 15:31:37 +02:00
Romain Neutron
1a3461d5fc Update to filesystem service provider 2012-10-04 15:31:36 +02:00
Nicolas Le Goff
ed946cc026 cleanup & refactor 2012-09-03 18:09:01 +02:00
Nicolas Le Goff
7d857e59dd reword tanslation string 
update doc blocks
 2012-09-03 18:09:01 +02:00
Nicolas Le Goff
d23b977602 remove console.log & var_dump 2012-09-03 18:09:01 +02:00
Nicolas Le Goff
db40a0bf7c fix some bugs 2012-09-03 18:09:01 +02:00
Nicolas Le Goff
c0dacd84b4 replace delete controllers by post controllers 
fix tests

fix typo

fix tests
 2012-09-03 18:08:59 +02:00
Nicolas Le Goff
ac326491f1 Rename controllers 2012-09-03 18:08:59 +02:00