hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,325 Commits 268 Branches 107 Tags
12f9575a8b93a5f86dd89c42a22ff33c82fbe2c8
Commit Graph

7325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Neutron
12f9575a8b Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/User/Adapter.php
	lib/classes/base.php
	lib/classes/connection.php
	lib/classes/databox/cgu.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/bridgeuploadfail.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/taskrun.php
	lib/classes/record/adapter.php
	lib/classes/registry.php
	lib/classes/set/order.php
	lib/classes/task/abstract.php
	lib/classes/task/appboxAbstract.php
	lib/classes/task/databoxAbstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/apibridge.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	templates/web/prod/upload/lazaret.html.twig
 2014-02-20 16:05:23 +01:00
Nicolas Le Goff
405dbb7533 Merge pull request #961 from romainneutron/env-var 
[3.9] JS_COMPILER is not related to the Travis build but to the build itself
 2014-02-20 14:50:43 +01:00
Nicolas Le Goff
53c7af3dbb Merge pull request #960 from romainneutron/exception-namespace 
[3.8] Avoid errors by explicitely namespacing root exception
 2014-02-20 14:50:36 +01:00
Romain Neutron
c623662513 JS_COMPILER is not related to the Travis build but to the build itself 2014-02-20 13:13:43 +01:00
Romain Neutron
2af21c064c Avoid errors by explicitely namespacing root exception 2014-02-20 11:28:31 +01:00
Nicolas Le Goff
d6caf64018 Merge pull request #958 from romainneutron/fix-1697 
[3.8] Fix #1697 : Add pagination to quarantine
 2014-02-19 20:35:56 +01:00
Nicolas Le Goff
171390f7c8 Use short array notations 2014-02-19 17:28:39 +01:00
Nicolas Le Goff
604ded5333 Fix CS 2014-02-19 17:27:21 +01:00
Romain Neutron
4b5613cf9a Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	builder.php
	launchpadToLocales.php
	localesToLaunchPad.php
 2014-02-19 12:08:05 +01:00
Nicolas Le Goff
fab9a64ae0 Merge pull request #959 from romainneutron/cleanup-files 
[3.8] Cleanup files
 2014-02-19 11:37:56 +01:00
Romain Neutron
4893b62fc6 Fix #1697 : Add pagination to quarantine 2014-02-19 11:37:47 +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
64955df549 Remove old files 2014-02-19 11:36:25 +01:00
Romain Neutron
5e5ac7f64f Fix patch 2014-02-19 11:33:42 +01:00
Romain Neutron
a331d4e467 Format changelog 2014-02-19 03:12:30 +01:00
Romain Neutron
0f4ff45490 Format changelog 2014-02-19 03:11:20 +01:00
Romain Neutron
2bc6dcd388 Update changelog 2014-02-19 03:09:04 +01:00
Romain Neutron
4ffa37c384 Update changelog for 3.8.3 2014-02-19 03:07:04 +01:00
Romain Neutron
e574a1c988 Merge branch '3.8' 2014-02-18 19:49:16 +01:00
Romain Neutron
2de870c3f9 Add a namespace to Phraseanet doctrine entities 2014-02-18 19:32:08 +01:00
Romain Neutron
71f2c1969b Merge pull request #956 from romainneutron/php-5.6 
[3.8] Add travis build on PHP 5.6
 2014-02-17 19:22:27 +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
53fff797a4 Add travis build on PHP 5.6 2014-02-17 15:54:08 +01:00
Nicolas Le Goff
7d77bef3e0 Merge pull request #859 from romainneutron/circular 
[3.9] Remove some circular references
 2014-02-17 14:20:47 +01:00
Romain Neutron
621bf7feec Prepend exec to commands 2014-02-17 12:30:04 +01:00
Romain Neutron
adaaf5b58a Use valid logger service 2014-02-17 12:30:04 +01:00
Romain Neutron
2a534615bb Update taskmanager versions 2014-02-17 12:30:03 +01:00
Romain Neutron
bdc93f0220 Remove some circular references 2014-02-17 12:25:18 +01:00
Nicolas Le Goff
b4a07c1469 Merge pull request #944 from romainneutron/websockets 
[3.9] Add websocket server
 2014-02-17 12:02:56 +01:00
Nicolas Le Goff
7537cce953 Merge pull request #940 from nlegoff/task_manager_backbone 
[3.9] Use backbone to display taskmanager front end
 2014-02-17 11:57: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
a834b3a4df Add useful infos in session storage 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
2c642f594f Add patch to version 3.9.0-alpha.11 2014-02-15 11:38:51 +01:00
Romain Neutron
811be51b3d Add WebsocketServer command 2014-02-15 11:38:51 +01:00
Romain Neutron
0fe18a2494 Add Websocket server 2014-02-15 11:38:51 +01:00
Romain Neutron
9238a939b3 Minimal fix for callback declaration 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
d0360a02b2 Remove signal listener once a signal has been caught 2014-02-15 11:38:50 +01:00
Romain Neutron
cec863ff7b Add check on libevent for production 2014-02-15 11:38:50 +01:00
Romain Neutron
ff5a3a6c16 Add dependency on Ratchet and react ZMQ 2014-02-15 11:38:50 +01:00
Romain Neutron
094b3f5c9d Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Core/CLIProvider/CLIDriversServiceProvider.php
	tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
 2014-02-14 19:45:57 +01:00
Nicolas Le Goff
dcacfcc5f6 Merge pull request #955 from romainneutron/executable-finder-backport 
[3.8] Backport executable finder to allow use of local npm package binaries
 2014-02-14 19:44:11 +01:00
Romain Neutron
d1b6aee633 I dont want to know how this could have work before 2014-02-14 19:23:51 +01:00
Romain Neutron
c9080de1c5 I dont want to know how this could have work before 2014-02-14 19:21:47 +01:00
Romain Neutron
687667771d Backport executable finder to allow use of local npm package binaries 2014-02-14 18:52:00 +01:00
Nicolas Le Goff
7025e756bc Use backbone to display taskmanager front end 2014-02-14 16:55:45 +01:00
Nicolas Le Goff
caca9e7a89 Merge pull request #951 from romainneutron/psr-0 
[3.9] Fix PSR-0 file naming
 2014-02-14 16:51:27 +01:00
Romain Neutron
c5d3f97258 Fix PSR-0 file naming 2014-02-14 15:51:09 +01:00