Commit Graph

12001 Commits

Author SHA1 Message Date
Mike Ng
53b8ca4087 Porting PHRAS-1586/PHRAS-1602 to 4.1 2017-12-22 11:15:17 +04:00
jygaulier
0d7c2bd52d PHRAS-1760_Provisionning-error_Master (#2396)
fix mismatch "database" (bad) -> "appbox_db" (good) variable in ansible scripts
2017-12-14 11:15:07 +01:00
Nicolas Maillat
aecc97bc3d Merge pull request #2387 from mike-esokia/fix_makefile
fix makefile
2017-12-11 15:24:13 +01:00
Mike Ng
3200760430 fix makefile 2017-12-11 17:50:49 +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
Jennifer
be811e8876 Translated using Weblate (French)
Currently translated at 98.2% (2319 of 2360 strings)

PHRAS-1749
2017-11-24 16:55:54 +01:00
Jennifer
897bcb276e Translated using Weblate (English)
Currently translated at 98.3% (2320 of 2360 strings)

PHRAS-1749
2017-11-24 16:55:51 +01:00
Nicolas Maillat
79493d9dca Merge pull request #2380 from mike-esokia/PHRAS-1721_PORT_PHRAS-1574
PHRAS-1721 Port PHRAS-1574
2017-11-23 10:55:22 +01:00
Mike Ng
77043c1a9d Port PHRAS-1574 2017-11-23 13:16:55 +04:00
Nicolas Maillat
a7d00f54c0 Merge pull request #2378 from mike-esokia/PHRAS-1715_refactor_admin
PHRAS-1715 refactor admin
2017-11-22 18:37:49 +01:00
Mike Ng
bb4087982b reset version 2017-11-22 18:11:35 +04:00
Mike Ng
36b2058add PORT PHRAS-1555/PHRAS-1568 to 4.1 2017-11-22 15:48:36 +04:00
Nicolas Maillat
d736e3db36 Merge pull request #2372 from xrousset78800/PHRAS-1723/vagrant-deploy-fix-paths-and-varnames
PHRAS-1723 Fix some paths, variable namings
2017-11-21 15:09:40 +01:00
Nicolas Maillat
5f1a2b7c42 Merge pull request #2375 from mike-esokia/PHRAS-1714_refacto_order_manager
PHRAS-1714 Porting BDC
2017-11-21 15:08:06 +01:00
Mike Ng
e497901763 dump locales 2017-11-21 15:39:51 +04:00
Mike Ng
7e2ce67e96 Merge branch 'master-alchemy' into PHRAS-1714_refacto_order_manager 2017-11-21 15:15:47 +04:00
Mike Ng
1e56eef3c6 wip - porting BDC 2017-11-21 10:06:10 +04:00
Nicolas Maillat
a85393f41c Merge pull request #2370 from mike-esokia/PHRAS-1512_PORT_PDFJS_TO_4.1
PHRAS-1512 port pdfjs to 4.1
2017-11-20 12:50:50 +01:00
Xavier Rousset
631733fa1f PHRAS-1723 Fix some paths, variable namings 2017-11-17 15:57:10 +01:00
Mike Ng
0c3918b8a5 updating code 2017-11-17 14:21:11 +04:00
Mike Ng
db306792a6 Merge branch 'master-alchemy' into PHRAS-1512_PORT_PDFJS_TO_4.1 2017-11-17 08:44:45 +04:00
Nicolas Maillat
689505928a Merge pull request #2231 from mike-esokia/PHRAS-1524_Port_PHRAS-1475_and_PHRAS-1498
PHRAS-1524 port PHRAS-1475 and PHRAS-1498
2017-11-16 13:40:51 +01:00
Nicolas Maillat
6c04aa6b94 Merge pull request #2368 from mike-esokia/PHRAS-1532_PORT_PHRAS-1487
PHRAS-1532 PORT PHRAS-1487
2017-11-16 10:29:56 +01:00
Nicolas Maillat
43c5277851 Merge pull request #2365 from mike-esokia/PHRAS-1528_PORT_PHRAS-1433
PHRAS-1528 PORT PHRAS-1433
2017-11-16 10:28:35 +01:00
Nicolas Maillat
cc52dbdaa9 Merge pull request #2364 from mike-esokia/PHRAS-1527_PORT_PHRAS-1414
PHRAS-1527 PORT PHRAS-1414
2017-11-16 10:28:15 +01:00
Nicolas Maillat
dfde06a293 Merge pull request #2363 from mike-esokia/PHRAS-1526_fix_event_button_print_export
PHRAS-1526 fix event listener for button export / download
2017-11-16 10:11:33 +01:00
Nicolas Maillat
2f722dfc6a Merge pull request #2366 from mike-esokia/PHRAS-1529_PORT_PHRAS-1415
PHRAS-1529 PORT PHRAS-1415
2017-11-15 15:48:03 +01:00
Nicolas Maillat
40772aeea2 Merge pull request #2230 from mike-esokia/PHRAS-1522_PORT_PHRAS-1337
PHRAS-1522 port PHRAS-1337
2017-11-15 15:21:13 +01:00
Nicolas Maillat
acc674be43 Merge pull request #2362 from mike-esokia/PHRAS-1525_port_PHRAS-1434_1435_1436_1437_1457
PHRAS-1525 port phras 1434 1435 1436 1437 1457
2017-11-15 13:43:05 +01:00
Nicolas Maillat
468f273dec Merge pull request #2228 from mike-esokia/PHRAS-1520_PORT_PHRAS-1464_1482_1483_1492_1496
PHRAS-1520 port to master
2017-11-15 10:17:01 +01:00
Mike Ng
8f8d9bb706 Merge branch 'master-alchemy' into PHRAS-1525_port_PHRAS-1434_1435_1436_1437_1457 2017-11-15 11:23:51 +04:00
Mike Ng
7932d632db Merge branch 'master-alchemy' into PHRAS-1524_Port_PHRAS-1475_and_PHRAS-1498 2017-11-15 09:45:18 +04:00
Mike Ng
546b93b5cc Merge branch 'master-alchemy' into PHRAS-1522_PORT_PHRAS-1337 2017-11-15 09:44:04 +04:00
Mike Ng
55aabea716 Merge branch 'master-alchemy' into PHRAS-1520_PORT_PHRAS-1464_1482_1483_1492_1496 2017-11-15 09:42:40 +04:00
Nicolas Maillat
43a629169a Merge pull request #2227 from mike-esokia/PHRAS-1516_port_PHRAS-1339
PHRAS-1516 Port PHRAS-1339
2017-11-14 14:05:10 +01:00
Nicolas Maillat
b13b72cc6c Update README.md 2017-10-17 23:33:51 +02:00
Jennifer
858927ac92 Translated using Weblate (German)
Currently translated at 99.2% (2268 of 2285 strings)
2017-09-26 12:45:56 +02:00
Nicolas Maillat
4dc7f96845 Translated using Weblate (French)
Currently translated at 99.8% (2281 of 2284 strings)
2017-09-26 12:45:56 +02:00
Nicolas Maillat
845d4b3555 Translated using Weblate (English)
Currently translated at 99.8% (2281 of 2284 strings)
2017-09-26 12:45:55 +02:00
Nicolas Maillat
7afd30e9d5 Translated using Weblate (French)
Currently translated at 99.8% (2281 of 2284 strings)
2017-09-15 15:59:14 +02:00
Nicolas Maillat
ad37ce2c66 Translated using Weblate (English)
Currently translated at 99.8% (2281 of 2284 strings)
2017-09-15 15:59:14 +02:00
Anthony C
162d9f7c21 Translated using Weblate (English)
Currently translated at 99.8% (2281 of 2284 strings)
2017-09-15 15:56:41 +02:00
Mike Ng
e5a2397370 update version phraseanet-production-client 2017-09-01 10:18:46 +04:00
Mike Ng
b6e8e73dd7 update version phraseanet-production-client 2017-09-01 10:01:29 +04:00
Jennifer
9761318970 Translated using Weblate (German)
Currently translated at 99.2% (2267 of 2285 strings)
2017-08-28 17:11:10 +02:00
Anthony C
892a1d1424 Translated using Weblate (French)
Currently translated at 99.8% (2281 of 2284 strings)
2017-08-28 17:11:10 +02:00
Anthony C
7386d4417b Translated using Weblate (English)
Currently translated at 99.8% (2281 of 2284 strings)
2017-08-28 17:11:10 +02:00
Jennifer
5c26656a9f Translated using Weblate (French)
Currently translated at 99.8% (2281 of 2284 strings)
2017-08-28 17:11:10 +02:00
Jennifer
54adaebda2 Translated using Weblate (English)
Currently translated at 99.8% (2281 of 2284 strings)
2017-08-28 17:11:10 +02:00
Nicolas Maillat
4c820d9ced Translated using Weblate (English)
Currently translated at 99.8% (2281 of 2284 strings)
2017-08-28 17:11:10 +02:00