lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,157 Commits 43 Branches 150 Tags 886 MiB
e455f8afa6
Commit Graph

3437 Commits

Author SHA1 Message Date
Laurent Destailleur
7b64e8643f Trans and css 2020-06-15 16:08:48 +02:00
Laurent Destailleur
6e81542148 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-12 14:36:11 +02:00
Laurent Destailleur
a0b6d9c4e0 css 2020-06-12 01:19:50 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
c70cd01971 Fix css 2020-06-11 17:58:00 +02:00
Laurent Destailleur
5e13a7f1e2 css 2020-06-10 22:05:49 +02:00
Laurent Destailleur
5794b1abea Fix for use with text browser 
Conflicts:
	htdocs/main.inc.php
 2020-06-10 12:46:55 +02:00
Laurent Destailleur
bd22ad4174 Fix for use with text browser 2020-06-10 12:35:39 +02:00
Laurent Destailleur
ff9312c96a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/class/ligneprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/line.php
 2020-06-08 20:36:54 +02:00
Laurent Destailleur
233c7e53f1 Debug v12 2020-06-08 20:31:09 +02:00
Laurent Destailleur
6ec2ff01f1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/website/index.php
 2020-06-07 23:15:13 +02:00
Laurent Destailleur
f7563818ac css 2020-06-07 23:12:56 +02:00
Laurent Destailleur
6f12488e30 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2020-06-07 19:55:48 +02:00
Laurent Destailleur
04f68d25cd css 2020-06-07 01:34:26 +02:00
Laurent Destailleur
88aaec63f7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 18:57:41 +02:00
Laurent Destailleur
36bc266d67 css 2020-06-06 17:33:26 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
d252248319 Fix back to link in ECM menu 
Fix picto in search_page
 2020-06-05 13:41:33 +02:00
Laurent Destailleur
ae3d786593 Fix crop on media file manager 
Conflicts:
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/core/photos_resize.php
	htdocs/theme/eldy/global.inc.php
 2020-06-03 12:38:42 +02:00
Laurent Destailleur
8894570054 Fix crop on media file manager 2020-06-03 11:20:59 +02:00
Laurent Destailleur
f92426034f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:06:27 +02:00
Laurent Destailleur
054d5c5f4c css 2020-06-02 17:00:08 +02:00
Laurent Destailleur
a9973ad60e Fix language key and css 2020-06-02 15:30:07 +02:00
Laurent Destailleur
9a30d4ca44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-02 13:32:02 +02:00
Laurent Destailleur
c4d8f0b6cc css 2020-06-01 12:35:27 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +02:00
Laurent Destailleur
fbaf705c2a Look and feel v12 2020-05-27 22:50:38 +02:00
Laurent Destailleur
e37e45f984 Debug credit transfer 2020-05-27 22:35:55 +02:00
Laurent Destailleur
d3e21c82f2 CSS 2020-05-27 02:38:54 +02:00
Laurent Destailleur
e308170ed8 CSS 2020-05-27 02:38:12 +02:00
Laurent Destailleur
c607c2daa0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-26 22:31:47 +02:00
Laurent Destailleur
44273e0570 Fix duplicate code 2020-05-26 22:31:27 +02:00
Laurent Destailleur
91ecd3455f Fix CSS 2020-05-26 22:30:11 +02:00
Laurent Destailleur
da8bd7507e NEW Add mass action to set category on a list of website pages. 2020-05-26 22:29:46 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
17382051c2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 22:19:50 +02:00
Laurent Destailleur
e4ef6334aa Look and feel v12 2020-05-25 14:08:36 +02:00
Laurent Destailleur
26177489c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 13:46:39 +02:00
Laurent Destailleur
25d1a2a1d8 Restore missing png file 2020-05-25 13:36:56 +02:00
Laurent Destailleur
160ac14eb3 Update logo 2020-05-25 13:32:57 +02:00
Laurent Destailleur
0b9e1e6ec6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 13:01:49 +02:00
Laurent Destailleur
056206098b CSS 2020-05-25 12:51:17 +02:00
Laurent Destailleur
0dbb8224fb Fix logo 2020-05-25 12:50:54 +02:00
Laurent Destailleur
9e77dc0a26 CSS 2020-05-25 12:50:29 +02:00
Laurent Destailleur
c67eeeaf6c CSS 2020-05-25 11:30:52 +02:00
Laurent Destailleur
61545703d1 CSS 2020-05-25 10:58:18 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
dacb326c15 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-24 01:10:41 +02:00
Laurent Destailleur
509ce9f571 CSS 2020-05-24 01:09:45 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Laurent Destailleur
4cb0ffeb1f Fix css 2020-05-24 01:04:56 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Laurent Destailleur
9b54ed766b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 15:37:08 +02:00
Laurent Destailleur
aec5200a98 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/variants/class/ProductCombination.class.php
 2020-05-23 15:37:00 +02:00
