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

1764 Commits

Author SHA1 Message Date
Laurent Destailleur
66a288a343 Merge pull request #12235 from frederic34/scopeindent 
clean indent
 2019-10-30 02:57:59 +01:00
Laurent Destailleur
6073692654 Merge pull request #12243 from TobiasSekan/FixEventSortNonNumeric 
Fix non-numeric error in sort event function
 2019-10-30 02:57:00 +01:00
Tobias Sekan
bfe7ad211f Fix non-numeric error in sort event function 
Fix non-numeric error in sort event function and fix mixed space and tab indent, use spaces
 2019-10-28 09:53:27 +01:00
Frédéric FRANCE
1a10b30a76 clean indent in comm directory 2019-10-26 14:28:40 +02:00
Norbert Penel
a67b3d8cf5 Implement new now feature 
8d75e83e55
 2019-10-24 18:55:43 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Frédéric FRANCE
86f22c4563 do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Laurent Destailleur
b813dfe3c9 Merge pull request #12172 from TobiasSekan/FixMissingIcalAuthor 
Fix missing organizer and contact on ical export
 2019-10-20 13:49:47 +02:00
Laurent Destailleur
89b0730483 Update actioncomm.class.php 2019-10-20 13:49:36 +02:00
Tobias Sekan
28dea51c4a Fix missing organizer in ical export 2019-10-18 13:18:09 +02:00
Laurent Destailleur
f85899742b Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
 2019-10-17 17:48:42 +02:00
Laurent Destailleur
1a021e85f6 Merge pull request #12141 from TobiasSekan/FixNoneNumericValue 
Fix non-numeric value encountered on ical export
 2019-10-17 17:39:25 +02:00
Tobias Sekan
daa7f54295 fix - not removed old code line 2019-10-17 08:10:21 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Tobias Sekan
741627897e fix interchanged allocation 2019-10-16 13:56:11 +02:00
Laurent Destailleur
a57b456aa6 Merge pull request #12143 from frederic34/patch-19 
NEW Add location into event tooltip. Use full day for fullday events
 2019-10-16 13:21:55 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Frédéric FRANCE
ccd9da99f4 Update list.php 2019-10-15 20:11:15 +02:00
Tobias Sekan
199fb3be0f Fix non-numeric value encountered on ical export 2019-10-15 14:29:27 +02:00
Laurent Destailleur
9ba992b8b6 Work on inventory module 2019-10-12 12:31:35 +02:00
Laurent Destailleur
51ef2cd20a FIX #12058 2019-10-07 20:20:06 +02:00
Laurent Destailleur
d4f4f33122 Merge pull request #12048 from frederic34/patch-17 
Update card.php
 2019-10-07 10:23:51 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Frédéric FRANCE
bfd8bc839e Update card.php 2019-10-06 10:28:09 +02:00
Laurent Destailleur
b60ee4c18c css 2019-10-03 09:58:49 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
fec67aade4 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 18:44:34 +02:00
Laurent Destailleur
d3eafa86d7 Merge pull request #11988 from frederic34/patch-12 
Add hook beforeAgenda in comm/action/index.php
 2019-09-30 18:03:25 +02:00
Laurent Destailleur
ce7e8c83a3 Use a dedicated css imgforviewmode for button used to switch view 2019-09-30 17:08:57 +02:00
Frédéric FRANCE
4a305ec95c Add hook beforeAgenda in comm/action/index.php 2019-09-30 15:59:05 +02:00
Laurent Destailleur
d8de78dca9 Merge pull request #11984 from fuhraih/develop 
Fix 11554 and 7533
 2019-09-30 15:31:41 +02:00
Frédéric FRANCE
258424416e Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Laurent Destailleur
86e5465197 Standardize extrafields code 2019-09-28 10:55:09 +02:00
fuhraih
5757159c30 FIX #7533 Infinite loop in Agenda per user view if workinghours not set 
correctly
Remove the spaces in the Working_hours and Working_days stored
 2019-09-27 22:29:12 +02:00
Laurent Destailleur
c5e7413ed2 Merge branch 'develop' into fix-resource-event-move-check-busy 2019-09-27 15:35:14 +02:00
Laurent Destailleur
34813a931f Merge branch 'develop' into patch-10 2019-09-27 14:45:09 +02:00
Laurent Destailleur
f90bfb54d4 Merge pull request #11913 from frederic34/actioncommcarddoaction 
add doaction to actioncommcard
 2019-09-27 14:34:49 +02:00
Frédéric FRANCE
41cb628d05 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-25 08:06:44 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
5838fa1229 Fix az09 -> aZ09 2019-09-24 14:20:45 +02:00
Laurent Destailleur
db334a3b94 FIX Var not enough sanitized 2019-09-24 14:16:24 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
40f75b16d8 FIX Substitution of __PROJECT_XXX__ not done 2019-09-23 13:04:22 +02:00
VESSILLER
ea5ff59076 FIX check if a resource is in use after a drag and drop from events 2019-09-17 16:43:36 +02:00
Frédéric FRANCE
850b9fd52a Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-17 08:24:31 +02:00
Frédéric FRANCE
155e8fb500 fix syntax 2019-09-17 08:18:01 +02:00
Frédéric FRANCE
0d63c43ccd add doaction to actioncommcard 2019-09-17 08:15:01 +02:00
Frédéric FRANCE
ecac1f9f40 wip 2019-09-17 08:02:55 +02:00