Commit Graph

11207 Commits

Author SHA1 Message Date
Thibaud Fabre
675ec2c939 Merge pull request #1957 from alchemy-fr/fix/provisioned-api-settings
API settings provisioning
2016-09-27 11:27:13 +02:00
Thibaud Fabre
7d22a716f5 Merge pull request #1956 from alchemy-fr/feature/collection-order-manager
PHRAS-1006 Add order manager in API collection description
2016-09-27 11:11:43 +02:00
Thibaud Fabre
87a9f532c8 Set extra API settings during provisioning 2016-09-27 11:11:25 +02:00
Thibaud Fabre
3d8d4f6d99 Fix config editor set command 2016-09-27 11:11:02 +02:00
Thibaud Fabre
ebc515f2c1 PHRAS-1006 Add order manager in API collection description 2016-09-27 10:38:34 +02:00
Thibaud Fabre
36a0f819fc Merge pull request #1955 from alchemy-fr/fix/vagrant-debug-mode
Allow debugger access to Vagrant host IP addresses
2016-09-27 10:17:18 +02:00
Thibaud Fabre
b18fa2d228 PHRAS-1214 Allow debugger access to Vagrant host IP addresses 2016-09-27 10:08:42 +02:00
Thibaud Fabre
758938ca09 Merge pull request #1954 from alchemy-fr/feature/edit-config-command
Add configuration editor command in setup
2016-09-27 07:55:50 +02:00
Thibaud Fabre
8b843b9357 Add configuration editor command in setup 2016-09-27 07:49:06 +02:00
Thibaud Fabre
a2b7c949fb Merge pull request #1953 from alchemy-fr/feature/improve-makefile
Split build into smaller targets
2016-09-27 06:30:11 +02:00
Thibaud Fabre
86d4dfc8fc Split build into smaller targets 2016-09-27 06:29:16 +02:00
Thibaud Fabre
1fcaa10f7a Merge pull request #1952 from alchemy-fr/fix/provisioning-4.0
Fix provisioning errors
2016-09-27 06:23:08 +02:00
Thibaud Fabre
cbe8789060 Do not install plugins as unprivileged user 2016-09-27 06:15:14 +02:00
Thibaud Fabre
8463b81752 Fix Gulp build command 2016-09-27 06:15:03 +02:00
Thibaud Fabre
826845f65b Merge pull request #1950 from xrousset78800/fix/change-caret-color-on-white-skin
Change caret color on phraseanet white skin
2016-09-26 17:33:23 +02:00
Xavier Rousset
06a0b89c48 PHRAS-1196 Change caret color on phraseanet white skin 2016-09-26 16:13:46 +02:00
Thibaud Fabre
3ddcc0202c Merge pull request #1949 from xrousset78800/fix/remove-rotation-subdef-wording-on-4.0
Remove unwanted rotation wording
2016-09-26 15:07:49 +02:00
Xavier Rousset
c98b40ef2f PHRAS-1224 Remove unwanted rotation wording 2016-09-26 14:44:44 +02:00
Thibaud Fabre
986a517ecf Merge pull request #1947 from alchemy-fr/fix/phras-1210
PHRAS-1210 Remove invalid assignment
2016-09-22 18:33:50 +02:00
Thibaud Fabre
051eb0a2bf PHRAS-1210 Remove invalid assignment 2016-09-22 18:11:24 +02:00
Thibaud Fabre
be4846c8aa Merge pull request #1942 from alchemy-fr/backport/provisioning
Backport provisioning
2016-09-22 12:03:23 +02:00
Thibaud Fabre
494f48c053 Split make targets and update provisioning accordingly 2016-09-22 11:53:06 +02:00
Thibaud Fabre
770d38b754 Install dependencies and public assets during initial provisioning 2016-09-22 10:10:31 +02:00
Thibaud Fabre
dc6cddcd26 Fix Ansible roles to provision fully functional Vagrant VM 2016-09-22 10:10:08 +02:00
Thibaud Fabre
d934e04c80 Merge pull request #1938 from jygaulier/PHRAS-1216_story-cover-changed-event
PHRAS-1216_story-cover-changed-event
2016-09-21 16:11:56 +02:00
Thibaud Fabre
fe3bae5201 Merge pull request #1939 from alchemy-fr/backport/validation-tokens
Fix non unique validation tokens
2016-09-21 16:02:39 +02:00
Jean-Yves Gaulier
1c1e9cf723 PHRAS-1216_story-cover-changed-event
- fix : class name/extend changed,
#time 10m
2016-09-21 15:47:55 +02:00
Thibaud Fabre
4a434672b4 Remove limit clause and use maxResults query method 2016-09-21 15:17:27 +02:00
Thibaud Fabre
e9f74c9c52 Fix login issues when multiple validation tokens exist 2016-09-21 15:17:18 +02:00
Jean-Yves Gaulier
e10971a88f PHRAS-1216_story-cover-changed-event
#time 1h
2016-09-21 15:13:12 +02:00
Thibaud Fabre
8ff6f3484e Merge pull request #1935 from moctardiouf/patch-2
fix syntax error text_mail_receiver
2016-09-19 15:15:31 +02:00
moctardiouf
4ff084ffe5 fix syntax error text_mail_receiver 2016-09-16 19:21:27 +02:00
Thibaud Fabre
7041c960c7 Fix filename 2016-08-02 15:25:53 +02:00
Thibaud Fabre
d6a68b9257 Merge pull request #1931 from aztech-dev/4.0
Remove autosubmit from order manager list
2016-07-29 15:06:26 +02:00
Thibaud Fabre
884d59462c Remove autosubmit from order manager list 2016-07-29 15:05:39 +02:00
Thibaud Fabre
144ebfb02a Merge pull request #1930 from aztech-dev/4.0
Allow removing order masters without adding a new one
2016-07-29 15:03:34 +02:00
Thibaud Fabre
303a39e359 Allow removing order masters without adding a new one 2016-07-29 14:46:18 +02:00
jygaulier
d558192a74 Merge pull request #1910 from jygaulier/PHRAS-1168_Backport-PHRAS-1094-to-4.0
PHRAS-1168_Backport-PHRAS-1094-to-4.0
2016-07-18 13:32:27 +02:00
Thibaud Fabre
9dc6509911 Merge pull request #1925 from aztech-dev/feature/cors-configuration
PHRAS-1180 Add configuration entry to enable CORS on custom paths
2016-07-12 15:11:32 +02:00
Thibaud Fabre
9ca8dee44f PHRAS-1180 Add configuration entry to enable CORS on custom paths 2016-07-12 14:22:12 +02:00
Thibaud Fabre
3072125658 Fix include resolution for search type 2 2016-07-02 15:40:32 +02:00
Thibaud Fabre
36751d1afb Merge pull request #1919 from aztech-dev/improvement/story-search-type
Fix incorrect include resolution for search type 2
2016-07-02 15:38:00 +02:00
Thibaud Fabre
8c888b99f5 Fix incorrect include resolution for search type 2 2016-07-02 15:35:45 +02:00
Thibaud Fabre
afb2250735 Merge pull request #1918 from alchemy-fr/improvement/story-search-type
Include record caption in new story search type
2016-07-02 15:04:07 +02:00
Thibaud Fabre
d370805b1f Rename methods for more consistency 2016-07-02 15:03:25 +02:00
Thibaud Fabre
7141d4c1d5 Rename caption metadata and use preloaded values 2016-07-02 14:53:40 +02:00
Thibaud Fabre
0bc38c9dd2 Include caption metadatas in search type 2 2016-07-02 14:35:47 +02:00
Thibaud Fabre
0679bd83b5 Merge pull request #1917 from aztech-dev/feature/simplify-story-search-response
Fix include resolution
2016-06-30 12:06:44 +02:00
Thibaud Fabre
faf9b98b11 Fix include resolution
Incorrect use of += operator on arrays caused the story includes to
always be unset
2016-06-30 11:57:02 +02:00
jygaulier
de997532d2 Merge pull request #1916 from jygaulier/PHRAS-726_delete-candidate
PHRAS-726_delete-candidate
2016-06-28 20:33:18 +02:00