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,871 Commits 268 Branches 107 Tags
3821e8af005f22bcdea8f19fd2740a4050a6351b
Commit Graph

2202 Commits

Author SHA1 Message Date
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
Xavier Rousset
31e0c43f7f Port PHRAS-1673 - language selection - to master PHRAS-1720 2017-12-22 16:03:46 +01: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
Mike Ng
e838b6f166 Port PHRAS-1577 to 4.1 2017-11-23 16:40:20 +04:00
Mike Ng
77043c1a9d Port PHRAS-1574 2017-11-23 13:16:55 +04:00
Mike Ng
36b2058add PORT PHRAS-1555/PHRAS-1568 to 4.1 2017-11-22 15:48:36 +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
falylala
ea53da9086 Show all available structure for install CLI/Graphic mode 2017-11-20 12:16:54 +04:00
Mike Ng
0c3918b8a5 updating code 2017-11-17 14:21:11 +04:00
Mike Ng
974f1b8a02 Porting PHRAS-1542 to 4.1 2017-11-17 11:32:37 +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
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
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
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
0fcd88b6ca Merge pull request #2222 from mike-esokia/PHRAS-1505_port_PHRAS-1399 
PHRAS-1505 port PHRAS-1399
 2017-08-28 17:12:49 +02:00
Nicolas Maillat
376a9d79d9 Merge pull request #2221 from mike-esokia/PHRAS-1504_port_PHRAS-392 
PHRAS-1504 port PHRAS-392
 2017-08-28 16:56:43 +02:00
Mike Ng
e20aef94eb clean up 
add PHRAS-1493
 2017-08-28 13:09:53 +04:00