2
0
forked from Wavyzz/dolibarr
Commit Graph

31 Commits

Author SHA1 Message Date
Alexandre SPANGARO
499eb87173 lang file for holidays is holiday 2019-10-13 08:20:37 +02:00
Laurent Destailleur
aaeb7dc9d6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/holiday.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
2019-05-10 17:45:33 +02:00
Juanjo Menent
2b182c1cc1 FIX: #11097 2019-05-09 20:39:30 +02:00
Frédéric FRANCE
315349a681 replace @public by @var 2019-04-18 18:41:02 +02:00
Philippe GRAND
af4edbba2b update with html5 compliant code 2019-03-14 14:26:43 +01:00
Frédéric FRANCE
c5c27fdb77 add visibility 2019-03-01 19:24:06 +01:00
Laurent Destailleur
7e4a4c2ae6 Merge pull request #10587 from frederic34/patch-23
Update mod_holiday_immaculate.php
2019-02-14 13:28:56 +01:00
Frédéric FRANCE
9370c8b3f6 Update mod_holiday_immaculate.php 2019-02-13 23:36:16 +01:00
Frédéric FRANCE
e0843e6130 Update modules_holiday.php 2019-02-13 23:35:44 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
8b601bd7fd Fix numbering of holidays 2018-10-25 18:50:53 +02:00
Philippe GRAND
7eda9c846c Standardize and update code 2018-09-20 15:01:03 +02:00
Philippe GRAND
7903a64c36 Standardize and update code 2018-09-20 14:23:09 +02:00
Philippe GRAND
7b50935e49 Standardize and update code 2018-09-20 13:44:45 +02:00
Frédéric FRANCE
3847df1de6 move phpcs:ignore 2018-09-04 21:53:53 +02:00
Frédéric FRANCE
fd6281b364 move phpcs:ignore 2018-09-04 20:00:09 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
6b6daf178f Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Philippe GRAND
edb566501d Update and standardize code 2018-08-17 18:54:41 +02:00
Frédéric FRANCE
d30874750f Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-14 09:02:12 +02:00
Frédéric FRANCE
850ac34020 mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
0b5a87a443 Update modules_holiday.php 2018-08-13 17:25:41 +02:00
Laurent Destailleur
e06eb9e2fc Fix phpcs 2018-06-30 18:38:23 +02:00
BENKE Charlene
3d268933a4 Create mod_holiday_madonna.php 2018-05-07 22:35:19 +02:00
BENKE Charlene
a20632d31d Create mod_holiday_immaculate.php 2018-05-07 22:34:26 +02:00
BENKE Charlene
ffaff97af1 Create modules_holiday.php 2018-05-07 22:33:14 +02:00
BENKE Charlene
8546943898 Create index.html 2018-05-07 22:30:40 +02:00