Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 05:21:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
96,016 Commits 36 Branches 190 Tags
0127a3bedb51f05f32f11c23fe9a2398ad1c7e21
Commit Graph

2095 Commits

Author SHA1 Message Date
Frédéric FRANCE
67abd6d1d6 go back actioncomm create after create project 2021-03-12 17:05:11 +01:00
Laurent Destailleur
c3a047ee06 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
 2021-03-08 19:31:47 +01:00
Laurent Destailleur
2f0c4038fb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
 2021-03-08 19:27:34 +01:00
Frédéric FRANCE
c0c9ac439f Update api_agendaevents.class.php 2021-03-08 00:23:05 +01:00
Frédéric FRANCE
45189de496 Update api_agendaevents.class.php 2021-03-08 00:16:28 +01:00
Florian HENRY
6844c57413 fix sql 2021-03-04 07:53:32 +01:00
Florian HENRY
ec52ed445c fix ambigous 2021-03-03 22:18:42 +01:00
Florian HENRY
04c6d5dd8f fix sql 2021-03-03 22:16:35 +01:00
Florian HENRY
91b93ac7ce fix sql 2021-03-03 22:10:17 +01:00
Florian HENRY
9c256ab8a8 fix review 2021-03-03 21:40:37 +01:00
Florian HENRY
4e2f929460 test 2021-03-03 21:11:04 +01:00
Florian HENRY
55e9a6596b test 2021-03-03 21:10:50 +01:00
Florian HENRY
1913564b38 fix travis 2021-03-03 16:28:14 +01:00
stickler-ci
e28f844d54 Fixing style errors. 2021-03-02 21:31:48 +00:00
Florian HENRY
e5e3abd685 class conference or booth or and table actioncomm ok 2021-03-02 22:23:54 +01:00
Florian HENRY
6862c206aa merge from develop 2021-03-02 21:48:35 +01:00
Florian HENRY
32ef55cd9e working default status/percent for event actioncomm 2021-03-01 20:58:02 +01:00
Florian HENRY
b5fd3e4984 on going 2021-03-01 17:06:03 +01:00
Laurent Destailleur
9cf4222d3a Look and feel v14 2021-02-27 17:15:40 +01:00
stickler-ci
eca98237f0 Fixing style errors. 2021-02-27 13:57:52 +00:00
Florian HENRY
eb17ae5fe2 fix event type select 2021-02-27 14:13:42 +01:00
Florian HENRY
bf04a8cf1b ongoing 2021-02-27 13:35:16 +01:00
Frédéric FRANCE
5931051c88 code syntax comm directory 2021-02-23 18:59:19 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Laurent Destailleur
485dd07f67 NEW Can show the holidays on the agenda view. 2021-02-18 23:13:55 +01:00
Laurent Destailleur
acc3915576 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-18 17:08:27 +01:00
Laurent Destailleur
27818b68ae Fix tz pb in week view 2021-02-18 17:07:39 +01:00
Laurent Destailleur
2afc85cb88 Fix navigation link in agenda views 2021-02-18 16:35:38 +01:00
Laurent Destailleur
72e4c00760 Fix showifmore 2021-02-18 16:13:30 +01:00
Laurent Destailleur
041a7f54e3 Fix cursor 2021-02-18 16:10:46 +01:00
Laurent Destailleur
b607ed6259 Look and feel v14 2021-02-18 15:58:38 +01:00
Laurent Destailleur
76a729147c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-18 15:42:38 +01:00
Laurent Destailleur
9d12aeee49 Fix timezone problem with drag and drop 2021-02-18 15:41:52 +01:00
Laurent Destailleur
72ad47c75f Fix link to create a new event in calendar 2021-02-18 15:20:05 +01:00
Laurent Destailleur
2904cc803f Fix selection in combo 2021-02-18 13:56:13 +01:00
Laurent Destailleur
56d2ac274a NEW Support color of type of event 2021-02-18 12:46:42 +01:00
Laurent Destailleur
fc9d6cef97 Enhancement Auto and manual calendar. Better separation. 2021-02-18 11:16:36 +01:00
Laurent Destailleur
9e16cd5b77 Look and feel v14 2021-02-14 20:47:57 +01:00
Laurent Destailleur
66c7770146 Factorize some common code for type of event 2021-02-14 20:12:43 +01:00
Laurent Destailleur
45789ec21c Fix TZ problems 
Conflicts:
	htdocs/core/lib/company.lib.php
 2021-02-07 19:47:33 +01:00
Laurent Destailleur
8c71c8335e Fix TZ problems 2021-02-07 19:44:22 +01:00
Laurent Destailleur
7b72ac5a7a Look and feel v14 2021-02-06 12:10:27 +01:00
Laurent Destailleur
6e7e8d7d36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	test/phpunit/CodingPhpTest.php
 2021-02-03 23:26:08 +01:00
Laurent Destailleur
d608a46c95 Fix dates 2021-02-03 22:47:35 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
3798892fd3 FIX Hide/Unhide external ICSS calendars 2021-02-03 19:53:28 +01:00
Laurent Destailleur
2e9656a5b2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/filefunc.inc.php
 2021-02-02 03:26:20 +01:00
Laurent Destailleur
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +01:00
Laurent Destailleur
7de4e622a9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-31 19:12:26 +01:00
Laurent Destailleur
7ffa9c6d99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-01-31 19:11:34 +01:00