Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

18964 Commits

Author SHA1 Message Date
stickler-ci
b2187c829a Fixing style errors. 2019-09-11 22:44:17 +00:00
ATM john
bf924f113e Add more style ans edit button 2019-09-12 00:37:36 +02:00
Laurent Destailleur
84e197e48a Clean code 2019-09-12 00:09:49 +02:00
Laurent Destailleur
5fd88f438f Clean code 2019-09-12 00:03:51 +02:00
Laurent Destailleur
d7d764e5f9 Fix var not defined 2019-09-11 23:56:53 +02:00
ATM john
907669bb51 New ticket messaging page 2019-09-11 23:30:09 +02:00
Frédéric FRANCE
e0f17cc71c add socialnetworks dictionary 2019-09-11 22:47:23 +02:00
Frédéric FRANCE
3fddef0c9e add socialnetworks dictionary 2019-09-11 22:27:09 +02:00
Abbes Bahfir
797bab4741 fix: repetition 2019-09-11 18:44:12 +01:00
Laurent Destailleur
3f3282400a FIX SQL syntax error and CSRF check on vat reports 2019-09-11 13:57:15 +02:00
Laurent Destailleur
5f236fda2e More complete error message with hour/min/sec 2019-09-11 00:28:09 +02:00
ATM john
9db2e27289 add widget box for supplier orders awaiting reception 2019-09-10 21:47:08 +02:00
stickler-ci
017a0fb70f Fixing style errors. 2019-09-10 19:42:31 +00:00
Philippe GRAND
6634ef4de5 Merge remote-tracking branch 'origin/develop' into new_branch_29_06_2019 2019-09-10 21:40:04 +02:00
Laurent Destailleur
eb2f48332b Show first line of code 2019-09-10 15:58:56 +02:00
Laurent Destailleur
48aedcee20 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2019-09-10 15:31:29 +02:00
Laurent Destailleur
d4e26fcc55 FIX missing include (dol_convert_file not found) 2019-09-10 15:29:33 +02:00
Tim Otte
8f4b2436e4 Ooops 2019-09-10 09:13:42 +02:00
Tim Otte
0c68a7b0e6 Possible solution for the problem "SELECT * is forbidden by SQL rules" 2019-09-10 09:11:31 +02:00
florian HENRY
d081a73dca Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-10 08:36:54 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
08f8ad6f30 FIX javascript error when using dol_use_jmobile=1 2019-09-10 00:09:18 +02:00
VESSILLER
3ea2e0c915 NEW add parent id or ref column in warehouse import 2019-09-09 15:03:20 +02:00
florian HENRY
5961c29d23 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-09 14:53:30 +02:00
florian HENRY
ee931d0f25 fix travis 2019-09-09 14:53:23 +02:00
Laurent Destailleur
66a9fabd06 If you develop your own emailing target selector and used 
parent::add_to_target(...), you must now use parent::addToTargets(...)
 2019-09-09 14:18:25 +02:00
florian HENRY
42cd15400d Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-09 14:12:34 +02:00
florian HENRY
42b3640a5a fix travis 2019-09-09 14:12:28 +02:00
Laurent Destailleur
0466ee1941 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 14:08:20 +02:00
Laurent Destailleur
d2131a0be8 Add filter on usage on project list 2019-09-09 14:08:10 +02:00
Laurent Destailleur
28ba5abb89 Clean code 2019-09-09 13:31:14 +02:00
Laurent Destailleur
d3bc05de76 Merge pull request #11848 from atm-john/add_progress_to_global_task_list 
Add progress to global task list
 2019-09-09 13:08:53 +02:00
Laurent Destailleur
235cfa5a5b Merge pull request #11846 from atm-john/fix_missing_total_progress 
Fix missing total progress column
 2019-09-09 13:07:10 +02:00
Laurent Destailleur
2c0d7ba97d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 12:58:42 +02:00
Laurent Destailleur
21d84f63a5 Work on template 2019-09-09 12:58:32 +02:00
Laurent Destailleur
64506a3e00 Merge pull request #11843 from aspangaro/11.0_translation 
Translation
 2019-09-09 12:57:55 +02:00
florian HENRY
617e430998 fix stravis and sticker 2019-09-09 12:31:17 +02:00
florian HENRY
63a83a0fa5 resolve conflict 2019-09-09 11:35:37 +02:00
david
ac539d20b9 FIX #10460 compatibility with MariaDB 10.4 2019-09-09 11:10:08 +02:00
Laurent Destailleur
071dad3233 Merge pull request #11844 from dgfmdrv/develop 
FIX #10460 compatibility with MariaDB 10.4
 2019-09-09 11:09:46 +02:00
Laurent Destailleur
73c3fa40bf Update phpunit 2019-09-09 10:53:13 +02:00
Laurent Destailleur
15eaa5cbd8 NEW Public holidays are now in a table (no more hard coded per country) 2019-09-09 10:27:56 +02:00
florian HENRY
bdb297a380 resolve conflict 2019-09-09 10:15:44 +02:00
Laurent Destailleur
5cc0b24f6f Fix param 2019-09-08 21:24:01 +02:00
Laurent Destailleur
1d311b2969 Fix scrutinizer 2019-09-08 21:21:33 +02:00
ATM john
ecddeb2b8b Add progress to global task list 2019-09-08 21:19:15 +02:00
ATM john
a639724b92 Fix follow tasks and time spent 2019-09-08 18:13:15 +02:00
ATM john
fa5cda2e88 Fix missing total progress column 2019-09-08 18:03:14 +02:00
Alexandre SPANGARO
985cfab8e9 Traduction 2019-09-08 05:22:13 +02:00
Alexandre SPANGARO
3ddd123eb1 Traduction 2019-09-08 05:18:52 +02:00