hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,025 Commits 268 Branches 107 Tags
0057cccdfe1f29f23be3fbfec5e1ce342aba31ec
Commit Graph

11025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benoît Burnichon
0057cccdfe ansible WIP 2016-05-16 14:45:42 +02:00
Thibaud Fabre
23fda9f81e Merge pull request #1845 from aztech-dev/fix/create-order-notify 
Fix mail notification for order managers
 2016-05-13 08:02:41 +02:00
Thibaud Fabre
719fef4943 Fix mail notification for order managers 2016-05-13 07:55:03 +02:00
jygaulier
d6cbdf6df4 Merge pull request #1844 from jygaulier/PHRAS-1101_BACKPORT-4.0 
PHRAS-1101_BACKPORT
 2016-05-12 18:27:02 +02:00
Jean-Yves Gaulier
378cc45a87 PHRAS-1101_THMB-TRAIN-IN-PREVIEW 
backport from master
#time 30m
 2016-05-12 17:16:47 +02:00
Thibaud Fabre
c7b1b6b78d Merge pull request #1830 from aztech-dev/feature/order-webhooks 
Add webhook notifications for order events
 2016-05-12 14:59:59 +02:00
Thibaud Fabre
1a65e8269e Change default notification method for order creation via API 2016-05-12 14:48:03 +02:00
Thibaud Fabre
5d01291555 Update mocks in order todo test 2016-05-12 14:36:40 +02:00
Thibaud Fabre
4ae762657e Update tests to mock event subscribers not mailers 2016-05-12 14:22:49 +02:00
Benoît Burnichon
20e9621bac Merge pull request #1841 from lostdalek/hotfix/PHRAS-1046-4.0 
PHRAS-1046
 2016-05-12 11:44:54 +02:00
Thibaud Fabre
5495c4b507 Fix initialisation of order event subscriber 2016-05-12 11:44:04 +02:00
Thibaud Fabre
5327b7893b Fix initialisation of notifiers 2016-05-12 11:21:12 +02:00
Florian BLOUET
79b7aba666 PHRAS-1046 - fix CGU content disposition in account 2016-05-12 10:39:44 +02:00
Benoît Burnichon
71bd86769c Merge pull request #1834 from bburnichon/feature/load-children-of-many-stories 
Load children of many stories
 2016-05-12 10:24:20 +02:00
Benoît Burnichon
36cecb96db Merge pull request #1837 from bburnichon/hotfix/security-fix 
Require latest version of roave/security-advisories.
 2016-05-12 10:23:44 +02:00
Benoît Burnichon
93e428e8ee Merge pull request #1839 from lostdalek/hotfix/PHRAS-999-4.0 
PHRAS-999
 2016-05-12 10:23:08 +02:00
Florian BLOUET
b63da92450 PHRAS-999 - push > list manager > remove useless notify button 2016-05-11 18:53:08 +02:00
Benoît Burnichon
2099b26435 Require latest version of roave/security-advisories. 
Bump symfony/symfony
 2016-05-11 18:17:16 +02:00
Thibaud Fabre
d8e357c199 Merge pull request #1836 from alchemy-fr/fix/vagrant-up 
Let Vagrant generate its own private keys
 2016-05-11 17:54:58 +02:00
Thibaud Fabre
f12354e6e1 Let Vagrant generate its own private keys 2016-05-11 17:54:12 +02:00
Benoît Burnichon
3abb34a702 Fixup error in reordering of elements 2016-05-11 17:50:57 +02:00
Benoît Burnichon
8e693964df Refactor getChildren() and get_grouping_parents() 2016-05-11 17:50:57 +02:00
Benoît Burnichon
ea9458da77 Avoid calling cache when data is already present 2016-05-11 17:50:57 +02:00
Thibaud Fabre
8681f25922 Update docblocks 2016-05-11 17:11:24 +02:00
Thibaud Fabre
2e815bc463 Add SQL migration for new order column and fix docblocks 2016-05-11 16:59:36 +02:00
Benoît Burnichon
95d3e5470d Merge pull request #1833 from lostdalek/hotfix/PHRAS-1084 
PHRAS-1084
 2016-05-11 15:08:13 +02:00
