Commit Graph

15351 Commits

Author SHA1 Message Date
Nicolas Maillat
4f143087ad Merge pull request #3652 from alchemy-fr/PHRAS-3270-fixgeoloc-preview
PHRAS-3270 Merge fix geoloc in preview
2020-11-17 17:10:10 +01:00
aina esokia
3e1d896767 PHRAS-3270 fix geoloc in preview 2020-11-17 18:22:02 +03:00
jygaulier
52b7a87e62 add : add stopwatch, new options (see --help)
add : use -v to get progression, or -vv to get long dump
todo : fasten plink creation
2020-11-17 12:54:10 +01:00
Nicolas Maillat
f9fdbab50f Merge branch 'master' into PHRAS-3240-worker-validation-reminder 2020-11-17 11:56:34 +01:00
jygaulier
35dee831a0 Merge branch 'master' into PHRAS-3272_cli-plinks-creation_MASTER 2020-11-17 10:01:53 +01:00
Nicolas Maillat
de65988171 Merge pull request #3650 from alchemy-fr/PHRAS-3270-fix-js-string
PHRAS-3270 merge fix js string in mapboxgl and mapboxjs
2020-11-17 10:01:41 +01:00
aina esokia
4237556e6a PHRAS-3270 fix js string 2020-11-17 11:16:24 +03:00
aina esokia
12faced9b8 merge master into branch 2020-11-17 10:46:02 +03:00
aina esokia
11777445f9 PHRAS-3236 update 2020-11-17 10:29:59 +03:00
aina esokia
06b2de9056 merge master into branch 2020-11-17 10:09:32 +03:00
jygaulier
4b34dd1626 Merge branch 'master' into PHRAS-3272_cli-plinks-creation_MASTER 2020-11-16 23:57:42 +01:00
jygaulier
d6e5304a5a add : bin/console records:build-permalinks
todo : add stopwatchs, limits (duration, maxrecs), segmentation, ...
todo : fasten plink creation
2020-11-16 23:48:35 +01:00
Nicolas Maillat
32a6d2ef3d Merge pull request #3648 from alchemy-fr/PHRAS-3270-mapboxGL-editing-multiple
PHRAS-3270 Merge Prod - editing - MapboxGL - editing assets position form several record improvement
2020-11-16 18:35:38 +01:00
Nicolas Maillat
ef7851c139 Merge branch 'master' into PHRAS-3270-mapboxGL-editing-multiple 2020-11-16 18:10:37 +01:00
aina esokia
f61d050fcb PHRAS-3270 improve edit several record 2020-11-16 16:48:16 +03:00
Nicolas Maillat
8cd5eacb9d Merge pull request #3645 from alchemy-fr/PHRAS-3267_bad-children-count-and-permalink-exists_MASTER
PHRAS-3267 Merge story bad children count and permalink exists exception MASTER
2020-11-16 14:34:01 +01:00
Nicolas Maillat
87daa3961e Merge branch 'master' into PHRAS-3267_bad-children-count-and-permalink-exists_MASTER 2020-11-14 00:59:06 +01:00
Jennifer
ccd0aa6165 Translated using Weblate (German)
Currently translated at 98.1% (2603 of 2653 strings)
2020-11-13 23:57:56 +00:00
Jennifer
f3ba0ddf64 Translated using Weblate (French)
Currently translated at 97.8% (2597 of 2653 strings)
2020-11-13 23:57:56 +00:00
Nicolas Maillat
c3614ff8d5 Translated using Weblate (English)
Currently translated at 97.9% (2599 of 2653 strings)
2020-11-13 23:57:56 +00:00
Jennifer
848faf00a5 Translated using Weblate (English)
Currently translated at 97.9% (2598 of 2653 strings)
2020-11-13 23:57:56 +00:00
Nicolas Maillat
f43d49ce08 Merge branch 'master' into PHRAS-3267_bad-children-count-and-permalink-exists_MASTER 2020-11-13 20:24:02 +01:00
Nicolas Maillat
b6b586492d Merge pull request #3647 from alchemy-fr/PHRAS-1378_es-max-result-window_MASTER
PHRAS-3265 merge JYG fix  es index max_result_window
2020-11-13 20:23:46 +01:00
Nicolas Maillat
28dbeafa83 Merge branch 'master' into PHRAS-1378_es-max-result-window_MASTER 2020-11-13 19:55:15 +01:00
Nicolas Maillat
def015cab3 Translated using Weblate (French)
Currently translated at 97.8% (2597 of 2653 strings)
2020-11-13 18:53:36 +00:00
Nicolas Maillat
0371306c8d Translated using Weblate (English)
Currently translated at 97.9% (2598 of 2653 strings)
2020-11-13 18:53:36 +00:00
Nicolas Maillat
13dc0568c9 Merge pull request #3579 from alchemy-fr/PHRAS-3189_Admin_expose_setting
PHRAS-3189 Merge Expose in Phraseanet core - Prod, Admin and worker
2020-11-13 13:50:45 +01:00
aina esokia
5336876a61 merge and resolve locale 2020-11-13 15:17:22 +03:00
Nicolas Maillat
76416994c7 Merge branch 'master' into PHRAS-3267_bad-children-count-and-permalink-exists_MASTER 2020-11-13 12:57:19 +01:00
Nicolas Maillat
ba9d99cd6c Merge pull request #3642 from alchemy-fr/PHRAS-3261-add-searchzone-mapboxGl
PHRAS-3261 Merge Prod - MapboxGL - add search zone on map as we have in mapboxJS
2020-11-13 12:54:47 +01:00
aina esokia
fe422c85f3 Merge branch 'PHRAS-3261-add-searchzone-mapboxGl' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3261-add-searchzone-mapboxGl 2020-11-13 14:32:24 +03:00
aina esokia
7d70080191 PHRAS-3261 mapboxjs fix popup 2020-11-13 14:31:56 +03:00
jygaulier
53e116cf4f fix : conf:max_result_window (es) is now used when creating index by searchengine 2020-11-13 10:10:35 +01:00
Nicolas Maillat
e7b7c0e43e Merge branch 'master' into PHRAS-3189_Admin_expose_setting 2020-11-12 14:29:18 +01:00
Nicolas Maillat
eaf70b6c5f Merge branch 'master' into PHRAS-3261-add-searchzone-mapboxGl 2020-11-12 11:52:19 +01:00
aina esokia
d74cb26268 PHRAS-3261 refresh geoloc and mapboxjs multiple add position 2020-11-12 12:59:41 +03:00
jygaulier
b2954c3119 Merge pull request #3646 from alchemy-fr/PHRAS-3265-port-max-result-window
PHRAS-3265 Port to 4.1 - taken in account max_result_window when create elastisearch index
2020-11-12 10:42:30 +01:00
aina esokia
6cf8a09a87 PHRAS-3261 change position miltiple 2020-11-11 18:21:43 +03:00
aina esokia
908ec3c0a1 PHRAS-3265 port max_result_window 2020-11-11 15:16:25 +03:00
aina esokia
902550226e PHRAS-3261 change icon 2020-11-11 14:43:39 +03:00
aina esokia
5152b87230 Merge branch 'PHRAS-3261-add-searchzone-mapboxGl' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3261-add-searchzone-mapboxGl 2020-11-11 11:57:06 +03:00
aina esokia
f21c497f76 PHRAS-3261 contextmenu change position 2020-11-11 11:56:18 +03:00
jygaulier
46377e99c2 - fix : removed useless exception test, because now creating the same plink twice will not crash. 2020-11-10 18:08:49 +01:00
jygaulier
7020caea83 - fix : total children count is now 0 for empty stories
- fix : creating permalinks (create_many) on twice the same record is handled.
2020-11-10 17:38:55 +01:00
Nicolas Maillat
38c4d24c7a Merge branch 'master' into PHRAS-3189_Admin_expose_setting 2020-11-10 17:34:05 +01:00
Nicolas Maillat
cc77f0632a Merge branch 'master' into PHRAS-3261-add-searchzone-mapboxGl 2020-11-10 17:24:16 +01:00
Nicolas Maillat
6930c88897 Merge pull request #3637 from alchemy-fr/PHRAS-3174_api-v3-records_4.1
PHRAS-3174 Merge api v3,  structure are now in redis cache, adding searchraw endpoint, without permalink.
2020-11-10 17:09:26 +01:00
aina esokia
f8ff172534 PHRAS-3261 2020-11-10 18:33:18 +03:00
aina esokia
cf509edbc5 PHRAS-3261 add search zone on mapboxGl
#time 3h
2020-11-06 17:16:17 +03:00
jygaulier
cfd385498d - add : cache on es "tags"
- removed : variable globalstructure construction (WITH_FIELDS, WITH_FLAGS...) (was unused)
- cleanup (stopwatches etc)
2020-11-05 19:54:14 +01:00