Commit Graph

44859 Commits

Author SHA1 Message Date
Laurent Destailleur
fd8219e187 Merge pull request #2143 from frederic34/patch-7
Typo
2014-12-10 11:34:28 +01:00
Laurent Destailleur
45d78c8c89 Merge pull request #2141 from frederic34/patch-5
Typo
2014-12-10 11:33:41 +01:00
Laurent Destailleur
b7c476d339 Merge pull request #2139 from frederic34/patch-3
Use same size for select_produits_fournisseur and select_produits
2014-12-10 11:30:57 +01:00
Laurent Destailleur
806fdf731f Merge pull request #2140 from frederic34/patch-4
Truncate label different for small or big screen
2014-12-10 11:30:29 +01:00
Frédéric FRANCE
37e5a97f84 Typo 2014-12-09 23:07:41 +01:00
Frédéric FRANCE
275ba0e3de Typo 2014-12-09 22:21:51 +01:00
Frédéric FRANCE
9f1ec0e710 Update html.form.class.php 2014-12-09 20:52:55 +01:00
Frédéric FRANCE
66f634f217 Update functions.lib.php 2014-12-09 20:47:54 +01:00
Frédéric FRANCE
6a01b6982e Update html.form.class.php 2014-12-09 20:20:52 +01:00
Frédéric FRANCE
590618eb38 Update functions.lib.php 2014-12-09 20:17:13 +01:00
Frédéric FRANCE
34b42ba798 Truncate label different for small or big screen 2014-12-09 18:47:12 +01:00
Frédéric FRANCE
8cae2f1448 Use same size for select_produits_fournisseur and select_produits 2014-12-09 16:21:44 +01:00
Laurent Destailleur
0ea7d51b22 Fixed: Several fix in color management (function at wrong place, mark
param that are deprecated, convertion of value to get correct
format in all situation)
2014-12-08 19:05:22 +01:00
Laurent Destailleur
e95160c218 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/user/agenda_extsites.php
2014-12-08 17:51:36 +01:00
Laurent Destailleur
f1ec0348ce Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-08 17:31:25 +01:00
Laurent Destailleur
bd91603cd8 Fixed: form outside table 2014-12-08 17:28:26 +01:00
Laurent Destailleur
1616f05068 Fixed: missing css 2014-12-08 02:51:26 +01:00
Laurent Destailleur
4d7f3cb741 Fixed: Pb of wrapping login page
New: Use placeholder
2014-12-08 02:41:21 +01:00
Laurent Destailleur
ea687b4957 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-08 00:30:42 +01:00
Laurent Destailleur
d9e5a597e4 Fixed: Avoid wrapping of help text 2014-12-08 00:29:33 +01:00
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
1e8e7474d8 Fixed: specimen init did not include new vars of 3.7 2014-12-07 21:22:43 +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