Commit Graph

7320 Commits

Author SHA1 Message Date
aynsix
1ca68fb9a5 update time limit (#2493) 2018-02-27 16:58:13 +01:00
Xavier Rousset
2195988675 PHRAS-1884 Bump php to 7.0.24 on circle CI and elastic to 2.3.3. 2018-02-27 14:48:34 +01:00
Sandeep
77352e59ef PHRAS-1856_PORT-PHRAS-1347 2018-02-26 11:30:55 +04:00
aina-esokia
d6ac9d6c6e update migration 2018-02-23 12:44:57 +04:00
aina-esokia
bea0f98d19 Update LazaretFile 2018-02-23 11:44:23 +04:00
aina-esokia
aac1bbb34e add record_ids to api/v1/quarantine 2018-02-23 11:22:44 +04:00
Sandeep
9db8aff7b8 PHRAS-1819: Lazaret checker colorspace add rga
Add support for rgba in colorspace checker
Add allow bypass colorspace checker for document type files
Updated Mediavorus version
2018-02-22 15:31:20 +04:00
aina-esokia
6fd11b630b allow to specify a filename on permalink usage 2018-02-21 11:43:53 +04:00
Nicolas Maillat
4808522150 Merge pull request #2467 from toky-esokia/PHRAS-1752-udpate-facebook-sdk-4.1
udpate facebook SDK to 5.6
2018-02-20 12:50:41 +01: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
Nicolas Maillat
815c46ad94 Merge pull request #2480 from mike-esokia/PHRAS-1871_PORT_PHRAS-854
PHRAS-1871 - PORT PHRAS-854 to 4.1
2018-02-19 14:37:50 +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
Mike Ng
b08b3a5fd8 PORT PHRAS-854 to 4.1 2018-02-19 11:04:47 +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
Toky Herizo
6c853cf98c udpate facebook SDK to 5.6 2018-02-12 11:24:14 +04:00
aina-esokia
029da5d9eb Port to 4.1 mysql restart autoincrement 2018-02-09 12:20:30 +04:00
aynsix
30755e9c46 PHRAS-1840-FIX-searchengine:index -p (#2456)
* FIX searchengine:index -p populate

* delete character nul of the metadata value
2018-02-06 14:21:25 +01:00
aynsix
df85aa8827 PHRAS-1797 porting searchengine:index to 4.1 (#2454)
* portage commande searchengine:index vers 4.1

* FIX Indexer

* Update DataboxFetcherFactory.php
2018-01-30 18:50:57 +01:00
Xavier Rousset
30e4fa767c PHRAS-1816 Fix exception message 2018-01-17 14:08:13 +01:00
nmaillat
3842d2bf97 PHRAS-1798 update version number and the name 2018-01-16 18:09:21 +01:00
Mike Ng
2644962783 Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336 2018-01-09 11:01:01 +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
4c11cfebd8 Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589 2018-01-09 09:50:57 +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
a08a55b58e Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log
# Conflicts:
#	.bowerrc
2018-01-08 16:37:46 +04:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Mike Ng
bddc3781ba resolve conflict 2018-01-08 15:54:47 +04:00
Nicolas Maillat
c2603da5ad Merge pull request #2373 from falylala/PHRAS-1717-PORT_Install_show_available_documentary
PHRAS-1717- PORT_1296_Show all available structure for install CLI/Graphic mode
2018-01-08 12:33:19 +01:00
Nicolas Maillat
27f4cfc4df Merge pull request #2424 from mike-esokia/PHRAS-1782_PORT_PHRAS-1770
PHRAS-1782 porting PHRAS-1770 to 4.1
2018-01-08 12:30:30 +01: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
Nicolas Maillat
684596106d Merge pull request #2393 from xrousset78800/PHRAS-1719/add-subset-presets-on-4-1
PHRAS-1719 Add presets selection on subdef admin page | Port to 4.1 PHRAS-1317
2018-01-08 12:18:14 +01:00
Nicolas Maillat
7b4dcec274 Merge pull request #2383 from mike-esokia/PHRAS-1736_PORT-165_and_1593
PHRAS-1736 port PHRAS-165 and PHRAS-1593
2018-01-08 12:12:20 +01:00
Mike Ng
c936582d88 porting PHRAS-1770 to 4.1 2018-01-04 14:41:19 +04: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
Xavier Rousset
c7f6b325d8 PHRAS-1766 Add orderable checkbox for each subdef - Remove order option on groups 2017-12-18 18:02:48 +01:00
Xavier Rousset
3a6f2eb365 Fix travis tests 2017-12-14 11:59:42 +01:00
Mike Ng
e9e9a737c3 PORT PHRAS-1559 and PHRAS-1560 to 4.1 2017-12-13 10:26:24 +04:00
Xavier Rousset
1683191d19 PHRAS-1719 Add presets selection on subdef admin page 2017-12-13 01:58:36 +01:00
Mike Ng
e0063d00c0 Porting custom-links to 4.1 2017-12-11 17:44:55 +04:00
jygaulier
8117d1ebc0 PHRAS-1751_GOOGLE-AUTH_master (#2384)
* PHRAS-1751_GOOGLE-AUTH_master
replace lib "alchemy/google-plus-api-client" by "google/apiclient"
had to downgrade facebook/php-sdk from 4 (does not exists ?) to 3 (abandoned anyway) to allow composer update.
see PHRAS-1752

* PHRAS-1751_GOOGLE-AUTH_master
revert composer.lock, only remove & update new google-sdk (composer full update make tests boot to fail. to see later)

* PHRAS-1751_GOOGLE-AUTH_master
fix unit test
2017-11-30 10:45:56 +01:00
Mike Ng
a79b72fbaf Port PHRAS-1593 2017-11-24 16:22:31 +04:00
falylala
ea53da9086 Show all available structure for install CLI/Graphic mode 2017-11-20 12:16:54 +04:00