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,292 Commits 268 Branches 107 Tags
1eba9920b5bf04b0709214a80e88a9f0dbf89947
Commit Graph

12292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
1eba9920b5 Merge pull request #2589 from aynsix/PHRAS-1999-build-preview-indesign-document 
PHRAS-1999 Core / Build Preview for indesign document
 2018-05-14 22:41:21 +02:00
Nicolas Maillat
40f95b7976 Merge pull request #2588 from mike-esokia/PHRAS-2037_mobile_home_phraseanet 
PHRAS-2037 fix responsive ui of login page
 2018-05-14 22:13:39 +02:00
aina-esokia
65d5c15623 build preview and thumbnail for indesign document 2018-05-14 11:47:32 +04:00
mike-esokia
7720a57a57 fix responsive ui of login page 2018-05-14 10:49:56 +04:00
Nicolas Maillat
a3c07056c3 Merge pull request #2587 from mike-esokia/PHRAS-2034_fix_ui_lightbox_mobile 
PHRAS-2034 add scroll for webkit
 2018-05-11 14:47:21 +02:00
mike-esokia
015cb0313a fix css class for button 2018-05-11 13:15:43 +04:00
mike-esokia
11e4f18127 add scroll for webkit 2018-05-11 13:08:05 +04:00
Nicolas Maillat
07da4872f5 Merge pull request #2586 from mike-esokia/PHRAS-2034_fix_ui_lightbox_mobile 
PHRAS-2034 fix ui and dialog lightbox mobile version
 2018-05-11 09:33:15 +02:00
mike-esokia
d6e53ef104 fix ui and dialog lightbox mobile version 2018-05-11 10:50:43 +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
Nicolas Maillat
ac2d86c3fc Merge pull request #2584 from mike-esokia/PHRAS-2030_nav_between_records 
PHRAS-2030 add functionality to navigate between records in mobile version of lightbox
 2018-05-10 11:00:32 +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
36968069c1 Merge pull request #2581 from aynsix/PHRAS-1976-use-composite-datasource 
PHRAS-1976 use composite datasource
 2018-05-09 13:49:06 +02:00
aina-esokia
fe78796db6 update alchemy/mediavorus 2018-05-09 14:59:52 +04:00
Nicolas Maillat
d102f5c59a Merge pull request #2559 from mike-esokia/PHRAS-2005_PORT_PHRAS-1996_to_4.1 
PHRAS-2005 PORT PHRAS-1996 to 4.1
 2018-05-09 12:37:51 +02:00
Nicolas Maillat
f75603a2f3 Merge pull request #2562 from KallooaSan/PHRAS-1997_add_indesign_support 
PHRAS-1997-PORT-PHRAS-1991
 2018-05-09 12:36:38 +02: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
45b3dd3a4a Merge pull request #2575 from KallooaSan/PHRAS-2016_restrict_travis_build 
PHRAS-2016 restrict travis build
 2018-05-08 21:24:15 +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
Nicolas Maillat
2be7061f1a Merge pull request #2578 from mike-esokia/PHRAS-2023_lightbox-mobile 
PHRAS-2023fix jquery-mobile and mobile layout for lightbox
 2018-05-08 19:56:52 +02:00
aina-esokia
a19cac5817 add locator to FtpJob 2018-05-08 15:16:52 +04:00
mike-esokia
be0969a8cb add back requirejs 2018-05-08 13:44:34 +04:00
mike-esokia
43e5f89d2e fix jquery-mobile and mobile layout for lightbox 2018-05-08 13:39:22 +04:00
Sandeep
987790e3c0 PHRAS-2016 restrict travis build 2018-05-07 17:33:49 +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
Nicolas Maillat
6d71232815 Merge pull request #2572 from KallooaSan/PHRAS-1819_add_quarantine_rule_on_type 
PHRAS-1819: add quarantine rule based on media type
 2018-05-07 14:39:07 +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
mike-esokia
2c39cf503a refactor suggested values in edit view 2018-05-07 14:14:46 +04:00
Pascal Borreli
0b6892ac35 Fixed typo in translation (#2570) 2018-05-04 19:13:04 +02:00
Nicolas Maillat
0edbfba330 Merge pull request #2568 from aynsix/PHRAS-1976-change-datasource-GPS-to-Composite 
PHRAS-1976 use composite datasource
 2018-05-04 11:21:58 +02:00
aina-esokia
c905ca303f use composite position 2018-05-03 17:25:37 +04:00
Sandeep
0f921489cf Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1997_add_indesign_support 2018-05-03 10:16:31 +04:00
Sandeep
beffe7073b Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1911-fix-route 2018-05-03 10:15:22 +04:00
Mike Ng
1c0f434f6b Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2005_PORT_PHRAS-1996_to_4.1 2018-05-03 09:12:43 +04:00
xrousset78800
81b3e75d3d PHRAS-2007 Update wording keys (#2566) 2018-05-02 18:40:32 +02:00
jygaulier
c6281ae79e PHRAS-2010_circle-crash_master (#2567) 
display node, npm & gulp versions
bump npm
 2018-05-02 17:44:08 +02:00
Sandeep
c75d94a321 PHRAS-1911 : fix route me/structures 2018-05-02 12:21:18 +04:00
Sandeep
b09e5ef6df PHRAS-1997-PORT-PHRAS-1991 2018-05-02 11:18:26 +04:00
mike-esokia
e454f625e1 add icon for indesign file format 2018-04-30 15:38:02 +04:00
Nicolas Maillat
267fd7a92f Merge pull request #2554 from jygaulier/PHRAS-483_SHA-UID_master 
PHRAS-483_SHA-UID_master
 2018-04-27 14:33:08 +02:00
Jean-Yves Gaulier
3f785e7ba3 PHRAS-483_SHA-UID_master 
add index (not analysed) & search on fields "sha256" and "uuid"
e.g. : uuid:"4d006e01-bc38-4aac-9a5b-2c90ffe3a8a2"
e.g. : sha256:a7f3ec01c4c5efcadc639d494d432006f13b28b9a576afaee4d3b7508c4be074
 2018-04-26 17:35:01 +02:00
Nicolas Maillat
8a8577c59e Merge pull request #2535 from KallooaSan/PHRAS-1911_fix_fields_structure 
PHRAS-1911 fix fields structure
 2018-04-20 16:42:56 +02:00
Nicolas Maillat
2f81390abe Merge pull request #2553 from mike-esokia/PHRAS-1970_fix_preview_ratio_on_zoom 
PHRAS-1970 fix preview ratio when zooming in detail screen
 2018-04-19 15:42:54 +02:00
mike-esokia
ad201ae1c2 fix preview ratio when zooming in detail screen 2018-04-19 16:16:37 +04:00
Nicolas Maillat
2eb453ce6a Merge pull request #2552 from mike-esokia/PHRAS-1959_spacebar_shortcut_video 
PHRAS-1959 fix slideshow functionality in detail screen
 2018-04-19 13:26:51 +02:00
mike-esokia
ccd10333b7 fix slideshow functionality in detail screen 2018-04-19 14:58:18 +04:00