hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,662 Commits 268 Branches 107 Tags
27433c769fbb5281b17247da99d8ac01c68ffa93
Commit Graph

2211 Commits

Author SHA1 Message Date
aynsix
5d8132b08d user webhook: registration and delete 2019-09-20 18:01:23 +04:00
aynsix
65d7affcb5 export mail : make it event oriented to facilitate worker treatement 2019-09-20 16:15:49 +04:00
aynsix
7541885637 buildsubdef with worker 2019-09-20 16:01:48 +04:00
Harrys Ravalomanana
c16dc45208 PHRAS-2686 2019-09-20 11:10:26 +04:00
Harrys Ravalomanana
b3af2c26b2 PHRAS-2686 2019-09-18 17:43:42 +04:00
Nicolas Maillat
4ce653b228 Merge branch 'master' into PHRAS-2127/fix-geoname-on-registration 2019-09-10 12:53:35 +02:00
Nicolas Maillat
b124aaed91 Merge branch 'master' into PHRAS-2688_Pord_41_Prod_workzone_change_type_of_numbering 2019-09-06 16:25:44 +02:00
Nicolas Maillat
990378d9b0 Merge branch 'master' into PHRAS-2127/fix-geoname-on-registration 2019-09-06 15:03:21 +02:00
Nicolas Maillat
b260bc0688 Merge branch 'master' into PHRAS-2741-api-leaves-temporary-file-41 2019-09-06 15:00:20 +02:00
Nicolas Maillat
5e3a9c7bee Merge branch 'master' into PHRAS-2724-port-PHRAS-2723 2019-09-06 13:04:03 +02:00
Nicolas Maillat
84f5cc4857 Merge branch 'master' into PHRAS-2666_slow-notifications_4.1 2019-09-06 13:02:44 +02:00
aynsix
fe087a9dc5 fix user creation from push and feedback window 2019-09-04 12:09:53 +04:00
Jean-Yves Gaulier
53272de3f5 PHRAS-2726_setstatus-api_4.1 : port of PHRAS-2716 
setstatus api did change unspecified bits due to string offset error
 2019-09-03 18:07:36 +02:00
aynsix
645ae0e777 fix api: remove temporary file when upload 2019-08-28 16:41:34 +04:00
Xavier Rousset
80b4c9a6a6 PHRAS-2127 | Add https in default geoname server url, remove url formatter in register controller 2019-08-14 15:49:25 +02:00
Harrys Ravalomanana
8987e2dba5 PHRAS-2688 commit to run ccircle ci test 2019-08-13 11:39:57 +04:00
Harrys Ravalomanana
f185558de7 PHRAS-2688 #comment Port 41 of Prod workzone: Change type of numbering #time 1h 2019-08-02 13:48:48 +04:00
Jean-Yves Gaulier
568268a918 PHRAS-2666_slow-notifications_4.1 
revert to fix unit test (?)
!!! WIP !!!
 2019-07-25 18:16:43 +02:00
Jean-Yves Gaulier
2fcbd7e6d7 PHRAS-2666_slow-notifications_4.1 
removed join on basket_elements where useless
code style + type hints
!!! WIP !!!
 2019-07-25 17:23:10 +02:00
Jean-Yves Gaulier
5585893f05 PHRAS-2651_event-to-message_4.1 
fix for php7.1
!!! WIP !!!
 2019-07-25 17:23:10 +02:00
aina-esokia
cd3995382c take account all record type for story cover 2019-07-11 11:31:41 +04:00
aina-esokia
fe48e8a305 api stories add cover source 2019-07-10 14:26:34 +04:00
Jean-Yves Gaulier
ce25275c03 PHRAS-2628_toolbar-plugin_4.1 
allow a plugin to his own js (at the end of the toolbar)
 2019-06-12 15:20:10 +02:00
Nicolas Maillat
73b0e7bd94 Merge branch 'master' into PHRAS-2184-list-manager-email-domain-filter 2019-06-11 17:22:29 +02:00
Jean-Yves Gaulier
dca1387a17 PHRAS-2605_fix-unittest-bootstrap_4.1 
fix conf
 2019-05-28 14:59:34 +02:00
aina-esokia
4097e19abb add a video start t parameter in permalink url 
#time 6h
 2019-05-15 16:13:16 +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
aina-esokia
eff72083ba update delete account config structure 
#time 0.5h
 2019-04-25 17:27:33 +04: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
aina-esokia
e68081399d port add model in order manager of collection 2019-04-02 15:36:49 +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
Harrys
b3976733e4 PHRAS-2430 Restore jsonQuery 2019-03-27 10:04:05 +04:00
aina-esokia
8ab2888850 port to 4.1 upload by url 2019-03-18 16:16:14 +04:00
aina-esokia
acc59ec42a List manager : add email domain in filter box 2019-03-08 15:39:58 +04:00
aina-esokia
605e6b031a fix presets audio name 2019-01-29 16:54:18 +04:00
aina-esokia
a656aa0072 audio subdeffrom video 2019-01-24 18:03:03 +04:00
Filip Vilic
eec09e55cd PHRAS-2327_report_refacto_41 2018-12-11 13:15:03 +01:00
Jean-Yves Gaulier
61058a3658 PHRAS-1326_intl-labels-in-facets_MASTER 
add "labels" array to facets
 2018-11-27 19:33:36 +01:00
jygaulier
e2f5afc07b PHRAS-2292_aggregates-as-new-json_MASTER (#2829) 
* PHRAS-2292_aggregates-as-new-json_MASTER
wip

* PHRAS-2292_aggregates-as-new-json_MASTER

* PHRAS-2292_aggregates-as-new-json_MASTER
fake commit to test circle (did not run on last commit !)
 2018-11-27 10:25:28 +01:00
aina-esokia
d413c86912 port to 4.1 search thesaurus term to all language 2018-11-26 10:48:57 +04:00
aina-esokia
6fe39113c0 fix escaping in thesaurus 2018-11-22 15:10:38 +04:00
aina-esokia
c58ed45333 fix prod escaping 2018-11-22 14:32:42 +04:00
Jean-Yves Gaulier
f7b103af3d PHRAS-2161_coll-id-in-log-docs_MASTER 
- explicit message when databox is failed to mount.
- reconnect db for long migration scripts
- mark (comment) doctrine "binary_strings" type so the upgrade is not done every time because the field was read-back as "varchar"
- proposal on long migration scripts (could be faster)
 2018-11-14 15:49:10 +01:00
Nicolas Maillat
9298580888 Merge pull request #2789 from xrousset78800/fix/update-access-page-design 
Update access page design
 2018-11-06 16:26:42 +00:00
Nicolas Maillat
36395f25ac Merge pull request #2801 from aynsix/PHRAS-1864-port-41-1868-admin-mount-database 
PHRAS-1864 port to 4.1 PHRAS-1868 database mount
 2018-11-06 09:32:31 +00:00