hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,091 Commits 268 Branches 107 Tags
b64f677c47f43e88c5a70fc6cb8fe27256b27b05
Commit Graph

1984 Commits

Author SHA1 Message Date
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
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 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
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
mike-esokia
8e71c52c7e fix bug with special characters in status label 2018-05-16 15:00:14 +04: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
mike-esokia
f33c1bc493 add text for translation 2018-05-07 15:20:56 +04: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
mike-esokia
4eaa008aec add technicalInfo in record of detail view 2018-04-18 14:33:39 +04:00
mike-esokia
0b80150f01 save overlapChapters in video editor in preferences 2018-04-13 11:47:00 +04:00
Mike Ng
c31b3d7589 refactored layout of video range extractor 2018-04-05 13:52:38 +04:00
sandeep
9961362d30 PHRAS-1911 fix structure fields 2018-03-26 14:42:17 +04:00
Mike Ng
696fc34642 wip extract video editor functionality to import into edit tools 2018-03-20 16:43:57 +04:00
Nicolas Maillat
4821145206 Merge pull request #2524 from KallooaSan/PHRAS-1911-add_route_return_list_documentary_fields 
PHRAS-1911-add route return list documentary fields
 2018-03-20 10:19:56 +01:00
Mike Ng
4a6bac8546 wip write video chapters 2018-03-19 17:52:57 +04:00
Sandeep
3c9e875ea9 PHRAS-1911 refactor technical fields list 2018-03-19 15:00:21 +04:00
Sandeep
5de988299d PHRAS-1911-add route return list documentary fields 2018-03-16 15:01:20 +04:00
xrousset78800
4b0292619b PHRAS-1317 Update DPI default value on presets (#2519) 2018-03-15 17:22:24 +01:00
Mike Ng
f95e40f0b8 Port PHRAS-1381 to 4.1 2018-03-08 13:02:07 +04:00
Mike Ng
d9687385e6 Port PHRAS-1697 to 4.1 2018-03-07 17:01:15 +04:00
Nicolas Maillat
b1fb69cac3 Merge pull request #2489 from aynsix/PHRAS-569-ajout-info-/api/v1/quarantine 
PHRAS-569 Add "reasons" in api/v1/quarantine
 2018-03-06 15:11:47 +01:00
Nicolas Maillat
1f78adf645 Merge pull request #2500 from aynsix/PHRAS-1832-port-1776-to-master 
PHRAS-1832 port 1776 to master - databox create
 2018-03-06 15:11:20 +01:00
Mike Ng
1e8c083374 Merge remote-tracking branch 'alchemy/master' into PHRAS-1897-read_video_chapters 2018-03-05 16:41:35 +04:00
Mike Ng
cff7f65253 read video chapters from meta fields in video-editor 2018-03-05 16:41:20 +04:00
Nicolas Maillat
249a4126b4 Merge pull request #2490 from KallooaSan/PHRAS-1856_PORT-PHRAS-1347 
PHRAS-1856_PORT-PHRAS-1347
 2018-03-05 11:31:27 +01:00
Nicolas Maillat
92fdbc785d Merge pull request #2498 from KallooaSan/PHRAS-1873_PORT_PHRAS-1685_dump_esquery 
PHRAS-1873 PORT PHRAS-1685 dump esquery
 2018-03-02 16:54:08 +01:00
Nicolas Maillat
a99534e982 Merge pull request #2499 from mike-esokia/PHRAS-1740_PORT_Refactor_trash 
PHRAS-1740 Porting refactor trash to 4.1
 2018-03-02 16:53:13 +01:00
aina-esokia
7ebcd8ae9b add info to api/quarantine 2018-03-02 18:06:01 +04:00
aina-esokia
b1c7e87799 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1832-port-1776-to-master 2018-03-01 17:41:45 +04:00
aina-esokia
9226e5a478 port 1776 databox create to master 2018-03-01 17:41:08 +04:00
Mike Ng
5708e8731b Porting refactor trash to 4.1 2018-03-01 15:14:49 +04:00
Sandeep
98911772b7 PHRAS-1873 PORT PHRAS-1685 dump esquery 2018-03-01 09:20:57 +04:00
KallooaSan
00be9e51b0 PHRAS-1895_PORT_PHRAS-1401_include_json_format_return_record (#2494) 
* PHRAS-1895_PORT_PHRAS-1401 include json format return record

* PHRAS-1895_rollback deleted action ref PHRAS-1688
 2018-02-28 17:31:45 +01:00
aina-esokia
27fd458f30 fetched conflicting recordids each time on called 2018-02-28 10:59:45 +04:00
KallooaSan
cb4ef28072 PHRAS-1863 PORT PHRAS-60 Add applicative trash (#2492) 2018-02-27 17:02:24 +01:00
Sandeep
77352e59ef PHRAS-1856_PORT-PHRAS-1347 2018-02-26 11:30:55 +04:00
aina-esokia
aac1bbb34e add record_ids to api/v1/quarantine 2018-02-23 11:22:44 +04:00
aina-esokia
6fd11b630b allow to specify a filename on permalink usage 2018-02-21 11:43:53 +04:00
KallooaSan
dbaba974ae Add extension to file path on api upload for extension-mapping (#2481) 2018-02-20 11:13:28 +01:00
Nicolas Maillat
e25144e302 Merge pull request #2477 from aynsix/PHRAS-1866-load-metadata-tab-content 
PHRAS-1866 load-metadata-tab-content
 2018-02-20 11:07:52 +01:00
aina-esokia
38d9af6b73 update SubdefsController 2018-02-19 17:19:14 +04:00
Mike Ng
0c55bc7e09 update backend code for PHRAS-1783 2018-02-19 16:07:54 +04:00
aina-esokia
d541c22659 Modif subdef 2018-02-19 15:02:44 +04:00
aina-esokia
b36b90a403 Load metadata tab content when tab activate 2018-02-19 14:51:30 +04:00
aina-esokia
79a0bdc31a show binary bloc name 2018-02-14 11:51:27 +04:00
aina-esokia
728edf9efb update toolsController 2018-02-12 16:05:18 +04:00