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

11149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Thibaud Fabre
a74aac8fe0 Merge pull request #1891 from lostdalek/hotfix/PHRAS-515 
PHRAS-515 - fix export by email form submission
 2016-05-30 14:08:58 +02:00
Thibaud Fabre
11a08534cf Merge pull request #1890 from lostdalek/hotfix/PHRAS-870 
PHRAS-870 - add physical size in technical informations
 2016-05-30 14:08:13 +02:00
Florian BLOUET
67bb19fa04 PHRAS-515 - fix export by email form submission 2016-05-27 16:17:41 +02:00
Florian BLOUET
168bde4179 PHRAS-870 - add physical size in technical informations 2016-05-27 14:48:09 +02:00
Thibaud Fabre
a581d9f61b Merge pull request #1888 from lostdalek/hotfix/PHRAS-1121 
PHRAS-1121 - Admin: fix collection reordering
 2016-05-26 11:53:54 +02:00
Florian BLOUET
de2c283667 PHRAS-1121 - Admin: fix collection reordering 2016-05-26 11:29:42 +02:00
Thibaud Fabre
a57d2bb3e1 Merge pull request #1886 from aztech-dev/feature/api-status-rights 
PHRAS-573 Add status rights in /me response
 2016-05-25 14:20:31 +02:00
Thibaud Fabre
907a6e5e87 Clarify comment on exclusion of statuses from response 
[skip ci]
 2016-05-25 14:10:41 +02:00
Thibaud Fabre
a2ae899121 PHRAS-573 Add status rights in /me response 2016-05-25 14:08:34 +02:00
Florian Blouet
e7bb2c6f8a Merge pull request #1885 from lostdalek/hotfix/PHRAS-1113 
PHRAS-1113 - fix tooltip positionning for records previews
 2016-05-25 13:48:04 +02:00
Florian BLOUET
5a8ff3b1d2 PHRAS-1113 - fix tooltip positionning for records previews 2016-05-25 13:47:04 +02:00
Thibaud Fabre
156f480972 Merge pull request #1884 from aztech-dev/feature/api-databox-rights 
PHRAS-572 List user rights by databox in /me route
 2016-05-25 13:22:10 +02:00
Thibaud Fabre
bf08667d0d PHRAS-572 List user rights by databox in /me route 2016-05-25 11:57:03 +02:00
Thibaud Fabre
ac8f0001e3 Merge pull request #1883 from aztech-dev/fix/record-tooltip 
Rollback PHRAS-1113 changes
 2016-05-24 18:51:02 +02:00
Thibaud Fabre
8dee4c40d5 Rollback PHRAS-1113 changes 2016-05-24 18:50:31 +02:00
Thibaud Fabre
9008561891 Merge pull request #1882 from aztech-dev/fix/application-settings-access 
Restrict application settings access to application owner
 2016-05-24 18:17:48 +02:00
Thibaud Fabre
12b5b2f4fc Merge pull request #1881 from aztech-dev/feature/admin-collection-ids 
Display unique collection IDs in collection admin
 2016-05-24 17:55:33 +02:00
Thibaud Fabre
010b7b7be2 Restrict application settings access to application owner 2016-05-24 17:45:38 +02:00
Thibaud Fabre
f4d71eeb63 Display unique collection IDs in collection admin 2016-05-24 17:30:02 +02:00
Thibaud Fabre
3636c065d5 Merge pull request #1880 from aztech-dev/fix/api-dev-nginx 
Fix nginx configuration for api_dev.php
 2016-05-24 16:18:55 +02:00
Thibaud Fabre
03150fc3a3 Fix nginx configuration for api_dev.php 
[skip ci]
 2016-05-24 16:17:50 +02:00
Thibaud Fabre
71f8607ee1 Merge pull request #1879 from aztech-dev/feature/api-dev 
Add dev entry point for API
 2016-05-24 16:13:27 +02:00
Thibaud Fabre
dc4920d456 Merge pull request #1876 from lostdalek/hotfix/PHRAS-1078-4.0 
PHRAS-1078 - toggle collection name with mini logo (4.0)
 2016-05-24 15:58:46 +02:00
Thibaud Fabre
7413d6200b Merge pull request #1878 from aztech-dev/feature/api-disable-ssl 
Add configuration option to disable SSL requirement on API
 2016-05-24 15:58:34 +02:00
Thibaud Fabre
6d512b23f9 Add dev entry point for API 2016-05-24 15:58:16 +02:00
Thibaud Fabre
888a2b4bb6 Add configuration option to disable SSL requirement on API 2016-05-24 15:38:59 +02:00
Thibaud Fabre
e37437084b Merge pull request #1877 from aztech-dev/fix/api-order-download 
Fix archive path when downloading orders via API
 2016-05-24 11:52:05 +02:00
Thibaud Fabre
2ad49979e4 Remove debug line 2016-05-23 17:59:02 +02:00
Thibaud Fabre
cf684cdeca Fix archive download via API 2016-05-23 17:54:40 +02:00
Florian BLOUET
c11f319db2 PHRAS-1078 - toggle collection name with mini logo 2016-05-23 16:09:54 +02:00
Thibaud Fabre
ac2b852df3 Merge pull request #1874 from lostdalek/hotfix/PHRAS-851-4.0 
PHRAS-851 - add missing informations in record preview (4.0)
 2016-05-23 14:13:50 +02:00