11180 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Benoît Burnichon	3ca3019668	Wipe record ids out of API search response ... Fix PHRAS-1085	2016-04-21 11:15:38 +02:00
Thibaud Fabre	2bff9dc26d	Merge pull request #1814 from bburnichon/feature/order-api-backport ... Backport Orders API	2016-04-20 16:55:39 +02:00
Benoît Burnichon	1e18b3e69f	This is a combination of 33 commits. ... - Squashed Pull request #1730 - Squashed Pull request #1741 - Squashed Pull request #1742 - Squash merge branch 4.0 - Squashed Pull request #1744 - Squashed Pull request #1746 - Squashed merge branch 4.0 - Squashed merge branch 4.0 - Squashed merge branch 4.0 - Squashed merge branch 4.0 - Squashed Pull request #1758 - Avoid using imagine/imagine alias as it is causing install issues - Squashed merge branch 4.0 - Squashed Pull request #1763 - Squashed merge branch 4.0 - Squash of 6 commits - Squashed merge branch 4.0 - This is a combination of 2 commits. - Squashed Pull request #1775 - Squashed Pull request #1777 - Squashed Pull request #1779 - Squashed Pull request #1780 - Squashed Pull request #1782 - Adds a Pull request template - Squased Pull request #1783 - Squash Pull request #1786 - Squashed Pull request #1796 - Squashed merge branch 4.0 - Squash Pull request #1791 - Squashed merge branch 4.0 - Squashed Pull request #1808 - Squashed Pull request #1811 - Squashed Pull request #1809	2016-04-20 16:22:14 +02:00
Thibaud Fabre	01b06c5144	Merge pull request #1813 from bburnichon/bug/download-oauth-issue ... Bug/download oauth issue	2016-04-19 17:16:59 +02:00
Benoît Burnichon	86b2f88722	Fixup timestamp issue and wrong variable use	2016-04-19 17:04:55 +02:00
Benoît Burnichon	5e84eccce8	Add OAuth authenticated routes to exceptions	2016-04-19 14:55:32 +02:00
Benoît Burnichon	f8fc74344e	Refactor SessionManagerSubscriber	2016-04-19 14:55:09 +02:00
Benoît Burnichon	3810d2c7e5	Merge pull request #1807 from aztech-dev/feature/oauth-on-download ... Add token based auth on download page	2016-04-13 15:35:42 +02:00
Thibaud Fabre	ce2ba36660	Add token based auth on download page	2016-04-13 15:21:39 +02:00
Thibaud Fabre	66e253d87f	Merge pull request #1804 from bburnichon/feature/add-api-application-loader-PHRAS-1073 ... Add api application loader	2016-04-13 15:12:13 +02:00
Benoît Burnichon	ded66ac8d1	Fix badly named class	2016-04-13 12:00:51 +02:00
Benoît Burnichon	dc2dee30af	Rename methods and fix Closure call issue	2016-04-13 12:00:51 +02:00
Benoît Burnichon	d2a5ca05bf	Make Api routes uses same flow as web	2016-04-13 12:00:51 +02:00
Thibaud Fabre	7a37fb9ded	Merge pull request #1803 from bburnichon/feature/add-oauth-on-basket-routes-PHRAS-1075 ... Add oauth authentication for export routes.	2016-04-12 18:49:03 +02:00
Benoît Burnichon	caec735784	Add oauth authentication for export routes. ... export_multi_export, export_mail, export_ftp & export_ftp_test are impacted.	2016-04-12 18:42:03 +02:00
Thibaud Fabre	c0ba718b2f	Merge pull request #1801 from bburnichon/delete-basket-element-issue ... Fix BasketElementRepository findByRecordIds	2016-04-11 13:51:46 +02:00
Benoît Burnichon	718db61448	PHPCS BasketElementRepository	2016-04-11 12:50:37 +02:00
Benoît Burnichon	bc1d5ed2c2	Fix BasketElementRepository findByRecordIds	2016-04-11 12:33:45 +02:00
Benoît Burnichon	7d6e341f66	Merge pull request #1797 from jygaulier/PHRAS-1065_backport-PHRAS-947 ... PHRAS-1065	2016-04-07 10:47:25 +02:00
Benoît Burnichon	aa07916a3f	Merge pull request #1795 from aztech-dev/fix/event-processor ... Doctrine iterator returns array not object	2016-04-07 10:12:03 +02:00
Jean-Yves Gaulier	1c63194400	PHRAS-1065 #time 1h ... backport PHRAS-947	2016-04-06 19:10:54 +02:00
Thibaud Fabre	431199694d	Doctrine iterator returns array not object	2016-04-06 17:22:27 +02:00
jygaulier	0cdedbfd5c	Merge pull request #1794 from jygaulier/PHRAS-1055_rebase-4.0 ... PHRAS-1055 backport to 4.0	2016-04-06 17:14:53 +02:00
jygaulier	429155bb16	Merge branch '4.0' into PHRAS-1055_rebase-4.0	2016-04-06 16:50:49 +02:00
Jean-Yves Gaulier	bc7fa44cf1	PHRAS-1055 #time 15m ... - fix fatal error "getName()"	2016-04-06 16:46:54 +02:00
Thibaud Fabre	f455123abd	Merge pull request #1793 from aztech-dev/fix/event-processor ... Fix event processor memory usage	2016-04-06 16:34:45 +02:00
Thibaud Fabre	c05cac4800	Hydrate events one by one to preserve memory	2016-04-06 16:16:47 +02:00
jygaulier	334dcff6bf	Merge pull request #1792 from jygaulier/PHRAS-1055_rebase-4.0 ... PHRAS-1055 rebase on 4.0	2016-04-06 15:20:44 +02:00
Jean-Yves Gaulier	e6b1ad4f2f	PHRAS-1055 #time 1h ... - no bug concerning --max_record - add try/catch so the job don't stop on errors PHRAS-1055 #time 5h - add option --dry - add verbose print (-v) - add "ALL" for type and subdef arguments - fix "substitute" options - fix show sql with arguments PHRAS-1055 #time 5h - better error handling - argument "databox" can be specified as id, dbname or viewname - add option "--partition=n/N" - argument "type" changed to option "--record_type=a,b,c" (can also be set as "--record_type=a,b --record_type=c") - argument "subdefs" changed to option "--name=x,y,z" (can also be set as "--name=x,y --name=z") - option "--with-substitution" changed to "--with_substituted" - option "--substitution-only" changed to "--substituted-only" PHRAS-1055 #time 2h - change lone argument (databox) to option "--databox" (mandatory) - add option "--missing_only" to create missing subdefs after structure change. - add option "--garbage_collect" to remove orphan subdefs left by structure change. PHRAS-1055 #time 1m - cleanup PHRAS-1055 #time 2h - cleanup - add option "--reset_subdef_flag" - add option "--set_writemeta_flag" PHRAS-1055 #time 1m - fix vocabulary (flag)	2016-04-06 11:36:00 +02:00
Thibaud Fabre	7ebbff44e6	Merge pull request #1774 from aztech-dev/fix/collection-watermark-4.0 ... Fix watermark getter	2016-03-23 18:20:26 +01:00
Thibaud Fabre	2e1ef8e279	Fix watermark getter	2016-03-23 18:02:48 +01:00
Thibaud Fabre	d1e8582c05	Merge pull request #1772 from aztech-dev/feature/subdef-webhook-events-4.0 ... Feature/subdef webhook events 4.0	2016-03-23 13:28:32 +01:00
Thibaud Fabre	b619bf7bba	Change failed to createion_failed	2016-03-23 12:42:31 +01:00
Thibaud Fabre	773a31d4f8	Add extra event types in webhooks	2016-03-23 12:42:31 +01:00
Benoît Burnichon	0332f37537	Merge pull request #1767 from lostdalek/hotfix/PHRAS-1038 ... PHRAS-1038	2016-03-22 17:27:25 +01:00
Florian BLOUET	755aac9e3e	PHRAS-1038 - fix story navigation in workzone context	2016-03-22 17:17:01 +01:00
Benoît Burnichon	4910beb251	Merge pull request #1769 from bburnichon/bug/orders-security-issue-v40-PHRAS-1042 ... orders security issue	2016-03-22 17:13:25 +01:00
Benoît Burnichon	25745732b6	Fix OrderElement accept/deny todo count	2016-03-22 16:16:09 +01:00
Benoît Burnichon	96295eab7b	Extract CollectionReferenceCollection class from ACL.	2016-03-22 16:15:44 +01:00
Benoît Burnichon	79119fe10a	some PHPCS fixing	2016-03-22 16:15:43 +01:00
Benoît Burnichon	83b8baa327	Reduce duplication for OrderController	2016-03-22 16:15:38 +01:00
Benoît Burnichon	a547a04aa6	Move Order controllers to same namespace	2016-03-22 16:14:08 +01:00
Benoît Burnichon	65550e8bd1	Refactor OrderTest	2016-03-22 16:13:23 +01:00
Benoît Burnichon	a5f9ace717	fix Basket owning setting when providing it	2016-03-22 16:13:22 +01:00
Benoît Burnichon	5b03159245	Add basket owning logic in Order	2016-03-22 16:13:22 +01:00