Romain Neutron
|
5642c144ee
|
Merge pull request #837 from romainneutron/fix-1618
[3.8] Fix user settings precedence
|
2013-12-11 14:47:51 -08:00 |
|
Jean-Yves Gaulier
|
f71fb36377
|
fix #1612
Conflicts:
lib/classes/caption/Field/Value.php
|
2013-12-11 19:49:49 +01:00 |
|
Jean-Yves Gaulier
|
f5f17549ad
|
fix #1612
Conflicts:
lib/classes/caption/Field/Value.php
|
2013-12-11 19:49:05 +01:00 |
|
Romain Neutron
|
8fd1256aa2
|
Fix user settings precedence
|
2013-12-10 11:01:30 +01:00 |
|
Romain Neutron
|
0832cc0b21
|
Merge pull request #834 from romainneutron/acl-fix
[3.8] Fix ACL binary comparison
|
2013-12-09 10:07:45 -08:00 |
|
Romain Neutron
|
0804d01b4f
|
Fix ACL binary comparison
|
2013-12-09 18:39:51 +01:00 |
|
Romain Neutron
|
ef55bd29cc
|
Merge branch 'jygaulier-ArchTaskStops' into 3.8
|
2013-12-09 14:14:44 +01:00 |
|
Romain Neutron
|
25bade7a47
|
Merge branch 'ArchTaskStops' of https://github.com/jygaulier/Phraseanet into jygaulier-ArchTaskStops
|
2013-12-09 14:14:19 +01:00 |
|
Romain Neutron
|
ca5fc9add8
|
Merge pull request #827 from nlegoff/fix1609
[3.8] Fix #1609 & #1608
|
2013-12-09 04:20:23 -08:00 |
|
Romain Neutron
|
aa3e459bfc
|
Merge pull request #830 from nlegoff/fix_1611
[3.8] Fix #1611 CSS issue with user list
|
2013-12-09 04:17:33 -08:00 |
|
Romain Neutron
|
281382c3a5
|
Merge pull request #831 from nlegoff/fix1615
[3.8] Fix #1616 Suggested values editing not working on mozilla firefox
|
2013-12-09 04:17:09 -08:00 |
|
Romain Neutron
|
737990a74d
|
Merge pull request #832 from nlegoff/fix1613
[3.8] Fix #1613 Can not launch lightbox
|
2013-12-09 04:16:47 -08:00 |
|
Nicolas Le Goff
|
d58d74d5fc
|
Fix #1613 Can not launch lightbox
|
2013-12-06 17:53:23 +01:00 |
|
Nicolas Le Goff
|
4e3abb9044
|
Fix #1616 Suggested values editing not working on mozilla firefox
|
2013-12-06 15:46:26 +01:00 |
|
Nicolas Le Goff
|
ac6d669dbb
|
Fix #1611 CSS issue with user list
|
2013-12-06 15:17:01 +01:00 |
|
Nicolas Le Goff
|
75fd59d57b
|
Fix #1609 & #1608 confirmation popup is not working
|
2013-12-06 14:14:56 +01:00 |
|
Romain Neutron
|
4177919245
|
Merge pull request #824 from nlegoff/login_fix
[3.8] Login page enhancements
|
2013-12-06 00:46:44 -08:00 |
|
Jean-Yves Gaulier
|
403a4e4127
|
Task archive may stop if maxmemory > 25Mo
|
2013-12-05 18:35:43 +01:00 |
|
Nicolas Le Goff
|
0d41e2948a
|
Fix language bar display in mobile devices
|
2013-12-05 15:41:23 +01:00 |
|
Nicolas Le Goff
|
1ffc6a2331
|
Display Termls of use in a new browser tab
|
2013-12-05 15:40:40 +01:00 |
|
Romain Neutron
|
da5ce60b50
|
Merge pull request #822 from romainneutron/patch-order
[3.8] Fix patch execution order
|
2013-12-04 05:51:07 -08:00 |
|
Romain Neutron
|
d6e2a604ba
|
Fix patch execution order
|
2013-12-04 14:21:38 +01:00 |
|
Romain Neutron
|
e70e35ae04
|
Merge pull request #810 from romainneutron/fix-1594
[3.8] Fix 1594 : Removed users are not disconnected
|
2013-12-03 12:21:30 -08:00 |
|
Romain Neutron
|
7bb1055646
|
Merge pull request #818 from romainneutron/fix-1598
[3.8] Fix #1598 #1599 : Fix support for portrait videos.
|
2013-12-03 12:20:46 -08:00 |
|
Romain Neutron
|
7904a33e07
|
Fix CS
|
2013-12-03 21:01:43 +01:00 |
|
Romain Neutron
|
0a813a6440
|
Bump to version 3.8.3-alpha.1
|
2013-12-03 18:22:15 +01:00 |
|
Romain Neutron
|
7a8f77c569
|
Fix #1594 : Removed users are not disconnected
|
2013-12-03 18:22:14 +01:00 |
|
Romain Neutron
|
900c62cb84
|
Fix #1598 #1599 : Fix support for portrait videos.
|
2013-12-03 18:14:45 +01:00 |
|
Romain Neutron
|
b024492c07
|
Merge pull request #819 from romainneutron/fix-1591
Fix #1591 : Fix subdef group/name parameter extraction
|
2013-12-03 09:09:19 -08:00 |
|
Romain Neutron
|
a3cd34bdc1
|
Merge pull request #820 from romainneutron/fix-1602
Fix #1602 : Use localisation for datepicker placeholder
|
2013-12-03 09:09:06 -08:00 |
|
Romain Neutron
|
9197805eae
|
Merge pull request #816 from romainneutron/fix-736
[3.8] Fix #736 : Re-inject phraseanet rights after collection creation in case of PhraseaEngine
|
2013-12-03 08:59:34 -08:00 |
|
Romain Neutron
|
8729bb094f
|
Fix #1602 : Use localisation for datepicker placeholder
|
2013-12-02 18:07:48 +01:00 |
|
Romain Neutron
|
fd83ba07cb
|
Fix #1591 : Fix subdef group/name parameter extraction
|
2013-12-02 17:47:50 +01:00 |
|
Romain Neutron
|
1472f96e93
|
Fix #736 : Re-inject phraseanet rights after collection creation in case of PhraseaEngine
|
2013-11-28 16:16:18 +01:00 |
|
Romain Neutron
|
7285717b80
|
Merge pull request #815 from nlegoff/menubar
[3.8] Add block to override menu bar title
|
2013-11-28 07:15:09 -08:00 |
|
Romain Neutron
|
18f63b4ce7
|
Merge pull request #817 from nlegoff/technical_data
[3.8] Wrap technical data into blocks
|
2013-11-28 05:07:45 -08:00 |
|
Romain Neutron
|
e7eb81dd0c
|
Merge pull request #814 from romainneutron/fix-1595
[3.8] Fix #1595 : Export document with its title returns a document named with its filename
|
2013-11-28 05:06:39 -08:00 |
|
Romain Neutron
|
c92ae5c49a
|
Merge pull request #813 from romainneutron/fix-1593
[3.8] Fix #1593 : "download" query parameter is not working anymore on permalink URIs
|
2013-11-28 05:06:16 -08:00 |
|
Romain Neutron
|
a518b7cc68
|
Merge pull request #812 from romainneutron/fix-1596
[3.8] Fix #1596 : Add datepicker input placeholder
|
2013-11-28 05:05:46 -08:00 |
|
Romain Neutron
|
18bfcd5ce8
|
Merge pull request #811 from nlegoff/fix1588
[3.8] Fix #1588 Error 400 when send email test
|
2013-11-28 05:03:57 -08:00 |
|
Nicolas Le Goff
|
7bbf00ff4b
|
Wrap technical data into blocks
|
2013-11-28 13:29:25 +01:00 |
|
Nicolas Le Goff
|
e2fcd816cc
|
Add block to override menu bar title
|
2013-11-28 12:38:24 +01:00 |
|
Romain Neutron
|
479daa5106
|
Merge pull request #809 from nlegoff/fix1600
[3.8] Fix #1600 Can not save a deleted field in admin field app
|
2013-11-28 03:15:16 -08:00 |
|
Romain Neutron
|
d1973bdc06
|
Fix #1595 : Export document with its title returns a document named with its filename
|
2013-11-28 11:56:40 +01:00 |
|
Romain Neutron
|
94d547d897
|
Fix #1593 : "download" query parameter is not working anymore on permalink URIs
|
2013-11-28 11:49:19 +01:00 |
|
Romain Neutron
|
deb5e7ea75
|
Fix #1596 : Add datepicker input placeholder
|
2013-11-28 11:29:04 +01:00 |
|
Nicolas Le Goff
|
7384a376b6
|
Fix #1588 Error 400 when send email test
|
2013-11-28 11:24:08 +01:00 |
|
Nicolas Le Goff
|
afde85140f
|
Fix #1600 Can not save a deleted field in admin field app
|
2013-11-28 11:08:42 +01:00 |
|
Romain Neutron
|
5504f9013a
|
Merge pull request #805 from nlegoff/fix1584
[3.8] Fix #1584 Unable to order medias
|
2013-11-27 03:12:47 -08:00 |
|
Nicolas Le Goff
|
52a8d9672c
|
Fix #1584 Unable to order medias
Conflicts:
templates/web/prod/Baskets/Reorder.html.twig
|
2013-11-27 12:09:55 +01:00 |
|