Mike Ng
3ca5e72d9f
fix index layout on lightbox
2018-02-28 12:37:14 +04:00
Mike Ng
04236bdc8a
add PHRAS-1703 to 4.1
2018-02-19 11:35:26 +04:00
Mike Ng
9e45fb6686
fix margin on video preview
2018-02-05 17:38:36 +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
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
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
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
53b8ca4087
Porting PHRAS-1586/PHRAS-1602 to 4.1
2017-12-22 11:15:17 +04: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
Mike Ng
36b2058add
PORT PHRAS-1555/PHRAS-1568 to 4.1
2017-11-22 15:48:36 +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
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
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
a0cad9ec8f
Fix localization in datepicker - admin
2017-08-14 10:26:52 +04:00
Mike Ng
87ac6c3e06
Refactor layout of thumbnails in lightbox
2017-08-11 15:23:48 +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
790c76a2d9
modify js and css files for PDFJS
2017-08-07 17:24:47 +04:00
Mike Ng
9e258cfae4
fix navigation user list and refactor layout
2017-08-02 17:18:53 +04:00
jygaulier
a70bf2fc70
PHRAS-1304_AUTO-COMPLETION_MASTER ( #2061 )
...
* PHRAS-1304_AUTO-COMPLETION_MASTER
ported from 4.0
* PHRAS-1304_AUTO-COMPLETION_MASTER
fix
* PHRAS-1304_AUTO-COMPLETION_MASTER
fix
* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 (5.5.21 is obsolete in cicleci)
* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 : php.ini moved in circelci
* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq & date to php for circleci
* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq
* PHRAS-1304_AUTO-COMPLETION_MASTER
bump amqp
* PHRAS-1304_AUTO-COMPLETION_MASTER
downgrade amqp to 1.2 to test compilation against old librabbit 0.4 (ubuntu)
* PHRAS-1304_AUTO-COMPLETION_MASTER
add amqp.so to php.ini, (re)bump amqp to 1.6
* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git
* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again
* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again and again
* PHRAS-1304_AUTO-COMPLETION_MASTER
fix test on media rotation 600*400 -> 400*599 !!!
* PHRAS-1304_AUTO-COMPLETION_MASTER
restore facebook sdk to 4.0.1 due to mistake
* PHRAS-1304_AUTO-COMPLETION_MASTER
deleted unwanted file
2017-02-06 18:26:56 +01:00
Thibaud Fabre
97f2e66698
Merge 4.0 branch
2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f
Merge branch 4.0
2016-12-05 15:26:48 +01:00
Thibaud Fabre
b84c35ff66
Merge pull request #2022 from xrousset78800/fix/add-warning-message-on-admin
...
Add warn message in admin
2016-12-05 12:26:49 +01:00
Xavier Rousset
cadb9febab
PHRAS-1220 Add warn message in admin fields setup
2016-12-02 15:26:31 +01:00
Xavier Rousset
e7dd94d5b8
Fix misplaced icon on admin dashboard
2016-12-01 15:03:34 +01:00
Xavier Rousset
f9d496f6c5
Align menu icons on prod view
2016-10-26 12:18:18 +02:00
Thibaud Fabre
01281c2942
Merge pull request #1970 from xrousset78800/fix/update-sharing-logo
...
Update logos on sharing page
2016-10-04 14:58:23 +02:00
Xavier Rousset
632c799f3e
PHRAS-1127 Update logos on sharing page
2016-10-04 14:48:15 +02:00
Xavier Rousset
b1a0d59710
PHRAS-1235 Change design to remove tooltip truncate
2016-09-29 18:11:58 +02:00
Xavier Rousset
06a0b89c48
PHRAS-1196 Change caret color on phraseanet white skin
2016-09-26 16:13:46 +02:00
Florian Blouet
8cac41f6f4
Merge pull request #1895 from lostdalek/hotfix/PHRAS-1104
...
PHRAS-1104 - edit record: fix empty value in multivalued fields
2016-05-31 15:12:14 +02:00
Florian BLOUET
e72cf0e41f
PHRAS-1104 - edit record: fix empty value in multivalued fields
2016-05-31 14:36:39 +02:00
Florian BLOUET
2201ebdb67
PHRAS-1080 - prod advanced search: fix document status selection
2016-05-30 17:01:09 +02:00
