Commit Graph

49434 Commits

Author SHA1 Message Date
Laurent Destailleur
ea7384cf68 git push origin developMerge branch 'defrance-patch-73' into develop 2015-09-23 19:22:08 +02:00
Laurent Destailleur
95daf14725 Merge branch 'patch-73' of https://github.com/defrance/dolibarr into
defrance-patch-73

Conflicts:
	htdocs/core/lib/functions.lib.php
2015-09-23 19:21:59 +02:00
Laurent Destailleur
94c485ef85 Merge pull request #3547 from GPCsolutions/mysqlerrhandling
Used OOP for mysqli connector
2015-09-23 18:32:35 +02:00
Laurent Destailleur
1c421a2fd2 Merge pull request #3569 from tysauron/patch-5
For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE
2015-09-23 18:26:20 +02:00
tysauron
f8f50b3071 For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE 2015-09-23 01:24:30 +02:00
Laurent Destailleur
f81df66564 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/.gitignore
	htdocs/categories/edit.php
2015-09-23 00:34:57 +02:00
tysauron
f1ab0d36c5 Chmod new file not old file 2015-09-23 00:32:30 +02:00
Laurent Destailleur
33f1dfd6f0 Merge pull request #3568 from tysauron/patch-4
Chmod new file not old file
2015-09-23 00:31:52 +02:00
Laurent Destailleur
e62bb4da13 Make parameter required 2015-09-23 00:09:32 +02:00
Laurent Destailleur
00b858e644 Merge pull request #3564 from FHenry/3.8
FIX : remove twice same test
2015-09-23 00:07:28 +02:00
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
tysauron
2d237cadc9 Chmod new file not old file 2015-09-22 22:37:31 +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
72d7671a1e Enhance CSS 2015-09-22 16:21:46 +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
2ce43dc0d8 Update ignore to secure 2015-09-22 15:40:17 +02:00
Laurent Destailleur
9acc75ac12 Test if Zend OPCache is installed 2015-09-22 14:23:24 +02:00
Laurent Destailleur
da6a1d6629 NEW Introduce a method getDefaultCreateValueForField for developers to
get a default value to use for a form in create mode.
Implement it for public and private notes.
2015-09-22 13:55:31 +02:00
Florian HENRY
178208918f FIX : remove twice same test 2015-09-22 12:03:11 +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
ee683049a6 Enhance CSS capabilities 2015-09-22 11:24:31 +02:00
Laurent Destailleur
23f6464999 Work on CSS 2015-09-22 01:25:06 +02:00
Laurent Destailleur
30703e184c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-21 17:28:32 +02:00
Laurent Destailleur
58a734cb17 Firstname only on login 2015-09-21 17:28:11 +02:00
Laurent Destailleur
d8c01a63f2 Merge pull request #3540 from AlainRnet/patch-1
Update categorie.php
2015-09-21 15:46:43 +02:00
Laurent Destailleur
fd90ac517f Add ignore file 2015-09-21 15:43:37 +02:00
Laurent Destailleur
c0ef8baa9d A better error message 2015-09-21 15:38:17 +02:00
Laurent Destailleur
2df47ff99c Better responsive top menu 2015-09-21 15:18:29 +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
bf85caade6 Move a file that is not an external lib 2015-09-18 21:53:35 +02:00
Laurent Destailleur
0821f18712 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-18 21:50:10 +02:00
Laurent Destailleur
397e409b9a Merge pull request #3543 from GPCsolutions/firephp
Installed FirePHP with composer
2015-09-18 20:53:27 +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
8332609d06 Merge pull request #3539 from All-3kcis/develop-patch-6
FIX  #3524
2015-09-18 20:49:27 +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
9658da5b7c Merge pull request #3549 from aternatik/api_rest_fix_composer
FIX #3548 : API not working after removing Composer
2015-09-18 20:46:16 +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