Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-15 21:33:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 38 Branches 191 Tags
e3a0220658b7dfc05bfb499ace614fda170e4f3b
Commit Graph

3991 Commits

Author SHA1 Message Date
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