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

44838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ef73201b3e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-08 00:11:21 +01:00
Laurent Destailleur
37b5de83b0 git push origin developMerge branch 'aspangaro-develop-html5' into develop 2014-12-08 00:10:30 +01:00
Laurent Destailleur
d7dd496239 Merge branch 'develop-html5' of https://github.com/aspangaro/dolibarr into aspangaro-develop-html5 2014-12-08 00:09:01 +01:00
Laurent Destailleur
c3734b1a88 Merge pull request #2103 from grandoc/develop 
add default payment mode select
 2014-12-08 00:03:05 +01:00
Laurent Destailleur
6ddae270b9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-07 23:52:02 +01:00
Laurent Destailleur
ec0c7476fb Work on select2 prototype. 2014-12-07 23:51:36 +01:00
Laurent Destailleur
634a9d8402 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2014-12-07 19:19:48 +01:00
Laurent Destailleur
1db6d86c78 Fix: versions 2014-12-07 19:10:24 +01:00
Laurent Destailleur
c35018be5f Fixed: Translations 2014-12-07 18:24:45 +01:00
Laurent Destailleur
455a2fe07a Fixed: Missing hook init 
Fixed: Translation at wrong place
 2014-12-07 15:14:24 +01:00
Laurent Destailleur
dce4b4acc2 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-07 15:13:37 +01:00
Laurent Destailleur
a4a7489a54 Fix: Missing the hook init 2014-12-07 15:12:32 +01:00
Laurent Destailleur
0b766b1f47 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-07 12:11:26 +01:00
Laurent Destailleur
ff23b0c0a6 Fix: No print 2014-12-07 12:10:50 +01:00
Laurent Destailleur
3186a8c23f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-07 12:07:53 +01:00
Laurent Destailleur
a59ac280bc Doxygen 2014-12-07 02:19:57 +01:00
Laurent Destailleur
c731321024 New: Function yn can show a visual checkbox 2014-12-07 01:57:23 +01:00
Laurent Destailleur
0459477097 Fix: Miscellaneous fixes for multicompany 2014-12-06 14:41:56 +01:00
Laurent Destailleur
1ad4ae5c78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-06 14:06:07 +01:00
Laurent Destailleur
71683d20cf Update doc 2014-12-06 14:05:51 +01:00
Juanjo Menent
c655af6135 Trad: Create es_ES productbatch from transifex 2014-12-06 11:06:34 +01:00
Juanjo Menent
fe23a851e7 Fix: datepicker first day of week can be monday by setting into 
display setup
 2014-12-06 11:03:48 +01:00
Juanjo Menent
0d9aa452b8 Trad: Create es_ES productbatch from transifex 2014-12-06 11:01:15 +01:00
Juanjo Menent
430b2ff8db Fix: datepicker first day of week can be monday by setting into 
display setup
 2014-12-06 11:00:49 +01:00
Juanjo Menent
6720d3d706 Trad: Update es_ES from transifex 2014-12-06 01:27:11 +01:00
Juanjo Menent
dc2bd10cec Trad: Update es_ES from transifex 2014-12-06 01:25:52 +01:00
Laurent Destailleur
72c3954f36 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
 2014-12-05 21:12:35 +01:00
Laurent Destailleur
f261e1736c Update doc 2014-12-05 21:10:38 +01:00
Laurent Destailleur
df066c3741 Fix: PHPCS 2014-12-05 20:34:36 +01:00
Laurent Destailleur
344aa40858 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	dev/codesniffer/ruleset.xml
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 20:21:40 +01:00
Laurent Destailleur
5f353c39d1 Fix: PHPCS 2014-12-05 20:18:30 +01:00
Laurent Destailleur
efe2719f48 Fix: PHPCS 2014-12-05 20:12:32 +01:00
Laurent Destailleur
9b5a03fa82 Fix: PHPCS 2014-12-05 20:08:37 +01:00
Laurent Destailleur
46f9ab15da Fixed: PHPCS 2014-12-05 19:26:21 +01:00
Laurent Destailleur
5755a046c5 Fix: PHPCS 2014-12-05 19:25:08 +01:00
Laurent Destailleur
17c6f84061 Update doc 2014-12-05 19:18:53 +01:00
Laurent Destailleur
ed5b89f7f1 Update doc 2014-12-05 17:55:18 +01:00
Laurent Destailleur
4ad93cd069 Fix: PHPCS 2014-12-05 17:49:27 +01:00
Laurent Destailleur
a5bdf952ee Fix: PHPCS 2014-12-05 17:44:47 +01:00
Laurent Destailleur
c36d362248 Fix: PHPCS 2.0 2014-12-05 17:38:34 +01:00
Laurent Destailleur
d3a22c42ab Try to solve pb with phpcs 2014-12-05 16:45:19 +01:00
Laurent Destailleur
4e181e3763 End test 2014-12-05 16:36:37 +01:00
Laurent Destailleur
b92e2520ea Test travis 2014-12-05 16:08:12 +01:00
Laurent Destailleur
a9338a0f9f Fix: Maxi debug of module productbatch. 
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 16:04:37 +01:00
Laurent Destailleur
41c9929613 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-05 16:01:23 +01:00
Laurent Destailleur
5457d3116a Fix: Maxi debug of module productbatch. 2014-12-05 16:01:01 +01:00
Laurent Destailleur
ceba894d57 Start to work on new generation combo box. 2014-12-05 13:26:47 +01:00
Laurent Destailleur
168e97e6ee Test 2014-12-05 01:28:59 +01:00
Laurent Destailleur
bff65fc6b4 Fix: starting with var with always same color 2014-12-05 01:25:18 +01:00
Laurent Destailleur
b702439bdd Test 2014-12-05 00:39:35 +01:00