lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49,202 Commits 43 Branches 150 Tags 886 MiB
dc89e6c516
Commit Graph

49202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
dc89e6c516 Merge pull request #3557 from hregis/3.8 
Fix: use get instead getJSON for avoid freezing
 2015-09-22 23:56:36 +02:00
Laurent Destailleur
077c696c09 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/.gitignore
	htdocs/theme/.gitignore
 2015-09-22 16:28:34 +02:00
Laurent Destailleur
90b78702e5 Update ignore to secure packaging 2015-09-22 16:23:51 +02:00
Laurent Destailleur
c125ba0d66 Update ignore to secure 
Conflicts:
	htdocs/.gitignore
 2015-09-22 15:42:59 +02:00
Laurent Destailleur
75daddbbe2 Update ignore to secure 2015-09-22 15:40:49 +02:00
Laurent Destailleur
c2bdd9b465 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-22 11:29:49 +02:00
Laurent Destailleur
fe6af7d8eb FIX Description of tags was mandatory in edit mode but not in create 
mode. Should not be mandatory.
 2015-09-22 11:29:26 +02:00
Laurent Destailleur
f2e2edbc64 FIX not closing CSS. 2015-09-21 15:10:52 +02:00
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
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
f9973d13b4 Merge pull request #3550 from AlainRnet/patch-2 
Update categorie.php
 2015-09-18 20:51:46 +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
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
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
Laurent Destailleur
57521f628c Fix bad path 2015-09-17 19:35:03 +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
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
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
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