lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,561 Commits 43 Branches 150 Tags 886 MiB
88356e2e97
Commit Graph

50561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a71cef3aa6 Merge pull request #3553 from aspangaro/3.8-19 
Missing translations in checks deposits exports
 2015-09-21 14:46:12 +02:00
Laurent Destailleur
7d4a9b17b6 FIX Creation of tables or keys must not be done with a random order. 2015-09-21 14:00:02 +02:00
Raphaël Doursenaud
d9acf32861 Fix Do not always append htdocs to include path 
Serving the htdocs directly is a best practice. The old code generates
a bogus include path in that case.
This code mitigates the issue by setting an include path only when needed.
 2015-09-21 09:47:25 +02:00
Regis Houssin
de04f3022c Fix: use get instead getJSON for avoid freezing 2015-09-20 09:05:52 +02:00
aspangaro
49f671eb1d Correct name 2015-09-19 07:24:32 +02:00
aspangaro
1901b2fb3b Missing translations in checks deposits exports 2015-09-19 07:15:13 +02:00
Laurent Destailleur
bf85caade6 Move a file that is not an external lib 2015-09-18 21:53:35 +02:00
Laurent Destailleur
0821f18712 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-18 21:50:10 +02:00
Laurent Destailleur
397e409b9a Merge pull request #3543 from GPCsolutions/firephp 
Installed FirePHP with composer
 2015-09-18 20:53:27 +02:00
Laurent Destailleur
f9973d13b4 Merge pull request #3550 from AlainRnet/patch-2 
Update categorie.php
 2015-09-18 20:51:46 +02:00
Laurent Destailleur
8332609d06 Merge pull request #3539 from All-3kcis/develop-patch-6 
FIX  #3524
 2015-09-18 20:49:27 +02:00
Laurent Destailleur
e85ddbb470 Merge pull request #3537 from GPCsolutions/3.8-3533 
FIX #3533 Load categories language
 2015-09-18 20:48:58 +02:00
Laurent Destailleur
9658da5b7c Merge pull request #3549 from aternatik/api_rest_fix_composer 
FIX #3548 : API not working after removing Composer
 2015-09-18 20:46:16 +02:00
Laurent Destailleur
378da082bd Fix selector or margin with jmobile 2015-09-18 20:43:10 +02:00
Laurent Destailleur
5f507cbbd8 Fix missing closing div making jmobile crazy 2015-09-18 20:23:06 +02:00
Laurent Destailleur
8699776930 Better usability with dolidroid 2015-09-18 16:17:52 +02:00
Laurent Destailleur
e974b07b09 Fix javascript error 2015-09-18 16:05:38 +02:00
Laurent Destailleur
f72f652d98 FIX Pb into pagination scroll widget 
FIX Style of previous-next card when using dolidroid
 2015-09-18 15:51:27 +02:00
Laurent Destailleur
14b6a74b2d Fix javascript error on POS 2015-09-18 14:13:15 +02:00
Laurent Destailleur
3eb8d3105a NEW Better look for POS. More responsive design. 2015-09-18 14:11:50 +02:00
Laurent Destailleur
fd8afdf098 Fix javascript error on POS 2015-09-18 14:11:06 +02:00
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