hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 14:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,452 Commits 268 Branches 107 Tags
2df0f9d659d10064c20239b33280a059bee33cc6
Commit Graph

506 Commits

Author SHA1 Message Date
Romain Neutron
c3ec4ab857 Merge pull request #900 from nlegoff/replace_demand 
[3.9] Migrate registration table to doctrine entity && refactor registration API
 2014-02-27 16:08:17 +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
399a514910 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Application.php
	tests/Alchemy/Tests/Phrasea/Core/Event/Subscriber/CookiesDisablerSubscriberTest.php
 2014-02-26 12:39:34 +01:00
Nicolas Le Goff
2ec4ffdbcc Refactor && Typo && Use plain objects as function parameters instead of ids 2014-02-26 12:10:54 +01:00
Nicolas Le Goff
c98fe4c23d Adressed Neutron's comments 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
b32e4c6158 Rename RegistrationManager to RegistrationManipulator 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
52f3baac05 Fix neutron's comment 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
75fac19e73 Migrate demand table to doctrine entity && refactor registration API 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
cec077ca9c Merge pull request #975 from romainneutron/api-cookies 
[3.8] Fix api cookies remover
 2014-02-26 11:55:20 +01:00
Romain Neutron
878c96f6d4 Add access restriction 2014-02-25 19:00:53 +01:00
Romain Neutron
fce3ba73ff Fix api cookies remover 
Conflicts:
	lib/Alchemy/Phrasea/Application.php
 2014-02-25 17:53:37 +01:00
Nicolas Le Goff
2028871f34 Fix Cs 2014-02-25 16:33:43 +01:00
Nicolas Le Goff
ab7f567d62 Bump to version 3.8.4-alpha.0 2014-02-24 18:40:10 +01:00
Romain Neutron
5e8e8f59d5 Use Zippy to zip 2014-02-24 16:25:59 +01:00
Nicolas Le Goff
1467dfbc3e Prepare version 3.8.3 2014-02-24 16:16:22 +01:00
Nicolas Le Goff
4535491e6c Merge pull request #965 from romainneutron/host-configuration 
[3.9] Add configuration per host
 2014-02-24 12:30:26 +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
Nicolas Le Goff
58c9e8733d Merge pull request #966 from romainneutron/plugin-disable 
[3.9] Add commands to enable/disable plugins
 2014-02-24 11:41:08 +01:00
Romain Neutron
5a5da77662 Use Doctrine DBAL instead of custom connection 2014-02-22 23:55:12 +01:00
Romain Neutron
a6bfcd95f4 Fix host configuration 2014-02-22 15:34:19 +01:00
Romain Neutron
de13d874a3 Fix configuration usage 2014-02-22 10:39:07 +01:00
Romain Neutron
501b313b25 Bump to version 3.9.0-alpha.12 2014-02-21 16:41:11 +01:00
Romain Neutron
df56eb4da7 Force plugin configuration in configuration 2014-02-21 16:37:53 +01:00
Romain Neutron
c4efe6d548 Add host configuration 2014-02-21 14:36:38 +01:00
Romain Neutron
862fe696cb Remove some circular references 2014-02-20 20:09:14 +01:00
Nicolas Le Goff
0cb75cdf95 Update upgrade 39 2014-02-19 20:31:42 +01:00
Nicolas Le Goff
eaa1feb765 Address PR comments 2014-02-19 17:29:27 +01:00
Andrey
ada3ec96c3 Add Doctrine schema pre-upgrades 
Conflicts:
	lib/classes/appbox.php
 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
3b0fe2eb75 Fix CS 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
b341495c88 Fix tests 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
4cc82af980 Fix settings 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
ed4ae71819 Fix test suite 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
53ae0ccc24 Remove User_Adapter Inteface References 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
c156f842c7 Remove User_Adapter 2014-02-19 17:28:53 +01:00
Nicolas Le Goff
2aba3e8d8d Merge pull request #957 from romainneutron/doctrine-namespace 
[3.9] Add a namespace to Phraseanet doctrine entities
 2014-02-19 11:37:09 +01:00
Romain Neutron
2de870c3f9 Add a namespace to Phraseanet doctrine entities 2014-02-18 19:32:08 +01:00
Nicolas Le Goff
f2e0b74998 Merge pull request #954 from romainneutron/task-manager 
[3.9] Updates to task manager
 2014-02-17 16:20:05 +01:00
Romain Neutron
adaaf5b58a Use valid logger service 2014-02-17 12:30:04 +01:00
Romain Neutron
bdc93f0220 Remove some circular references 2014-02-17 12:25:18 +01:00
Romain Neutron
ffab51235a Address PR comments 2014-02-15 12:05:05 +01:00
Romain Neutron
c0b152d73a Add authorization strategy for WAMP topics 2014-02-15 11:38:51 +01:00
Romain Neutron
8385493ae1 Bump to version 3.9.0-alpha.11 2014-02-15 11:38:51 +01:00
Romain Neutron
0fe18a2494 Add Websocket server 2014-02-15 11:38:51 +01:00
Romain Neutron
f181135cde Add task manager broadcaster subscriber 2014-02-15 11:38:51 +01:00
Romain Neutron
687667771d Backport executable finder to allow use of local npm package binaries 2014-02-14 18:52:00 +01:00
Romain Neutron
787e86aacf Fix latest merge 2014-02-14 11:59:15 +01:00
Romain Neutron
903f63cd32 Merge branch '3.8' 2014-02-14 11:43:55 +01:00
Romain Neutron
9aa4e7abd8 Fix #1680 : Add support for custom extension to mime-type mapping 2014-02-13 16:22:41 +01:00
Romain Neutron
b819de9a54 Rename xliff files to xlf 2014-02-12 19:58:51 +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