hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,343 Commits 268 Branches 107 Tags
92636bfe5aa79e95c64579d9a8e20700deedff75
Commit Graph

71 Commits

Author SHA1 Message Date
Benoît Burnichon
92636bfe5a Properly initialize value. 
Change call to protected method to public one.
 2015-06-09 11:26:20 +02:00
Benoît Burnichon
118bb2f03c Some fixup for ES instance 2015-03-11 15:22:20 +01:00
Nicolas Le Goff
bd4836aaa7 Remove Websockets dependencies 2015-03-10 09:55:43 +01:00
Nicolas Le Goff
9a3e92ed9c Multiple ORMs for all database 2015-02-12 17:58:45 +01:00
Nicolas Le Goff
700c955677 Fix tests 2015-02-06 19:25:19 +01:00
Nicolas Le Goff
6485b64e68 Fix latest merge 2014-08-20 15:13:41 +02:00
Nicolas Le Goff
46da7be65d Merge branch '3.8' 
Conflicts:
	.travis.yml
	bin/developer
	build-env.sh
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
	tests/Alchemy/Tests/Phrasea/Command/Setup/XSendFileMappingGeneratorTest.php
	tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
	tests/Alchemy/Tests/Phrasea/Form/Login/PhraseaRegisterFormTest.php
 2014-08-19 15:30:25 +02:00
Nicolas Le Goff
9e2083dfe4 Add init command 2014-08-13 18:21:57 +02:00
Nicolas Le Goff
e5b8817c46 PHP CS fix 2014-05-30 15:22:00 +02:00
Romain Neutron
d3bf3f747e Fix unit tests 2014-03-05 15:27:24 +01:00
Nicolas Le Goff
6c3cdfc52e Merge pull request #1006 from romainneutron/fix-connection-master 
[Ready][3.9] Add reconnectable connection
 2014-03-04 11:19:44 +01:00
Romain Neutron
4695054dcf Fix unit tests when running without phrasea2 extension 2014-03-03 19:26:44 +01:00
Romain Neutron
8cf73891c0 Add reconnectable connection 2014-03-03 01:00:15 +01:00
Romain Neutron
d5e5c715d8 Make tests silent 2014-02-28 03:38:41 +01:00
Nicolas Le Goff
03b05783bd Merge pull request #970 from romainneutron/host-configuration-access-restriction 
[3.9] Add access restriction based on host configuration
 2014-02-26 13:11:38 +01:00
Romain Neutron
878c96f6d4 Add access restriction 2014-02-25 19:00:53 +01:00
Nicolas Le Goff
2028871f34 Fix Cs 2014-02-25 16:33:43 +01:00
Nicolas Le Goff
06b633a615 Merge pull request #968 from romainneutron/doctrine-connection 
[3.9] Use Doctrine DBAL as connection
 2014-02-24 12:15:03 +01:00
Romain Neutron
5a5da77662 Use Doctrine DBAL instead of custom connection 2014-02-22 23:55:12 +01:00
Romain Neutron
fb693836d5 Add enable/disable plugins commands 2014-02-21 16:41:11 +01:00
Romain Neutron
25073721c8 Fix unit tests 2014-02-20 13:08:56 +01:00
Romain Neutron
811be51b3d Add WebsocketServer command 2014-02-15 11:38:51 +01:00
Romain Neutron
c5d3f97258 Fix PSR-0 file naming 2014-02-14 15:51:09 +01:00
Romain Neutron
372fc86601 Use short array declarations 2014-02-11 18:44:31 +01:00
Nicolas Le Goff
4596bf5d30 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Security/Firewall.php
 2014-02-04 11:30:23 +01:00
Romain Neutron
f267a5568e Fix latest merge 2014-02-03 22:00:07 +01:00
Nicolas Le Goff
bd1e4516bd Merge branch '3.8' 
Conflicts:
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/conf.d/configuration.yml
	templates/mobile/common/index.html.twig
 2014-02-03 19:02:22 +01:00
Nicolas Le Goff
938a832a49 Merge pull request #911 from romainneutron/fix-1663 
[3.8] Fix #1663 : Remove plugin configuration on uninstall
 2014-02-03 09:24:16 -08:00
Romain Neutron
0085b15304 Fix #1663 : Remove plugin configuration on uninstall 2014-02-03 14:00:33 +01:00
Romain Neutron
b2af24954c Fix #1662 : Abort plugin uninstall in case the plugin is not present 2014-02-03 13:52:38 +01:00
Nicolas Le Goff
30078730ab Merge branch '3.8' 
Conflicts:
	bin/console
	composer.lock
 2014-01-31 14:59:53 +01:00
Romain Neutron
6b81b2b39e Add plugin:list command 2014-01-29 18:17:34 +01:00
Romain Neutron
d7f7e1c92c Fix CS 2014-01-14 12:04:38 +01:00
Romain Neutron
4b5f318ef1 Fix unit tests 2014-01-10 15:30:32 +01:00
Romain Neutron
89dc1c5129 Add fixtures to sqlite db 2013-12-18 23:34:06 +01:00
Romain Neutron
a74ad06ad1 Fix CS 2013-12-18 18:15:16 +01:00
Romain Neutron
a3b1ae7163 Fix unit test names, property and function visibility 2013-12-10 01:29:02 +01:00
Romain Neutron
a94f9a2f15 App loading optimisation + unit tests to PHP 5.4 2013-12-05 19:08:34 +01:00
Romain Neutron
7e0a3c7338 Use configuration property accessor 2013-11-18 18:48:27 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
13915dc1a8 Rename "phraseanet.configuration" service to "configuration" 2013-11-15 22:08:07 +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
afd9d33b9a Update task manager commands 2013-10-29 18:46:34 +01:00
Romain Neutron
58c402ac2b Update unit tests and legacy 2013-10-29 18:46:34 +01: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
Nicolas Le Goff
898a48f68f Fix tests 2013-08-19 19:25:58 +02:00
Nicolas Le Goff
20bcb94c1a Attempt to fix travis build 2013-08-19 14:36:05 +02:00
Nicolas Le Goff
fa1174d6e3 Update bower install command 2013-08-19 14:36:05 +02:00