Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

233 Commits

Author SHA1 Message Date
Laurent Destailleur
f6099fba15 Fix phpcs 2018-10-04 16:58:34 +02:00
Laurent Destailleur
378013b863 Better select language component 2018-10-03 20:58:45 +02:00
Laurent Destailleur
83be1759b1 Work on multilang website 2018-10-03 20:00:52 +02:00
Laurent Destailleur
fd859d3162 Add a component to select lang into a web site 2018-10-03 18:40:54 +02:00
Laurent Destailleur
957d5958a4 Work on website 2018-10-01 13:09:12 +02:00
Laurent Destailleur
33130853c8 Fix website 2018-09-28 00:59:02 +02:00
Laurent Destailleur
0987db765c Work on export/import 2018-09-26 11:28:41 +02:00
Laurent Destailleur
0a4d80012a Support export/import of logo site in web site templates 2018-09-26 11:15:11 +02:00
Laurent Destailleur
2ef0cb8d9b Fix cloning 2018-09-25 20:34:05 +02:00
Laurent Destailleur
eff1d1c89e Work on website module 2018-09-25 16:35:59 +02:00
Laurent Destailleur
e6be047178 Work on new management for website module 2018-09-25 15:00:37 +02:00
Laurent Destailleur
f04b8eea6d Work on website module 2018-09-24 19:21:21 +02:00
Laurent Destailleur
9dc4ad4cc3 Add warning when using editinline 2018-09-24 15:38:13 +02:00
Laurent Destailleur
ea517da85c Work on filemanager for websites 2018-09-24 15:14:32 +02:00
Laurent Destailleur
6e95fb5f05 Warning in website module 2018-09-20 14:36:13 +02:00
Frédéric FRANCE
987fdbe73c Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
3e71f4e6b0 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
3bf296c9cf Merge pull request #9448 from frederic34/loadfichetitre 
remove deprecated
 2018-09-12 18:23:24 +02:00
Laurent Destailleur
45e769243d Fix import web site 2018-09-11 00:11:14 +02:00
Laurent Destailleur
a4a4b8ddff Fix error management 2018-09-10 23:23:44 +02:00
Laurent Destailleur
b0be1ddadb Fix files generated 2018-09-10 23:20:31 +02:00
Laurent Destailleur
9e982e05df Fix import 2018-09-10 22:58:20 +02:00
Laurent Destailleur
280f15e8bf Fix fk_user 2018-09-10 21:55:03 +02:00
Laurent Destailleur
98c3657d45 Fix default status of website 2018-09-10 21:43:21 +02:00
Laurent Destailleur
5a279bfce0 Fix import 2018-09-10 21:25:30 +02:00
Laurent Destailleur
3de8381c20 Website module 2018-09-10 19:36:46 +02:00
Laurent Destailleur
47cfda6734 Webiste 2018-09-10 09:09:51 +02:00
Frédéric FRANCE
0e0db9d1ee remove deprecated 2018-09-09 15:52:55 +02:00
Laurent Destailleur
5719a38ea7 Work on website module. Support now links to company logos. 2018-09-09 14:05:23 +02:00
Frédéric FRANCE
7e0b1055db Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-09 13:36:53 +02:00
Frédéric FRANCE
f02b2f0239 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Frédéric FRANCE
e73bd6da6b completly comment unused code 2018-09-09 13:29:58 +02:00
Laurent Destailleur
a5edd530d2 Fix delete of website 2018-09-08 14:10:07 +02:00
Laurent Destailleur
a2b71d9a7a NEW Can delete a website in experimental website module 2018-09-08 12:04:40 +02:00
Frédéric FRANCE
65b74ad30f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
2a9ef8dc05 move phpcs:ignore 2018-09-02 22:05:19 +02:00
Frédéric FRANCE
35232b753a move phpcs:ignore 2018-09-02 20:37:12 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Philippe GRAND
c013f9cf3d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 15:13:04 +02:00
Laurent Destailleur
c2548b8b39 Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm 
NEW hook formConfirm always called if hooked
 2018-09-01 14:50:08 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Philippe GRAND
3a8bde227b Standardize and update code 2018-08-31 19:26:08 +02:00
Philippe GRAND
70ae8c6081 Standardize and update code 2018-08-31 18:27:16 +02:00
ksar-ksar
49d3bea192 Remove the test 
After discussion with Frederic, the best solution is to remove the test
 2018-08-30 11:27:48 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
fe4260a014 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00