Commit Graph

6516 Commits

Author SHA1 Message Date
Romain Neutron
77e37e710a Merge pull request #680 from romainneutron/update-dependencies
[3.8] Update dependencies
2013-10-03 08:03:12 -07:00
Romain Neutron
b85cd0c417 Merge pull request #678 from nlegoff/fix_1502
[3.8] Fix #1502 workzone content is displayed when it is closed
2013-10-03 08:02:37 -07:00
Nicolas Le Goff
24a3950db9 Fix #1502 workzone content is displayed when it is closed 2013-10-03 16:48:21 +02:00
Romain Neutron
5ceaa35717 Fix latest merge 2013-10-03 16:41:59 +02:00
Romain Neutron
e99081df36 Update dependencies 2013-10-03 15:41:06 +02:00
Romain Neutron
1dfbff5666 Merge branch '3.8'
Conflicts:
	CHANGELOG.md
	bin/developer
	lib/classes/module/console/systemUpgrade.php
	www/skins/report/jquery-ui.css
2013-10-03 15:29:22 +02:00
Romain Neutron
642a1a5657 Fix CS 2013-10-03 15:24:15 +02:00
Romain Neutron
1b9a90d635 Fix office plugin class name 2013-10-03 15:24:15 +02:00
Romain Neutron
d4c2e5959e Fix #1491 : Fix cache serialization in case of controlled vocabulary 2013-10-03 15:24:15 +02:00
Nicolas Le Goff
be02d1d7a0 Fix #1453 Edition field on firefox 2013-10-03 15:24:15 +02:00
Romain Neutron
bcc3c4e0ac Update Changelog 2013-10-03 15:24:15 +02:00
Nicolas Le Goff
478b275f85 Enhance IE 6 management 2013-10-03 15:23:18 +02:00
Romain Neutron
4e07dfb969 Merge pull request #668 from romainneutron/bower-simplification
[3.8] Bower installer simplification
2013-10-03 06:20:41 -07:00
Romain Neutron
0a86cb635e Merge pull request #671 from nlegoff/fix1499
[3.8] Fix #1499 Increase default task memory overflow
2013-10-03 06:18:02 -07:00
Romain Neutron
1df6296c8b Merge pull request #673 from romainneutron/fix-1489
[3.8] Fix 1489 Let errors happen when they occur
2013-10-03 06:17:42 -07:00
Romain Neutron
0236f927cc Merge pull request #674 from romainneutron/fix-1401
[3.8] Fix 1401 Bump video max bitrate to 12000
2013-10-03 06:17:16 -07:00
Romain Neutron
7fc1999883 Merge pull request #675 from romainneutron/fix-1506
[3.8] Fix 1506 Avoid query error in case search engine index is broken
2013-10-03 06:17:05 -07:00
Romain Neutron
41eeea1bda Merge pull request #676 from romainneutron/fix-1506bis
[3.8] Fix #1506 : Install data path is not saved
2013-10-03 06:16:50 -07:00
Romain Neutron
3c4b3868ec Merge pull request #679 from nlegoff/fix_1509
[3.8] Fix #1509 missing label for stories status edition
2013-10-03 06:16:31 -07:00
Nicolas Le Goff
b66da8861a Fix #1499 Increase default task memory overflow 2013-10-03 14:29:27 +02:00
Romain Neutron
cb98c5e2d3 Merge pull request #677 from romainneutron/fix-1510
Fix #1510 : Fix API application status display
2013-10-03 05:23:12 -07:00
Nicolas Le Goff
2a1c421110 fix #1509 Fix missing label for stories status edition 2013-10-03 12:20:27 +02:00
Romain Neutron
d6d3ffa243 Fix #1510 : Fix API application status display 2013-10-03 12:20:02 +02:00
Romain Neutron
a0ebc1addb Merge pull request #670 from nlegoff/fix_1501
[3.8] Fix #1501 User can not be deleted because of the sql column size
2013-10-02 10:39:18 -07:00
Romain Neutron
4501f2ac8f Fix #1503 : Avoid query error in case search engine index is broken 2013-10-02 19:30:59 +02:00
Romain Neutron
f638343de1 Fix #1506 : Install data path is not saved 2013-10-02 19:30:36 +02:00
Romain Neutron
255f66968f Bump video max bitrate to 12000 2013-10-02 18:34:57 +02:00
Romain Neutron
abae32ca5f Fix #1489 : Let errors happen when they occur 2013-10-02 18:30:48 +02:00
Nicolas Le Goff
d7c720ed7d Fix #1501 increase usr_login column size 2013-10-02 17:33:26 +02:00
Romain Neutron
3564bd064a Merge pull request #672 from romainneutron/login-enhancements
[3.8] Open up controller API to allow better pluginification
2013-10-02 08:12:07 -07:00
Romain Neutron
fba9da7daa Open up controller API to allow better pluginification 2013-10-02 13:59:22 +02:00
Romain Neutron
5e6a6c9702 Merge pull request #663 from nlegoff/fix_1475
[3.8] Fix #1475 Update report custom CSS & download detail
2013-10-01 02:50:12 -07:00
Romain Neutron
2651d16d20 Merge pull request #664 from nlegoff/fix_1343
[3.8] Fix #1343 Display default name if label is empty
2013-10-01 02:48:09 -07:00
Romain Neutron
e63ae364ff Merge pull request #667 from nlegoff/fix_1495
[3.8] Fix #1495 Remove focus when editing fields
2013-10-01 02:47:44 -07:00
Romain Neutron
621fc2db9d Merge pull request #669 from nlegoff/fix1494
[3.8] Fix #1494 zero indexed field list
2013-10-01 02:47:23 -07:00
Nicolas Le Goff
bfb27ddced Fix #1494 zero indexed field list 2013-10-01 11:16:56 +02:00
Romain Neutron
eb590780ca Fix CS 2013-09-30 18:26:32 +02:00
Romain Neutron
d294e553d8 Fix office plugin class name 2013-09-30 18:25:41 +02:00
Romain Neutron
15e7b3aa1a Bower installer simplification 2013-09-30 14:32:26 +02:00
Nicolas Le Goff
0edc1abc9e Fix #1495 Remove focus action 2013-09-30 12:25:01 +02:00
Romain Neutron
77367557fb Merge pull request #666 from romainneutron/fix-1491
Fix #1491 : Fix cache serialization in case of controlled vocabulary
2013-09-30 02:57:30 -07:00
Nicolas Le Goff
93c3a46b3c Fix #1475 Update report custom CSS 2013-09-30 11:50:29 +02:00
Nicolas Le Goff
332579440a Display default name if label is empty 2013-09-30 11:43:01 +02:00
Romain Neutron
d43b78cff7 Merge pull request #665 from nlegoff/fix_1453
[3.8] Fix #1453 Admin field edition ocus problem on firefox
2013-09-27 15:56:46 -07:00
Romain Neutron
4db4008a52 Fix #1491 : Fix cache serialization in case of controlled vocabulary 2013-09-27 19:06:40 +02:00
Nicolas Le Goff
d4045f968c Fix #1453 Edition field on firefox 2013-09-27 18:35:10 +02:00
Romain Neutron
5218c24cbf Update Changelog 2013-09-26 17:24:56 +02:00
Romain Neutron
af6dc0f565 Merge pull request #662 from nlegoff/ie6_fix
[3.8] Enhance IE 6 management
2013-09-26 08:22:17 -07:00
Nicolas Le Goff
a7cfb48acc Enhance IE 6 management 2013-09-26 15:23:16 +02:00
Romain Neutron
9025bfffaa Update Changelog 2013-09-26 13:02:22 +02:00