Laurent Destailleur
|
1797569a6d
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2014-11-29 16:44:37 +01:00 |
|
Laurent Destailleur
|
278cdf72d6
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2014-11-29 12:41:26 +01:00 |
|
Laurent Destailleur
|
06df952e57
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2014-11-29 12:40:20 +01:00 |
|
Laurent Destailleur
|
0a7255ccc1
|
Fixed: Module for target emailing must not be visible when modules is
disabled.
|
2014-11-29 12:38:36 +01:00 |
|
Laurent Destailleur
|
e118d9af22
|
Fixed: Protection to lock language setup in demo mode was not working
|
2014-11-29 12:11:12 +01:00 |
|
aspangaro
|
c27e2676e3
|
Modify presentation of login page
|
2014-11-29 07:08:35 +01:00 |
|
Ion Agorria
|
fac46b3b46
|
Code for dinamic prices funcionality
|
2014-11-29 06:31:35 +01:00 |
|
Laurent Destailleur
|
d3b32ce22f
|
Fixed: Bad function/picto for information messages (not a star)
|
2014-11-28 19:49:42 +01:00 |
|
Frédéric FRANCE
|
369f802112
|
Fix mix of space and nbsp
|
2014-11-28 08:50:37 +01:00 |
|
aspangaro
|
1c89186652
|
Merge remote-tracking branch 'Upstream/develop' into develop-html5
|
2014-11-28 06:20:01 +01:00 |
|
Laurent Destailleur
|
a724c3aa70
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/main.inc.php
|
2014-11-28 02:26:40 +01:00 |
|
Laurent Destailleur
|
df9a6dae6c
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fichinter/fiche.php
|
2014-11-28 02:20:01 +01:00 |
|
Laurent Destailleur
|
a81c483061
|
Revert "Update objectline_create.tpl.php"
This reverts commit fdac53bfca.
|
2014-11-28 02:14:25 +01:00 |
|
Laurent Destailleur
|
9ba5e9434d
|
Fix: W3C a label must be used if there is an "input" field only. Also it
is recommanded to have the input inside the label tags, not outside.
This solve bugs on some smatphone browsers.
|
2014-11-28 02:05:40 +01:00 |
|
Marcos García de La Fuente
|
1c16a2e621
|
Fixed [ bug #1642 ]: add a free line in contract
|
2014-11-28 01:15:45 +01:00 |
|
Laurent Destailleur
|
44b81ad29c
|
Merge pull request #2074 from marcosgdf/bug-1642
Fixed [ bug #1642 ]: add a free line in contract
|
2014-11-28 01:14:23 +01:00 |
|
Laurent Destailleur
|
38062177d3
|
Doxygen
|
2014-11-28 00:37:46 +01:00 |
|
Laurent Destailleur
|
ae6f458a98
|
Merge pull request #2092 from frederic34/patch-2
Fix Typo
|
2014-11-28 00:12:11 +01:00 |
|
Laurent Destailleur
|
02d53aa26f
|
Merge pull request #2093 from frederic34/patch-4
Fix Typo
|
2014-11-28 00:11:49 +01:00 |
|
Laurent Destailleur
|
b21171303a
|
Merge pull request #2094 from frederic34/patch-5
Fix Typo
|
2014-11-28 00:11:23 +01:00 |
|
Laurent Destailleur
|
631a98c322
|
Merge pull request #2095 from frederic34/patch-6
Fix Typo
|
2014-11-28 00:10:48 +01:00 |
|
Laurent Destailleur
|
61889d2195
|
Merge pull request #2096 from frederic34/patch-7
Fix Typo
|
2014-11-28 00:10:24 +01:00 |
|
Laurent Destailleur
|
6843bfcc15
|
Fix typo
|
2014-11-28 00:01:59 +01:00 |
|
Laurent Destailleur
|
d9cb9c1585
|
Merge pull request #2102 from aspangaro/develop-center
Task 1603 - Remove <center> deprecated HTML5 tags
|
2014-11-27 23:58:44 +01:00 |
|
Laurent Destailleur
|
60e5369db2
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/bookmarks/card.php
|
2014-11-27 22:01:02 +01:00 |
|
aspangaro
|
b98c0a3208
|
Login - Better presentation with RWD
|
2014-11-27 20:32:29 +01:00 |
|
Philippe GRAND
|
217cacbc29
|
To avoid over wrighting lines
|
2014-11-27 17:26:06 +01:00 |
|
aspangaro
|
21f14320cf
|
Untranslatable token in datepicker
|
2014-11-27 05:07:04 +01:00 |
|
Frédéric FRANCE
|
2ee55a39fd
|
Update ecm.lib.php
|
2014-11-26 18:35:16 +01:00 |
|
Frédéric FRANCE
|
90b582b1f3
|
Fix 1733 Homepage boxes close button translation error
In french : Close -> Clotûrer (Close a propal)
Close2 ->Fermer (Close a window)
|
2014-11-26 16:58:54 +01:00 |
|
aspangaro
|
38d94bac33
|
Correct login page
|
2014-11-25 21:47:08 +01:00 |
|
aspangaro
|
559bf93acb
|
Correct
|
2014-11-25 20:40:00 +01:00 |
|
aspangaro
|
c4c69e191b
|
Replace <center> tags
|
2014-11-25 20:13:43 +01:00 |
|
Francis Appels
|
18406fc550
|
Fix: Show sender Country on PDF docs
Show sender Country on PDF docs when sender Country != receiver Country
|
2014-11-25 14:26:45 +01:00 |
|
Frédéric FRANCE
|
911f9c0913
|
Fix Typo
|
2014-11-25 01:13:52 +01:00 |
|
Frédéric FRANCE
|
e4517ee0f4
|
Fix Typo
|
2014-11-25 01:07:45 +01:00 |
|
Frédéric FRANCE
|
9fb58e06f6
|
Fix Typo
|
2014-11-25 01:06:55 +01:00 |
|
Frédéric FRANCE
|
6163635d7c
|
Fix Typo
|
2014-11-25 01:06:04 +01:00 |
|
Frédéric FRANCE
|
9d813b25d9
|
Fix Typo
|
2014-11-25 01:05:01 +01:00 |
|
Laurent Destailleur
|
1dbb19e8ef
|
Merge pull request #2058 from defrance69/patch-30
Update objectline_create.tpl.php
|
2014-11-24 10:57:14 +01:00 |
|
Laurent Destailleur
|
ca1a21012e
|
Merge pull request #2086 from aspangaro/3.7-patch1
Patch module resource
|
2014-11-24 00:58:41 +01:00 |
|
Laurent Destailleur
|
7a18240d2f
|
Doxygen
|
2014-11-23 23:22:49 +01:00 |
|
aspangaro
|
aa8c165f06
|
Presentation
|
2014-11-23 21:03:34 +01:00 |
|
Marcos García de La Fuente
|
a927a04421
|
Fixed [ bug #1705 ] Members statistics menu entry strange target
|
2014-11-23 16:55:32 +01:00 |
|
Laurent Destailleur
|
9c107790e4
|
Merge pull request #2079 from marcosgdf/bug-1705
Fixed [ bug #1705 ] Members statistics menu entry strange target
|
2014-11-23 16:53:54 +01:00 |
|
Laurent Destailleur
|
245a06d433
|
Merge remote-tracking branch 'origin/3.7' into develop
|
2014-11-23 16:52:15 +01:00 |
|
Marcos García de La Fuente
|
bd765ef3ae
|
Fixed [ bug #1705 ] Members statistics menu entry strange target
|
2014-11-23 16:17:09 +01:00 |
|
Marcos García de La Fuente
|
9f73277ef2
|
Fixed [ bug #1642 ]: add a free line in contract
|
2014-11-23 13:14:54 +01:00 |
|
Laurent Destailleur
|
97a6bd842d
|
Minor fixes.
|
2014-11-23 12:39:53 +01:00 |
|
Laurent Destailleur
|
2a56a19b7d
|
Merge remote-tracking branch 'origin/3.7' into develop
|
2014-11-22 16:59:12 +01:00 |
|