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

12071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
dad484fa5b Merge pull request #2435 from alchemy-fr/fix-provisionning-master 
PHRAS-1794 PHRAS-1800 and PHRAS-1804 : fix pecl-packages and node version
 2018-01-12 16:16:15 +01:00
Moctar
48ebfa0541 PHRAS-1800 : add ffmpeg compilation and version as variable 2018-01-12 15:22:28 +01:00
Moctar
36e4b97f93 PHRAS-1794 and PHRAS-1804 : fix pecl-packages and node version 2018-01-12 12:56:53 +01:00
Nicolas Maillat
06413e9f9c Merge pull request #2432 from xrousset78800/fix/PHRAS-1790-update-provisionning 
PHRAS-1790 Export repository url on vars, fix rabbitmq issue
 2018-01-10 23:31:31 +01:00
Xavier Rousset
60c43ece93 PHRAS-1790 Export repository url on vars, fix rabbitmq issue 2018-01-10 19:42:33 +01:00
jygaulier
6e89b93c7d PHRAS-1765 (#2398) 
bump es to 2.3.3
 2018-01-10 15:09:30 +01:00
xrousset78800
215e47fb79 PHRDPL-28 Export xdebug IDEKEY and port to an easy setting of debug configuration (#2430) 2018-01-09 18:25:51 +01:00
xrousset78800
9a5f4f3d1b PHRDPL-27 Fix typo on ansible php task (#2428) 2018-01-09 17:54:10 +01:00
Nicolas Maillat
8b26abdd77 Merge pull request #2419 from mike-esokia/PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336 
PHRAS-1744 porting PHRAS-1578 PHRAS-1579 PHRAS-1621 PHRAS-1675 PHRAS-1404 PHRAS-…
 2018-01-09 11:15:14 +01:00
Nicolas Maillat
1c7b14802c Merge pull request #2413 from mike-esokia/PHRAS-1734_PORT_PHRAS-1589 
PHRAS-1734 porting PHRAS-1589 to 4.1
 2018-01-09 11:13:23 +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
Nicolas Maillat
655352e199 Merge pull request #2390 from mike-esokia/PHRAS-1735_add_git_log 
PHRAS-1735 Porting PHRAS-1591 to 4.1
 2018-01-08 14:48:58 +01:00
Nicolas Maillat
a1b48997a8 Merge pull request #2386 from mike-esokia/PHRAS-1745_PORT_custom_links 
Porting custom-links to 4.1
 2018-01-08 14:48:31 +01:00
Mike Ng
6235b9051b Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log 2018-01-08 17:27:43 +04:00
Mike Ng
9fb7af78f5 redump locales 2018-01-08 17:26:14 +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
a853ec7d8d Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log 
# Conflicts:
#	.bowerrc
 2018-01-08 16:37:28 +04:00
Mike Ng
3dd4c50350 Merge branch 'master-alchemy' into PHRAS-1735_add_git_log 
# Conflicts:
#	resources/www/common/js/components/common.js
 2018-01-08 16:26:28 +04:00
Mike Ng
8908a6b23f Merge branch 'master-alchemy' into PHRAS-1735_add_git_log 
# Conflicts:
#	resources/www/common/js/components/common.js
 2018-01-08 16:26:00 +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
a0eccc22e8 Merge pull request #2426 from mike-esokia/PHRAS-1783_PORT_PHRAS-1764 
PHRAS-1783 porting PHRAS-1764 to 4.1
 2018-01-08 12:31:05 +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
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
ed15180c07 porting PHRAS-1764 to 4.1 2018-01-04 15:01:51 +04:00
Mike Ng
c936582d88 porting PHRAS-1770 to 4.1 2018-01-04 14:41:19 +04: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
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
Xavier Rousset
49e8efe96b Update php5enmod to phpenmod to enable zmq 2017-12-29 16:47:00 +01:00
Mike Ng
1aa919cc08 porting PHRAS-1589 to 4.1 2017-12-22 16:04:02 +04:00