Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

6320 Commits

Author SHA1 Message Date
Frédéric FRANCE
de3a67f5bd Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-12 21:52:06 +02:00
Frédéric FRANCE
0d3a2f800b fix colspan in show_project 2019-09-12 21:39:57 +02:00
ATM john
859904587f add private support and title buttons 2019-09-12 21:17:48 +02:00
Frédéric FRANCE
6f33874d75 add entity 2019-09-12 21:13:00 +02:00
Frédéric FRANCE
cd109d04cd add function 2019-09-12 20:44:24 +02:00
John Botella
7dcb871048 Fix private message type 2019-09-12 18:39:29 +02:00
Laurent Destailleur
56a99f6e6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-12 11:22:13 +02:00
florian HENRY
d6dcbc714c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-12 09:38:14 +02:00
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
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
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
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
florian HENRY
42cd15400d Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-09 14:12:34 +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
florian HENRY
63a83a0fa5 resolve conflict 2019-09-09 11:35:37 +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
ATM john
ecddeb2b8b Add progress to global task list 2019-09-08 21:19:15 +02:00
ATM john
fa5cda2e88 Fix missing total progress column 2019-09-08 18:03:14 +02:00
Laurent Destailleur
f08c07f315 Fix bugs reported by scrutinizer 2019-09-06 10:42:51 +02:00
florian HENRY
dff7be59c8 mostlyDone 2019-09-06 09:22:53 +02:00
Laurent Destailleur
37a32af7b0 NEW Add dictionary to store public holidays. 2019-09-05 20:19:13 +02:00
Laurent Destailleur
f893854986 Fix remove warnings 2019-09-05 14:24:13 +02:00
Laurent Destailleur
4a19f510fd Fix scrutinizer reports 2019-09-05 13:58:35 +02:00
Laurent Destailleur
f4a7714f82 Fix bad log 2019-09-05 13:42:58 +02:00
Laurent Destailleur
9666200d6b Enhance error management 2019-09-04 19:55:15 +02:00
Tim Otte
54d0b94b6d Added extrafield support to the product supplier price lines 2019-09-04 15:13:42 +02:00
Laurent Destailleur
b445c0eec7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
 2019-09-03 22:40:26 +02:00
Laurent Destailleur
0a17e6bfd5 FIX Several pb in export of documents 
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
 2019-09-03 22:39:24 +02:00
florian HENRY
73c5b9617f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-03 17:07:59 +02:00
florian HENRY
6c20fbafdf add trigger files 2019-09-03 17:04:42 +02:00
Laurent Destailleur
ca7ce63648 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
 2019-09-02 23:04:15 +02:00
Laurent Destailleur
a126b1e538 FIX Add char $ and ; in sanitizing of filenames. 2019-09-02 22:25:44 +02:00
florian HENRY
d811de4da2 let only triggers part 2019-09-02 22:01:48 +02:00
Laurent Destailleur
a96742ee9b Can search into global site files. 
Support of cancel to previous page
 2019-09-02 18:43:22 +02:00
Laurent Destailleur
c068177027 Work on search on global site files 2019-09-02 16:39:56 +02:00
florian HENRY
405c92640c on going 2019-09-02 14:47:32 +02:00
florian HENRY
b535bc0cb9 start dev 2019-09-02 11:27:04 +02:00
Laurent Destailleur
29d2e7edd0 missing reposition 2019-09-02 04:39:36 +02:00
Laurent Destailleur
ee15ccf82e missing reposition 2019-09-02 04:28:55 +02:00