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

11180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaud Fabre
dc6cddcd26 Fix Ansible roles to provision fully functional Vagrant VM 2016-09-22 10:10:08 +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
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
Jean-Yves Gaulier
69cc533ff6 PHRAS-726_delete-candidate 
- change : thesaurus pool notifications is 10s
- fix : thesaurus / delete term is ok

#time 1h
 2016-06-28 19:10:23 +02:00
jygaulier
a934280052 Merge pull request #1914 from jygaulier/PHRAS-726_delete-candidate 
PHRAS-726_delete-candidate
 2016-06-28 17:16:07 +02:00
Jean-Yves Gaulier
9c32183747 PHRAS-726_delete-candidate 
- remove : prod / replace candidate is removed from menu
- fix : thesaurus / delete candidate is ok

#time 1h
 2016-06-28 16:54:32 +02:00
Thibaud Fabre
0c4f9edea7 Merge pull request #1915 from aztech-dev/feature/simplify-story-search-response 
Add record count property to story responses
 2016-06-28 15:31:27 +02:00
Thibaud Fabre
3498b835d5 Add record count property to story responses 2016-06-28 15:30:20 +02:00
Jean-Yves Gaulier
ef108d543e PHRAS-726_delete-candidate 
- change : prod / delete candidate does not update records metadata
- change : prod / replace candidate is disabled
- fix : prod / delete candidate is ok

#time 2h
 2016-06-28 15:12:31 +02:00
Thibaud Fabre
dc14a5d950 Merge pull request #1913 from aztech-dev/feature/simplify-story-search-response 
Remove records property from story search results
 2016-06-28 13:22:51 +02:00
Thibaud Fabre
5648f3219c Remove records property from story search results 2016-06-28 13:12:58 +02:00
Jean-Yves Gaulier
b49a5ceda5 PHRAS-1168_Backport-PHRAS-1094-to-4.0 
(update php-es lib)
#time 30m
 2016-06-16 17:57:04 +02:00
jygaulier
65e666ee98 Merge pull request #1908 from jygaulier/PHRAS-1164_Backport-PHRAS-1158-to-4.0 
PHRAS-1164_Backport-PHRAS-1158-to-4.0
 2016-06-16 17:22:51 +02:00
Jean-Yves Gaulier
9e891d4ae9 PHRAS-1164_Backport-PHRAS-1158-to-4.0 
#time 20m
 2016-06-16 16:02:26 +02:00
jygaulier
1e900543f7 Merge pull request #1904 from jygaulier/PHRAS-1160_Backport-PHRAS_1159 
PHRAS-1160_Backport-PHRAS_1159
 2016-06-15 18:00:13 +02:00
jygaulier
d825483f5e Merge pull request #1905 from jygaulier/PHRAS-1161_Backport-PHRAS_1100 
PHRAS-1161_Backport-PHRAS_1100
 2016-06-15 18:00:04 +02:00
Jean-Yves Gaulier
27ee4334c2 PHRAS-1161_Backport-PHRAS_1100 
#time 30m
 2016-06-15 15:53:14 +02:00
Jean-Yves Gaulier
95043b5e7a PHRAS-1160_Backport-PHRAS_1159 
#time 20m
 2016-06-15 15:32:20 +02:00
Thibaud Fabre
9a6429a70b Merge pull request #1901 from aztech-dev/fix/download-cors 
Configure CORS for download path
 2016-06-14 10:33:47 +02:00
Thibaud Fabre
b3035dd867 Configure CORS for download path 2016-06-14 10:32:18 +02:00
Thibaud Fabre
243b15ee94 Merge pull request #1900 from aztech-dev/fix/duplicated-extensions 
Fix duplicated extensions
 2016-06-14 09:39:09 +02:00
Thibaud Fabre
82c6f809c9 Fix duplicated extensions 2016-06-14 09:36:49 +02:00
Thibaud Fabre
9bb2b66d15 Merge pull request #1899 from aztech-dev/fix/export-file-extensions 
Fix incorrect file names for filename containing dots
 2016-06-13 19:17:46 +02:00
Thibaud Fabre
fab4a6e6d5 Fix incorrect file names for filename containing dots 2016-06-13 18:57:23 +02:00
jygaulier
1d9ca59c52 Merge pull request #1897 from jygaulier/PHRAS-1125_backport_4.0 
PHRAS-1125_backport
 2016-06-13 18:32:22 +02:00
Jean-Yves Gaulier
433c840622 PHRAS-1125_backport 
fix : on thumbnail grid (pdf), thumbnail title is now over the thumbnail image.
 2016-06-13 18:27:59 +02:00
Florian Blouet
8cac41f6f4 Merge pull request #1895 from lostdalek/hotfix/PHRAS-1104 
PHRAS-1104 - edit record: fix empty value in multivalued fields
 2016-05-31 15:12:14 +02:00
Florian BLOUET
e72cf0e41f PHRAS-1104 - edit record: fix empty value in multivalued fields 2016-05-31 14:36:39 +02:00
Thibaud Fabre
5021ed8bbe Merge pull request #1893 from lostdalek/hotfix/PHRAS-1080 
PHRAS-1080 - prod advanced search: fix document status selection
 2016-05-31 12:04:54 +02:00
Florian BLOUET
2201ebdb67 PHRAS-1080 - prod advanced search: fix document status selection 2016-05-30 17:01:09 +02:00