Laurent Destailleur
872b59f568
NEW: Add experimental option PDF_ALLOW_HTML_FOR_FREE_TEXT to be able to
...
enter pdf footer text with wysiwyg editor.
2015-09-18 12:34:36 +02:00
Laurent Destailleur
a4ab5f5552
Restore manual install of ckeditor. It seems upgrade with phpcomposer
...
make some plugins not working.
2015-09-18 12:10:47 +02:00
Laurent Destailleur
9d7a77f2e5
Doc comment
2015-09-18 12:03:35 +02:00
Laurent Destailleur
f01b9c09a3
Removed duplicate code. Use inheritance instead.
2015-09-18 10:36:23 +02:00
AlainRnet
8dd843ab8f
Update categorie.php
...
voir https://github.com/Dolibarr/dolibarr/pull/3540/files (je n'avais pas vu dans quelle branche j'étais)
2015-09-17 23:23:18 +02:00
jfefe
bf4fe91197
FIX #3548 : API not working after removing Composer
2015-09-17 20:48:57 +02:00
Raphaël Doursenaud
148e8a2c23
Used OOP for mysqli connector
...
Better error handling
Slightly more readable codebase
2015-09-17 20:39:48 +02:00
Laurent Destailleur
4195eb3366
NEW Color category is visible onto the thumb of tags on thirdparty, or
...
products cards.
2015-09-17 20:20:03 +02:00
Laurent Destailleur
c8e0839296
NEW Add color on categories
2015-09-17 20:00:54 +02:00
Laurent Destailleur
27b1f2ecc6
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-17 19:52:13 +02:00
Laurent Destailleur
81b447dd0f
NEW Add color on categories
2015-09-17 19:51:56 +02:00
Laurent Destailleur
57521f628c
Fix bad path
2015-09-17 19:35:03 +02:00
Laurent Destailleur
b1168d223a
NEW Introduce table llx_overwrite_trans to be able to overwrite
...
translations by simple database edition.
2015-09-17 18:44:42 +02:00
Raphaël Doursenaud
2cf0f240b9
Installed FirePHP with composer
2015-09-17 16:08:00 +02:00
Laurent Destailleur
8ff41a8ded
Enhance performance of option MAIN_OVERWRITE_TRANS_
2015-09-17 15:35:51 +02:00
AlainRnet
f8f24f7b29
Update categorie.php
...
la navigation entre membre depuis sa catégorie ne fonctionne pas sans ajouter "&type=3" à l'URL
2015-09-17 10:35:18 +02:00
All-3kcis
31266b3c11
FIX #3524
...
(Fatal error: Call to undefined function getRandomPassword() in /htdocs/user/card.php on line 846)
2015-09-17 10:00:32 +02:00
Laurent Destailleur
8bb832d06b
Fix Natural english
2015-09-17 00:48:10 +02:00
Laurent Destailleur
099e3f0376
FIX Removed warnings
2015-09-17 00:47:56 +02:00
Laurent Destailleur
9cbd236c8c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
Laurent Destailleur
313d9ddacd
FIX #3534
2015-09-16 22:04:03 +02:00
Raphaël Doursenaud
6ffdbf91ec
FIX #3533 Load categories language
2015-09-16 21:35:20 +02:00
Laurent Destailleur
7d8013b371
FIX #3533
2015-09-16 21:34:01 +02:00
Laurent Destailleur
38bae655ea
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
...
Conflicts:
htdocs/core/class/html.form.class.php
2015-09-16 21:24:51 +02:00
Laurent Destailleur
e36928fd65
FIX #3529
2015-09-16 21:23:52 +02:00
Laurent Destailleur
8251807408
Merge pull request #3532 from FHenry/3.7
...
FIX : #3530
2015-09-16 21:08:17 +02:00
Laurent Destailleur
30ccd28d01
Merge pull request #3535 from GPCsolutions/3.7-debian
...
FIX Syntax error in Debian Apache configuration
2015-09-16 21:07:04 +02:00
Laurent Destailleur
7f60abdf7b
FIX #3524
2015-09-16 21:05:02 +02:00
Raphaël Doursenaud
cb31ab3e2b
FIX Syntax error in Debian Apache configuration
...
This issue prevented Apache from starting after dolibarr deb package
installation with the following error:
Syntax error on line 30 of /etc/apache2/conf.d/dolibarr.conf:
order takes one argument, 'allow,deny', 'deny,allow', or 'mutual-failure'
2015-09-16 19:53:32 +02:00
Florian HENRY
8fd9d2a7ce
FIX : #3530
2015-09-16 10:21:32 +02:00
Laurent Destailleur
813667e564
Debug swith of ckeditor theme
2015-09-15 17:45:40 +02:00
Laurent Destailleur
1b836dc31e
Merge pull request #3408 from aspangaro/develop-60
...
New: CkEditor add possibility to choose skin
2015-09-15 17:09:11 +02:00
Juanjo Menent
7b8096d367
Merge pull request #3523 from defrance/patch-78
...
fix error on tabcollectors and enhance
2015-09-15 15:16:14 +02:00
Juanjo Menent
4e19500cce
Merge pull request #3527 from FHenry/3.7
...
FIX : Must not be able to create Proposal on thridparty with "close" status #3526
2015-09-15 15:13:36 +02:00
Juanjo Menent
91bac76511
Merge pull request #3522 from aspangaro/3.8-18
...
Fix : Class 'Categorie' not found in core\class\html.form.class.php in supplier card
2015-09-15 15:11:26 +02:00
Florian HENRY
a0fb27bd80
FIX : Can create Proposal on close thridparty #3526
2015-09-15 14:34:49 +02:00
aspangaro
5b57231c52
Fix : error skin name by default
2015-09-15 06:14:33 +02:00
BENKE Charlie
95cfce925f
fix error on tabcollectors and enhance
...
fix error on tabcollectors feature
add number of tabs present in tab collectors
2015-09-15 03:33:27 +02:00
aspangaro
2d2f59fe3f
Fix : Class 'Categorie' not found in core\class\html.form.class.php
2015-09-14 22:33:48 +02:00
Laurent Destailleur
d985c77eca
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-09-14 18:36:08 +02:00
Laurent Destailleur
e0a88fabd9
FIX #3521
2015-09-14 17:54:53 +02:00
Laurent Destailleur
36beb289f3
Merge pull request #3520 from aspangaro/3.8-18
...
Fix #3225 Missing translations in interventions
2015-09-14 17:24:42 +02:00
Laurent Destailleur
ca2b66ffb3
Merge pull request #3519 from aspangaro/3.8-17
...
Fix #3227 #3226 Missing translations in supplier exports
2015-09-14 17:24:22 +02:00
Laurent Destailleur
c75f62ddb7
FIX icon into export profile may be not correctly output
2015-09-14 12:12:14 +02:00
Laurent Destailleur
b4c964760d
Sync transifex
2015-09-13 23:25:55 +02:00
Laurent Destailleur
3b01b8cb47
Fix security hole
2015-09-13 22:50:08 +02:00
aspangaro
334766d194
Fix #3225 Missing translations in interventions
2015-09-13 22:03:54 +02:00
aspangaro
27a85c074e
Merge remote-tracking branch 'origin/3.8-18' into 3.8-17
2015-09-13 21:45:32 +02:00
aspangaro
1d4c747aa2
Fix #3227 #3226 Missing translations in supplier exports
2015-09-13 21:44:59 +02:00
Laurent Destailleur
4eedec0274
Fix tool to generate filecheck
2015-09-13 20:25:33 +02:00
