Commit Graph

12001 Commits

Author SHA1 Message Date
Jean-Yves Gaulier
95043b5e7a PHRAS-1160_Backport-PHRAS_1159
#time 20m
2016-06-15 15:32:20 +02:00
Jean-Yves Gaulier
d9ee0bef5d PHRAS-1159_Subdef-Task-Doctrine-Cache-err
#time 4h
fix : Error "wrong number of arguments" using a secondary encoding instance (subdef task) is fixed
2016-06-15 15:07:05 +02:00
jygaulier
c678227ba0 Merge pull request #1902 from jygaulier/PHRAS-1100_QUARANTINE-XML
PHRAS-1100_QUARANTINE-XML
2016-06-14 19:44:19 +02:00
Jean-Yves Gaulier
0609a6d990 PHRAS-1100_QUARANTINE-XML
#time 4h
fix : add from quarantine is ok (did crash when a multivalue field was populated via xml file).
2016-06-14 19:03:31 +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
Thibaud Fabre
184e61969c Merge pull request #1896 from lostdalek/feature/externalProductionClientStyles
Move css from Phraseanet to external npm module
2016-06-02 17:15:30 +02:00
Florian BLOUET
dd444c6298 Bump Phraseanet Production Client 2016-06-02 14:33:50 +02:00
Florian BLOUET
885edae1f2 add npm watch command, fix css link 2016-06-02 14:27:20 +02:00
Florian BLOUET
0ade016f14 updated css theme switch 2016-06-02 14:27:20 +02:00
Florian BLOUET
c279a04b85 wip: move styles into phraseanet-production-client module 2016-06-02 14:27:20 +02:00
Thibaud Fabre
04bd18b20d Merge pull request #1894 from jygaulier/PHRAS-1125_PDF-THUMBNAIL-TITLE
PHRAS-1125_PDF-THUMBNAIL-TITLE
2016-05-31 15:26:09 +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
Jean-Yves Gaulier
915b2eaf09 PHRAS-1125_PDF-THUMBNAIL-TITLE
fix : on thumbnail grid (pdf), thumbnail title is now over the thumbnail image.
2016-05-31 14:12:54 +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
bdbf858d5d Merge pull request #1892 from mjusteau/master
Fix upgrade from 3.8 to 4.0
2016-05-30 14:09:53 +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
9c41775cb4 Merge pull request #1889 from aztech-dev/merge/4.0
Merge 4.0
2016-05-30 14:08:32 +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
Mathieu Justeau
6a3bddf259 Fix upgrade from 3.8 to 4.0 2016-05-27 16:21:19 +00: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
54670d52df Merge branch '4.0' into merge/4.0 2016-05-26 11:56:56 +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
Thibaud Fabre
f1269b1cc5 Merge pull request #1887 from aztech-dev/merge/4.0
Merge 4.0
2016-05-26 11:30:35 +02:00
Florian BLOUET
de2c283667 PHRAS-1121 - Admin: fix collection reordering 2016-05-26 11:29:42 +02:00
Thibaud Fabre
11b850897a Remove unneeded method 2016-05-25 18:05:47 +02:00
Thibaud Fabre
cd530b4696 Fix merge failure in V1Controller 2016-05-25 17:40:10 +02:00
Thibaud Fabre
1917b3dba3 Merge branch 4.0 into master 2016-05-25 17:21:08 +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