Laurent Destailleur
81b8961dab
Qual: Dead code war
2014-03-17 11:13:53 +01:00
Laurent Destailleur
bb3632e90c
Fix: Pb with new ckeditor.
2014-03-13 12:45:20 +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
2c0f1340d5
New: Update ckeditor to version 4 (part 2)
2014-03-08 13:17:20 +01:00
Laurent Destailleur
cd3e56a2d0
Merge pull request #1450 from grandoc/develop
...
fix english misspelling
2014-03-06 18:23:51 +01:00
Laurent Destailleur
6f60755426
New: Add option MAIN_FAVICON_URL
2014-03-05 17:26:59 +01:00
philippe
e2b29bb108
fix english misspelling
2014-03-05 09:57:36 +01:00
Laurent Destailleur
b64a2b2718
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-28 21:43:29 +01:00
Laurent Destailleur
0c2ca119d7
Fix: Add a test to avoid the non stable and experimental fuc...
...
feature "MAIN_MENU_USE_JQUERY_LAYOUT" to make application hang.
2014-02-26 16:51:38 +01:00
Grand Philippe
2f2668d41f
typo
2014-01-23 12:25:25 +01:00
Grand Philippe
8a0bddf4c5
typo
2014-01-21 18:55:45 +01:00
Laurent Destailleur
c7a73e4e00
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 12:57:13 +01:00
Laurent Destailleur
22767bac36
Fix: Missing the version into url
2014-01-18 12:51:27 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Laurent Destailleur
4074547589
Fix;: Pb of caching static resource (js and css). Add a workaround to
...
avoid any problems.
2014-01-18 00:50:21 +01:00
Laurent Destailleur
ac45051b53
Fix: Showing version is wrong when replace by external module
2014-01-15 02:04:44 +01:00
Laurent Destailleur
5f65b2a97f
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-12 20:23:24 +01:00
Laurent Destailleur
0f329e72ef
Fix: MAIN_FORCETHEME was not working when user set its own theme
2014-01-12 20:22:35 +01:00
Laurent Destailleur
4d298b1891
Update code comments and add log warning to help debug
2014-01-12 20:03:18 +01:00
Laurent Destailleur
0990ef3961
Update code comments and add log warning to help debug
2014-01-12 20:02:41 +01:00
Marcos García de La Fuente
e7d2765fc6
Replaced use of htmlentities with dol_htmlentities
2014-01-05 21:08:37 +01:00
Marcos García de La Fuente
e49f94d02e
Fixed XSS problem in title tag
2014-01-05 04:52:45 +01:00
Laurent Destailleur
b6a910cf34
Fix: jmobile is crazy, we can disable it
2013-12-02 12:34:46 +01:00
Laurent Destailleur
4a1f6713ff
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/main.lang
2013-11-21 18:45:33 +01:00
Laurent Destailleur
0d853cf73d
Fix: [ bug #1118 ] Minor problem on print page link
2013-11-21 02:49:22 +01:00
simnandez
e66371c6d1
New: Link to communities. Add official Support links
2013-11-13 16:35:02 +01:00
Laurent Destailleur
faae93bd03
Fix: Duplicate code
2013-10-22 17:57:22 +02:00
Laurent Destailleur
c9012b498f
Fix: Code comment and phpunit test
2013-10-18 17:34:12 +02:00
Laurent Destailleur
12366410e5
Merge remote-tracking branch 'origin/3.4' into develop
2013-10-18 17:30:14 +02:00
Laurent Destailleur
4e637d3121
Fix: Sanitizing PHP_SELF
2013-10-18 17:27:17 +02:00
Laurent Destailleur
2f1340a6c6
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/societe/class/societe.class.php
2013-10-18 12:19:12 +02:00
Laurent Destailleur
5e35731693
Add debug info to find a bug
2013-10-18 11:41:37 +02:00
Laurent Destailleur
d9106b6e85
Add debug info to find a bug
2013-10-18 11:19:32 +02:00
Laurent Destailleur
b9aac118aa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-21 12:31:38 +02:00
Laurent Destailleur
fd564f5c7d
Optimize cookie usage for boxes. Only 1 cookie per box, instead of 1
...
cookie
per
parameter.
2013-09-21 12:30:44 +02:00
Laurent Destailleur
491bd76c1b
Work on openif authentication mode
2013-09-18 21:22:24 +02:00
Laurent Destailleur
b1f528f4d5
Comment code of a deprecated variable.
2013-08-07 20:56:10 +02:00
Maxime Kohlhaas
1b54efcaaf
Task # 853 : Can hide in conf the search by product supplier ref, and displayed only if product and supplier module are enabled
2013-07-30 11:26:37 +02:00
Laurent Destailleur
87713c49ac
New: Into POST forms, if you can add a parameter DOL_AUTOSET_COOKIE with
...
a vlue that is list name, separated by a coma, of other POST parameters,
Dolibarr will automatically save this parameters into user cookies.
New: Can select to see number or amount or both, for graph boxes.
2013-07-29 19:12:04 +02:00
Laurent Destailleur
00f39f9bfd
Fix: tons of bugs into css.
...
Qual: Remove table for login informations.
Fix: Restore compatibility with IE 8+.
2013-07-28 17:02:13 +02:00
Laurent Destailleur
0743521b6b
- No need to load css of plugin fileupload (plugin never loaded). Too
...
much bugged to be included by default.
- Vertical menu must be under horizontal menu, even if horizontal menu
is wrapped.
- Add an empty li at end of list to provide more options for skins.
2013-07-28 05:35:51 +02:00
Laurent Destailleur
61f11d3621
Fix: Duplicate tooltip
2013-07-26 11:12:29 +02:00
Laurent Destailleur
7b5e0678db
New: Make some changes to allow usage of alternative
...
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Regis Houssin
4cd6ae6bbd
Fix: convert lines delimiters
2013-06-24 17:36:33 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Laurent Destailleur
570275cd76
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/opensurvey.lang
htdocs/opensurvey/public/index.php
2013-06-21 15:37:17 +02:00
Laurent Destailleur
a749e2bfaa
Fix: Still working on css debug. bureau2crea and cameleo are too
...
bugged. I disable them with jmobile to have things working correctly.
Conflicts:
htdocs/theme/bureau2crea/style.css.php
2013-06-20 16:20:31 +02:00
