Mike Ng
53b8ca4087
Porting PHRAS-1586/PHRAS-1602 to 4.1
2017-12-22 11:15:17 +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
Florian BLOUET
5a8ff3b1d2
PHRAS-1113 - fix tooltip positionning for records previews
2016-05-25 13:47:04 +02:00
Thibaud Fabre
8dee4c40d5
Rollback PHRAS-1113 changes
2016-05-24 18:50:31 +02:00
Thibaud Fabre
ac2b852df3
Merge pull request #1874 from lostdalek/hotfix/PHRAS-851-4.0
...
PHRAS-851 - add missing informations in record preview (4.0)
2016-05-23 14:13:50 +02:00
Thibaud Fabre
60545bd14c
Merge pull request #1870 from lostdalek/hotfix/PHRAS-1115-4.0
...
PHRAS-1115 - fix lightbox mobile events handling (4.0)
2016-05-23 14:13:36 +02:00
Florian BLOUET
b7a3571d04
PHRAS-851 - add databox name, collection name and logo to record title in preview
2016-05-23 11:36:25 +02:00
Florian BLOUET
cf465c3a03
PHRAS-1115 - fix lightbox mobile events handling
2016-05-20 15:22:40 +02:00
Florian BLOUET
4e7dac9e9f
PHRAS-1113 - fix tooltip positionning: handle dynamic size of thumbnails
2016-05-20 10:58:41 +02:00
Florian BLOUET
5be77091cf
PHRAS-1113 - fix tooltip positionning for records previews
2016-05-19 18:29:20 +02:00
Florian BLOUET
20bdc9c5af
PHRAS-1082 - fix preview icon in record editor
2016-05-09 16:41:23 +02:00
Florian BLOUET
3d12754c8c
fix PHRAS-1076
2016-05-09 15:05:22 +02:00
Benoît Burnichon
53ef815145
restore register at initialization
2016-04-22 20:22:56 +02:00
Benoît Burnichon
d6b386662d
fix listener to be called when refreshing Basket Workzone
2016-04-22 19:18:29 +02:00
Florian BLOUET
755aac9e3e
PHRAS-1038 - fix story navigation in workzone context
2016-03-22 17:17:01 +01:00
Florian BLOUET
ba646fa733
PHRAS-1039 - fix preview backward navigation
2016-03-21 10:20:56 +01:00
Florian BLOUET
7dd8b73606
PHRAS-945 - fix record selection in story detailled view
2016-02-26 17:29:36 +01:00
Benoît Burnichon
3300d7e06e
Merge pull request #1734 from lostdalek/hotfix/PHRAS-995
...
PHRAS-995
2016-02-26 15:55:49 +01:00
Benoît Burnichon
2da0da014c
Merge pull request #1733 from lostdalek/hotfix/PHRAS-1016
...
PHRAS-1016
2016-02-26 15:39:12 +01:00
Florian BLOUET
5ac036c123
PHRAS-995 - fix search results css in diapo mode
2016-02-26 15:32:42 +01:00
Florian BLOUET
588d10c2dc
PHRAS-1016 - fix default selection to group instead of records for story editing
2016-02-26 13:04:26 +01:00
Florian BLOUET
fdc2129c22
PHRAS-1010 - fix maintenance message display
2016-02-26 11:48:01 +01:00
Benoît Burnichon
992ae162dc
Merge pull request #1728 from lostdalek/hotfix/PHRAS-995
...
PHRAS-995
2016-02-25 20:47:09 +01:00
Benoît Burnichon
22ece5bef5
Merge pull request #1727 from lostdalek/hotfix/PHRAS-998
...
PHRAS-998
2016-02-25 20:46:41 +01:00
Florian BLOUET
c6a6591ccd
PHRAS-995 - fix css of search results in list mode
2016-02-25 12:36:50 +01:00
Florian BLOUET
efaf546222
PHRAS-998 - fix basket preference modal css
2016-02-25 12:05:02 +01:00
Florian BLOUET
3050c7904e
PHRAS-999 - fix events delegation
2016-02-25 11:30:15 +01:00
