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
13,764 Commits 268 Branches 107 Tags
c3bd321609584d2255467f68fd108eac74032a21
Commit Graph

5118 Commits

Author SHA1 Message Date
Nicolas Maillat
98707ff23e Merge branch 'master' into PHRAS-1659-user-create 2020-02-21 16:05:06 +01:00
Nicolas Maillat
115895a16a Merge branch 'master' into PHRAS-1629-collection-list-jsonformat 2020-02-21 15:45:46 +01:00
aynsix
497307c0dc add jsonformat to collection:list 2020-02-21 17:37:04 +03:00
Nicolas Maillat
3cdc33b673 Merge branch 'master' into PHRAS-1659-user-create 2020-02-21 15:29:00 +01:00
Nicolas Maillat
6aac273a20 Merge branch 'master' into PHRAS-1627-databox-list-jsonformat 2020-02-21 15:28:23 +01:00
aynsix
f8f9d9f9c9 add jsonformat option to databox:list 2020-02-21 17:16:14 +03:00
aynsix
e2e6879cd2 add jsonformat to user:list 2020-02-21 16:57:45 +03:00
aynsix
015ce2506b remove adress and zipcode option to the user:create command 2020-02-21 16:02:33 +03:00
aynsix
f79ae4f05e remove city and fax option to the command user:create 2020-02-21 14:17:20 +03:00
aynsix
de8ef9d9e2 merge 2020-02-21 14:14:30 +03:00
aynsix
6d1994df4d merge 2020-02-21 14:10:34 +03:00
Nicolas Maillat
0b393a340a Update UserCreateCommand.php 2020-02-20 18:55:36 +01:00
Nicolas Maillat
d91c4be04d add warn on send_mail_password 2020-02-20 18:43:53 +01:00
Nicolas Maillat
5a94c84d43 Merge branch 'master' into PHRAS-2933_Fix_sort_facet 2020-02-20 18:16:37 +01:00
Nicolas Maillat
c4d2612fa0 Merge branch 'master' into PHRAS-1659-user-create 2020-02-20 17:37:09 +01:00
Nicolas Maillat
20b62de216 Merge branch 'master' into PHRAS-1659-user-create 2020-02-20 17:30:32 +01:00
Nicolas Maillat
74b6d532ea Merge branch 'master' into PHRAS-1648-user-set-password 2020-02-20 17:15:18 +01:00
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
ac17ca616a command collection:list 2020-02-20 16:16:30 +03:00
aynsix
211d33ff46 command databox:list 2020-02-20 15:52:05 +03: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
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
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
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
5a794c493a create feedEntriesTokens in bulk / doctrine. No more sql 2020-02-11 15:17:13 +01:00
Jean-Yves Gaulier
211ba02f59 bump patch to 22a 2020-02-10 11:39:42 +01:00