10953 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Benoît Burnichon	ba1801474d	Merge branch '4.0' into hotfix/PHRAS-965	2016-02-16 17:48:17 +01:00
Benoît Burnichon	58c02bbc0b	Merge pull request #1698 from bburnichon/bug/translation-keys-PHRAS-956 ... translation keys	2016-02-16 17:48:00 +01:00
Benoît Burnichon	03314703b7	Dump translation messages	2016-02-16 14:45:34 +01:00
Benoît Burnichon	b6656f8b72	Fix translation keys	2016-02-16 14:45:34 +01:00
Benoît Burnichon	7bb8484034	Remove unused use statement	2016-02-16 14:45:34 +01:00
Benoît Burnichon	3ee7e74a90	Merge pull request #1699 from bburnichon/bug/broken-oauth2-authentication-PHRAS-971 ... broken oauth2 authentication	2016-02-16 14:07:56 +01:00
Benoît Burnichon	27eaf37a45	Set OAuth2_Adapter default API version	2016-02-16 13:48:35 +01:00
Benoît Burnichon	41287802ca	fixup some PHPCS	2016-02-16 13:48:06 +01:00
Florian BLOUET	f5bdbc8cab	fix tooltips for captions	2016-02-15 18:05:26 +01:00
Florian BLOUET	459c7164f7	PHRAS-965 - fix preview tooltip positionning in answers grid	2016-02-15 16:35:17 +01:00
Benoît Burnichon	dd0ab31bee	Merge pull request #1694 from bburnichon/bugfix/multiple-orders-PHRAS-960 ... Change bad SQL query which not always is scalar	2016-02-15 16:27:50 +01:00
Benoît Burnichon	311f563b86	Change bad SQL query which not always is scalar	2016-02-15 16:04:57 +01:00
Benoît Burnichon	94004d3605	Merge pull request #1693 from bburnichon/hotfix/user-search-issue ... Twig uses users User_Query instance, not result iterable	2016-02-15 15:49:11 +01:00
Benoît Burnichon	d5bf3b742e	Twig uses users User_Query instance, not result iterable ... Introduced by fad68369ca in PR #1690 PHRAS-962	2016-02-15 15:08:15 +01:00
Benoît Burnichon	86144169a2	Merge pull request #1692 from bburnichon/improvement/PHRAS-961 ... Bridge_Api class should not depend on SQL time	2016-02-15 15:07:06 +01:00
Benoît Burnichon	8a0b461cdc	Bridge_Api class should not depend on SQL time ... PHRAS-961	2016-02-15 13:53:56 +01:00
Benoît Burnichon	ced945f36e	Merge pull request #1691 from bburnichon/bug/document-filenames-PHRAS-967 ... document filenames generation bug	2016-02-12 19:56:56 +01:00
Benoît Burnichon	1d519ff58f	Fixup FilesystemService document filename generation. ... There was a missing '.' before extension	2016-02-12 19:29:28 +01:00
Benoît Burnichon	d1e1d18f8a	Merge pull request #1690 from bburnichon/bug/unlock-link-PHRAS-962 ... Incorrect generation of unlock links	2016-02-12 19:20:11 +01:00
Benoît Burnichon	59e5b0b0e8	Reformat array and add offset_start variable	2016-02-12 17:29:22 +01:00
Benoît Burnichon	bf3d3ae8f1	Remove useless property	2016-02-12 17:29:22 +01:00
Benoît Burnichon	fad68369ca	Remove possible bugs in UserManage helper	2016-02-12 17:29:22 +01:00
Benoît Burnichon	ae97ad90e6	Method renaming to remove underscores	2016-02-12 17:29:21 +01:00
Benoît Burnichon	de590a60ea	PHPCS Fixes some unused class imports	2016-02-12 17:29:21 +01:00
Benoît Burnichon	f6f6feb4e9	Group generation of Email confirmation	2016-02-12 16:41:17 +01:00
Benoît Burnichon	9aa5faff50	Merge pull request #1688 from bburnichon/bug/import-users-PHRAS-966 ... Wrong Check on user existence. Then, there was a mismatch in activity/job.	2016-02-12 14:01:05 +01:00
Benoît Burnichon	8910750928	Fix import users ... PHRAS-966	2016-02-12 13:40:40 +01:00
Florian Blouet	40a06ebfd3	PHRAS-879 - misc fixes on white skin, add missing var	2016-02-12 12:24:38 +01:00
Florian Blouet	00abc461f1	PHRAS-963 - fix css color	2016-02-12 11:26:40 +01:00
Benoît Burnichon	f93d1d6696	Merge pull request #1684 from bburnichon/travis-tweak ... CI tweaks & fixes on white skin	2016-02-12 11:22:06 +01:00
Benoît Burnichon	faead9fbd3	Change circle conf to only use 2 containers	2016-02-12 10:14:56 +01:00
Benoît Burnichon	d64eaf2b9b	Group first 2 builds	2016-02-12 10:14:56 +01:00
Benoît Burnichon	a1532f5557	Change travis to run same suites as circleci	2016-02-12 10:14:54 +01:00
Florian Blouet	f59fc905b4	PHRAS-879 - misc fixes on white skin	2016-02-11 16:26:21 +01:00
Benoît Burnichon	229f0e64cb	Merge pull request #1676 from bburnichon/bugfix/checkers-same-type-PHRAS-957 ... Register checkers with similar type	2016-02-11 16:04:45 +01:00
Benoît Burnichon	8f42ea6a79	Merge branch '4.0' into bugfix/checkers-same-type-PHRAS-957	2016-02-11 15:26:48 +01:00
Florian Blouet	236c036f9c	PHRAS-601 - fix behavior in delete records modal	2016-02-11 14:14:27 +01:00
Florian Blouet	15634e1cd4	PHRAS-896 - fix duplicated facets in workzone	2016-02-11 14:14:27 +01:00
Florian BLOUET	a1c5148700	PHRAS-941 - fix old jquery selector for selected and checked, fix jquery migrate url call	2016-02-11 14:14:27 +01:00
Benoît Burnichon	14fffe314a	PHPCS	2016-02-10 19:38:30 +01:00
Benoît Burnichon	9b89c0f6db	Border Manager can accepts several checkers with same type	2016-02-10 19:37:45 +01:00
Benoît Burnichon	27e35ae1b8	Merge pull request #1673 from lostdalek/hotfix/PHRAS-930 ... PHRAS-930	2016-02-09 16:42:50 +01:00
Florian BLOUET	b874022b1f	PHRAS-930 - add localized caption's label in preview and tooltips	2016-02-09 16:16:13 +01:00
Benoît Burnichon	38069ae486	Merge pull request #1672 from lostdalek/hotfix/PHRAS-952 ... PHRAS-952	2016-02-09 14:31:16 +01:00
Florian BLOUET	dd35a3cad6	PHRAS-952 - fix thumbnail train synchronisation	2016-02-09 14:13:20 +01:00
Thibaud Fabre	011db3d84e	Merge pull request #1671 from bburnichon/admin-management-PHRAS-949 ... Demote Admin users on request	2016-02-09 13:44:32 +01:00
Benoît Burnichon	403eb36903	Demote Admin users on request	2016-02-09 12:25:28 +01:00
Benoît Burnichon	8f4bf4c7a8	Merge pull request #1668 from lostdalek/hotfix/PHRAS-934 ... PHRAS-934	2016-02-08 19:23:17 +01:00
Benoît Burnichon	dd8ce55081	Merge branch 'master' into hotfix/PHRAS-934	2016-02-08 18:53:17 +01:00
Benoît Burnichon	6d73f0cce5	Merge pull request #1670 from bburnichon/bugfix/binary-file-response-PHRAS-948 ... BinaryFileResponse issue with request having 'If-Range' header as a date	2016-02-08 18:52:44 +01:00