Commit Graph

9716 Commits

Author SHA1 Message Date
Laurent Destailleur
6317cb53f2 FIX Merge of 2 thirdparties when there is one common tag. 2016-06-20 15:42:16 +02:00
Laurent Destailleur
195fcc5653 Minor fixes 2016-06-20 11:43:53 +02:00
Laurent Destailleur
10f2d7cd67 Fix Debug and minor fixes 2016-06-20 10:54:02 +02:00
Laurent Destailleur
8356dd1080 Fix minor 2016-06-20 10:22:08 +02:00
Laurent Destailleur
7f4e163a52 Fix scrutinizer reports 2016-06-20 02:37:02 +02:00
Laurent Destailleur
74f19944b9 Fix rtl language ar_SA 2016-06-20 00:13:30 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
Laurent Destailleur
eac5cbb0dd FIX Fix the reposition on the clear target button. 2016-06-19 11:59:55 +02:00
Laurent Destailleur
0cbfb28a0f FIX using media files in dolfilemanager with spaces inside. 2016-06-19 11:45:13 +02:00
Laurent Destailleur
e08ac03618 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-19 11:19:30 +02:00
Laurent Destailleur
cd122462aa Fix errors on files/dir permissions on dolfilemanager. 2016-06-19 11:19:11 +02:00
Laurent Destailleur
4382f2a437 Clean language files 2016-06-18 11:06:11 +02:00
Laurent Destailleur
988ed3947c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-17 16:28:28 +02:00
Laurent Destailleur
34c741bf0d FIX CSS and responsive behaviour (feature with a menu hider is on on
smarpthone)
2016-06-17 16:28:16 +02:00
Laurent Destailleur
243a30e5de Code comment 2016-06-17 15:51:09 +02:00
Laurent Destailleur
48f30b5ef1 Cleaner menu 2016-06-17 12:39:00 +02:00
Laurent Destailleur
4c29e87a78 Merge pull request #5318 from BoboTiG/develop
Fix status icon of unpaid invoices box
2016-06-16 20:25:25 +02:00
Alexis Algoud
25fe110a34 FIX a task without project inclusion call a non included object Link 2016-06-16 14:08:14 +02:00
Laurent Destailleur
3720c95a52 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-16 09:50:45 +02:00
Laurent Destailleur
232f525f29 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/core/lib/project.lib.php
2016-06-15 18:31:43 +02:00
Laurent Destailleur
5b5b7a2bf9 FIX Bad value used for task warning delay
FIX Compatibility datee and date_end for warning of tasks
2016-06-15 14:05:48 +02:00
Laurent Destailleur
1396f11b77 css fix 2016-06-12 20:31:38 +02:00
Laurent Destailleur
65cbf1623b Fix option testmenuhider. Constant to test it is MAIN_TESTMENUHIDER 2016-06-12 20:24:05 +02:00
Laurent Destailleur
aed2c5cb30 Clean css 2016-06-10 18:41:18 +02:00
Laurent Destailleur
74e59a1bc4 Debug prototype feature "testmenuhider" 2016-06-10 18:41:10 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
Laurent Destailleur
ad001ed4dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-07 14:06:17 +02:00
Laurent Destailleur
c7065cc3b8 Minor esthetic fixes 2016-06-07 13:15:38 +02:00
BoboTiG
2f8915947f Add GROUP BY to be SQL standart compliant 2016-06-07 10:16:20 +02:00
Laurent Destailleur
dcc1589d7c Merge pull request #5312 from aspangaro/4.0-p32
Loan - Debug & update
2016-06-07 00:28:20 +02:00
Laurent Destailleur
645412517d css enhancement 2016-06-06 22:07:35 +02:00
aspangaro
a6a96c710d Restore note page 2016-06-06 20:36:04 +02:00
BoboTiG
616ede1643 Unpayed invoices box: fix status icon 2016-06-06 19:05:24 +02:00
Laurent Destailleur
29fab54578 Fix box of last contracted contract (contract ref was not visible, label
was wrong).
2016-06-06 17:18:31 +02:00
Laurent Destailleur
47308d27c3 Missing column import_key and import for vat payments 2016-06-06 14:37:06 +02:00
Laurent Destailleur
1f93425193 Merge pull request #5308 from atm-maxime/develop
FIX #5044
2016-06-06 13:35:59 +02:00
Laurent Destailleur
52fefc2d02 Debug module resource 2016-06-06 13:14:05 +02:00
Laurent Destailleur
9b6e5196ea Debug module resource. Filter on agenda. 2016-06-06 13:05:36 +02:00
Laurent Destailleur
681249de8a Debug module resource 2016-06-06 12:29:15 +02:00
Maxime Kohlhaas
fdfcc064dc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2016-06-06 11:53:53 +02:00
Laurent Destailleur
51ce4804dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-06 10:58:43 +02:00
Laurent Destailleur
ff23c825ae Code comment 2016-06-06 10:58:23 +02:00
aspangaro
fda07997d2 Fix: Loan - Remove page note, already present in card 2016-06-05 15:25:21 +02:00
Maxime Kohlhaas
caaffdb0c3 FIX #5044 2016-06-05 02:54:25 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Maxime Kohlhaas
0ab4827091 FIX #5087 2016-06-05 02:06:32 +02:00
Laurent Destailleur
c07933729a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-05 00:29:40 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Maxime Kohlhaas
a5472b58d1 FIX #5108 2016-06-05 00:24:00 +02:00
Laurent Destailleur
db2269b9dd Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/langs/en_US/admin.lang
2016-06-05 00:12:34 +02:00