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
13,856 Commits 268 Branches 107 Tags
7ad05c7d171e7b94c026e5f39a9746291aa42073
Commit Graph

13856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
31a61f7e6d Merge pull request #3323 from alchemy-fr/PHRAS-2884-chapter-vtt-semantic-clean 
PHRAS-2884 #comment merge, bump embed-bundle version  in 4.1  use now 2.0.9 for cleaning chapter vtt source name
 2020-02-05 13:33:35 +01:00
aynsix
e20bb42f98 hide cterms ckbox if not relevant 2020-02-05 11:21:45 +03:00
aynsix
5be57280f6 use embed-bundle 2.0.9 for cleaning chapter vtt source name 2020-02-05 10:52:09 +03:00
Nicolas Maillat
98cbc0725b Merge pull request #3320 from alchemy-fr/PHRAS-2898-missing-string 
PHRAS-2898 #comment merge 4.1  Some string are missing or not take in account in Feedback printed report
 2020-02-04 11:46:30 +01:00
aynsix
1996e1efec fix missing string 2020-02-04 11:10:27 +03:00
Nicolas Maillat
43eff6d08a Merge pull request #3312 from alchemy-fr/PHRAS-2891_Fix-facets_tooltip 
PHRAS-2891 #comment Fix Facet tooltip Phraseanet side with theme refacto
 2020-01-31 19:47:35 +01:00
Nicolas Maillat
83a049314a Merge branch 'master' into PHRAS-2891_Fix-facets_tooltip 2020-01-31 16:11:57 +01:00
Nicolas Maillat
4dcae17a77 Merge pull request #3316 from alchemy-fr/PHRAS-2894_Quarantine_allow_to_substitute_without_selecting_target-Record 
PHRAS-2894  #comment merge Quarantine: allow to substitute without selecting target record, (when match only one record).
 2020-01-31 16:09:37 +01:00
Harrys Ravalomanana
a207bdd015 PHRAS-2891 2020-01-31 18:05:09 +04:00
Nicolas Maillat
92ba8d2c8a Merge branch 'master' into PHRAS-2894_Quarantine_allow_to_substitute_without_selecting_target-Record 2020-01-31 13:00:19 +01:00
Nicolas Maillat
855976a4f6 Merge pull request #3313 from alchemy-fr/PHRAS_2895_Prod_edit-Windows_missing_space 
PHRAS-2895 #comment Prod - Edit windows - missing space between thumbnails
 2020-01-31 13:00:03 +01:00
Nicolas Maillat
17517a4e1f Merge branch 'master' into PHRAS-2894_Quarantine_allow_to_substitute_without_selecting_target-Record 2020-01-31 12:41:55 +01:00
Nicolas Maillat
50caaa2442 Merge branch 'master' into PHRAS_2895_Prod_edit-Windows_missing_space 2020-01-31 12:41:37 +01:00
Nicolas Maillat
1c4d4c3982 Translated using Weblate (French) 
Currently translated at 99.7% (2416 of 2423 strings)
 2020-01-31 10:50:47 +00:00
Nicolas Maillat
6bc497945a Translated using Weblate (English) 
Currently translated at 99.8% (2419 of 2423 strings)
 2020-01-31 10:50:47 +00:00
Harrys Ravalomanana
a4a5fac254 PHRAS-2894 #comment Fix Quarantine allow to substitute without selecting target Record #time 2h" 
git commit -m PHRAS-2894
 2020-01-31 14:15:56 +04:00
jygaulier
bd721bec02 Merge branch 'master' into PHRDPL-86_xdebug 2020-01-30 12:01:00 +01:00
Alexandre BRACH
e55dbd4f89 PHRDPL-86 #comment XDebug ok 2020-01-30 11:49:11 +01:00
Harrys Ravalomanana
9db40cfed4 PHRAS-2895 #comment Fix Prod edit windows : missing space #time 1h 2020-01-30 10:57:33 +04:00
Harrys Ravalomanana
bec8596f7e #comment Fix Facet tooltip #time 2h 2020-01-30 10:32:48 +04:00
Nicolas Maillat
8b66603905 Merge pull request #3311 from alchemy-fr/PHRAS-2885-Prod-Add_missing_warning 
PHRAS-2885 #comment merge Prod - Add missing warning when try to edit record from different databases.
 2020-01-29 17:11:21 +01:00
Nicolas Maillat
729291ba01 Merge branch 'master' into PHRAS-2885-Prod-Add_missing_warning 2020-01-29 16:49:08 +01:00
Nicolas Maillat
80f3d8f65f Merge pull request #3309 from alchemy-fr/PHRAS-2892_feedback_fix_string 
PHRAS-2892 #comment merge Push & Feedback fix string on input name
 2020-01-29 16:34:39 +01:00
