Commit Graph

3553 Commits

Author SHA1 Message Date
Romain Neutron
b482a0ebb7 Merge pull request #530 from romainneutron/fix-1361
[3.7] Fix #1361 : Bump to Media-Alchemyst 0.1.7
2013-07-22 10:00:09 -07:00
Romain Neutron
5440879c4c Fix #1361 : Bump to Media-Alchemyst 0.1.7 2013-07-22 18:35:17 +02:00
Romain Neutron
9def196202 Merge pull request #526 from romainneutron/3.7-fixes
[3.7] 3.7 fixes
2013-07-22 04:44:09 -07:00
Romain Neutron
62d68f0995 Update to latest colorspace git checksum 2013-07-19 18:01:58 +02:00
Romain Neutron
5eae11bd0c Fix #1270 : Update XML field after having rename a databox documentation structure field 2013-07-19 17:53:54 +02:00
Romain Neutron
e06b78564f Fix #1271 : Disable access to status editing if user does not have access 2013-07-19 17:52:38 +02:00
Romain Neutron
23369fb04d Prepare version 3.7.13 3.7.13 2013-07-04 11:36:32 +02:00
Romain Neutron
af29b06d83 Merge pull request #458 from romainneutron/thesaurus
[3.7] Fix #989 : Unable to reject thesaurus candidate
2013-07-04 02:22:55 -07:00
Romain Neutron
b43c5d9f6b Fix neutron/imagine commit 2013-07-04 10:56:03 +02:00
Romain Neutron
cc554f1529 Fix #989 : Unable to reject thesaurus candidate 2013-07-03 17:10:10 +02:00
Romain Neutron
c87afd466f Fix template 2013-06-28 23:22:09 +02:00
Romain Neutron
ae50d07d05 Fix template 2013-06-28 23:16:05 +02:00
Romain Neutron
2c5f05c113 Merge pull request #445 from nlegoff/fix_1203
[3.7] Fix #1203
2013-06-28 10:58:24 -07:00
Nicolas Le Goff
9297d2f6b5 Fix #1203 Do not display story creation form if user do not have appropriate rights 2013-06-28 17:51:44 +02:00
Romain Neutron
1a7b53593e Update to latest rebase 2013-06-27 16:37:33 +02:00
Romain Neutron
979342b27e Merge pull request #427 from romainneutron/ffmpeg0-2-4
[3.7] Bump to FFMpeg-PHP 0.2.4
2013-06-25 01:25:10 -07:00
Romain Neutron
89b2162b8b Bump to FFMpeg-PHP 0.2.4 2013-06-24 12:21:37 +02:00
Romain Neutron
c8d4ba5ffa Merge pull request #414 from romainneutron/fix-1149
[3.7] Fix #1149 : Disable preview shortcut when a modal dialog is open
2013-06-18 06:33:55 -07:00
Romain Neutron
e5d1d6439c Fix #1149 : Disable preview shortcut when a modal dialog is open 2013-06-17 22:56:10 +02:00
Romain Neutron
09901c8068 Merge branch 'jygaulier-3.7-fix1165' into 3.7 2013-05-13 20:11:07 +02:00
Romain Neutron
280b33a716 Adjust new getter / setter for order masters 2013-05-13 20:10:35 +02:00
jygaulier
1958520e34 methods moved to acl, added test 2013-05-13 19:40:24 +02:00
jygaulier
f7e203089a add methods to userAdapter to get/set "order_master" 2013-05-13 19:40:24 +02:00
Romain Neutron
a281f878fc Merge pull request #346 from romainneutron/v3.7.12
[3.7] 3.7.12
3.7.12
2013-05-13 04:50:17 -07:00
Romain Neutron
5680bda758 Prepare version 3.7.12 2013-05-13 12:17:37 +02:00
Romain Neutron
00be29dbc8 Update locales 2013-05-13 12:17:36 +02:00
Romain Neutron
5fa7f8ea53 Fix #1164 : Grouped status bit in advanced search options are not displayed correctly 2013-05-13 12:17:36 +02:00
Romain Neutron
715ae961b9 Fix #1160 : Fix advanced search collection list 2013-05-13 12:17:36 +02:00
Romain Neutron
0470d9b57c Fix #1156 : Move mime detection hack to application level 2013-05-13 12:17:35 +02:00
Romain Neutron
67c2d21109 Add explicit --no-dev option to composer in packager script 2013-05-05 12:48:20 +02:00
Romain Neutron
bbfecfaa7c Fix #1152 : On upload, require subdefinitions creation when files have been totally copied 2013-05-03 20:38:13 +02:00
Romain Neutron
a5b0eff376 Fix #1169 : Disable preview keyboard shortcut while download window open 2013-05-03 20:36:54 +02:00
Romain Neutron
45d59942f1 Fix #1158 : Remove required attributes on non-required attributes in Order creation 2013-05-03 18:16:18 +02:00
Romain Neutron
733c5618c2 Fix CS, add comment 2013-04-25 13:02:45 +02:00
jygaulier
4947bacc26 Fix #1162 : Some queries can be processed against business fields in case of multiple databoxes 2013-04-25 12:58:27 +02:00
Romain Neutron
be66d73774 Prepare version 3.7.11 3.7.11 2013-04-25 12:54:08 +02:00
Romain Neutron
516007a641 Fix CS 2013-04-22 16:40:24 +02:00
Romain Neutron
61670e76bf Merge pull request #338 from nlegoff/fix_report
[3.7] Fix #1155 Export CSV truncated
2013-04-22 07:38:31 -07:00
Nicolas Le Goff
d0c261ff32 Fix #1155 Export CSV truncated 2013-04-22 15:15:30 +02:00
Romain Neutron
8457fc9a41 Remove extra comments 2013-04-22 14:44:21 +02:00
Romain Neutron
b657a617e3 Merge pull request #337 from jygaulier/3.7-fix1153
[3.7] Fix #1153
2013-04-22 05:43:26 -07:00
Romain Neutron
19b594cfea Merge pull request #336 from romainneutron/3.7.11
[3.7] Update Imagine / Media-Alchemyst versions
2013-04-22 05:24:05 -07:00
jygaulier
b539a05ba6 Fix #1144 : Add admin task-manager IE compatibility 2013-04-22 14:21:09 +02:00
jygaulier
ab26dbeca2 fix #1153 2013-04-18 16:39:55 +02:00
Romain Neutron
61d7da3c76 Fix #1146 : Update Imagine / Media-Alchemyst versions 2013-04-18 14:57:29 +02:00
Romain Neutron
3eb81b3712 Prepare version 3.7.10 3.7.10 2013-04-03 10:42:00 +02:00
Romain Neutron
6e5aca34ed Fix #1138 #1139 : Consecutive Image Tools calls may fail 2013-04-03 10:42:00 +02:00
Romain Neutron
06c2e45b74 Fix #1137 : Phrasea install fails on step 5 2013-04-03 10:42:00 +02:00
Romain Neutron
532064bc43 Fix travis build 2013-04-03 10:42:00 +02:00
Romain Neutron
d5c97082d6 Move URL etag from permalinks to media subdef urls 2013-04-03 10:42:00 +02:00