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
13,179 Commits 268 Branches 107 Tags
9fdd704d5a2d518392746cfb65c23a700004a09f
Commit Graph

7368 Commits

Author SHA1 Message Date
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
mike-esokia
5a4de4750c PORT PHRAS-1681 to 4.1 2018-05-16 16:34:42 +04:00
mike-esokia
8e71c52c7e fix bug with special characters in status label 2018-05-16 15:00:14 +04:00
aina-esokia
65d5c15623 build preview and thumbnail for indesign document 2018-05-14 11:47:32 +04:00
Nicolas Maillat
39d86ef260 Merge pull request #2582 from aynsix/PHRAS-2031-porting-Add-xmpmm-documentId 
PHRAS-2031 Port to 4.1 - Add XmpMM:DocumentID source
 2018-05-10 11:01:33 +02:00
Nicolas Maillat
7b4104413f Merge pull request #2583 from aynsix/PHRAS-2032-porting-api-route-me-collections 
PHRAS-2032 port to 4.1 api route me/collections
 2018-05-10 11:01:16 +02:00
mike-esokia
b07f5aa07f add functionality to navigate between records in mobile version of lightbox 2018-05-10 11:57:08 +04:00
aina-esokia
d86fd39380 port to 4.1 api route me/collections 2018-05-10 10:58:14 +04:00
aina-esokia
cf41426095 add to 4.1 XmpMM:DocumentID source 2018-05-10 10:16:59 +04:00
Nicolas Maillat
5a122a405c Merge pull request #2579 from aynsix/PHRAS-1932-ftp-export-task 
PHRAS-1932 FTP export task
 2018-05-08 21:26:06 +02:00
Nicolas Maillat
e4ca34fd24 Merge pull request #2563 from KallooaSan/PHRAS-1911-fix-route 
PHRAS-1911 : fix route me/structures
 2018-05-08 21:23:43 +02:00
aina-esokia
a19cac5817 add locator to FtpJob 2018-05-08 15:16:52 +04:00
Nicolas Maillat
2f38b33357 Merge pull request #2574 from mike-esokia/PHRAS-2026_refactor_suggested_values 
PHRAS-2026 refactor suggested values on edit view
 2018-05-07 15:07:09 +02:00
mike-esokia
f33c1bc493 add text for translation 2018-05-07 15:20:56 +04:00
Sandeep
7f8251d4e2 PHRAS-1819: add quarantine rule based on media type 2018-05-07 14:31:12 +04:00
aina-esokia
c905ca303f use composite position 2018-05-03 17:25:37 +04:00
Sandeep
c75d94a321 PHRAS-1911 : fix route me/structures 2018-05-02 12:21:18 +04:00