Commit Graph

318 Commits

Author SHA1 Message Date
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
Mike Ng
0c3918b8a5 updating code 2017-11-17 14:21:11 +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
Mike Ng
0394773521 refactor links of documentation to 4.0 2017-08-22 13:29:12 +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
160a1a2c13 add original size to media for calculating position 2017-08-11 14:21:46 +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
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
77c848f32e Merge pull request #2008 from jygaulier/PHRAS-1260_INDEX-WIDTH-HEIGHT
Phras 1260 index width height
2016-11-03 16:22:26 +01:00
Jean-Yves Gaulier
229c80fe74 PHRAS-1260_INDEX-WIDTH-HEIGHT
- new : added size (filesize) of document to es
 - new : methods getWidth(),... to record_adapter
 - fix : template
2016-11-03 15:27:57 +01:00
Jean-Yves Gaulier
0c75189a64 PHRAS-508_acl-cache
- refactor : acl strings changed to ACL class constants
 - code cleanup
 - wip but try to merge for bc break test
2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
6a2285f66d PHRAS-508_acl-cache
- wip
2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
837a294827 PHRAS-1192_quarantaine-by-filenames_4.0
- add : quarantine thumbnails looks like result thb (zoom, caption, infos, ...) by using the same template
 - removed : some code about highlighting titles
 - fix : double extension on exported files
2016-09-28 13:16:10 +02:00
Thibaud Fabre
a74aac8fe0 Merge pull request #1891 from lostdalek/hotfix/PHRAS-515
PHRAS-515 - fix export by email form submission
2016-05-30 14:08:58 +02:00
Florian BLOUET
67bb19fa04 PHRAS-515 - fix export by email form submission 2016-05-27 16:17:41 +02:00
Florian BLOUET
168bde4179 PHRAS-870 - add physical size in technical informations 2016-05-27 14:48:09 +02:00
Benoît Burnichon
1e18b3e69f This is a combination of 33 commits.
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
2016-04-20 16:22:14 +02:00
Florian BLOUET
459c7164f7 PHRAS-965 - fix preview tooltip positionning in answers grid 2016-02-15 16:35:17 +01:00
Florian BLOUET
a1c5148700 PHRAS-941 - fix old jquery selector for selected and checked, fix jquery migrate url call 2016-02-11 14:14:27 +01:00
Florian BLOUET
b874022b1f PHRAS-930 - add localized caption's label in preview and tooltips 2016-02-09 16:16:13 +01:00
Florian BLOUET
d3b779eee1 PHRAS-914 - fix lightbox captions display, fix videoTips width and height 2016-01-21 18:00:42 +01:00
Benoît Burnichon
080080b5a4 Merge pull request #1626 from bburnichon/OpenEmbed
Open embed
2016-01-15 14:57:47 +01:00
Florian BLOUET
d7255c489e fix video tooltips 2016-01-13 17:02:43 +01:00
Benoît Burnichon
8ef94dd5a7 Fixup datafile embed 2016-01-13 13:23:14 +01:00
Benoît Burnichon
845900e90e Twig error 2016-01-12 20:18:36 +01:00
Benoît Burnichon
523b82b5ae Change on embed bundle handling 2016-01-12 20:18:36 +01:00
Florian BLOUET
f3b5bbeab0 PHRAS-892 - fix video size in preview tooltips 2016-01-11 17:39:47 +01:00
Florian BLOUET
02da92b77b bump embed bundle, removed swfobject dependency, cleanup and fix thumbnail twig files 2015-12-14 18:26:31 +01:00
Florian BLOUET
53fdcf33bc add autoplay option for caption preview, removed useless audio and video libs 2015-12-14 15:21:28 +01:00
Florian BLOUET
8399ccbed8 integration of embed video and documents in preview window 2015-12-14 14:16:25 +01:00
Florian BLOUET
c370145647 add og tags in permalink view, twig/css/js cleanup 2015-12-07 16:59:33 +01:00
Florian BLOUET
205aae28de PHRAS-450 - fix captured images dimension issue
Admin - allow input value change for sliders
fix misc css issues
update jquery checked attr into prop
2015-12-03 15:24:29 +01:00
Florian BLOUET
5d2735cd0a update jquery attr into prop method for checked and disabled properties 2015-12-02 17:35:41 +01:00
Florian BLOUET
52b06b208e css cleanup: main menu, misc - admin: fixes js issues 2015-12-02 17:35:40 +01:00
Florian BLOUET
0194e1b46a wip: css cleanup 2015-12-02 17:35:40 +01:00
Florian BLOUET
ff7daad804 wip: css cleanup 2015-12-02 17:35:39 +01:00
Florian BLOUET
0e97e4a0ae moved skins/icon to assets/common/images/icons 2015-12-02 17:35:37 +01:00
Florian BLOUET
f186091823 wip: component reorg, gathering js, css, images, ... 2015-12-02 17:35:36 +01:00
Florian BLOUET
285edaf504 wip - refactoring frontend dependency and build tools - removed deprecated features (client interface) 2015-12-02 17:35:36 +01:00
Nicolas Le Goff
0007bf58be PHRAS-350 Deprecate client 2015-10-27 10:38:58 +01:00
Florian BLOUET
6711f9d2cc PHRAS-605 - captions tooltip ui cleanup and fixes 2015-07-23 14:42:58 +02:00
Benoît Burnichon
4880f2bf5a Add getAuthenticator usage
Replace $app['authentication']->getUser() by $app->getAuthenticatedUser()
replace twig app['authentication'].getUser() with corresponding method
2015-07-02 12:33:18 +02:00
Florian BLOUET
2569d3dc02 PHRAS-593 fixes video, pdf and audio preview in prod interface 2015-06-19 18:27:47 +02:00
Benoît Burnichon
649f0fe510 Refactor can see business fields. 2015-05-29 17:53:45 +02:00
Benoît Burnichon
80e2783855 Restore ability to see business fields 2015-05-29 14:19:19 +02:00