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
14,050 Commits 268 Branches 107 Tags
11e729ca1e7942e394ecfff22148bdeb978d1f3b
Commit Graph

7643 Commits

Author SHA1 Message Date
Nicolas Maillat
e7797d9580 Merge branch 'master' into PHRAS-1661-user-list 2020-02-20 16:52:30 +01:00
Nicolas Maillat
0ad81652d5 Merge branch 'master' into PHRAS-1629-collection-list 2020-02-20 16:22:46 +01:00
Nicolas Maillat
97170e3838 Merge branch 'master' into PHRAS-1627-databox-list 2020-02-20 15:38:05 +01:00
aynsix
ad83e9dc38 command user:set-password 2020-02-20 16:56:59 +03:00
aynsix
895dc21b30 command user:create 2020-02-20 16:51:29 +03:00
aynsix
6164ad9c20 command user:list 2020-02-20 16:40:32 +03:00
aynsix
57fdfd432e command collection:unpublish 2020-02-20 16:32:08 +03:00
aynsix
f4bb9e706f command collection:publish 2020-02-20 16:22:51 +03:00
aynsix
ac17ca616a command collection:list 2020-02-20 16:16:30 +03:00
aynsix
f5adf02c55 command databox:unmount 2020-02-20 16:10:15 +03:00
aynsix
cfff230820 command databox:mount 2020-02-20 16:02:50 +03:00
aynsix
211d33ff46 command databox:list 2020-02-20 15:52:05 +03:00
aynsix
db0489c05e Revert "start subdef creation after first write meta" 
This reverts commit cfa854f307.
 2020-02-20 11:11:18 +03:00
Nicolas Maillat
ed7a5fe288 Merge branch 'master' into PHRAS-2741-worker-service-part1 2020-02-19 20:49:31 +01:00
Nicolas Maillat
346c046e04 Merge branch 'master' into PHRAS-2603-migration-patch-configuration-yml 2020-02-19 18:36:09 +01:00
Nicolas Maillat
3fe46083e7 Merge branch 'master' into PHRAS-2933_Fix_sort_facet 2020-02-19 17:57:40 +01:00
Jean-Yves Gaulier
4f99fb57c7 cleanup debug 2020-02-19 17:10:32 +01:00
Jean-Yves Gaulier
63fce45974 PHRAS-2854_generate-js-fixtures 
add message to tell to remove plugins
 2020-02-19 16:20:36 +01:00
Harrys Ravalomanana
b232806b8b PHRAS-2933 2020-02-19 18:38:52 +04:00
aynsix
f10126bf3c change patch name 2020-02-19 10:48:45 +03:00
aynsix
90db5f7358 merge master 2020-02-19 10:46:03 +03:00
aynsix
24d85bb499 bump to version 4.1.0-alpha.23a 2020-02-19 10:43:23 +03:00
Nicolas Maillat
f63a0c4605 Merge branch 'master' into PHRAS-2927_optimize-feedback-process_4.1 2020-02-18 17:28:33 +01:00
Jean-Yves Gaulier
50b50116e7 PHRAS-2934_Bad-dctrine-mapping-webhookeventdelivery_4.1 
- added missing relation
 2020-02-18 17:26:45 +01:00
Nicolas Maillat
d7417177e4 Merge branch 'master' into PHRAS-2913_create-tokens-faster_4.1 2020-02-18 15:24:11 +01:00
Nicolas Maillat
378daacabb Merge branch 'master' into PHRAS-2901_tokens-add-index_4.1 2020-02-18 14:52:36 +01:00
Nicolas Maillat
8723fc3720 Merge branch 'master' into PHRAS-2879_facet-order_4.1 2020-02-18 10:23:12 +01:00
Jean-Yves Gaulier
722b1e3750 include Harrys's new templates 
fix form restore
fix Version
 2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
4f7be4c0a9 fix bad merge happened cause last rebase (?) 2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
eeec1ab716 save facets following the order of the admin form. 2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
c7fc2b6422 change patch number 2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
3b8d75d39d fix : tech facets did appear twice. 2020-02-17 20:17:08 +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
53f17e1897 save modifications in conf, and also write back to databoxes 2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
8171b7c1f1 PHRAS-2879_facet-order_4.1 
fix setup:install (cont' 2)
 2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
4305441a03 PHRAS-2879_facet-order_4.1 
fix setup:install (cont')
 2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
6838198a69 PHRAS-2879_facet-order_4.1 
fix setup:install.
 2020-02-17 20:17:08 +01:00
Jean-Yves Gaulier
2ccdcfed27 PHRAS-2879_facet-order_4.1 
save all facet settings in conf, order is preserved in admin/search-engine-settings.
todo : ux to re-order facets
todo : return facets into query results in this setting order.
todo : migration from dbox settings (field struct) to conf ; remove field setting from admin
 2020-02-17 20:17:08 +01:00
Nicolas Maillat
1bf4ecf60d Merge branch 'master' into PHRAS-2906-fix-for-job-and-activity-on-user-update 2020-02-17 16:42:10 +01:00
Jean-Yves Gaulier
a8c19de4d3 PHRAS-2927_optimize-feedback-process_4.1 
add route "lightbox/ajax/GET_ELEMENTS/{{basket_id}}/" to get counts of elements validated as "yes", "no" or "nul".
Will allow front to display alert before submitting
 2020-02-13 18:22:54 +01:00
Jean-Yves Gaulier
5a794c493a create feedEntriesTokens in bulk / doctrine. No more sql 2020-02-11 15:17:13 +01:00
Harrys Ravalomanana
b08ae5c2fa PHRAS-2910 #comment Fix Order manager : action from notification in menu bar #time 4h 2020-02-11 17:21:03 +04:00
Jean-Yves Gaulier
211ba02f59 bump patch to 22a 2020-02-10 11:39:42 +01:00
Jean-Yves Gaulier
5f7ca7c9a6 add indexes to table "Tokens" 2020-02-10 11:16:41 +01:00
Jean-Yves Gaulier
e4d3da9336 rollback : can't create token in sql since the om will cry during update. Can't mix om and sql. 2020-02-08 22:29:52 +01:00
Jean-Yves Gaulier
83484e3bd0 fix for unit-testing on null user (to dig : why ?...) 2020-02-08 09:58:57 +01:00
Jean-Yves Gaulier
419440f5c2 fix for failing test 2020-02-07 22:33:18 +01:00
Jean-Yves Gaulier
18993043f2 fake change to re-run tests 2020-02-07 22:14:47 +01:00
Jean-Yves Gaulier
746c9076d4 fix malformed sql 2020-02-07 22:14:47 +01:00