Laurent Destailleur
5ee17a2f14
Merge pull request #1460 from atm-gauthier/3.5
...
error on ajax_constantonoff function
2014-03-11 11:53:44 +01:00
Marcos García de La Fuente
1d357ec2f9
Removed odd tabs from some modules
2014-03-11 11:53:22 +01:00
Laurent Destailleur
814f6b2b90
Merge pull request #1459 from open-minds/patch-1
...
Fix JavaScript date format in portuguese (Brazil) language file
2014-03-11 11:52:43 +01:00
Laurent Destailleur
6efe28d5c8
Merge pull request #1457 from aspangaro/develop-salary
...
Add salary payment in tax module
2014-03-11 11:49:28 +01:00
Laurent Destailleur
7c6dbf72b0
Merge pull request #1456 from miicha/patch-1
...
I validated the pr but has said by marcosgdf, to not loose it, you must fix translation from web interface at https://www.transifex.com/projects/p/dolibarr/
2014-03-11 11:47:20 +01:00
Laurent Destailleur
324402be0d
Merge pull request #1465 from marcosgdf/bug-1295
...
Fixed bug 1295: Error when creating an agenda extrafield with a number as reference
2014-03-11 11:45:50 +01:00
Marcos García de La Fuente
96143ff4a7
Added missing translation keys
2014-03-11 11:41:19 +01:00
Marcos García de La Fuente
64e76852c5
Corrected projects admin page translation
2014-03-11 11:37:42 +01:00
Marcos García de La Fuente
54b9f72977
Unified module name in members admin page and added spacing before submit button
2014-03-11 11:31:37 +01:00
Marcos García de La Fuente
f9a451dbb9
Corrected intervention translation in module configuration page
2014-03-11 11:27:25 +01:00
Marcos García de La Fuente
0a603777ae
Added missing spacing
2014-03-11 11:27:06 +01:00
Marcos García de La Fuente
371f0cbb8e
Fixed module name in contract admin setup page
2014-03-11 11:15:35 +01:00
Marcos García de La Fuente
096a446b7f
Changed style of contract creation form to the 3.5 style
2014-03-11 11:15:15 +01:00
aspangaro
99b2dfda77
Correct Travis Error
2014-03-11 10:52:49 +01:00
aspangaro
d97f9e50cd
Merge branch 'upstream/develop'
2014-03-11 10:40:22 +01:00
Laurent Destailleur
6860ae84b9
Avoid browser to hang by adding PROJECT_MAX_NB_TASKS.
2014-03-11 09:48:45 +01:00
Laurent Destailleur
932b421d1d
Merge remote-tracking branch 'origin/3.5' into develop
2014-03-11 09:46:51 +01:00
Laurent Destailleur
c9edced656
- New: Add filter on project status into task list. By default, only
...
"opened" project are visible.
- New: Status "validated" for project are renamed into "opened".
2014-03-11 09:43:26 +01:00
aspangaro
12ffb19cec
Use more explicit name for class and functions
2014-03-11 06:26:18 +01:00
Laurent Destailleur
67de6699d6
Fix: Translation of number for pt_PT
2014-03-11 01:37:37 +01:00
Marcos García de La Fuente
20262a0164
Fix bug #1295 : Error when creating an agenda extrafield with a number as reference
2014-03-10 23:58:16 +01:00
Laurent Destailleur
be97066a74
Fix: Bug into sql request because of incomplete group by
2014-03-10 23:57:19 +01:00
Marcos García de La Fuente
78ec0054d9
Added bug number for agenda extrafield problems
2014-03-10 23:33:09 +01:00
Marcos García de La Fuente
4209ad740c
Updated changelog
2014-03-10 23:20:48 +01:00
aspangaro
61a5735300
Rename "Sal" class into "Salaries"
2014-03-10 21:17:03 +01:00
Marcos García de La Fuente
89a4c51153
Added es_CL language
2014-03-10 21:13:16 +01:00
Marcos García de La Fuente
fa56fe4e8b
Corrected Unknown error message typo
2014-03-10 19:36:32 +01:00
Laurent Destailleur
ccc40362e7
Fix: Must use div for columns of index pages. Not table.
2014-03-10 17:19:02 +01:00
Laurent Destailleur
21bf279248
Fix: css
2014-03-10 16:17:55 +01:00
Gauthier
92e8f54e9a
error on ajax_constantonoff function
2014-03-10 10:53:20 +01:00
Laurent Destailleur
97677f08a9
Fix: Add protection to avoid memory hung
2014-03-10 01:49:44 +01:00
Laurent Léonard
353390c971
Fix JavaScript date format in portuguese (Brazil) language file
2014-03-09 23:37:13 +01:00
Laurent Destailleur
38423b9ec9
Fix: bad version
2014-03-09 03:29:58 +01:00
Laurent Destailleur
4fe4d0fcbc
Fix: Translation source
2014-03-09 03:14:53 +01:00
Laurent Destailleur
271ef07c7d
Packager works with beta versions
2014-03-09 03:04:47 +01:00
Laurent Destailleur
fad9ba6130
Merge remote-tracking branch 'origin/3.5' into develop
2014-03-09 02:49:39 +01:00
Laurent Destailleur
b8d816b208
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
build/debian/dolibarr.install
build/makepack-dolibarr.pl
2014-03-09 02:48:37 +01:00
Laurent Destailleur
7a741e0691
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
build/makepack-dolibarr.pl
2014-03-09 02:14:00 +01:00
Laurent Destailleur
f652a4d807
Script to prepare 3.3.5
2014-03-09 02:08:13 +01:00
Laurent Destailleur
b2116c37d8
Enhance packager:
...
- No need to be root to run script
- create git tag of version
- debian package do not use the deprecated dpatch command
- debian package is a quilt package (not native)
- debian package was missing file watch
- clean exclusion for zip and tgz package (exclusion must be done into
makepack-dolibarr.pl, not into specific package code)
- can publish files to sourceforge
2014-03-09 01:37:08 +01:00
Laurent Destailleur
2a853329e5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/doleditor.class.php
htdocs/main.inc.php
htdocs/product/class/product.class.php
2014-03-08 14:25:59 +01:00
Laurent Destailleur
c082d7c82e
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/main.inc.php
2014-03-08 14:17:49 +01:00
Laurent Destailleur
2e2f86b968
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/class/doleditor.class.php
htdocs/main.inc.php
2014-03-08 14:14:23 +01:00
Laurent Destailleur
a6bb785b5f
Fix: Compatibility with v4 of ckeditor (for debian)
2014-03-08 14:06:01 +01:00
Laurent Destailleur
6a3323d6d1
Fix: Readonly mode does not need to use a specific toolbar with ckeditor
...
4.
2014-03-08 13:46:17 +01:00
Laurent Destailleur
7071e233d3
Fix css for ckeditor 4.
2014-03-08 13:36:42 +01:00
Laurent Destailleur
2c0f1340d5
New: Update ckeditor to version 4 (part 2)
2014-03-08 13:17:20 +01:00
Laurent Destailleur
c65d681d87
New: Update ckeditor to version 4 (part 1)
2014-03-08 12:11:01 +01:00
aspangaro
db0a45d78f
Merge branch 'upstream/develop'
2014-03-08 04:54:24 +01:00
KreizIT
18e4703438
Travis fix
2014-03-07 12:21:35 +01:00
