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
12,919 Commits 268 Branches 107 Tags
b70c0ea8cea477a5572c8ac3561402d52dc9d09c
Commit Graph

12919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
54bad38ea9 Merge branch 'master' into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-04-30 15:29:10 +02:00
Jennifer
9c6568890e Translated using Weblate (German) 
Currently translated at 89.3% (2142 of 2396 strings)
 2019-04-30 15:26:40 +02:00
Jennifer
bf7f74ede5 Translated using Weblate (French) 
Currently translated at 92.6% (2221 of 2396 strings)
 2019-04-30 15:26:39 +02:00
Jennifer
f7a0fe9bad Translated using Weblate (English) 
Currently translated at 94.7% (2271 of 2396 strings)
 2019-04-30 15:26:39 +02:00
Harrys Ravalomanana
d0e1baed54 Merge branch 'PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query' of https://github.com/HRavalomanana/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-04-30 13:51:53 +04:00
Harrys Ravalomanana
5e5f5e34cb PHRAS-2430 update phraseanet-production-client@0.34.7 2019-04-30 13:50:01 +04:00
Harrys Ravalomanana
dd6422c620 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-04-30 13:48:29 +04:00
Nicolas Maillat
768ccafd3c Merge branch 'master' into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-04-30 10:29:04 +02:00
Jennifer
f82df20d50 Translated using Weblate (German) 
Currently translated at 89.4% (2143 of 2396 strings)
 2019-04-29 16:51:03 +02:00
Jennifer
c292915bb6 Translated using Weblate (French) 
Currently translated at 92.4% (2215 of 2396 strings)
 2019-04-29 16:51:02 +02:00
Jennifer
9182888c15 Translated using Weblate (English) 
Currently translated at 94.9% (2275 of 2396 strings)
 2019-04-29 16:51:02 +02:00
Jennifer
3e48c7e6ae Translated using Weblate (German) 
Currently translated at 88.8% (2114 of 2380 strings)
 2019-04-29 15:12:28 +02:00
Jennifer
80428a802f Translated using Weblate (French) 
Currently translated at 92.9% (2212 of 2380 strings)
 2019-04-29 15:12:28 +02:00
Jennifer
f8ea3f1f3f Translated using Weblate (English) 
Currently translated at 95.3% (2270 of 2380 strings)
 2019-04-29 15:12:27 +02:00
Nicolas Maillat
865c38e2a5 Translated using Weblate (French) 
Currently translated at 93.1% (2213 of 2376 strings)
 2019-04-29 15:12:27 +02:00
Nicolas Maillat
a2dffd0916 Merge pull request #2998 from aynsix/PHRAS-1972-update-key-config-delete-account 
PHRAS-1972: 4.1 delete account update config structure
 2019-04-25 21:16:22 +02:00
aina-esokia
eff72083ba update delete account config structure 
#time 0.5h
 2019-04-25 17:27:33 +04:00
Nicolas Maillat
5aa13687e6 Merge pull request #2988 from aynsix/PHRAS-2497-port-41-search-when-mix-data 
PHRAS-2497 Port TO 4.1 - Search issue when query mix data from Public and Private field
 2019-04-24 18:44:26 +02:00
Nicolas Maillat
20e544a6bf Merge pull request #2986 from xrousset78800/PHRAS-2496/pre-build-vagrant-image-for-phraseanet 
PHRAS-2496 | Pre-build vagrant image for Phraseanet
 2019-04-23 15:04:54 +02:00
Xavier Rousset
035a4f95a6 Update with old box name 2019-04-23 12:39:28 +02:00
aina-esokia
47d974a466 PHRAS-2497 #comment port to 4.1 Search issue when query mix data from Public and Private field 
#time 2h
 2019-04-23 12:10:25 +04:00
Xavier Rousset
79e33fcae1 PHRAS-2496 Pre-build vagrant image for Phraseanet and implement it in Phraseanet vagrant file 2019-04-19 18:46:46 +02:00
Nicolas Maillat
44fb25912b Merge pull request #2983 from xrousset78800/fix/quick-typo-fix 
PHRAS-2533 Inject docker dependencies, typo fix
 2019-04-18 17:19:42 +02:00
Xavier Rousset
83b21da377 PHRAS-2533 Inject docker dependencies, typo fix 2019-04-18 17:14:54 +02:00
Nicolas Maillat
e58eff8ebf Merge pull request #2981 from alchemy-fr/PHRAS-2532-port-4.1-circleci-hosts-for-docker 
adding phraseanet-docker hostnames to circleci hosts
 2019-04-18 14:07:31 +02:00