Harrys Ravalomanana
32c65ca125 upgrade phraseanet-production-client 2020-01-29 17:40:47 +04:00
Harrys Ravalomanana
55f4678c2f PHRAS-2885 Add missing warning when try to edit record from different db 2020-01-29 17:24:50 +04:00
Harrys Ravalomanana
de2f8dc588 merge of master 2020-01-29 10:31:44 +04:00
Nicolas Maillat
3bbb5711f9 Merge branch 'master' into PHRAS-2892_feedback_fix_string 2020-01-27 15:49:17 +01:00
Jennifer
9082728e59 Translated using Weblate (German) 
Currently translated at 98.3% (2380 of 2420 strings)
 2020-01-27 14:33:17 +00:00
Nicolas Maillat
0fd8b93a89 Translated using Weblate (English) 
Currently translated at 99.1% (2400 of 2420 strings)
 2020-01-27 14:33:17 +00:00
Harrys Ravalomanana
b8f91dbddf PHRAS-2892 Feedback fix string #time 2h 2020-01-27 18:18:00 +04:00
Nicolas Maillat
29cd49e9b4 Merge pull request #3306 from alchemy-fr/PHRAS-2875-bis 
PHRAS-2875 #comment merge  workzone and basket refacto ( update phraseanet-production-client)
 2020-01-27 14:19:45 +01:00
Harrys Ravalomanana
f29be7f07b PHRAS-2885 2020-01-27 15:06:44 +04:00
Harrys Ravalomanana
21c9f9e1be PHRAS-2875 2020-01-27 12:25:02 +04:00
Nicolas Maillat
51bf756d87 Merge pull request #3304 from alchemy-fr/PHRAS-2719_Edit_form_unable_to_select_value_in_mutivalue_field 
PHRAS-2719 #comment merge Edit form : Unable to select a value in a multivalued field
 2020-01-24 13:55:01 +01:00
Nicolas Maillat
0e6f42e400 Merge branch 'master' into PHRAS-2719_Edit_form_unable_to_select_value_in_mutivalue_field 2020-01-24 12:56:03 +01:00
Nicolas Maillat
d652d29f31 Merge pull request #3305 from alchemy-fr/PHRAS-2890-print-fiel-attribute-gui-visible-false 
PHRAS-2890 : #comment merge 4.1 Don't print the field with attribute "Displayed in Graphical Interface" to false
 2020-01-24 12:55:28 +01:00
aynsix
d1374ef47f don't print fiels with attribute gui_visible false 2020-01-24 11:48:51 +03:00
Harrys Ravalomanana
eff33ef4d2 PHRAS-2719 2020-01-24 12:34:21 +04:00
Harrys Ravalomanana
154543620e Merge master 2020-01-24 10:59:18 +04:00
Harrys Ravalomanana
2b15159fa2 PHRAS-2719 2020-01-24 10:54:53 +04:00
Nicolas Maillat
d21d296c14 Merge branch 'master' into PHRAS-2719_Edit_form_unable_to_select_value_in_mutivalue_field 2020-01-23 17:51:06 +01:00
Nicolas Maillat
22a11daab2 Merge pull request #3300 from alchemy-fr/PHRAS-2761-audio-file-preview-case 
PHRAS-2671 #comment Merge Change behavior of preview display in audio file case Only the previous PR #3108  change the behavior for all kind of record (image video audio document)
 2020-01-23 17:30:31 +01:00
Nicolas Maillat
bda45a91bf Merge branch 'master' into PHRAS-2761-audio-file-preview-case 2020-01-23 17:12:53 +01:00
aynsix
ff9d1da3df Merge branch 'PHRAS-2603-migration-patch-configuration-yml' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2603-migration-patch-configuration-yml 2020-01-23 16:29:31 +03:00
aynsix
a6e5e504ca change vttFieldName to ChapterVttFieldName in configuration 2020-01-23 16:28:27 +03:00
Harrys Ravalomanana
8f24ed7676 Merge branch 'master' into PHRAS-2719_Edit_form_unable_to_select_value_in_mutivalue_field 2020-01-23 17:00:45 +04:00
Harrys Ravalomanana
407c13b8c8 PHRAS-2719 2020-01-23 16:26:11 +04:00
Nicolas Maillat
b4ace8ae77 Translated using Weblate (French) 
Currently translated at 99.0% (2398 of 2420 strings)
 2020-01-23 12:09:50 +00:00
Nicolas Maillat
75b1701cec Translated using Weblate (French) 
Currently translated at 99.0% (2398 of 2420 strings)
 2020-01-23 12:07:33 +00:00
Nicolas Maillat
dd83f83411 Translated using Weblate (English) 
Currently translated at 99.1% (2400 of 2420 strings)
 2020-01-23 12:07:33 +00:00