Benoît Burnichon
|
8120cdda40
|
Change conflicting AbstractMigration. Bump xlf files
|
2016-01-12 20:18:36 +01:00 |
|
Benoît Burnichon
|
50ec80af97
|
Merge pull request #1624 from lostdalek/hotfix/PHRAS-892
PHRAS-892
|
2016-01-11 18:55:19 +01:00 |
|
Florian BLOUET
|
f3b5bbeab0
|
PHRAS-892 - fix video size in preview tooltips
|
2016-01-11 17:39:47 +01:00 |
|
Benoît Burnichon
|
ec825abb5c
|
Merge pull request #1623 from bburnichon/enhancement/php7-support
Remove PHP7
|
2016-01-11 13:58:21 +01:00 |
|
Benoît Burnichon
|
5f3c391b37
|
PECL for ZMQ is not available
Remove 7.0 compatibility.
|
2016-01-11 13:56:38 +01:00 |
|
Benoît Burnichon
|
7c56ab7cec
|
Also add zmq when installing php7
|
2016-01-11 13:41:54 +01:00 |
|
Benoît Burnichon
|
e8ebeb6150
|
Merge pull request #1622 from bburnichon/bug/PHRAS-900
Lower priority of extended formats in API
|
2016-01-11 13:12:01 +01:00 |
|
Benoît Burnichon
|
70b927ceb9
|
Change Imagick to beta PECL
|
2016-01-11 11:09:38 +01:00 |
|
Benoît Burnichon
|
edefb161be
|
Lower priority of extended formats in API
PHRAS-900
|
2016-01-11 10:23:51 +01:00 |
|
Benoît Burnichon
|
31d04cf5a3
|
Merge pull request #1620 from lostdalek/hotfix/PHRAS-899
PHRAS-899
|
2016-01-11 09:52:45 +01:00 |
|
Benoît Burnichon
|
1b95b603d5
|
Merge pull request #1621 from aztech-dev/refactor-databoxes
Reorder databox methods
|
2016-01-08 17:21:29 +01:00 |
|
Thibaud Fabre
|
d0c53b0dd0
|
Reorder databox methods
|
2016-01-08 17:08:37 +01:00 |
|
Florian BLOUET
|
1f0c30fdb3
|
PHRAS-899 - fix loadImage dependency in statusbit edition and feed edition
|
2016-01-08 16:43:25 +01:00 |
|
Benoît Burnichon
|
127c9ab243
|
Merge pull request #1617 from aztech-dev/merge-clean-boxes
Merge clean boxes
|
2016-01-08 15:56:31 +01:00 |
|
Thibaud Fabre
|
f5df9f1ad4
|
Bust databox cache via repository
|
2016-01-08 15:15:29 +01:00 |
|
Weblate
|
d4c30ee4f8
|
Merge remote-tracking branch 'origin/master'
|
2016-01-08 11:42:16 +01:00 |
|
Benoît Burnichon
|
0e5c8a17e0
|
Merge pull request #1619 from lostdalek/frontendFixes
fix plugins image path
|
2016-01-08 11:42:12 +01:00 |
|
Weblate
|
66da0f39bb
|
Merge remote-tracking branch 'origin/master'
|
2016-01-08 11:35:56 +01:00 |
|
Benoît Burnichon
|
eea10f0958
|
Merge pull request #1618 from bburnichon/master
Try clear 'last' query.
|
2016-01-08 11:35:52 +01:00 |
|
Florian BLOUET
|
687b815114
|
fix plugins image path
|
2016-01-08 11:18:06 +01:00 |
|
Thibaud Fabre
|
74366feac3
|
Fix failing tests
- SQL query error
- Reload updated collections in tests (error in test logic)
|
2016-01-07 18:57:19 +01:00 |
|
Benoît Burnichon
|
d481d5066a
|
Try clear 'last' query.
PHRAS-895
|
2016-01-07 18:03:17 +01:00 |
|
Vagrant User
|
bf524dac0c
|
Fix failing enable/disable collection tests
|
2016-01-07 17:02:20 +01:00 |
|
Thibaud Fabre
|
921a32034a
|
Allow override of app temp path via PHRASEANET_TMP env var
|
2016-01-07 16:06:13 +01:00 |
|
Weblate
|
f980662ce0
|
Merge remote-tracking branch 'origin/master'
|
2016-01-07 14:08:18 +01:00 |
|
jygaulier
|
f8efdda22c
|
Merge pull request #1613 from jygaulier/PHRAS-888_N+1-GetCaption
#PHRAS-888 time 10h
|
2016-01-07 14:08:13 +01:00 |
|
Weblate
|
972ebe6703
|
Merge remote-tracking branch 'origin/master'
|
2016-01-07 10:34:28 +01:00 |
|
Benoît Burnichon
|
edefe88e59
|
Merge pull request #1616 from lostdalek/embed-bundle
Bump Embed-Bundle at v0.1.1
|
2016-01-07 10:34:19 +01:00 |
|
Thibaud Fabre
|
c92d5da9fe
|
Merge branch 'clean-boxes' into merge-clean-boxes
|
2016-01-06 19:53:43 +01:00 |
|
Florian BLOUET
|
ae9189cc9f
|
Bump Embed-Bundle at v0.1.1
|
2016-01-06 18:38:48 +01:00 |
|
Jean-Yves Gaulier
|
f4c834d68c
|
#PHRAS-888 time 5m
rollback (double record instantiation was ok)
|
2016-01-06 14:59:13 +01:00 |
|
Weblate
|
edfd4a2757
|
Merge remote-tracking branch 'origin/master'
|
2016-01-06 10:14:52 +01:00 |
|
Benoît Burnichon
|
e3f49db7b6
|
Merge pull request #1612 from jygaulier/PHRAS-846_tasks-logs
Phras 846 tasks logs
|
2016-01-06 10:14:48 +01:00 |
|
Weblate
|
06d0127884
|
Merge remote-tracking branch 'origin/master'
|
2016-01-06 10:12:20 +01:00 |
|
Anthony C
|
52dd5d9dbb
|
Translated using Weblate (English)
Currently translated at 99.9% (2291 of 2292 strings)
|
2016-01-06 10:12:20 +01:00 |
|
Benoît Burnichon
|
99b7f89116
|
Merge pull request #1615 from bburnichon/bump-copyright
Bump Copyright year to 2016
|
2016-01-06 10:12:09 +01:00 |
|
Benoît Burnichon
|
51023c5533
|
bump copyright year
|
2016-01-05 13:38:14 +01:00 |
|
Jean-Yves Gaulier
|
f2d94dc667
|
#PHRAS-888 time 10h
rewrite : no more n+1 sql for record get_caption()
enhance : can fetch a record without instanciating 2 record_adapter (=no more copy)
|
2015-12-30 18:49:48 +01:00 |
|
Jean-Yves Gaulier
|
2a40e8230d
|
#PHRAS-846 time 5m
fix twig error
|
2015-12-28 17:51:28 +01:00 |
|
Jean-Yves Gaulier
|
d2ef455ef8
|
#PHRAS-846 time 1h
fix test
|
2015-12-28 17:24:13 +01:00 |
|
Jean-Yves Gaulier
|
d5536d4195
|
#PHRAS-846 time 10m
fix : add default "version" for bc with other calls
|
2015-12-28 15:31:23 +01:00 |
|
Jean-Yves Gaulier
|
62df4a806f
|
PHRAS-846 #time 1d
display of tasks logs in admin is ok.
if many logs (logrotate) display links
|
2015-12-28 15:14:56 +01:00 |
|
Benoît Burnichon
|
1bd737194a
|
Use internal dispatch method
|
2015-12-24 16:35:41 +01:00 |
|
Benoît Burnichon
|
1a9b9b59b2
|
Merge pull request #1611 from moctardiouf/master
Fix caption_field declaration error
|
2015-12-24 11:08:22 +01:00 |
|
moctardiouf
|
d6ab4e4dd4
|
Fix caption_field declaration error
|
2015-12-24 10:56:49 +01:00 |
|
Jean-Yves Gaulier
|
8a012973bc
|
wip
|
2015-12-23 15:56:54 +01:00 |
|
Benoît Burnichon
|
2f6350cec0
|
Merge pull request #1610 from bburnichon/feature/PHRAS-867
PHRAS-874
|
2015-12-23 14:40:09 +01:00 |
|
Benoît Burnichon
|
af25e6bfd8
|
Remove status table
|
2015-12-23 14:13:07 +01:00 |
|
Benoît Burnichon
|
699cfad0b6
|
Status operation returns data with same length as input
|
2015-12-23 14:13:07 +01:00 |
|
Jean-Yves Gaulier
|
78be8977de
|
wip
|
2015-12-23 11:14:55 +01:00 |
|