Laurent Destailleur
394ea5075f
Merge pull request #13823 from aspangaro/12.0_a25 
NEW: Add quick dropdown menu in top right menu (MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)
 2020-05-23 15:07:27 +02:00
Laurent Destailleur
5f3a82423f Fix regression in look and feel v12 2020-05-23 14:38:37 +02:00
Laurent Destailleur
b4223dbdec
Merge branch '12.0' into fix_board_expensereport_toapprove 2020-05-23 14:32:12 +02:00
Frédéric FRANCE
0f4f727d18
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-22 08:27:12 +02:00
Maxime Kohlhaas
6b1eef9827 Fix board exepense report to approve 2020-05-22 00:50:13 +02:00
Laurent Destailleur
5d78f6dac5 NEW Add link to edit property from search result of website pages 2020-05-22 00:38:01 +02:00
Laurent Destailleur
76823d3e39 Clean CSS, clean code 2020-05-21 20:59:02 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
b58060f899
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-21 13:29:43 +02:00
Laurent Destailleur
8a481b297c Clean CSS, clean code 2020-05-21 13:06:36 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
2d0abebca3 CSS 2020-05-19 04:40:08 +02:00
Laurent Destailleur
608d3ce32f Responsive 2020-05-17 16:10:29 +02:00
Laurent Destailleur
106fe7bde6 Clean conflict between direct debit and direct credit orders. 2020-05-17 15:06:09 +02:00
Laurent Destailleur
af46108cc4 Look and feel v12 2020-05-17 13:34:16 +02:00
Laurent Destailleur
ce0d00a0ae CSS 2020-05-16 15:50:46 +02:00
Laurent Destailleur
bd4251237b css 2020-05-16 15:16:40 +02:00
Laurent Destailleur
c85233e779 Fix CSS 2020-05-16 15:12:28 +02:00
Laurent Destailleur
0781e9e227 CSS 2020-05-16 14:47:12 +02:00
Laurent Destailleur
86ff60f161 Fix break line and set of opportunity fields 2020-05-15 15:50:50 +02:00
Laurent Destailleur
949ef8d7d8 Fix css 2020-05-15 12:49:22 +02:00
Laurent Destailleur
8a2741650a Fix css 2020-05-15 12:46:55 +02:00
Laurent Destailleur
ad906fc508 Fix use SVG logo instead of PNG 2020-05-15 12:43:48 +02:00
Laurent Destailleur
6ec5dd02b6 Fix Fatal error with bad triggers 2020-05-14 15:27:10 +02:00
Laurent Destailleur
9a8e9bdc99 Position of fields 2020-05-14 14:30:43 +02:00
Laurent Destailleur
0b3e917155 CSS 2020-05-14 14:30:26 +02:00
Laurent Destailleur
4a04cecbaa CSS 2020-05-14 14:30:22 +02:00
Laurent Destailleur
410694100d CSS 2020-05-12 23:42:01 +02:00
Laurent Destailleur
e9c405182d css 2020-05-12 14:18:31 +02:00
Laurent Destailleur
c89e8efec3 responsive 2020-05-12 14:08:28 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Laurent Destailleur
c4a7923b51 CSS 2020-05-11 19:02:52 +02:00
Laurent Destailleur
a2bc46f1c0 CSS 2020-05-11 12:50:24 +02:00
Laurent Destailleur
c511af69fe Debug look and feel v12 2020-05-10 21:07:49 +02:00
Laurent Destailleur
501f1ba2c4 Fix look and feel v12 2020-05-10 15:45:07 +02:00
Regis Houssin
d9a0edcf2b FIX missing file manifest.json.php 2020-05-08 00:01:56 +02:00
Laurent Destailleur
206b16410e Revert the option to avoid to introduce a feature that is duplicate with 
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
 2020-05-07 22:52:32 +02:00
Laurent Destailleur
247acdd274 Fix position of custom groups of modules 2020-05-06 03:47:28 +02:00
Alexandre SPANGARO
489a2cd0cc NEW: Add quick dropdown menu in top right menu 2020-05-05 21:35:03 +02:00
Laurent Destailleur
ded0526ca1
Merge pull request #13738 from bb2a/patch-6 
links color for table title line is equal to Text color for table title line
 2020-05-05 18:12:07 +02:00
Anthony Berton
d81ae29ab7
Update style.css.php 2020-05-03 14:05:18 +02:00
Anthony Berton
dabb2f4ad3
Update theme_vars.inc.php 2020-05-03 14:01:42 +02:00
Anthony Berton
a31eaf2eb8
Update style.css.php 2020-05-03 13:59:40 +02:00
Laurent Destailleur
fcee3a68f4 Fix sort on file manager of website 2020-05-03 13:00:39 +02:00
Anthony Berton
2f18b444d7
Update style.css.php 2020-05-03 10:44:37 +02:00
Anthony Berton
f299f0f849
Update theme_vars.inc.php 2020-05-03 10:42:49 +02:00