hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,363 Commits 268 Branches 107 Tags
c9356ec206641f3362b9ec0981c2a68f3b4489b5
Commit Graph

2020 Commits

Author SHA1 Message Date
aynsix
c9356ec206 max_items depends on header application/vnd.phraseanet.story-paginate 2019-11-28 18:15:55 +04:00
Nicolas Maillat
e6ebc29ecd Merge branch 'master' into PHRAS-2196-api-stories-pagination 2019-11-27 13:21:31 +01:00
Nicolas Maillat
77d3405149 Merge branch 'master' into PHRAS-2196-api-stories-pagination 2019-11-21 17:54:23 +01:00
Jean-Yves Gaulier
246ffd15ef PHRAS-2796_actionbar-enhancements_4.1 
port code from 4.0
 2019-11-21 14:11:33 +01:00
Harrys Ravalomanana
5e4da5f28f PHRAS-2805 #comment Port41 of Facet-case-sensibility 2019-11-14 15:02:04 +04:00
Harrys Ravalomanana
5f2617e5f7 PHRAS-2816 #comment add attribute gui_visible to show fields on roll over and detailled view #time 2h 2019-11-12 18:13:05 +04:00
Nicolas Maillat
c9a0a0490c Merge branch 'master' into PHRAS-2761_add_status_change_capabilities-to_quarantine 2019-11-05 12:26:43 +01:00
Jean-Yves Gaulier
b4e848a5e9 PHRAS-2808-2806_disable-cterms_mask-writable-fields_4.1 
new : checkbox in admin/field to allow gui (prod) editing, default=checked.
rename "publish_cterms" to "generate_cterms"
todo : implement "gui_editable" in edit ux (hide field when =false)
todo : 2 new strings (ckbox labels) to trans
 2019-10-31 19:31:12 +01:00
Jean-Yves Gaulier
ce13112105 PHRAS-2808_disable-cterms_4.1 
new : checkbox in admin/field to disable cterms generation.
fix : when cterms is cleared (during reindex), rejected terms are kept
WIP
 2019-10-31 18:12:26 +01:00
Harrys Ravalomanana
df86aac2ba PHRAS-2766 #comment port 41 Add status change capabilities to quarantine #time 3h 2019-10-29 16:48:14 +04:00
Nicolas Maillat
90959422eb Merge branch 'master' into PHRAS-2754-reactivate-permalink-41 2019-09-27 16:10:59 +02:00
aynsix
dbaca5bb94 reactivate permalink when record moved from TRASH 4.1 2019-09-27 11:49:09 +04:00
Nicolas Maillat
fcb275da4c Merge branch 'master' into PHRAS-2686_paging_new_design 2019-09-23 12:24:00 +02:00
jygaulier
704e119f6b Merge branch 'master' into PHRAS-2666_slow-notifications_4.1 2019-09-23 12:04:11 +02: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
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
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