hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,797 Commits 268 Branches 107 Tags
2d537cfbbd0d91abdf1b94291f971c005df9c628
Commit Graph

933 Commits

Author SHA1 Message Date
Nicolas Maillat
d7417177e4 Merge branch 'master' into PHRAS-2913_create-tokens-faster_4.1 2020-02-18 15:24:11 +01:00
Jean-Yves Gaulier
b1b35cc92b fix malformed query on tech fields ('_' in query) 2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
20839f1dd7 return facets following the order defined in conf. 2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
e75a483cd5 PHRAS-2913_create-tokens-faster_4.1 
- create token by sql
- create feedentry tokens in bulk-sql
 2020-02-07 22:14:47 +01:00
jygaulier
b6fa28276d Merge branch 'master' into PHRAS-2757_print-feedback_4.1 2020-01-09 20:33:11 +01:00
Jean-Yves Gaulier
32fbf049cf PHRAS-2757_print-feedback_4.1 
Add a print format when printing a feedback basket
Only the creator of the feedback can print it.
 2020-01-09 20:31:09 +01:00
Harrys Ravalomanana
1dd0be65d4 PHRAS-2868 #comment update phraseanet-production-client version 2020-01-09 19:05:31 +04:00
Jean-Yves Gaulier
0967f3c810 PHRAS-2631_feedback-icon 
fix : 2 new icons for feedback baskets; no more display of 2 icons.
fix : tooltip on "about" icon of feedback baskets
 2019-12-05 14:52:46 +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
b124aaed91 Merge branch 'master' into PHRAS-2688_Pord_41_Prod_workzone_change_type_of_numbering 2019-09-06 16:25:44 +02:00
aynsix
fe087a9dc5 fix user creation from push and feedback window 2019-09-04 12:09:53 +04: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
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
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
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
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
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
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
18ff40a537 port to 4.1 PHRAS-2227 FIX changing status appear in log_docs table 2018-11-06 11:22:53 +04:00
Filip Vilic
e41145ead7 PHRAS-2192_detailed_selection_dev box position fix 2018-08-30 10:20:37 +02:00
Filip Vilic
5cd490ce99 PHRAS-2192 detailed selection info - html added 2018-08-16 11:37:50 +02:00
aina-esokia
0d2e2eb494 use tmp_files on upload file 2018-06-28 17:32:57 +04:00
Nicolas Maillat
9d32f2c0fb Merge pull request #2646 from mike-esokia/PHRAS-2099_refacto_push_feedback 
PHRAS-2099 WIP refacto push feedback
 2018-06-15 16:36:48 +02:00
Mike Ng
83c6dbe1a7 wip - refactor ui of push screen and dialogs 2018-06-15 17:25:46 +04:00
aina-esokia
923265f71b insert or update in technical_data table 2018-06-13 11:06:24 +04:00
Nicolas Maillat
dbd179c003 Merge pull request #2622 from aynsix/PHRAS-2065-port-1730 
PHRAS-2065 port PHRAS-1730 to 4.1: dispatch record.edit event
 2018-06-01 09:45:09 +02:00
Mike Ng
57c7f2ac09 refactor notice on mapboxgl map and add title to dialog 2018-05-30 16:11:24 +04:00
aina-esokia
3233e66c03 port PHRAS-1730 to 4.1: dispatch record.edit event 2018-05-30 11:53:09 +04:00
mike-esokia
b86eaf7ed3 add notice on mapboxgl 2018-05-29 16:51:14 +04:00
mike-esokia
f33c1bc493 add text for translation 2018-05-07 15:20:56 +04:00
mike-esokia
4eaa008aec add technicalInfo in record of detail view 2018-04-18 14:33:39 +04:00
mike-esokia
0b80150f01 save overlapChapters in video editor in preferences 2018-04-13 11:47:00 +04:00