hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,066 Commits 268 Branches 107 Tags
6e89b93c7d8ac52fed7f284c171393d75f82f421
Commit Graph

333 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Mike Ng
d49ef51a9a add images 2017-12-14 11:32:30 +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
55587ca6cf fix infoDialog 
add button to display git log
 2017-12-12 13:31:48 +04:00
Mike Ng
847c302863 add images 2017-12-12 12:06:20 +04:00
Mike Ng
5f2ce74956 fix context-menu help 2017-12-12 11:56:49 +04:00
Mike Ng
e0063d00c0 Porting custom-links to 4.1 2017-12-11 17:44:55 +04: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
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
Mike Ng
e497901763 dump locales 2017-11-21 15:39:51 +04:00
Xavier Rousset
631733fa1f PHRAS-1723 Fix some paths, variable namings 2017-11-17 15:57:10 +01:00
Mike Ng
db306792a6 Merge branch 'master-alchemy' into PHRAS-1512_PORT_PDFJS_TO_4.1 2017-11-17 08:44:45 +04: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
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
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
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