Moctar
aa65192102 adding phraseanet-docker hostnames to circleci hosts 2019-04-18 12:13:33 +02:00
Nicolas Maillat
1bdf1150f5 Merge pull request #2979 from xrousset78800/fix/add-docker-containers-name-on-etc-hosts 
PHRAS-2533 Inject containers hostname on /etc/hosts file
 2019-04-18 09:30:59 +02:00
Xavier Rousset
4203a814a4 PHRAS-2533 Inject containers hostname on /etc/hosts file 2019-04-17 17:47:45 +02:00
jygaulier
035d804d15 PHRAS-2276 port to 4.1 template escape (#2819) 
* fix escape lightbox

* fix escape in admin connected-user

* fix prod escaping

* fix escaping in thesaurus

* escape when rendered

* escape in controller
 2019-04-08 14:30:00 +02:00
aynsix
5cdf473c7f PHRAS-1972: Account Page, Allow a Phraseanet User to delete his account and associated datas (#2918) 
* allow user to delete account

* generate translation and add checkbox in the windows confirmation

* change text an configuration key

* update delete account fonctionality

* rename variable

* write in explicite condition

* merge yarn.lock

* regenerate translation
 2019-04-08 14:25:17 +02:00
aina-esokia
c89757c4d7 escape in controller 2019-04-05 15:57:49 +04:00
Harrys Ravalomanana
2390244e9e Merge branch master into PHRAS-2430 2019-04-05 15:11:09 +04:00
aina-esokia
7426eb453d Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2276-port-template-escape 2019-04-05 11:49:45 +04:00
Nicolas Maillat
4bb3e28bf5 Merge pull request #2967 from 4rthem/randomlib 
PHRAS-2505 replace ircmaxell/random-lib with paragonie/random-lib for php7.1
 2019-04-04 14:24:55 +02:00
Arthur de Moulins
887ad91174 PHRAS-2505 replace ircmaxell/random-lib with paragonie/random-lib for php7.1 2019-04-04 12:34:04 +02:00
Nicolas Maillat
e687b5ba28 Merge pull request #2965 from aynsix/PHRAS-2067-record-font-icon-substitution 
PHRAS-2067: add substitution icon for font otc and ttc
 2019-04-02 14:20:44 +02:00
Nicolas Maillat
d2e09dbdf7 Merge pull request #2966 from aynsix/PHRAS-2499-add-model-order-manager 
PHRAS-2499: Port to 4.1 - Add Model to "Order Managers" of collection
 2019-04-02 14:20:22 +02:00
aina-esokia
e68081399d port add model in order manager of collection 2019-04-02 15:36:49 +04:00
aina-esokia
8015c5ec7b add substitution icon for font otc and ttc 2019-04-02 14:58:34 +04:00
Nicolas Maillat
141bfde9ca Merge pull request #2943 from aynsix/PHRAS-2067-icon-substitution-fonts-record 
PHRAS-2067:  Prod : Introduce thumbnail & preview generic images for Fonts records
 2019-04-01 15:23:04 +02:00
Nicolas Maillat
2b0f6fda2b Merge pull request #2949 from aynsix/PHRAS-2465-port-upload-by-url 
PHRAS-2465 Port To 4.1 - upload-via-url_4.0
 2019-04-01 15:22:08 +02:00
Kamlesh Balloo
c5e95b7e44 PHRAS-2430-update-phraseanet-production-version-for-restore-query 2019-04-01 14:55:04 +04:00
Nicolas Maillat
20a90dfc73 Merge pull request #2962 from 4rthem/arthur-PHRAS-2494 
PHRAS-2494 keep node_modules directory for performance
 2019-04-01 12:10:47 +02:00
Kamlesh Balloo
70ccedf8e5 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-04-01 10:11:05 +04:00
aina-esokia
df1fcd66d5 Merge branch 'PHRAS-2276-port-template-escape' of https://github.com/aynsix/Phraseanet into PHRAS-2276-port-template-escape 2019-03-29 17:21:47 +04:00
aina-esokia
60c126c7b9 escape when rendered 2019-03-29 17:20:04 +04:00
aina-esokia
019498b5c4 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2276-port-template-escape 2019-03-29 17:09:37 +04:00
Arthur de Moulins
25aeb9d73a PHRAS-2494 keep node_modules directory for performance 2019-03-27 17:23:44 +01:00
Nicolas Maillat
788ff0d2b3 Merge pull request #2960 from xrousset78800/PHRAS-2455-resolve-php-warning-on-dashboard 
PHRAS-2455 Resolve PHP warnings on setup, update provisionning
 2019-03-27 17:05:03 +01:00
Xavier Rousset
8c0cd7d886 PHRAS-2455 Resolve PHP warnings on setup, update provisionning 2019-03-27 14:22:24 +01:00