Commit Graph

13907 Commits

Author SHA1 Message Date
Harrys Ravalomanana
56f6eb83e3 PHRAS-2978-add feedback creation date on workzone feedback 2020-03-16 15:46:41 +04:00
Harrys Ravalomanana
947bc734ac PHRAS-2978 #comment fix date format and add datepicker fo modify feedback validation deadline #time 4h 2020-03-13 17:14:37 +04:00
Harrys Ravalomanana
d1df992136 PHRAS-2978 add translation 2020-03-11 17:04:20 +04:00
Harrys Ravalomanana
c4d33f5f55 PHRAS-2978 #comment Workzone basket: fix date format and tooltip display 2020-03-11 16:59:44 +04:00
Nicolas Maillat
900d56e09d Translated using Weblate (French)
Currently translated at 99.3% (2430 of 2446 strings)
2020-03-10 21:47:35 +00:00
Nicolas Maillat
f208f93842 Translated using Weblate (English)
Currently translated at 99.4% (2432 of 2446 strings)
2020-03-10 21:47:35 +00:00
Nicolas Maillat
9f7fe0671e Translated using Weblate (English)
Currently translated at 99.4% (2432 of 2446 strings)
2020-03-10 21:23:36 +00:00
Nicolas Maillat
6f0588ae81 Translated using Weblate (French)
Currently translated at 99.3% (2429 of 2446 strings)
2020-03-10 21:22:34 +00:00
Nicolas Maillat
e72a0d4ee9 Merge pull request #3398 from alchemy-fr/PHRAS-2976-migration-patch-old-facette
PHRAS-2976 #comment merge Migration Patch, transform old facette style to new one.
2020-03-10 13:49:14 +01:00
Nicolas Maillat
a6891ff2d5 Merge branch 'master' into PHRAS-2976-migration-patch-old-facette 2020-03-10 13:23:16 +01:00
Nicolas Maillat
1256f28f05 Merge pull request #3396 from alchemy-fr/PHRAS-2967_Lightbox-de-of-send-email-report
PHRAS-2967 #comment merge Lightbox - dev of send email report - warn windows
2020-03-10 13:22:03 +01:00
Harrys Ravalomanana
a9523f55f3 Merge branch 'master' into PHRAS-2967_Lightbox-de-of-send-email-report 2020-03-10 11:58:14 +04:00
Harrys Ravalomanana
5cc2de772d PHRAS-2967 #comment add warning modal for lightbox mobile #time 6h 2020-03-10 11:50:45 +04:00
aynsix
cd42452db8 migration patch for facets 2020-03-10 10:49:53 +03:00
Nicolas Maillat
510704d6aa Merge pull request #3397 from alchemy-fr/PHRAS-2974_more_document_formats_unoconv
PHRAS-2974 #comment merge more document formats for unoconv
2020-03-09 18:50:10 +01:00
Nicolas Maillat
08fd0f6253 Add document formats for unoconv 2020-03-09 17:45:02 +01:00
Nicolas Maillat
08f2f1f984 Merge pull request #3393 from alchemy-fr/PHRAS-2964-41-change-column-size
PHRAS-2964 #comment merge 4.1 change column size for sbas
2020-03-09 17:29:41 +01:00
aynsix
38afc8dd43 change version to 4.1.0-alpha.24a 2020-03-09 17:58:20 +03:00
Nicolas Maillat
6beae7a43f Merge branch 'master' into PHRAS-2964-41-change-column-size 2020-03-09 15:23:34 +01:00
Nicolas Maillat
746f2ae4c4 Merge branch 'master' into PHRAS-2967_Lightbox-de-of-send-email-report 2020-03-06 15:02:11 +01:00
Harrys Ravalomanana
c98a0e54cc PHRAS-2967 2020-03-06 17:56:14 +04:00
aynsix
7a72485b33 use 4.1.0-alpha.25a 2020-03-06 14:08:29 +03:00
Nicolas Maillat
18c57bfffa Merge pull request #3367 from alchemy-fr/docker-compose-merge
PHRDPL-44 #comment merge phraseanet-docker repo to this one
2020-03-06 11:20:12 +01:00
Nicolas Maillat
46d2b2b99e Add env.* accordance to the readme 2020-03-06 10:49:32 +01:00
Nicolas Maillat
9e0a000b4e Merge branch 'master' into docker-compose-merge 2020-03-06 10:42:44 +01:00
Nicolas Maillat
df5f4d8eed Merge pull request #3390 from alchemy-fr/PHRAS-2961_Prod_workzone-feedback-display-ending-date
PHRAS-2961 #comment merge Prod - Display ending date in feedback rollover and feedback deploy in workzone
2020-03-06 10:42:25 +01:00
aynsix
bccf38cbf6 change column size 2020-03-06 11:47:01 +03:00
Nicolas Maillat
7b8a1325e6 Merge branch 'master' into docker-compose-merge 2020-03-05 16:50:04 +01:00
Nicolas Maillat
f6349afdeb Change in redis config
replace property domain by namespace
2020-03-05 16:49:34 +01:00
Nicolas Maillat
c75e3bd0ff Merge branch 'master' into PHRAS-2961_Prod_workzone-feedback-display-ending-date 2020-03-04 20:41:19 +01:00
Nicolas Maillat
6c058d3f9b Merge pull request #3340 from alchemy-fr/PHRAS-2927_optimize-feedback-process_4.1
PHRAS-2927  #comment merge of endpoint for optimize feedback process 4.1
2020-03-04 15:23:29 +01:00
Harrys Ravalomanana
2d3147b47b PHRAS-2961 #comment Add: Prod workzone feedback : ending date #time 3h 2020-03-04 17:04:01 +04:00
Nicolas Maillat
87928440a6 Merge branch 'master' into PHRAS-2927_optimize-feedback-process_4.1 2020-03-04 14:00:17 +01:00
Nicolas Maillat
f67e4c4b15 Merge pull request #3385 from alchemy-fr/PHRAS-1648-user-password
PHRAS-1648 #comment  bin/console user:password
2020-03-04 13:59:38 +01:00
aynsix
87d6ea0eb3 fix wording 2020-03-04 10:58:43 +03:00
Nicolas Maillat
7ad05c7d17 Merge branch 'master' into docker-compose-merge 2020-03-03 22:39:09 +01:00
Nicolas Maillat
b83e5500f0 Merge branch 'master' into PHRAS-1648-user-password 2020-03-03 17:19:37 +01:00
Nicolas Maillat
6efbbc3661 Merge pull request #3384 from alchemy-fr/PHRAS-2956_Fix_Account-developpers-application
PHRAS-2956 #comment merge Account - developers - application - GUI create a desktop application
2020-03-03 15:31:02 +01:00
Nicolas Maillat
63744b7a3b Merge branch 'master' into PHRAS-2956_Fix_Account-developpers-application 2020-03-03 15:07:52 +01:00
Nicolas Maillat
37f5da6511 Merge pull request #3388 from alchemy-fr/PHRAS-1632-fix-user-application
PHRAS-1632 #comment merge 4.1 user:application , add client_secret on return
2020-03-03 15:07:31 +01:00
Harrys Ravalomanana
1411a013f1 Merge branch 'master' into PHRAS-2956_Fix_Account-developpers-application 2020-03-03 18:06:13 +04:00
Harrys Ravalomanana
baed57ba21 upgrade phraseanet-production-client 2020-03-03 18:04:25 +04:00
Harrys Ravalomanana
fd5685f775 PHRAS-2956 2020-03-03 17:35:11 +04:00
aynsix
495c9ec296 add client_secret on return 2020-03-03 12:23:19 +03:00
aynsix
8acd7576d0 Merge branch 'PHRAS-1648-user-password' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1648-user-password 2020-03-03 12:13:32 +03:00
aynsix
354b1b8e6e fix return 2020-03-03 12:12:44 +03:00
aynsix
bb356e206f fix mail link and returned hash 2020-03-03 11:41:15 +03:00
Nicolas Maillat
b84b769de0 Merge branch 'master' into PHRAS-1648-user-password 2020-03-03 09:41:12 +01:00
Nicolas Maillat
d387a12049 Merge pull request #3386 from alchemy-fr/PHRAS-1661-user-list-remove-application
PHRAS-1661#comment remove application list in bin/console user:list
2020-03-02 22:57:57 +01:00
Nicolas Maillat
1bfd5b6de0 Update readme 2020-03-02 21:59:11 +01:00