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

182 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
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
95b0c24d4b Use semver for Phraseanet version numbers 2013-11-07 17:49:39 +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
f9e597658d Merge pull request #745 from romainneutron/master-CS 
[3.9] Fix CS
 2013-10-31 09:27:46 -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
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
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
fe3aabd6d1 Fix #1544 : Upgrade data from 3.5 does not work 2013-10-31 13:15:27 +01:00
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
72310ceefc Address comments 2013-10-29 18:56:23 +01:00
Romain Neutron
5d2dd07caa Fix latest rebase 2013-10-29 18:56:01 +01:00
Romain Neutron
046429cc4b Rename task tests, add task start and task stop 2013-10-29 18:46:37 +01:00
Romain Neutron
c0ab4944f9 Rename commands 2013-10-29 18:46:37 +01:00
Romain Neutron
24d0a5f88b Rename commands to task-manager namespace 2013-10-29 18:46:37 +01:00
Romain Neutron
053de5df8b Address PR comments 2013-10-29 18:46:36 +01:00
Romain Neutron
49c01c6417 Update command to use verbosity level 2013-10-29 18:46:35 +01:00
Romain Neutron
afd9d33b9a Update task manager commands 2013-10-29 18:46:34 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
212b09afa2 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Permalink.php
 2013-10-25 18:50:15 +02:00
Romain Neutron
8b510031a0 Fix #1544 : Upgrade data command fails 2013-10-25 16:02:53 +02:00
Romain Neutron
6345fcc83a Add uninstaller for development purposes 2013-10-07 10:08:11 +02:00
Romain Neutron
0a950b0ae6 Add uninstaller for development purposes 2013-10-04 17:29:13 +02:00
Romain Neutron
15e7b3aa1a Bower installer simplification 2013-09-30 14:32:26 +02:00
Romain Neutron
48680fd3c3 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php
	lib/Alchemy/Phrasea/Core/Version.php
	templates/web/setup/wrapper.html.twig
 2013-09-26 12:51:21 +02:00
Romain Neutron
d7076cd441 Allow failure on composer self-update 2013-09-25 11:49:25 +02:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00
Romain Neutron
91dd9ce321 Disable composer interactivity 2013-09-17 16:22:01 +02:00
Romain Neutron
4c90f168a7 Remove unused use statements 2013-09-04 14:25:01 +02:00
Romain Neutron
b6a8a90197 Fix CS 2013-09-04 12:14:52 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Romain Neutron
8b49c6127b Fix Sqlite db regeneration in case of deleted db 2013-08-30 16:38:39 +02:00
Romain Neutron
447cb60327 Fix CS 2013-08-30 13:48:13 +02:00
Nicolas Le Goff
6a8312ca64 Add FtpCredentials entity 2013-08-23 12:09:50 +02:00
Nicolas Le Goff
4b02c44e80 Add missing doc blocks 2013-08-20 15:10:56 +02:00
Nicolas Le Goff
282a474a5e Fix timeout issue 2013-08-19 17:25:46 +02:00
Nicolas Le Goff
dd49b7173c Fix CS 2013-08-19 15:23:25 +02:00
Nicolas Le Goff
ea2d99e8a5 Rename build-asset task to install-asset & add less compilation after bower install 2013-08-19 14:46:16 +02:00
Nicolas Le Goff
e51e5094d8 Rename prefer-dist option to clear-cache 2013-08-19 14:36:06 +02:00
Nicolas Le Goff
ffbd2942ca Fix typo 2013-08-19 14:36:05 +02:00
Nicolas Le Goff
453dc79253 Fix path and output for less builder 2013-08-19 14:36:05 +02:00
Nicolas Le Goff
fa1174d6e3 Update bower install command 2013-08-19 14:36:05 +02:00
Nicolas Le Goff
ba6e060b44 Remove javascript builder command 2013-08-19 14:35:56 +02:00
Romain Neutron
c093d7d954 Merge pull request #565 from nlegoff/local_npm 
[3.9] Make required npm package available locally
 2013-08-09 08:32:05 -07:00
Nicolas Le Goff
f6e9e227f8 Install npm package locally 2013-08-08 18:23:23 +02:00
Romain Neutron
5ce2ec5da8 Merge branch '3.8' 2013-08-08 16:46:36 +02:00