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,732 Commits 268 Branches 107 Tags
eff72083ba3f7f73808334104d4e1eab71f0c5d6
Commit Graph

2182 Commits

Author SHA1 Message Date
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
Mike Ng
1f4f6da278 fix label tab thesaurus 2017-08-23 13:48:20 +04:00
Mike Ng
2d17177ded hide facets containing single element from preference menu 2017-08-22 17:07:05 +04:00
Mike Ng
0394773521 refactor links of documentation to 4.0 2017-08-22 13:29:12 +04:00
Mike Ng
48dff55226 refactor link for documentation to 4.1 2017-08-22 13:21:06 +04:00
Mike Ng
be17fd8e0d fix event listener for button export / download 2017-08-22 12:03:26 +04:00
Mike Ng
9ed6a0210f Porting PHRAS-1434, PHRAS-1435, PHRAS-1436, PHRAS-1437, PHRAS-1457 to 4.1 2017-08-21 14:34:53 +04:00
Mike Ng
d37ada4d06 refactored order_box and order_item 2017-08-18 16:13:22 +04:00
Mike Ng
197612de7b implementation back-end for refactoring of orders 
refactoring layout order-box and order-item
 2017-08-17 14:42:10 +04:00
Mike Ng
83016d1d94 refactor google chart on popularity tab 2017-08-16 13:56:24 +04:00
Mike Ng
191a59c827 add search to candidate tab 
refactor search_term function in backend
 2017-08-15 12:54:16 +04:00
Mike Ng
a0cad9ec8f Fix localization in datepicker - admin 2017-08-14 10:26:52 +04:00
Mike Ng
160a1a2c13 add original size to media for calculating position 2017-08-11 14:21:46 +04:00
Mike Ng
63331e3a84 hide unused buttons when loading preview - lightbox 2017-08-11 10:47:13 +04:00
Mike Ng
a93e231c1a fix - load lightbox library 
set height of lightbox iframe to 100%
 2017-08-10 16:39:53 +04:00
Mike Ng
c5acac8d6d fix source in iframe 2017-08-09 17:08:26 +04:00
Mike Ng
790c76a2d9 modify js and css files for PDFJS 2017-08-07 17:24:47 +04:00
Mike Ng
64ad521d61 add filter to user list 2017-08-03 14:31:03 +04:00
Mike Ng
a07bfecd85 add feedback and reload side menu when activating collection 2017-08-03 11:55:53 +04:00
Mike Ng
9e258cfae4 fix navigation user list and refactor layout 2017-08-02 17:18:53 +04:00
Thibaud Fabre
cc6efb0dc9 Merge 4.0 into master 2016-12-06 15:34:13 +01:00