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
12,421 Commits 268 Branches 107 Tags
88035173c53c1b02cfc6068199542b9465d55956
Commit Graph

7184 Commits

Author SHA1 Message Date
jygaulier
88035173c5 PHRAS-2126_Array-to-String-err-idx_4.1 (#2656) 
fix : es error message during indexation is now dumped (not always a string)
fix : es file "size" is now type "long"
 2018-07-02 18:41:40 +02:00
aina-esokia
0d2e2eb494 use tmp_files on upload file 2018-06-28 17:32:57 +04:00
Nicolas Maillat
41f95f3ca9 Merge branch 'master' into PHRAS-1798_update_version_name 2018-06-26 13:13:19 +00:00
aynsix
01f5380305 remove old tables (#2654) 2018-06-25 18:22:38 +02:00
aynsix
677ce56779 use tmp_files storage for generating all mediatype (#2652) 2018-06-25 13:45:06 +02:00
jygaulier
b9aa04be6b PHRAS-2096_Autoregister-Whitelist_MASTER (#2642) 
Add a whitelist to filter autoregistration
 2018-06-21 18:35:44 +02:00
aina-esokia
5488d5d47c FIX create subview mediatype dropdown 2018-06-20 17:26:19 +04:00
aynsix
e74fb4b877 change zip archive creation directory (#2650) 2018-06-20 11:24:07 +02:00
Nicolas Maillat
0decda7227 Merge pull request #2645 from aynsix/PHRAS-2112-video-subdef-in-specified-path 
PHRAS-2112 generate video subdef in temporary path first
 2018-06-19 19:18:32 +00:00
aina-esokia
4e1190a156 change temporary storage config 2018-06-19 10:58:34 +04:00
aynsix
0aecfa8301 update field on camera_model_aggregate (#2647) 2018-06-18 15:38:21 +02: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
d306d292eb generate video subdef in temporary path first 2018-06-15 15:51:10 +04:00
aynsix
9809e8f176 modify create guest account and filter guest user (#2534) 2018-06-14 19:16:10 +02:00
aynsix
20fd33696b migration script for old guest account (#2644) 2018-06-14 19:09:15 +02:00
aina-esokia
3996f842a2 delete data from cache 2018-06-13 17:56:17 +04:00
aina-esokia
923265f71b insert or update in technical_data table 2018-06-13 11:06:24 +04:00
aina-esokia
313c902a10 update SubdefsController 2018-06-11 18:20:37 +04:00
aina-esokia
7656dac7a2 update SubdefGenerator 2018-06-08 17:04:10 +04:00
aina-esokia
9180bc88ef generate pdf subdef 2018-06-08 15:49:46 +04:00
aina-esokia
e27fae0961 generate pdf subdef 2018-06-06 16:53:10 +04:00
aina-esokia
0bc95e1d0e port to 4.1 advanced search sort by updated_on 2018-06-05 17:07:16 +04:00
Nicolas Maillat
cd491aae57 Merge pull request #2626 from mike-esokia/PHRAS-2079_design_personalisation_logo 
PHRAS-2079 design personalisation logo
 2018-06-01 21:56:44 +02:00
mike-esokia
275730c3fb wip file upload 2018-06-01 17:19:05 +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-esokia
3d50c59e89 add download function 
refactored code of personalisation logo section
wip - file upload
 2018-06-01 11:29:09 +04:00
Nicolas Maillat
0f61063684 Merge pull request #2620 from aynsix/PHRAS-2062-port-2061 
PHRAS-2062 port 2061 authorize with providers
 2018-05-31 17:20:34 +02:00
mike-esokia
4d96feaf28 create form for uploading logo 
refactor admin setup layout for adding logo personalisation section
 2018-05-31 16:04:10 +04: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
Nicolas Maillat
4e747f23e5 Merge branch 'master' into PHRAS-2008_add_notice 2018-05-29 15:56:12 +02:00
aina-esokia
ff67cd5ac6 port authorize with providers 2018-05-29 17:47:19 +04:00
mike-esokia
b86eaf7ed3 add notice on mapboxgl 2018-05-29 16:51:14 +04:00
Nicolas Maillat
cce12398dd Merge pull request #2618 from aynsix/PHRAS-2041-port-1657 
PHRAS-2041 port to 4.1 session.cookie_secure message
 2018-05-29 14:47:44 +02:00
aina-esokia
1cf9bcd6b4 port to 4.1 session.cookie_secure message 2018-05-29 16:07:42 +04:00
aina-esokia
93ad45dd91 port better agregate to 4.1 2018-05-29 15:25:42 +04:00
Nicolas Maillat
50feb78c12 Merge pull request #2606 from mike-esokia/PHRAS-2053_PORT_PHRAS_2051_to_4.1 
PHRAS-2053 port PHRAS-2051 to 4.1
 2018-05-23 20:04:32 +02:00
mike-esokia
04a0f56b4d Add PHRAS-1539 2018-05-23 17:15:56 +04:00
mike-esokia
f8fb8837cb wip restore hightlights and multivalue seperator 2018-05-23 17:00:15 +04:00
aina-esokia
b6ed165dd5 add print caption 2018-05-23 15:09:06 +04:00
Nicolas Maillat
53ba8c1361 Merge pull request #2602 from mike-esokia/PHRAS-2053_PORT_PHRAS_2051_to_4.1 
PHRAS-2053 port PHRAS 2051 to 4.1
 2018-05-23 11:11:55 +02:00
Nicolas Maillat
d6ff62a095 Merge pull request #2597 from jygaulier/PHRAS-2009_Geo-operator_MASTER 
PHRAS-2009_Geo-operator_MASTER
 2018-05-21 13:26:33 +02:00
mike-esokia
6a323a3189 add trim before matching value to regex 2018-05-21 11:23:43 +04:00
mike-esokia
816cd4f20b resolve conflict 2018-05-21 11:11:50 +04:00
mike-esokia
12fc9344d4 show hex as icon in technical data 2018-05-18 17:36:19 +04:00
Nicolas Maillat
44b618ac2d Merge pull request #2598 from mike-esokia/PHRAS-1051_fix_delete_icon_status 
PHRAS-1051 fix delete function for status icons
 2018-05-18 12:36:01 +02:00
Nicolas Maillat
49f1cc6bca Merge pull request #2594 from mike-esokia/PHRAS-1707_PORT_PHRAS-1681 
PHRAS-1707 PORT PHRAS-1681 to 4.1
 2018-05-18 12:24:24 +02:00
mike-esokia
ecced3d583 fix delete icon function on status 2018-05-18 10:40:10 +04:00
Jean-Yves Gaulier
1e64eb7a42 PHRAS-2009_Geo-operator_MASTER 
add the "geolocation="lat lon distance" query
 2018-05-17 21:13:28 +02:00