Florian BLOUET
4e1ebe7b0d PHRAS-1084 - fix admin tooltip conflict 2016-05-11 14:51:12 +02:00
Benoît Burnichon
5fcf8c4716 Merge pull request #1829 from lostdalek/hotfix/PHRAS-1082 
PHRAS-1082
 2016-05-09 18:01:29 +02:00
Florian BLOUET
20bdc9c5af PHRAS-1082 - fix preview icon in record editor 2016-05-09 16:41:23 +02:00
Benoît Burnichon
62e8635130 Merge pull request #1828 from lostdalek/hotfix/PHRAS-1076 
fix PHRAS-1076
 2016-05-09 15:29:30 +02:00
Florian BLOUET
3d12754c8c fix PHRAS-1076 2016-05-09 15:05:22 +02:00
Thibaud Fabre
957d588d6f Add order webhook processor 2016-04-29 02:26:28 +02:00
Thibaud Fabre
276b060c58 Add order validation notifier interface and mailer implementation 2016-04-28 16:41:26 +02:00
Thibaud Fabre
6aeb28d530 Restore register at initialization 
Restore register at initialization
 2016-04-28 13:36:02 +02:00
Thibaud Fabre
1b1debd09c Add notification method on order entity 2016-04-27 18:06:16 +02:00
Thibaud Fabre
eac63db412 Merge pull request #1825 from aztech-dev/fix/create-order 
PHRAS-1091 Pass view instead of order to transformer
 2016-04-26 15:41:38 +02:00
Thibaud Fabre
579293c636 PHRAS-1091 Pass view instead of order to transformer 2016-04-26 15:38:38 +02:00
Benoît Burnichon
53ef815145 restore register at initialization 2016-04-22 20:22:56 +02:00
Benoît Burnichon
3c4c3c9359 Merge pull request #1820 from bburnichon/bug/story-detach-error-PHRAS-1076 
fix listener to be called when refreshing Basket Workzone
 2016-04-22 19:26:28 +02:00
Benoît Burnichon
d6b386662d fix listener to be called when refreshing Basket Workzone 2016-04-22 19:18:29 +02:00
Benoît Burnichon
051d4b41f6 Merge pull request #1819 from bburnichon/bug/image-rotate-issue-PHRAS-1024 
Image rotate issue
 2016-04-22 17:39:30 +02:00
Benoît Burnichon
fca3146f91 Remove subdef etag when marking physically unavailable 2016-04-22 17:07:18 +02:00
Benoît Burnichon
f84f625a4e All media_subdef updates go to the repository 2016-04-22 16:15:37 +02:00
Benoît Burnichon
c053ef5045 Fixup invalid method name causing tooltip error 2016-04-22 16:14:10 +02:00
Benoît Burnichon
ca6c3f9920 Changes on SubdefGroup reflected in using clients 2016-04-22 12:42:14 +02:00
Benoît Burnichon
2b097e9be7 Extract SubdefGroup class 2016-04-22 12:38:33 +02:00
Thibaud Fabre
06f12cabce Merge pull request #1817 from bburnichon/bug/oauth_token-PHRAS-1086 
OAuth authentication is not properly prioritized
 2016-04-21 13:24:16 +02:00
Thibaud Fabre
a83fb6b836 Merge pull request #1816 from bburnichon/bug/api-list-stories-PHRAS-1085 
Remove record ids in stories elements search API
 2016-04-21 13:23:06 +02:00
Benoît Burnichon
ceb8cb55eb Add request query parameter check for oauth_token 2016-04-21 12:14:09 +02:00
Benoît Burnichon
7109131f78 Fixup CookiesDisablerSubscriber for all API routes 2016-04-21 12:13:26 +02:00