Commit Graph

5092 Commits

Author SHA1 Message Date
aynsix
f5adf02c55 command databox:unmount 2020-02-20 16:10:15 +03:00
Nicolas Maillat
346c046e04 Merge branch 'master' into PHRAS-2603-migration-patch-configuration-yml 2020-02-19 18:36:09 +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
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
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
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
gjacobjn
b18ef09661 Update AccountController.php 2020-02-07 17:17:54 +01:00
aynsix
6c1f3c3e62 use phraseanet version 4.1.0-alpha.20a 2020-02-06 18:01:05 +03:00
aynsix
2ffed8c4d5 patch to change data format geolocation 2020-02-06 17:34:57 +03:00
gjacobjn
2f02cef4b0 Update Edit.php 2020-02-06 10:48:16 +01:00
aynsix
1996e1efec fix missing string 2020-02-04 11:10:27 +03:00
aynsix
d1374ef47f don't print fiels with attribute gui_visible false 2020-01-24 11:48:51 +03:00
aynsix
e3f596963a add base name in pdf feedback 2020-01-23 12:12:59 +03:00
aynsix
5b38565e1a add format deedback only and fix pdf text 2020-01-23 11:38:17 +03:00
Nicolas Maillat
a41a87d7d0 Merge branch 'master' into PHRAS-2603-migration-patch-configuration-yml 2020-01-20 16:31:16 +01:00
aynsix
572e8b0def update phpexiftool to 0.7.3 in 4.1 2020-01-20 12:13:13 +03:00
jygaulier
998c751843 Port PHRAS-2877
Port of PHRAS-2877 User manipulator did not allow to set a null email
Temporary Null email is used by saml plugin while creating a user.
2020-01-13 14:48:53 +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
aynsix
63d2f1cf54 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2603-migration-patch-configuration-yml 2019-12-17 14:09:27 +04:00
Harrys Ravalomanana
ad47f4b18c PHRAS-2706 #comment Prod Fix Basket browser #time 2h 2019-12-17 12:07:04 +04:00
aynsix
afc5a85edf change param name 2019-12-13 15:28:02 +04:00
Nicolas Maillat
6afc40ef3b Merge branch 'master' into PHRAS-2196-api-stories-pagination 2019-12-12 12:56:48 +01:00
Nicolas Maillat
a43d073c8a Merge branch 'master' into PHRAS-2840-exclure-collection-quarantaine 2019-12-12 12:10:35 +01:00