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

80 Commits

Author SHA1 Message Date
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
95b0c24d4b Use semver for Phraseanet version numbers 2013-11-07 17:49:39 +01: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
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
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Romain Neutron
50913c00ab Fix disconnection on session delete 2013-11-04 19:10:45 +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
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
7c576d8284 Require PHP ZMQ extension 2013-10-29 18:41:39 +01:00
Romain Neutron
1dfbff5666 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	bin/developer
	lib/classes/module/console/systemUpgrade.php
	www/skins/report/jquery-ui.css
 2013-10-03 15:29:22 +02:00
Romain Neutron
f638343de1 Fix #1506 : Install data path is not saved 2013-10-02 19:30:36 +02:00
Romain Neutron
2c7073182a Fix CS 2013-09-12 13:55:31 +02:00
Romain Neutron
0d3aaf362d Merge branch 'feeds-entities' of https://github.com/csaoh/Phraseanet 2013-09-12 13:53:56 +02:00
Romain Neutron
6c29fc88e9 Merge branch '3.8' 
Conflicts:
	composer.lock
	templates/mobile/common/index.html.twig
 2013-09-05 13:57:42 +02:00
Andrey
c1c8327260 Replaced SQL connection for sqlite tests 2013-09-05 13:44:15 +02:00
Andrey
c0bd291f7a Add Doctrine schema pre-upgrades 2013-09-05 13:44:14 +02:00
Romain Neutron
ba980d5f34 Fix tmp directories cleanup 2013-09-04 17:14:53 +02:00
Romain Neutron
e0f6be3425 Remove eval calls 2013-09-04 14:39:30 +02:00
Romain Neutron
447cb60327 Fix CS 2013-08-30 13:48:13 +02:00
Nicolas Le Goff
34b4fdde74 Remove get_wrong_email_users() from User_Adapter 2013-08-26 17:48:51 +02:00
Nicolas Le Goff
628938fdbf Fix #1380 Add default settings for periodic tasks 2013-08-07 14:23:31 +02:00
Nicolas Le Goff
d413394027 Fix #1380 Add default settings for periodic tasks 2013-08-06 19:12:10 +02:00
Romain Neutron
439de91a4e Use PhpExecutableFinder to find PHP binary 2013-07-23 16:56:23 +02:00
Nicolas Le Goff
5b0bc8b284 Add recess binary 
Set recess binary to config
 2013-07-12 20:06:32 +02:00
Romain Neutron
c4b977469d Refactor configuration check 2013-07-12 18:40:12 +02:00
Romain Neutron
09b786326a Remove old php.ini requirement 2013-07-10 21:23:38 +02:00
Romain Neutron
e8d8844e81 Fix PHP ini configuration 2013-07-10 19:44:48 +02:00
Romain Neutron
b85aec668e Fix #1261 : unoconv required version 2013-07-09 14:55:35 +02:00
Romain Neutron
242b2c0f71 Remove dependency on convert and composite 2013-07-04 14:10:57 +02:00
Romain Neutron
32875e6698 Remove support of binary paths by registry 2013-06-27 12:43:24 +02:00
Romain Neutron
456d5a2a9c Fix migration detection 2013-06-18 15:38:40 +02:00
Romain Neutron
341156f6d7 Fix Migration 3.8 2013-06-11 18:11:42 +02:00
Romain Neutron
3209ab4bcb Attach probe for version 3.8 2013-06-11 18:08:34 +02:00
Romain Neutron
3077ce08ec Move patch to migration 2013-06-11 16:27:22 +02:00
Romain Neutron
43d55e20ed Fix doc blocks 2013-06-11 15:59:18 +02:00
Romain Neutron
32c2d6154a Remove phraseanet services, update configuration 2013-06-11 14:05:44 +02:00
Romain Neutron
5df6e262df Merge pull request #313 from romainneutron/auth-providers 
[3.8] Auth providers
 2013-05-29 10:44:31 -07:00
Nicolas Le Goff
0248aa5adf Fix #867 Add Exiftool binary check 
Enhancement

Fix typo
 2013-05-29 15:16:09 +02:00
Romain Neutron
d2bc4f4a23 Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
9285536d0d Fix install 2013-05-23 18:52:41 +02:00
Romain Neutron
f6ffdd8770 Fix indexer min version comparison operator 2013-05-14 15:02:27 +02:00
Romain Neutron
b5c58c99cf Review directories structure 2013-05-13 19:21:52 +02:00
Romain Neutron
ba904e197f Fix imagick version constant use 2013-05-13 19:01:33 +02:00
Romain Neutron
e92331b200 Use constants for binaries requirements 2013-05-13 17:15:47 +02:00
Romain Neutron
0080aa79ca Addressed github review 2013-05-13 15:35:56 +02:00
Romain Neutron
09e28f493e Update Phrasea requirements 2013-05-13 15:07:49 +02:00
Romain Neutron
24049cae4a Add file binary requirement 2013-05-13 15:07:49 +02:00
Romain Neutron
43856b7f62 Cleanup Code 2013-05-13 15:07:49 +02:00