Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
65,163 Commits 36 Branches 189 Tags
40d04482b030e4b697e23fcb51e37b00f7b2d47b
Commit Graph

13372 Commits

Author SHA1 Message Date
Laurent Destailleur
5fa8db1650 Work on timesheets 2017-11-22 21:19:40 +01:00
Laurent Destailleur
adce4b5b7b Debug multi contact on event. 
Prepare also code to manage properties of attendees of event
 2017-11-22 14:42:47 +01:00
Laurent Destailleur
fd5cb736ce Merge pull request #6961 from atm-ph/new_event_with_multi_contact 
New multi contacts on actioncomm
 2017-11-22 12:05:04 +01:00
Laurent Destailleur
aa91b9075a Fix cancel button 2017-11-22 11:54:02 +01:00
Laurent Destailleur
d2b3fc5813 Merge pull request #7849 from IonAgorria/resources-card 
NEW: Merge resource/add.php to resource/card.php
 2017-11-22 11:33:56 +01:00
Laurent Destailleur
30d0c4f210 Merge pull request #7845 from vvnt/patch-6 
modSociete.class.php (spelling correction)
 2017-11-22 11:33:03 +01:00
Laurent Destailleur
918a51b9da Merge pull request #7844 from vvnt/patch-5 
modPropale.class.php (spelling correction)
 2017-11-22 11:28:25 +01:00
Laurent Destailleur
f6cc441c2e Merge pull request #7843 from vvnt/patch-4 
Update modFacture.class.php (Spelling correction)
 2017-11-22 11:28:05 +01:00
Laurent Destailleur
62da0160e1 Merge pull request #7780 from fappels/develop_update_tablednd 
FIX #3551 and #6823 table drag and drop not working.
 2017-11-22 11:22:14 +01:00
Laurent Destailleur
c3d8ef2104 Update functions.lib.php 2017-11-22 11:14:52 +01:00
Regis Houssin
a9bfe0f48f Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876) 2017-11-22 10:12:51 +01:00
Regis Houssin
848a27283b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_member 2017-11-22 09:51:57 +01:00
Regis Houssin
1595bb1148 NEW add possibility to remove address field 2017-11-22 09:51:46 +01:00
Ion
7c6622f5b3 Merge resource/add.php to resource/card.php 2017-11-21 20:12:55 +01:00
vvnt
c74eef03dd modSociete.class.php (spelling correction) 
Minor spelling correction.
 2017-11-21 15:17:02 +01:00
vvnt
005be3f69b modPropale.class.php (spelling correction) 
Minor spelling correction
 2017-11-21 15:13:13 +01:00
vvnt
98998a7060 Update modFacture.class.php 2017-11-21 15:07:53 +01:00
Laurent Destailleur
2b95679b84 Add info to help spam fight 2017-11-21 14:09:15 +01:00
Laurent Destailleur
a630e665d9 Work on modulebuilder 2017-11-21 11:50:57 +01:00
Laurent Destailleur
4b4412d5da Standardize file names for ECM 2017-11-20 19:40:34 +01:00
Laurent Destailleur
e19ca7b6d4 Work on generic filemanager 2017-11-20 18:19:41 +01:00
Laurent Destailleur
818f43e7ad Work on generic filemanager 2017-11-19 22:04:24 +01:00
Laurent Destailleur
6953420ce8 Support for ar_EG as laternative of ar_AS 2017-11-19 21:25:21 +01:00
Laurent Destailleur
5849efd9fc Work on public sharing files 2017-11-19 20:44:57 +01:00
Laurent Destailleur
4ad0d5df43 Fix scrutinizer issues 2017-11-19 16:55:28 +01:00
Laurent Destailleur
248a359ac9 Fix phpcs 2017-11-19 16:30:05 +01:00
Laurent Destailleur
304819a726 Work on module builder 2017-11-19 16:26:39 +01:00
Laurent Destailleur
4938a0ba2a Add param forcenowrap on tooltip function 2017-11-19 12:41:37 +01:00
Laurent Destailleur
47afe470eb Merge small js into lib_header.js.php 
Move filemanager.tpl.php
CSS enhancement
 2017-11-19 12:22:01 +01:00
Laurent Destailleur
9b1470dab5 Work on generic filemanager component 2017-11-18 22:13:19 +01:00
Laurent Destailleur
bcaccb1829 Add layout into link of sub resources to solve undesired cache effect 2017-11-18 12:35:25 +01:00
atm-ph
15a8f2037b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-11-18 11:54:21 +01:00
Laurent Destailleur
80bdb45be8 Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:48:16 +01:00
Laurent Destailleur
742bf29c65 Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:29:42 +01:00
Laurent Destailleur
7349b5d793 Fix php 7.2 2017-11-17 17:23:56 +01:00
Laurent Destailleur
2705030006 Code comment 2017-11-17 15:34:15 +01:00
Laurent Destailleur
2cb190fc5c Fix return code 2017-11-17 15:27:59 +01:00
Laurent Destailleur
776f999b71 Merge branch 'develop' into develop_update_tablednd 2017-11-17 15:10:09 +01:00
Laurent Destailleur
ead629708c Look and feel v6 2017-11-17 14:57:14 +01:00
Laurent Destailleur
405275693f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/replenishorders.php
	htdocs/projet/activity/perday.php
 2017-11-17 14:20:08 +01:00
Laurent Destailleur
68f477eaf7 Merge pull request #7818 from dolibarr95/patch-29 
Fix : syntax error in dol_print_graph()
 2017-11-17 13:18:11 +01:00
Laurent Destailleur
e06087888b NEW Show line "other filtered task" when using filter on timesheet. 2017-11-16 22:55:04 +01:00
Laurent Destailleur
f153d9c9ff Fix time spent counted twice 2017-11-16 19:41:31 +01:00
Laurent Destailleur
4f25bc5e3b NEW detection of edge browser 2017-11-16 14:44:55 +01:00
Laurent Destailleur
c527189088 Standardize page name 2017-11-16 12:18:25 +01:00
dolibarr95
c6c1552c01 syntax error 
bad syntax when add an url in dol_print_graph()
 2017-11-15 11:11:45 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
 2017-11-14 19:47:33 +01:00
Laurent Destailleur
501f5b8292 Merge duplicate translation key 2017-11-14 18:26:39 +01:00
Laurent Destailleur
451d3ed8ed NEW Add API to activate/unactivate a contract 2017-11-14 17:51:04 +01:00
Laurent Destailleur
a50589c3c9 NEW Better behaviour when using a text browser 2017-11-14 15:10:46 +01:00