hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,799 Commits 268 Branches 107 Tags
6bb94250288dc8ca2007ee6d4417332f51a0bc5e
Commit Graph

12799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
aynsix
905ddcb836 port PHRAS-2468: don't drop log_colls (#2959) 2019-03-27 12:02:30 +01:00
Harrys
04da9678ec Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-27 10:05:44 +04:00
Harrys
b3976733e4 PHRAS-2430 Restore jsonQuery 2019-03-27 10:04:05 +04:00
Nicolas Maillat
e9f363de1d Merge pull request #2954 from aynsix/PHRAS-2478-port-search-different-type-fields 
PHRAS-2478: Port to 4.1 - Search issue when query mix data from different type of fields
 2019-03-22 10:04:34 +01:00
aina-esokia
eaf8cf076a port to 4.1 search mix type 2019-03-22 12:04:42 +04:00
Harrys
456b0794c3 Update package.json 2019-03-21 18:02:13 +04:00
Harrys
f6fb898ec5 PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-21 17:49:40 +04:00
Harrys
41e847256a PHRAS-2430 Port to 4.1 - Advance search refacto , Restore Query and a little Polish 2019-03-20 16:03:13 +04:00
Harrys
93c4fd1370 Update package.json 2019-03-20 09:28:12 +04:00
Harrys
f02fd6ba6e Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-19 18:09:18 +04:00
Harrys
87c8433f0f PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-19 18:08:44 +04:00
Nicolas Maillat
e426eff8af Merge pull request #2951 from alchemy-fr/PHRAS-2473_populate_time_improvement 
PHRAS-2473 Populate improv, sql query optimization.
 2019-03-18 15:43:22 +01:00
Nicolas Maillat
71f0e676f9 PHRAS-2473 Populate improv, sql query optimization. 
PHRAS-2473 Populate time improvement with a sql query optimization
 2019-03-18 15:08:16 +01:00
aina-esokia
da8cc25c04 add translation 2019-03-18 16:40:11 +04:00
aina-esokia
8ab2888850 port to 4.1 upload by url 2019-03-18 16:16:14 +04:00
Harrys
1bfdcec97b Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-03-15 12:54:49 +04:00