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
14,050 Commits 268 Branches 107 Tags
11e729ca1e7942e394ecfff22148bdeb978d1f3b
Commit Graph

7643 Commits

Author SHA1 Message Date
Jean-Yves Gaulier
e75a483cd5 PHRAS-2913_create-tokens-faster_4.1 
- create token by sql
- create feedentry tokens in bulk-sql
 2020-02-07 22:14:47 +01:00
gjacobjn
b18ef09661 Update AccountController.php 2020-02-07 17:17:54 +01:00
aynsix
6c1f3c3e62 use phraseanet version 4.1.0-alpha.20a 2020-02-06 18:01:05 +03:00
aynsix
2ffed8c4d5 patch to change data format geolocation 2020-02-06 17:34:57 +03:00
gjacobjn
2f02cef4b0 Update Edit.php 2020-02-06 10:48:16 +01:00
aynsix
8e8c9fca1d fix patch for canditate terme 2020-02-05 17:31:53 +03:00
aynsix
1996e1efec fix missing string 2020-02-04 11:10:27 +03:00
aynsix
d1374ef47f don't print fiels with attribute gui_visible false 2020-01-24 11:48:51 +03:00
aynsix
a6e5e504ca change vttFieldName to ChapterVttFieldName in configuration 2020-01-23 16:28:27 +03:00
aynsix
e3f596963a add base name in pdf feedback 2020-01-23 12:12:59 +03:00
aynsix
5b38565e1a add format deedback only and fix pdf text 2020-01-23 11:38:17 +03:00
Nicolas Maillat
a41a87d7d0 Merge branch 'master' into PHRAS-2603-migration-patch-configuration-yml 2020-01-20 16:31:16 +01:00
aynsix
572e8b0def update phpexiftool to 0.7.3 in 4.1 2020-01-20 12:13:13 +03:00
jygaulier
998c751843 Port PHRAS-2877 
Port of PHRAS-2877 User manipulator did not allow to set a null email
Temporary Null email is used by saml plugin while creating a user.
 2020-01-13 14:48:53 +01:00
jygaulier
b6fa28276d Merge branch 'master' into PHRAS-2757_print-feedback_4.1 2020-01-09 20:33:11 +01:00
Jean-Yves Gaulier
32fbf049cf PHRAS-2757_print-feedback_4.1 
Add a print format when printing a feedback basket
Only the creator of the feedback can print it.
 2020-01-09 20:31:09 +01:00
Harrys Ravalomanana
1dd0be65d4 PHRAS-2868 #comment update phraseanet-production-client version 2020-01-09 19:05:31 +04:00
aynsix
12d01afeb0 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2741-worker-service-part1 2019-12-19 16:09:47 +04:00
aynsix
cfa854f307 start subdef creation after first write meta 2019-12-19 16:09:35 +04:00
aynsix
c40802265d update config 2019-12-17 14:34:18 +04:00
aynsix
63d2f1cf54 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2603-migration-patch-configuration-yml 2019-12-17 14:09:27 +04:00
Harrys Ravalomanana
ad47f4b18c PHRAS-2706 #comment Prod Fix Basket browser #time 2h 2019-12-17 12:07:04 +04:00
aynsix
afc5a85edf change param name 2019-12-13 15:28:02 +04:00
Nicolas Maillat
ede9c5ad3b Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security 2019-12-12 12:57:33 +01:00
Nicolas Maillat
6afc40ef3b Merge branch 'master' into PHRAS-2196-api-stories-pagination 2019-12-12 12:56:48 +01:00
Nicolas Maillat
84d1fdead4 Merge branch 'master' into PHRAS-2739-incorporate-subdefwebhook 2019-12-12 12:56:10 +01:00
Nicolas Maillat
a43d073c8a Merge branch 'master' into PHRAS-2840-exclure-collection-quarantaine 2019-12-12 12:10:35 +01:00
Nicolas Maillat
78619ad2cc Merge branch 'master' into PHRAS-2739-incorporate-subdefwebhook 2019-12-12 12:07:17 +01:00
Nicolas Maillat
5e414fbe6d Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security 2019-12-12 12:07:02 +01:00
aynsix
48f78698cc resolve conflict 2019-12-12 14:33:37 +04:00
aynsix
5a703f207a fix record order in story 2019-12-12 12:13:56 +04:00
aynsix
8eb6ae5dfa change variable name 2019-12-11 18:18:30 +04:00
aynsix
9ac196784a change sql params form 2019-12-11 12:41:43 +04:00
aynsix
1c0b1db9c7 exlu collection in quarantaine when upload 2019-12-11 11:48:23 +04:00
aynsix
f475a5c925 fix api/v3 api_version 2019-12-06 14:24:03 +04:00
aynsix
2fd5b6cba2 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2196-api-stories-pagination 2019-12-06 14:22:32 +04:00
Nicolas Maillat
2f05804c52 Merge branch 'master' into PHRAS-1324-add-libfaac 2019-12-05 18:44:05 +01:00
Jean-Yves Gaulier
0967f3c810 PHRAS-2631_feedback-icon 
fix : 2 new icons for feedback baskets; no more display of 2 icons.
fix : tooltip on "about" icon of feedback baskets
 2019-12-05 14:52:46 +01:00
aynsix
d95014831e update presets webm 2019-12-05 15:23:59 +04:00
aynsix
960c40233c add presets and libmp3lame to default 2019-12-05 14:55:56 +04:00
aynsix
276d5a8ce6 remove unused comment 2019-12-05 14:42:15 +04:00
aynsix
3d6d2e4e64 fix V1Controller 2019-12-05 14:30:17 +04:00
aynsix
e4b29d70c5 route search and storie on api/v3 2019-12-05 12:30:23 +04:00
aynsix
530397db00 do no use header application/vnd.phraseanet.story-paginate 2019-12-04 10:17:59 +04:00
aynsix
3d1983452e Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2196-api-stories-pagination 2019-12-04 10:10:03 +04:00
aynsix
cac34cc3a4 add libfdk_aac and change presets name 2019-12-02 16:34:49 +04:00
aynsix
f7a6ae2f3f patch for configuration.yml 2019-12-02 15:34:28 +04:00
Nicolas Maillat
5342f07a82 Revert "PHRAS-1324 : libfaac abandoned 4.1" 2019-11-29 16:38:47 +01:00
Nicolas Maillat
f28488b6ec Merge branch 'master' into PHRAS-1154-remove-all-last-default-query 2019-11-29 13:14:21 +01:00
aynsix
166c302889 remove all and last in default query pref 2019-11-29 12:22:24 +04:00