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
7,325 Commits 268 Branches 107 Tags
12f9575a8b93a5f86dd89c42a22ff33c82fbe2c8
Commit Graph

2396 Commits

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
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
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
5e5ac7f64f Fix patch 2014-02-19 11:33:42 +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
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
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
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
Romain Neutron
0be7c3b848 Fix grunt usage. It needs to be at Phraseanet root to work correctly as local npm package 2014-02-14 14:40:35 +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
Nicolas Le Goff
8994bbc133 Merge pull request #946 from romainneutron/fix-1680 
[3.8] Fix #1680 : Add support for custom extension to mime-type mapping
 2014-02-14 11:41:38 +01:00
Nicolas Le Goff
c3c0110b7d Merge branch '3.8' 2014-02-13 21:44:23 +01:00
Nicolas Le Goff
fad08dc337 Merge pull request #949 from romainneutron/cache-namespace-strategy 
[3.8] Update cache namespace strategy to avoid collisions
 2014-02-13 18:01:01 +01:00
Nicolas Le Goff
e02f6f0879 Merge pull request #948 from romainneutron/fix-feeds 
[3.9] Fix Feed aggregate to suit the interface
 2014-02-13 16:42:12 +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
7f7d9c7753 Update cache namespace strategy to avoid collisions 2014-02-13 16:11:02 +01:00
Romain Neutron
172718fd88 Fix Feed aggregate to suit the interface 2014-02-13 13:42:09 +01:00
Nicolas Le Goff
7df2343ac4 Merge pull request #943 from romainneutron/locales 
[3.9] Rename xliff files to xlf
 2014-02-13 11:14:13 +01:00
Nicolas Le Goff
f4f063ad3e Merge branch '3.8' 
Conflicts:
	templates/web/report/report_layout_child.html.twig
 2014-02-13 11:12:26 +01:00
Romain Neutron
b819de9a54 Rename xliff files to xlf 2014-02-12 19:58:51 +01:00
Romain Neutron
372fc86601 Use short array declarations 2014-02-11 18:44:31 +01:00
Romain Neutron
76048709ee Fix CS 2014-02-11 16:27:47 +01:00
Romain Neutron
e4ce070cde Fix latest merge 2014-02-11 15:26:51 +01:00
Nicolas Le Goff
1fcd920d6d Fix #1684 CSV report are empty 2014-02-11 14:05:56 +01:00
Nicolas Le Goff
6053a03b87 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	tests/Alchemy/Tests/Phrasea/Application/ApiTestCase.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2014-02-11 09:02:29 +01:00
Nicolas Le Goff
aa914b4c13 Merge pull request #936 from romainneutron/fix-1693 
[3.8] Fix #1693 : Guest users should be able to access detailed view
 2014-02-11 08:45:04 +01:00
Nicolas Le Goff
c03dbad424 Merge pull request #939 from romainneutron/fix-1691 
[3.8] Fix #1691 : Avoid exception message for users
 2014-02-11 08:43:22 +01:00
Romain Neutron
66b3ad0022 Fix #1691 : Avoid exception message for users 2014-02-10 23:33:25 +01:00
Romain Neutron
68e775dfd3 Fix #1693 : Guest users should be able to access detailed view 2014-02-10 14:08:01 +01:00
Romain Neutron
8cdd19bcf7 Fix #1689 : Discard wrong XML errors 2014-02-10 12:15:17 +01:00
Nicolas Le Goff
c4eadb7e0e Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/TOU.php
	lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Security/Firewall.php
	lib/classes/task/abstract.php
	tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php
 2014-02-05 19:42:22 +01:00