Commit Graph

78626 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
bed959bb38 add entity 2019-09-12 21:17:52 +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
Frédéric FRANCE
fa44af1df8 work on user 2019-09-12 20:03:28 +02:00
Frédéric FRANCE
e4a0de245a work on user 2019-09-12 18:41:26 +02:00
Frédéric FRANCE
34f928556d work on user 2019-09-12 18:32:47 +02:00
Frédéric FRANCE
62922884fe specimens 2019-09-12 18:12:28 +02:00
Frédéric FRANCE
9f3c54e5a5 definitions 2019-09-12 18:04:24 +02:00
Laurent Destailleur
ca997a4172 Comment 2019-09-12 11:56:42 +02:00
Laurent Destailleur
decddd2157 Doc 2019-09-12 11:23:10 +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
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
Frédéric FRANCE
3e11476810 add socialnetworks dictionary 2019-09-11 23:09:20 +02:00
Frédéric FRANCE
dc2ea3cef9 add socialnetworks dictionary 2019-09-11 23:00:14 +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
ee11da1075 Update ChangeLog 10.0.2 2019-09-11 21:08:49 +02:00
Laurent Destailleur
6d20a656bb FIX CSRF check when using stripe old payment methods 2019-09-11 18:44:10 +02:00
Laurent Destailleur
db900cb5ea FIX EDB-ID:47370 2019-09-11 17:51:50 +02:00
Laurent Destailleur
eeaeefe20c FIX Add repair.php option 'restore' to restore user picture after v10 2019-09-11 15:46:37 +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
4ecbc1719f Update ckeditor 4.12 2019-09-10 17:57:31 +02:00
Laurent Destailleur
d2b2cc010b Update ckeditor 4.12 2019-09-10 17:50:55 +02:00
Laurent Destailleur
eb2f48332b Show first line of code 2019-09-10 15:58:56 +02:00
Laurent Destailleur
5fa40f1d62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 15:32:50 +02:00
Laurent Destailleur
0e62d315f2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-10 15:32:03 +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
Laurent Destailleur
bf104f609a NEW Add pagination on list of object of a category 2019-09-10 01:44:36 +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
ba33369af6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-10 00:10:08 +02:00
Laurent Destailleur
08f8ad6f30 FIX javascript error when using dol_use_jmobile=1 2019-09-10 00:09:18 +02:00
Laurent Destailleur
28785b31d7 Removed useless div 2019-09-09 19:18:01 +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
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
d061e61d25 Fix add_to_target has only 1 param. 2019-09-09 13:45:25 +02:00
Laurent Destailleur
28ba5abb89 Clean code 2019-09-09 13:31:14 +02:00
Laurent Destailleur
f2b9517dac FIX #11834 2019-09-09 13:16:31 +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
6b355997da Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-09 13:05:52 +02:00
Laurent Destailleur
f6e04ba314 Fix sql error 2019-09-09 13:05:41 +02:00
Laurent Destailleur
c7bab8681a Fix sql error #11845 2019-09-09 13:05:08 +02:00
Laurent Destailleur
39924cd413 Merge pull request #11842 from aspangaro/10.0_p8
FIX #11401 Adherent unknown language key
2019-09-09 12:59:16 +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