Nicolas Maillat
079bf402c7
Merge pull request #2423 from mike-esokia/PHRAS-1779_PORT_PHRAS-511
...
PHRAS-1779 porting PHRAS-511 to 4.1
2018-01-08 12:29:40 +01:00
Nicolas Maillat
caa1957f47
Merge pull request #2422 from mike-esokia/PHRAS-1778_PORT_PHRAS-179
...
PHRAS-1778 porting PHRAS-179 to 4.1
2018-01-08 12:29:05 +01:00
Nicolas Maillat
62c7443333
Merge pull request #2420 from mike-esokia/PHRAS-1741_PORT_PHRAS-1616
...
PHRAS-1741 porting PHRAS-1616 to 4.1
2018-01-08 12:28:18 +01:00
Nicolas Maillat
b67df5ee30
Merge pull request #2412 from mike-esokia/PHRAS-1739_port_1641
...
PHRAS-1739 porting PHRAS-1641 to 4.1
2018-01-08 12:25:46 +01:00
Nicolas Maillat
095580bc64
Merge pull request #2411 from mike-esokia/PHRAS-1728_update_favicon
...
PHRAS-1728 Porting PHRAS-1586/PHRAS-1602 to 4.1
2018-01-08 12:23:41 +01:00
Nicolas Maillat
738eaec13c
Merge pull request #2410 from mike-esokia/PHRAS-1747_PORT_PHRAS-1301
...
PHRAS-1747 port phras 1301
2018-01-08 12:22:34 +01:00
Nicolas Maillat
f720b3d073
Merge pull request #2395 from mike-esokia/PHRAS-1738_update_menu_basket
...
Phras 1738 PORT PHRAS-1614
2018-01-08 12:20:59 +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
08dfc7c8ea
Merge pull request #2391 from mike-esokia/PHRAS-1743_refactor_icons_type
...
PHRAS-1743 Port PHRAS-1646 to 4.1 (PR production-client)
2018-01-08 12:17:17 +01:00
Nicolas Maillat
aa2a9f5681
Merge pull request #2389 from mike-esokia/PHRAS-1748_fix_help_menu
...
PHRAS-1748: fix dropdown on help-menu
2018-01-08 12:15:31 +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
Nicolas Maillat
bdab445192
Merge pull request #2382 from mike-esokia/PHRAS-1727_PORT_PHRAS-1577
...
PHRAS-1727 Port PHRAS-1577
2018-01-08 12:01:48 +01:00
Nicolas Maillat
dffb227dc1
Merge pull request #2371 from mike-esokia/PHRAS-1712_memorize_truncate_choice
...
PHRAS-1712 Porting PHRAS-1542 to 4.1
2018-01-08 12:00:12 +01:00
Nicolas Maillat
d73cba39a8
Merge pull request #2418 from xrousset78800/fix/phpenmod-zmq-provisioning
...
Fix zmq provisioning
2018-01-04 21:25:39 +01:00
Mike Ng
2a8af901f3
porting PHRAS-511 to 4.1
2018-01-04 13:16:28 +04:00
Mike Ng
e7d3a5c405
porting PHRAS-179 to 4.1
2018-01-04 12:33:31 +04:00
Mike Ng
82d9ef86a4
porting PHRAS-1616 to 4.1
2018-01-03 17:08:02 +04:00
Xavier Rousset
49e8efe96b
Update php5enmod to phpenmod to enable zmq
2017-12-29 16:47:00 +01:00
Mike Ng
e6d8169e49
porting PHRAS-1641 to 4.1
2017-12-22 13:21:57 +04:00
Mike Ng
53b8ca4087
Porting PHRAS-1586/PHRAS-1602 to 4.1
2017-12-22 11:15:17 +04:00
Mike Ng
9c3f65f3f7
load appropriate status based on store collection
2017-12-21 16:50:21 +04:00
Mike Ng
2be6f0bc9a
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1747_PORT_PHRAS-1301
2017-12-21 14:25:13 +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
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
Mike Ng
d49ef51a9a
add images
2017-12-14 11:32:30 +04:00
Mike Ng
d0a1c4c599
PORT PHRAS-1614 to 4.1
2017-12-14 11:32:08 +04:00
Mike Ng
2811964f01
PORT PHRAS-1301/PHRAS-1676 to 4.1
2017-12-13 12:51:08 +04: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
a099ec33f3
modify icons for document types
2017-12-12 15:13:55 +04:00
Mike Ng
5f2ce74956
fix context-menu help
2017-12-12 11:56:49 +04: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
Mike Ng
cc2f919fe0
dump locales
2017-11-24 16:41:22 +04:00
Mike Ng
a79b72fbaf
Port PHRAS-1593
2017-11-24 16:22:31 +04:00
Mike Ng
e838b6f166
Port PHRAS-1577 to 4.1
2017-11-23 16:40:20 +04: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
