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,123 Commits 268 Branches 107 Tags
815c46ad94e82fb9bf2a2afcfde20a6680d7b017
Commit Graph

2025 Commits

Author SHA1 Message Date
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
Mike Ng
0c55bc7e09 update backend code for PHRAS-1783 2018-02-19 16:07:54 +04:00
Mike Ng
b08b3a5fd8 PORT PHRAS-854 to 4.1 2018-02-19 11:04:47 +04:00
Nicolas Maillat
696da67286 Merge pull request #2471 from mike-esokia/PHRAS-1854_PORT_PHRAS-1319 
PHRAS-1854 port PHRAS-1319
 2018-02-15 12:09:50 +01:00
aina-esokia
9018254602 don't display binary data 2018-02-12 14:43:36 +04:00
Mike Ng
cee867d662 port PHRAS-1319 to 4.1 2018-02-12 11:31:37 +04:00
Mike Ng
374f8eaff4 migrate backbone and underscore to npm and refactored test modules 2018-01-19 15:03:00 +04:00
Mike Ng
802c52d7ff refatored html code to use proper font-awesome classes 2018-01-19 13:32:20 +04:00
Mike Ng
431d9dc46a migrating dependencies from bower to npm 2018-01-16 09:42:29 +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
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
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
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
Mike Ng
ed15180c07 porting PHRAS-1764 to 4.1 2018-01-04 15:01:51 +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
Mike Ng
1aa919cc08 porting PHRAS-1589 to 4.1 2017-12-22 16:04:02 +04: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
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
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
55587ca6cf fix infoDialog 
add button to display git log
 2017-12-12 13:31:48 +04:00
Mike Ng
e0063d00c0 Porting custom-links to 4.1 2017-12-11 17:44:55 +04:00
Mike Ng
a79b72fbaf Port PHRAS-1593 2017-11-24 16:22:31 +04:00