11199 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Benoît Burnichon	e2e1fb0e09	Change Api SearchController to use Fractal	2016-05-19 13:44:01 +02:00
Benoît Burnichon	dc4921c7c0	Merge pull request #1857 from alchemy-fr/translations/4.0 ... Translations update 4.0	2016-05-19 12:26:00 +02:00
Benoît Burnichon	4d576f261b	Update translation dump	2016-05-19 12:20:46 +02:00
Anthony C	6edf46478d	Translated using Weblate (French) ... Currently translated at 100.0% (2296 of 2296 strings)	2016-05-19 11:30:57 +02:00
Benoît Burnichon	d919275055	Merge pull request #1856 from bburnichon/push-controller ... URL in Push emails have no authentication tokens.	2016-05-19 11:30:51 +02:00
Benoît Burnichon	ea808d23d7	Tokens should be string, not objects.	2016-05-19 10:53:07 +02:00
Thibaud Fabre	1a3b12e7a1	Merge pull request #1855 from aztech-dev/fix/api-order-admin-access ... Improve order create notification	2016-05-18 18:15:52 +02:00
Thibaud Fabre	1dd4167a13	Improve order create notification	2016-05-18 18:14:49 +02:00
Thibaud Fabre	f441a76ca8	Merge pull request #1854 from aztech-dev/fix/api-order-admin-access ... Fix order creator name in mail notifications	2016-05-18 17:57:37 +02:00
Thibaud Fabre	a7a048d81f	Fix order creator name in mail notifications	2016-05-18 17:56:18 +02:00
Thibaud Fabre	fee62a6e1a	Merge pull request #1852 from aztech-dev/fix/api-order-admin-access ... Fix access control condition	2016-05-18 16:29:40 +02:00
Thibaud Fabre	14e1e412bb	Fix access control condition	2016-05-18 16:28:27 +02:00
Thibaud Fabre	6b0ef66a1a	Merge pull request #1851 from aztech-dev/fix/api-order-admin-access ... Allow access to all orders via API to admins	2016-05-18 16:03:26 +02:00
Thibaud Fabre	c4843b6aad	Allow access to all orders via API to admins	2016-05-18 15:35:56 +02:00
Thibaud Fabre	1150bcaef8	Merge pull request #1850 from aztech-dev/fix/order-notifications ... Fix order notification subscriber and provider	2016-05-18 14:08:41 +02:00
Thibaud Fabre	95bb3eedeb	Fix duplicate log entries in webhook job	2016-05-18 13:07:28 +02:00
Thibaud Fabre	a02eab5f9e	Fix order notification subscriber and provider	2016-05-18 13:07:28 +02:00
Thibaud Fabre	92c0725f5b	Merge pull request #1849 from aztech-dev/fix/json-schema ... Fix JSON schema decode error	2016-05-18 01:01:37 +02:00
Thibaud Fabre	d924a8aad5	Fix JSON schema decode error	2016-05-17 23:17:10 +02:00
jygaulier	2822c02ffa	Merge pull request #1848 from jygaulier/PHRAS-1101_BACKPORT-4.0 ... PHRAS-1101_BACKPORT-4.0	2016-05-17 20:32:01 +02:00
Jean-Yves Gaulier	10e4a7a961	PHRAS-1101_BACKPORT-4.0 ... - fix : some elements of "train" don't display preview/caption when selected (due to code exception)	2016-05-17 20:23:20 +02:00
Thibaud Fabre	0be170e3f6	Merge pull request #1846 from aztech-dev/feature/backport-ansible ... Backport Ansible provisioning	2016-05-16 15:33:25 +02:00
Thibaud Fabre	adb01194b2	Fix Mailcatcher role for use with Ruby <= 1.9	2016-05-16 15:33:11 +02:00
Thibaud Fabre	775acc238f	Checkout provisioning from master	2016-05-16 14:50:25 +02:00
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