Jean-Yves Gaulier
dca1387a17
PHRAS-2605_fix-unittest-bootstrap_4.1
...
fix conf
2019-05-28 14:59:34 +02:00
Harrys Ravalomanana
dd6422c620
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query
2019-04-30 13:48:29 +04:00
aina-esokia
c89757c4d7
escape in controller
2019-04-05 15:57:49 +04:00
Harrys Ravalomanana
2390244e9e
Merge branch master into PHRAS-2430
2019-04-05 15:11:09 +04:00
Harrys
b3976733e4
PHRAS-2430 Restore jsonQuery
2019-03-27 10:04:05 +04:00
aina-esokia
8ab2888850
port to 4.1 upload by url
2019-03-18 16:16:14 +04:00
Jean-Yves Gaulier
61058a3658
PHRAS-1326_intl-labels-in-facets_MASTER
...
add "labels" array to facets
2018-11-27 19:33:36 +01:00
jygaulier
e2f5afc07b
PHRAS-2292_aggregates-as-new-json_MASTER ( #2829 )
...
* PHRAS-2292_aggregates-as-new-json_MASTER
wip
* PHRAS-2292_aggregates-as-new-json_MASTER
* PHRAS-2292_aggregates-as-new-json_MASTER
fake commit to test circle (did not run on last commit !)
2018-11-27 10:25:28 +01:00
aina-esokia
18ff40a537
port to 4.1 PHRAS-2227 FIX changing status appear in log_docs table
2018-11-06 11:22:53 +04:00
Filip Vilic
e41145ead7
PHRAS-2192_detailed_selection_dev box position fix
2018-08-30 10:20:37 +02:00
Filip Vilic
5cd490ce99
PHRAS-2192 detailed selection info - html added
2018-08-16 11:37:50 +02:00
aina-esokia
0d2e2eb494
use tmp_files on upload file
2018-06-28 17:32:57 +04: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
923265f71b
insert or update in technical_data table
2018-06-13 11:06:24 +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 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
mike-esokia
b86eaf7ed3
add notice on mapboxgl
2018-05-29 16:51:14 +04:00
mike-esokia
f33c1bc493
add text for translation
2018-05-07 15:20:56 +04: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
Mike Ng
696fc34642
wip extract video editor functionality to import into edit tools
2018-03-20 16:43:57 +04:00
Mike Ng
4a6bac8546
wip write video chapters
2018-03-19 17:52:57 +04: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
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
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
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
38d9af6b73
update SubdefsController
2018-02-19 17:19:14 +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
aina-esokia
c1d384976e
update ToolsController
2018-02-12 15:18:16 +04:00
aina-esokia
9018254602
don't display binary data
2018-02-12 14:43:36 +04:00
Mike Ng
4f518c605d
Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336
...
# Conflicts:
# resources/locales/messages.de.xlf
# resources/locales/messages.en.xlf
# resources/locales/messages.fr.xlf
# resources/locales/messages.nl.xlf
# resources/locales/validators.de.xlf
# resources/locales/validators.en.xlf
# resources/locales/validators.fr.xlf
# resources/locales/validators.nl.xlf
# resources/www/admin/styles/main.scss
2018-01-09 11:00:03 +04:00
Mike Ng
2c75dc654f
Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589
...
# Conflicts:
# resources/locales/messages.de.xlf
# resources/locales/messages.en.xlf
# resources/locales/messages.fr.xlf
# resources/locales/messages.nl.xlf
# resources/locales/validators.de.xlf
# resources/locales/validators.en.xlf
# resources/locales/validators.fr.xlf
# resources/locales/validators.nl.xlf
2018-01-09 09:50:27 +04:00
Mike Ng
30f49bdd35
resolve conflict
2018-01-08 15:57:13 +04:00
Nicolas Maillat
3d84736b4a
Merge pull request #2394 from mike-esokia/PHRAS-1726_PORT_PHRAS-1559_1560
...
PORT PHRAS-1559 and PHRAS-1560 to 4.1
2018-01-08 12:19:22 +01:00
Mike Ng
071ce25b31
porting PHRAS-1578/PHRAS-1579/PHRAS-1621/PHRAS-1675/PHRAS-1404/PHRAS-1336 to 4.1
2018-01-03 15:26:43 +04:00
Mike Ng
1aa919cc08
porting PHRAS-1589 to 4.1
2017-12-22 16:04:02 +04:00
