Laurent Destailleur
f98df3c807
NEW Can edit link to the translation page in website module
2019-10-31 21:09:33 +01:00
Laurent Destailleur
628018ca2b
css
2019-10-31 17:31:45 +01:00
Laurent Destailleur
360b3a9550
NEW Ask the new label and new dates in confirm popup when cloning tax
2019-10-31 14:06:26 +01:00
Frédéric FRANCE
7f3f48be0f
clean indent in theme directory
2019-10-26 21:11:36 +02:00
Laurent Destailleur
de6b9c5fc7
Fix tabs not visible
2019-10-24 11:56:07 +02:00
Laurent Destailleur
f4545a2068
Debug method MAIN_STATUS_USES_CSS
2019-10-23 17:31:54 +02:00
Laurent Destailleur
e261d63295
NEW Can add a button "Create" after combo of object with modulebuilder.
2019-10-21 14:44:39 +02:00
Laurent Destailleur
7960c91955
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/theme/md/style.css.php
2019-10-16 17:27:41 +02:00
Laurent Destailleur
dd97a2e666
CSS
2019-10-16 14:11:11 +02:00
Laurent Destailleur
86e4ca55df
Merge
2019-10-16 14:04:54 +02:00
Laurent Destailleur
a1c93cb2e6
MAIN_ACTIVATE_HTML5 is now always on now (so option removed).
...
Look and feel v11
2019-10-15 02:45:12 +02:00
Laurent Destailleur
c869cbe193
Merge pull request #11995 from atm-john/develop_unlock_title_button_feature
...
Unlock title button feature
2019-10-14 23:55:10 +02:00
Laurent Destailleur
9c94ffeea9
Fix css
2019-10-12 18:40:41 +02:00
John Botella
1fdc38da2f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fix_logo_bg
2019-10-11 14:36:48 +02:00
Laurent Destailleur
de107fb02e
NEW Can set a squarred icon on your company setup
2019-10-11 11:27:05 +02:00
John Botella
4873cbd071
Fix css name
2019-10-11 10:10:12 +02:00
John Botella
13115a55a2
Fix logo background and hidden conf
2019-10-11 10:02:59 +02:00
John Botella
535a09e856
Fix block title height if no button MD
2019-10-11 09:17:17 +02:00
Laurent Destailleur
e7f56b67d8
Look and feel v11
2019-10-10 23:00:33 +02:00
Laurent Destailleur
fce07cf8ca
CSS
2019-10-10 22:52:11 +02:00
Laurent Destailleur
f82f4162c3
NEW Look and fill v11: Introduce CSS "trforbreak"
2019-10-10 22:42:23 +02:00
Laurent Destailleur
072a0a26d6
Use a font awesome icon to show "shippable" flag on orders.
2019-10-09 18:07:00 +02:00
Laurent Destailleur
346e9f3e1b
Fix import of web site
...
Fix sort on constant setup page lost
2019-10-09 15:01:19 +02:00
Laurent Destailleur
9d534617a0
css
2019-10-08 21:10:51 +02:00
Laurent Destailleur
f83cc0bcfd
Picto of user umage larger
2019-10-08 21:02:59 +02:00
Laurent Destailleur
f55a4d77e4
css
2019-10-08 16:41:03 +02:00
Laurent Destailleur
2bb55200f7
Clean user card
2019-10-07 13:46:13 +02:00
Alexandre SPANGARO
d0840b038f
Remove constant MAIN_DISABLE_FONT_AWESOME_5
2019-10-03 20:42:02 +02:00
Laurent Destailleur
65d68a9de0
css
2019-10-02 15:03:15 +02:00
Laurent Destailleur
c6d38227b6
NEW Use a dedicated css for the pencil to edit a field
2019-10-02 14:44:38 +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
Laurent Destailleur
d65af06d20
Merge pull request #11869 from atm-john/new_ticket_messaging_page
...
New ticket messaging page design
2019-09-30 15:34:35 +02:00
Laurent Destailleur
f6b60290f0
FIX Css on disabled standard combo
2019-09-30 11:57:25 +02:00
Laurent Destailleur
f96c9c3bb5
FIX #11931 #11963
2019-09-27 11:51:34 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Laurent Destailleur
41a2a25729
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/ligne.php
2019-09-17 12:23:58 +02:00
Laurent Destailleur
68842b0b63
Fix css for company logo in top menu
2019-09-16 19:08:45 +02:00
Laurent Destailleur
8d79404914
Fix css for responsive
2019-09-16 18:40:58 +02:00
Laurent Destailleur
544a1237bc
FIX regression with option to hide picto on top menu
2019-09-15 15:11:13 +02:00
Laurent Destailleur
7019e69ee2
FIX regression with option to hide picto on top menu
2019-09-15 15:09:36 +02:00
Laurent Destailleur
5137104b92
Fix responsive
2019-09-13 01:46:18 +02:00
Laurent Destailleur
48e03e1ab5
Fix responsive
2019-09-13 01:38:41 +02:00
ATM john
bf924f113e
Add more style ans edit button
2019-09-12 00:37:36 +02:00
Laurent Destailleur
e7e663a27e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-05 17:57:41 +02:00
Laurent Destailleur
04174316c8
Fix css for expanded dir in ecm
2019-09-05 17:57:21 +02:00
Laurent Destailleur
7438eecc64
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/type.php
2019-09-02 04:41:43 +02:00
Laurent Destailleur
46affe9090
Fix css on smartphone
2019-09-01 21:14:56 +02:00
Laurent Destailleur
af6e25d928
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-31 12:37:58 +02:00
Laurent Destailleur
524b0cd85f
FIX Mode smartphone was not triggered when there is too loo menu
...
entries.
2019-08-31 12:34:18 +02:00
Laurent Destailleur
210effc742
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-30 04:18:23 +02:00
Laurent Destailleur
906506b74c
Fix alignement of legend
2019-08-30 04:14:45 +02:00
Laurent Destailleur
9fd4f839ec
Use css "pictomodule" for picto of modules
2019-08-28 19:28:50 +02:00
Laurent Destailleur
cc3fd0f1f6
Merge pull request #11679 from atm-john/develop_new_task_progress_bar
...
FIX/NEW task widget and add task progress bar
2019-08-19 10:05:16 +02:00
Laurent Destailleur
2587dc041f
Minor CSS fix
2019-08-19 09:46:22 +02:00
Laurent Destailleur
58573632ab
Fix css
2019-08-18 06:00:33 +02:00
Laurent Destailleur
7e4cf224ec
Merge branch 'develop' into develop_new_task_progress_bar
2019-08-18 05:38:45 +02:00
Laurent Destailleur
2285e0d780
Make colors less aggressive
2019-08-18 02:07:40 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard
2019-08-18 01:26:56 +02:00
Laurent Destailleur
386f929fe3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/website.lib.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
2019-08-15 23:39:02 +02:00
Laurent Destailleur
056626b8e3
Nicer toolbar for website menu
2019-08-15 18:59:08 +02:00
Regis Houssin
056f51bfc5
FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme
2019-08-13 07:14:42 +02:00
ATM john
22c4a1b49e
Merge branch 'develop_new_dashboard' of github.com:atm-john/dolibarr into develop_new_task_progress_bar
2019-08-11 09:57:13 +02:00
ATM john
3a21805a02
add style to md
2019-08-11 09:46:40 +02:00
John Botella
4ae818f7a6
Fix md theme missing style
2019-08-06 10:58:18 +02:00
John Botella
690d09be3e
Fix md theme missing style
2019-08-06 10:36:24 +02:00
Laurent Destailleur
a63a6a5853
FIX Online payment
2019-07-28 23:49:05 +02:00
Laurent Destailleur
220f8300c1
FIX Responsive of public interface of ticket
2019-07-20 00:14:14 +02:00
Laurent Destailleur
e3359c6f0f
FIX Can't submit a ticket from public interface
2019-07-05 11:21:04 +02:00
Laurent Destailleur
512b832c77
CSS
2019-07-04 13:26:20 +02:00
Laurent Destailleur
560f145a32
Fix css
2019-06-25 11:35:40 +02:00
Laurent Destailleur
08d5ca4ddb
Debug page to export accounting documents
2019-06-17 17:53:43 +02:00
Laurent Destailleur
1520ca9646
Fix buttons for payments
2019-06-07 13:51:53 +02:00
Laurent Destailleur
1415ad5b53
Debug website module
2019-06-02 17:27:00 +02:00
Laurent Destailleur
d6aef89719
Fix css
2019-05-25 12:42:12 +02:00
Laurent Destailleur
728e270307
Fix css
2019-05-24 23:11:05 +02:00
Laurent Destailleur
4d8aba6963
Fix CSS
2019-05-22 11:48:31 +02:00
Laurent Destailleur
eafc35b00f
Look and feel v10
2019-05-21 13:27:45 +02:00
Laurent Destailleur
54441a1abd
Fix css
2019-05-21 12:36:18 +02:00
Laurent Destailleur
d86fc28aba
Fix CSS
2019-05-19 13:01:11 +02:00
Laurent Destailleur
278d4fdb8e
Fix css
2019-05-13 20:55:05 +02:00
Laurent Destailleur
eab49d4300
NEW Update Stripe library to 6.34.3
2019-05-03 02:22:27 +02:00
Laurent Destailleur
ab1f371ea5
Fix encoding on expense report PDF
2019-04-24 20:58:27 +02:00
Laurent Destailleur
72025f6d5d
Fix CSS
2019-04-23 15:54:24 +02:00
Laurent Destailleur
8e8fc7e557
Fix css
2019-04-13 12:48:44 +02:00
Laurent Destailleur
ebe8f27c16
Fix on smartphone
2019-04-13 10:29:09 +02:00
Laurent Destailleur
861c1b412c
CSS
2019-04-09 19:23:34 +02:00
Laurent Destailleur
ff629b2355
NEW Color for hover and for checked line is on by default
2019-04-09 15:57:26 +02:00
Laurent Destailleur
1ffb5a72d5
Replace image with font awesome
2019-04-05 14:45:54 +02:00
Laurent Destailleur
9e98421333
CSS
2019-04-05 11:09:58 +02:00
Laurent Destailleur
c5f5abc67d
Fix css for MD theme
2019-04-03 14:37:38 +02:00
Laurent Destailleur
7120078b0f
NEW Simplification of styles architcture: Showing or not the menuhider
...
is completely decided by CSS and screen size instead of PHP+CSS.
2019-04-03 13:26:50 +02:00
Laurent Destailleur
c1157679e8
Show a chevron top/down after login
2019-03-30 14:30:06 +01:00
Laurent Destailleur
26e3f41f73
Translation
2019-03-29 16:18:47 +01:00
Laurent Destailleur
c43cf843a9
Merge branch 'theme_top_menu_login' of https://github.com/atm-john/dolibarr into atm-john-theme_top_menu_login
2019-03-22 11:15:02 +01:00
Laurent Destailleur
23ce97fb2d
NEW Introduce css "nobottomiftotal"
2019-03-19 16:01:03 +01:00
Laurent Destailleur
70c2ffc816
FIX toggle of login_block was ko with eldy theme
2019-03-19 14:22:57 +01:00
Laurent Destailleur
3b4bcc67c9
Merge pull request #10780 from atm-john/theme_sidebarr_toggle
...
NEW/FIX Theme sidebarr toggle
2019-03-15 19:41:39 +01:00
Laurent Destailleur
a2d6723ff3
WIP Link files to expense report lines
2019-03-15 15:07:52 +01:00
Frédéric FRANCE
9be780f47d
Update style.css.php
2019-03-14 09:18:51 +01:00
John BOTELLA
240162b347
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu_login
2019-03-12 14:00:52 +01:00
John BOTELLA
288ce5c553
add more info
2019-03-12 14:00:26 +01:00
Laurent Destailleur
73b6ad733f
Make font awesome 5.7 used by default
2019-03-12 10:34:19 +01:00
Laurent Destailleur
d762766a56
Font awesome 5 by default
2019-03-12 10:11:34 +01:00
John BOTELLA
be2885c75b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_sidebarr_toggle
2019-03-12 09:24:42 +01:00
Laurent Destailleur
6daa262779
Files for variables of themes were renamed from graph-color.php into
...
theme_vars.inc.php to match naming convention of extension .inc.php for
files to be included.
2019-03-11 20:32:25 +01:00
Laurent Destailleur
0480b7ee4a
CSS
2019-03-11 18:29:01 +01:00
Laurent Destailleur
1bd422b8b9
CSS
2019-03-10 14:45:16 +01:00
John BOTELLA
56a40c7de8
Fix sidebar collapse behavior
2019-03-08 14:06:37 +01:00
John BOTELLA
1127716abf
add support for md theme
2019-03-07 17:50:26 +01:00
John BOTELLA
218690db00
add css behavior
2019-03-07 17:05:27 +01:00
Laurent Destailleur
d4409ffb08
Restore menu MRP on new eldy code
2019-03-06 14:18:58 +01:00
Frédéric FRANCE
0c2a77cb53
Merge remote-tracking branch 'upstream/develop' into patch-2
2019-03-05 18:14:15 +01:00
Laurent Destailleur
7d37b4c46d
CSS
2019-03-05 13:04:54 +01:00
Frédéric FRANCE
bdba88a6d5
remove warning
2019-03-04 18:23:52 +01:00
Laurent Destailleur
27402f432a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/class/don.class.php
htdocs/product/stock/card.php
htdocs/theme/eldy/style.css.php
2019-03-04 16:29:16 +01:00
Laurent Destailleur
d502d10da4
CSS
2019-03-03 21:05:33 +01:00
Laurent Destailleur
83fc10e917
css
2019-03-03 13:38:45 +01:00
Laurent Destailleur
03237d1730
NEW Look and feel v10 - Add CSS tabBarNoTop
2019-03-02 18:20:13 +01:00
Laurent Destailleur
5f6ca1119a
Replace arrow picto with fontawesome
2019-03-02 14:07:13 +01:00
Laurent Destailleur
56d921ea52
CSS
2019-03-02 12:57:07 +01:00
Laurent Destailleur
70744a8ca0
CSS
2019-02-27 13:58:26 +01:00
Laurent Destailleur
3a2a1b4a56
Debug module ticket
2019-02-26 13:43:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Laurent Destailleur
af6a7446ee
Merge pull request #9871 from laudeco/feature/fontawesome_migration
...
migrate font awesome to 5.4.1
2018-12-22 19:52:39 +01:00
Laurent Destailleur
2d2b95a082
Fix calculation of top menu entry of user
2018-12-18 17:01:57 +01:00
Laurent Destailleur
57c41bac56
Fix parameter session_cache_limiter
2018-12-18 15:07:32 +01:00
Laurent Destailleur
16496218d3
css
2018-12-18 13:21:00 +01:00
Laurent Destailleur
250725663d
FIX Missing generic css
2018-12-11 13:48:12 +01:00
Laurent Destailleur
9e20d9e847
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-29 11:03:16 +01:00
Laurent Destailleur
10fc0149d8
responsive
2018-11-29 11:03:02 +01:00
Laurent Destailleur
ef3a280f40
Merge pull request #10082 from grandoc/new_branch_26_11_2018
...
fix typo error
2018-11-29 10:57:48 +01:00
Laurent Destailleur
b9c08853be
CSS
2018-11-28 16:54:21 +01:00
Philippe GRAND
a59a4c60e0
FIX : Typo errors
2018-11-26 16:09:05 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
6401a7ab06
Fix css
2018-11-08 16:03:10 +01:00
Laurent Destailleur
f4346c1469
Fix css
2018-11-03 19:24:28 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Laurent Destailleur
5d249d71ca
Fix menu at wrong place
2018-10-26 14:38:26 +02:00
De Coninck Laurent
35bf07bab6
migrate fontawesome to 5.4.1
...
migrate the fontawesome to the latest library in the idea to use the last one (more complete) to use fontawesome icons instead of images.
Font awesome 5.4.1 is leighter than the previous loaded version.
2018-10-25 17:54:29 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
f8316abfc0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/theme/md/style.css.php
2018-10-24 02:58:29 +02:00
Laurent Destailleur
919c4fc5bc
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/theme/md/style.css.php
2018-10-24 02:40:57 +02:00
Laurent Destailleur
2ba6f96765
Update style.css.php
2018-10-24 02:27:59 +02:00
Frédéric FRANCE
83e2951107
Update style.css.php
2018-10-21 09:59:14 +02:00
Frédéric FRANCE
28c86a613d
Update style.css.php
2018-10-21 09:39:07 +02:00
Frédéric FRANCE
c4029f5e5f
Update style.css.php
2018-10-21 09:23:33 +02:00
Laurent Destailleur
66cb06eca9
NEW Top menu is always on screen with MD theme.
2018-10-18 17:33:14 +02:00
Laurent Destailleur
8779d3043f
css
2018-10-13 14:22:26 +02:00
Laurent Destailleur
1ca3a41f4f
Fix login
2018-10-13 14:16:42 +02:00
Laurent Destailleur
ded5c4c3dd
Social network module
2018-10-12 11:02:03 +02:00
Laurent Destailleur
f154139a0e
Reduce length of tab title "Bank"
2018-10-04 20:22:25 +02:00
Laurent Destailleur
5f897eb7ee
Clean code
2018-10-01 00:40:02 +02:00
Laurent Destailleur
f990719daa
Add experimental module TakePOS
2018-09-28 13:31:41 +02:00
Laurent Destailleur
5bd538fb2c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/modStripe.class.php
htdocs/filefunc.inc.php
htdocs/projet/element.php
2018-09-20 23:43:34 +02:00
Laurent Destailleur
df395847d3
FIX #9567
2018-09-20 19:14:32 +02:00
Laurent Destailleur
09a41fd757
Look and feel v8
2018-09-19 17:33:50 +02:00
Laurent Destailleur
a8ecec68e7
css
2018-09-18 11:58:26 +02:00
Laurent Destailleur
d872beb499
Fix css
2018-09-17 12:59:43 +02:00
Laurent Destailleur
a75629e8e9
CSS
2018-09-17 12:25:49 +02:00
Laurent Destailleur
bbfe4462dc
NEW Add lib for multiselect with checkboxes
...
NEW Can select several prospect level in thirdparty filter.
Remove old multiselect lib that was not used by core.
2018-09-15 13:31:25 +02:00
Laurent Destailleur
78e983a1f5
CSS v9
2018-09-13 16:39:50 +02:00
Laurent Destailleur
b4264ee0a0
Use font awesome for sort image
2018-09-12 21:57:32 +02:00
Ferran Marcet
b658626e21
NEW: Highlight lines on lists when they are checked
2018-09-04 11:54:13 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Laurent Destailleur
18125d56e5
css
2018-07-23 14:10:59 +02:00
Laurent Destailleur
174394c476
Work on website module
2018-07-23 14:08:20 +02:00
Laurent Destailleur
f419964c76
Fix Debug website module
2018-07-20 15:01:50 +02:00
Laurent Destailleur
00165871bd
CSS
2018-06-23 15:10:44 +02:00
Laurent Destailleur
0170906524
Look and feel
2018-06-23 14:39:24 +02:00
Laurent Destailleur
6dba88ab6e
Several fixes in look and feel
2018-06-23 14:23:07 +02:00
Laurent Destailleur
7daee6dc6b
A lot of fix of css and look and feel v8
2018-06-23 00:07:56 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +02:00
Laurent Destailleur
19e40466b1
css
2018-06-19 13:26:30 +02:00
Laurent Destailleur
187127ce6f
Fix CSS
2018-06-16 21:19:50 +02:00
Laurent Destailleur
87d073b5cd
Fix conflict with external ticketsup module
2018-06-04 21:49:29 +02:00
Laurent Destailleur
a6104d18a9
CSS
2018-06-02 16:36:05 +02:00
Laurent Destailleur
3d97fa36d1
CSS
2018-05-25 11:08:05 +02:00
Laurent Destailleur
32ace6a8cf
NEW Add hook setContentSecurityPolicy
2018-04-30 15:17:38 +02:00
Laurent Destailleur
39aef07c6b
FIX Only voters can send comments in public survey page
2018-04-25 17:14:18 +02:00
Laurent Destailleur
271e50ccf4
CSS
2018-04-24 10:06:13 +02:00
Laurent Destailleur
9b57dadc18
css
2018-04-21 00:05:14 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
46d28acb44
Look and feel v8
2018-04-18 02:10:23 +02:00
Laurent Destailleur
1e0a660d24
More font awesome picto instead of img
2018-04-16 19:57:46 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
8c307987d8
css
2018-04-16 00:26:13 +02:00
Laurent Destailleur
72de21537c
Clean code
2018-04-15 20:09:09 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
Laurent Destailleur
9e50bbb9b1
standardize code
2018-04-15 16:35:18 +02:00
Laurent Destailleur
187cc35786
Look and feel v8
2018-04-14 22:23:56 +02:00
Laurent Destailleur
2f0780a51f
csss
2018-04-14 15:53:58 +02:00
Laurent Destailleur
b68cded9c4
Clean code
2018-04-13 13:11:07 +02:00
QuentinSu
803ea150cb
Update style.css.php
...
Line break not taken into account in the GED module
2018-04-10 17:12:26 +02:00
Laurent Destailleur
99ed9c4589
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/compta/facture/list.php
2018-04-08 13:10:10 +02:00
Laurent Destailleur
79af10fc83
Fix search filters
2018-04-08 13:01:42 +02:00
Laurent Destailleur
f659b62316
CSS
2018-04-07 17:14:23 +02:00
Laurent Destailleur
d3adbdfbbc
FIX Restaure way to have empty entry menu
2018-04-06 14:04:52 +02:00
Laurent Destailleur
ff505ba148
Work on a page dedicated for external frontend (mobile, ...)
2018-03-29 11:34:01 +02:00
Laurent Destailleur
9f11cf77df
Merge ticket css in main css
2018-03-26 15:45:56 +02:00
Laurent Destailleur
53edb86ffb
Make sending of email for member module ok with new email template archi
2018-03-23 19:35:25 +01:00
Laurent Destailleur
42b0a22df2
Use font-awsome for play icon
2018-03-21 13:16:05 +01:00
Laurent Destailleur
857bb6c6ee
Css
2018-03-21 10:53:15 +01:00
Laurent Destailleur
0c45760dd4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step5.php
htdocs/langs/en_US/holiday.lang
htdocs/public/payment/newpayment.php
htdocs/public/stripe/newpayment.php
2018-03-19 17:58:19 +01:00
Laurent Destailleur
91cc3d1b73
FIX navigation and filters on holiday list
2018-03-19 16:11:42 +01:00
Laurent Destailleur
cb1069cf0b
Use font-awesome for the picto to move/transfer a line
2018-03-17 13:21:27 +01:00
Laurent Destailleur
302fed8646
More fa image to replace png picto
2018-03-14 20:08:44 +01:00
Laurent Destailleur
98b7d4c2e2
NEW Can set the start/end date of service line in invoice templates
2018-03-12 12:27:40 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
f800d50fec
WIP to show event per hours
2018-03-07 11:53:30 +01:00
Laurent Destailleur
a0a9e12178
Fix css
2018-03-07 11:29:50 +01:00
Laurent Destailleur
1e6a55745c
CSS
2018-03-06 11:54:05 +01:00
Laurent Destailleur
5839cedb4c
CSS
2018-03-04 10:47:35 +01:00
Laurent Destailleur
01b0336e9b
Fix tooltip on delete button
2018-03-03 12:10:27 +01:00
Laurent Destailleur
471aca5180
CSS
2018-03-02 11:41:46 +01:00
Laurent Destailleur
191a1e9350
Fix css
2018-03-02 11:18:29 +01:00
Laurent Destailleur
a3350d12d8
css
2018-03-01 23:51:06 +01:00
Laurent Destailleur
0a27855141
CSS
2018-03-01 18:21:47 +01:00
Laurent Destailleur
132ee2c788
CSS
2018-03-01 16:48:12 +01:00
Laurent Destailleur
2368cb615f
Look and feel v8
2018-03-01 11:51:25 +01:00
Laurent Destailleur
6f29a574cf
CSS
2018-03-01 02:37:18 +01:00
Laurent Destailleur
82a9d1797f
css
2018-02-28 19:36:04 +01:00
Laurent Destailleur
1907b9c52d
Fix search on dates on template invoices
2018-02-27 19:04:21 +01:00
Laurent Destailleur
7ba263c9ab
Fix search on dates on template invoices
2018-02-27 19:03:14 +01:00
Laurent Destailleur
de89893d57
NEW Show total of time consumed in week in time spent entry page
2018-02-26 14:09:56 +01:00
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
7722f004c8
FIX #8153
2018-02-15 14:08:42 +01:00
Laurent Destailleur
f0855da0fb
Fix responsive
2018-02-15 12:57:04 +01:00
Laurent Destailleur
18acff5e57
Fix avoid error when homepage not set
2018-02-15 01:29:51 +01:00
Laurent Destailleur
1a6cff8fee
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 01:28:14 +01:00
Laurent Destailleur
e984d7df9f
NEW Add total of time spent in timespent page at top of page too.
2018-02-09 23:52:43 +01:00
Laurent Destailleur
84fd67c407
CSS
2018-02-09 15:49:49 +01:00
Laurent Destailleur
a7682eb59f
CSS
2018-02-08 21:01:34 +01:00
Laurent Destailleur
0f51963600
NEW Externalsite module can accept iframe content.
2018-02-08 19:00:13 +01:00
Laurent Destailleur
eccdc9a075
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Laurent Destailleur
b56da9c11e
Better balance css columns in dashboard
2018-02-08 15:11:05 +01:00
Laurent Destailleur
729cf20df7
Fix css
2018-02-07 20:53:13 +01:00
Laurent Destailleur
b1f43a14bd
CSS
2018-02-07 02:29:55 +01:00
Laurent Destailleur
930d58ab96
Fix import supplier product price vat
2018-02-06 10:03:06 +01:00
Laurent Destailleur
074f4a3b46
Fix class not found when selecting project ref in lists
2018-02-06 00:34:14 +01:00
Laurent Destailleur
ad621f4035
CSS
2018-02-05 23:17:05 +01:00
Laurent Destailleur
85964e02de
Fix css
2018-02-05 12:34:11 +01:00
Laurent Destailleur
18ed53b9a7
Fix css
2018-01-24 18:04:06 +01:00
Laurent Destailleur
6e906ac0e3
Clean code
2018-01-24 13:08:09 +01:00
Laurent Destailleur
f1b63d7cbf
Fix css
2018-01-23 09:00:03 +01:00
Laurent Destailleur
273e88a599
Fix send into ledger for expense report. Show accounted status.
2018-01-22 03:07:11 +01:00
Laurent Destailleur
1e9ddf153c
Fix workboard not visible on smartphone, so i invert position with stats
2018-01-17 13:55:53 +01:00
Laurent Destailleur
1c3fb7f94b
Fix responsive of boxes
2018-01-16 16:15:49 +01:00
Laurent Destailleur
3410e29755
CSS
2018-01-15 11:20:45 +01:00
Laurent Destailleur
95d2a9f88d
Responsive and css
2018-01-12 01:10:03 +01:00
Laurent Destailleur
eaecb9da5e
CSS
2018-01-11 20:33:09 +01:00
Laurent Destailleur
42e659e26c
Fix link for online payment
2018-01-08 13:21:04 +01:00
Laurent Destailleur
3b54be5dac
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/product/price.php
2017-12-22 12:55:16 +01:00
Laurent Destailleur
207730bf63
Css
2017-12-22 00:22:33 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
635917d0e6
CSS
2017-12-20 21:33:45 +01:00
Laurent Destailleur
d20062df73
Fix jquery css theme
2017-12-20 20:18:41 +01:00
Laurent Destailleur
9ea2fe226d
Fix look and feel v6
2017-12-20 19:30:30 +01:00
Laurent Destailleur
3f6b3b51ca
Fix css
2017-12-20 15:09:58 +01:00
Laurent Destailleur
9d10eb57f2
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/dolibarr_changes.txt
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/main.inc.php
2017-12-20 13:28:41 +01:00
Laurent Destailleur
b1f98b5903
Fix inline edit
2017-12-20 12:45:38 +01:00
Laurent Destailleur
8d671b2b26
Debug website module
2017-12-17 16:24:47 +01:00
Laurent Destailleur
9f2a42b67d
NEW Can filter on user on unalterable log
2017-12-16 21:50:58 +01:00
Laurent Destailleur
e90a6b8c0f
Option THEME_HIDE_BORDER_ON_INPUT to restore border on inputfields work
...
also with md theme.
2017-12-16 20:52:49 +01:00
Laurent Destailleur
394eeb3cd9
Fix rendering MD files of images by adding a css
2017-12-16 15:11:40 +01:00
Laurent Destailleur
427f1490f8
Fix css
2017-12-14 13:52:32 +01:00
Laurent Destailleur
9880ef7364
Fix module website
2017-12-12 01:40:34 +01:00
Laurent Destailleur
4443c0f0a0
Fix style
2017-12-10 15:24:47 +01:00
Laurent Destailleur
e3dcff7f5b
Fix substition for menus title and urls
2017-12-09 15:35:01 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
Laurent Destailleur
a0231b5c60
Fix responsive
2017-12-01 12:55:28 +01:00
Laurent Destailleur
670465fcd8
Fix responsive and search
2017-12-01 12:01:17 +01:00
Laurent Destailleur
a15a57317b
Debug accountancy module
2017-11-28 11:12:13 +01:00
Laurent Destailleur
cf274a7e3f
Fix CSS
2017-11-26 22:23:21 +01:00
Laurent Destailleur
b142ac1c06
CSS
2017-11-26 22:12:11 +01:00
Laurent Destailleur
d340d7bae5
Fix CSS
2017-11-26 21:56:41 +01:00
Laurent Destailleur
c16a150a70
NEW Remove background on agenda view when event is a not busy event.
2017-11-24 20:02:46 +01:00
Laurent Destailleur
3db52b5f9e
Debug responsive of v7
2017-11-24 14:23:25 +01:00
Laurent Destailleur
adce4b5b7b
Debug multi contact on event.
...
Prepare also code to manage properties of attendees of event
2017-11-22 14:42:47 +01:00
Laurent Destailleur
47afe470eb
Merge small js into lib_header.js.php
...
Move filemanager.tpl.php
CSS enhancement
2017-11-19 12:22:01 +01:00
Laurent Destailleur
90684750c1
CSS
2017-11-18 13:09:12 +01:00
Laurent Destailleur
56036d3024
Fix css
2017-11-18 02:03:10 +01:00
Laurent Destailleur
7ddf1669ef
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:34:20 +01:00
Laurent Destailleur
742bf29c65
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:29:42 +01:00
Laurent Destailleur
ead629708c
Look and feel v6
2017-11-17 14:57:14 +01:00
Laurent Destailleur
0d192df1fd
Standardize interface
2017-11-16 18:33:56 +01:00
Laurent Destailleur
4d198534a2
Clean CSS files
2017-11-16 12:09:34 +01:00
Laurent Destailleur
5c3d8acfbb
Work on website
2017-11-15 19:47:07 +01:00
Laurent Destailleur
010e542fe4
CSS
2017-11-14 01:15:02 +01:00
Laurent Destailleur
01a41237bf
CSS
2017-11-11 14:20:08 +01:00
Laurent Destailleur
debc0480dd
CSS
2017-11-10 20:20:59 +01:00
Laurent Destailleur
a029b16795
css
2017-11-10 18:27:03 +01:00
Laurent Destailleur
864e747f51
CSS
2017-11-07 19:46:28 +01:00
Laurent Destailleur
141bef0b8a
Fix translation and css
2017-11-04 15:21:35 +01:00
Laurent Destailleur
cfacfab6cf
NEW Show badge with nbr of shipment on shimpen tab of order
...
NEW Add button cancel on shipment creation
2017-11-02 12:38:36 +01:00
Laurent Destailleur
4220d02dd4
Debug module blocked log
2017-10-31 23:57:37 +01:00
Laurent Destailleur
bbe1c9c494
NEW Can download PDF document from the payment page
2017-10-30 00:45:47 +01:00
Laurent Destailleur
1a49a2bb94
Clean css/code
2017-10-28 11:00:02 +02:00
Laurent Destailleur
815faf4c91
Fix css for website
2017-10-27 16:00:37 +02:00
Laurent Destailleur
82b333e423
Fix migration to select2 4.0.5
2017-10-26 14:06:23 +02:00
Laurent Destailleur
caa24e1a68
Fix width of tooltips
2017-10-26 12:34:53 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Laurent Destailleur
f4f47c6732
NEW Remove tooltip tipTip library replaced with standatd jquery tooltip
2017-10-22 21:15:08 +02:00
Laurent Destailleur
99b88265d3
Fix larger select2 combo
2017-10-21 21:05:00 +02:00
Laurent Destailleur
475db3172a
NEW Remove js library fileupload that was not used by core code.
2017-10-21 19:40:17 +02:00
Laurent Destailleur
19a5780f7f
Clean code
2017-10-20 23:49:20 +02:00
Laurent Destailleur
daa7847ab3
NEW All search boxes are available on smartphone
2017-10-20 01:18:21 +02:00
Laurent Destailleur
428c3e973d
FIX for combo on rtl languages
2017-10-18 18:36:10 +02:00
Laurent Destailleur
6bcdf2ff75
Test replacement of img switcher with FA css
2017-10-17 14:03:22 +02:00
Laurent Destailleur
3f36cf23f5
NEW Break lines per project on the new timesheet page
2017-10-12 13:17:22 +02:00
Laurent Destailleur
8e0da9bfeb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/document.php
2017-10-04 13:32:53 +02:00
Laurent Destailleur
90964d25ce
Fix css
2017-10-02 17:52:20 +02:00
Laurent Destailleur
0e15aef44f
CSS
2017-09-30 00:30:58 +02:00
Laurent Destailleur
c9e9f60f8f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-25 19:55:52 +02:00
Laurent Destailleur
c5287e68b1
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/multicurrency.php
htdocs/core/modules/modFournisseur.class.php
2017-09-25 19:54:27 +02:00
Laurent Destailleur
87a75a0ad7
CSS not bold on jnotify messages
2017-09-24 01:46:00 +02:00
Laurent Destailleur
91d303465d
NEW Can add html content on right of tabs
2017-09-24 01:39:06 +02:00
Laurent Destailleur
7d580105c8
Fix css
2017-09-23 13:02:25 +02:00
Laurent Destailleur
35d00fd2ec
Fix wrap on lites_total
2017-09-23 09:28:31 +02:00
Laurent Destailleur
839f3ca41d
NEW Can use an url like $conf->global>-MYPARAM for menu urls
2017-09-23 03:22:48 +02:00
Laurent Destailleur
a94f2b07e1
Fix css
2017-09-23 02:46:33 +02:00
Laurent Destailleur
2f317c5834
Debug online payment using unique form
2017-09-20 19:34:14 +02:00
Laurent Destailleur
1d6213ea7d
Add picto for cheque payment
2017-09-20 15:29:47 +02:00
Laurent Destailleur
5f7631a95d
NEW Days where user is on vacation use different colors in timesheet.
2017-09-19 17:07:39 +02:00
Laurent Destailleur
f5bc9c08b1
Missing css
2017-09-19 11:38:28 +02:00
Laurent Destailleur
34221fc163
CSS of payment page
2017-09-11 03:38:39 +02:00
Laurent Destailleur
c5567fafd4
Enhancement for smartphone
2017-09-04 09:25:53 +02:00
Laurent Destailleur
9312005318
NEW Move accountancy features into a dedicated menu
2017-08-29 12:43:47 +02:00
Laurent Destailleur
c29d78bd0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-24 14:57:44 +02:00
Laurent Destailleur
9684c8b4bc
Fix css
2017-08-24 14:54:32 +02:00
Laurent Destailleur
90afbcb034
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
Laurent Destailleur
e25a428118
Fix compatibility with Internet Explorer
2017-08-23 12:32:28 +02:00
Laurent Destailleur
b48f501a0c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-21 11:04:09 +02:00
Laurent Destailleur
d7be62b7da
Better style
2017-08-21 11:02:24 +02:00
Laurent Destailleur
083cb33a6c
Clean ecm code
2017-08-20 23:16:20 +02:00
Laurent Destailleur
2321091170
NEW Move the upload input on top right in ECM module
2017-08-20 21:23:19 +02:00
Laurent Destailleur
b6a7ce6822
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-01 10:22:37 +02:00
Laurent Destailleur
2f9f9ac80d
Fix personal conf was not loaded
2017-07-31 11:56:20 +02:00
Laurent Destailleur
80f096a9d8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-31 02:09:15 +02:00
Laurent Destailleur
1897e3cbad
Some fix for better compatibility
2017-07-30 20:43:18 +02:00
Laurent Destailleur
bb8d458468
Fix menu editor
2017-07-30 19:41:45 +02:00
Laurent Destailleur
cae21d3937
Fix in agenda output per user/type (reduce memory usage)
2017-07-29 01:59:26 +02:00
Laurent Destailleur
af63dc76c1
Fix flex problems
2017-07-28 23:46:11 +02:00
Laurent Destailleur
7760594643
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
htdocs/theme/eldy/style.css.php
htdocs/websites/class/website.class.php
htdocs/websites/index.php
2017-07-20 18:31:58 +02:00
Laurent Destailleur
3b8f60f90e
Fix pb of recursive include in website module
2017-07-20 16:49:20 +02:00
Laurent Destailleur
1e7aa4d9b4
Work on module website
2017-07-19 16:38:00 +02:00
Laurent Destailleur
86926a28ec
Fix css
2017-07-18 14:27:51 +02:00
Laurent Destailleur
644486b4a0
Fix css
2017-07-15 17:32:36 +02:00
Laurent Destailleur
bbc8994d36
Fix css
2017-07-14 13:28:21 +02:00
Laurent Destailleur
7ae52d843c
Look and feel v6
2017-07-01 14:23:24 +02:00
Laurent Destailleur
3fdfebf7ef
Fix position of top menu does not follow 'position' field.
2017-06-27 04:25:41 +02:00
Laurent Destailleur
509aad9bce
Fix README
2017-06-24 12:52:39 +02:00
Laurent Destailleur
9ec7929753
Look and feel v6
2017-06-21 10:59:39 +02:00
Laurent Destailleur
7c41c9a3e4
Fix activation of dependency for a dedicated country.
...
BlockedLog depends now on CashDesk only.
2017-06-17 11:43:00 +02:00
Laurent Destailleur
2d571bf097
Fix bad merge
2017-06-14 10:50:43 +02:00
Laurent Destailleur
b889db997a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/datepicker.php
htdocs/core/get_menudiv.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/search_page.php
htdocs/main.inc.php
htdocs/master.inc.php
htdocs/product/list.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/card.php
htdocs/user/index.php
2017-06-14 10:48:34 +02:00
Laurent Destailleur
848f70e026
Fix bad merge
2017-06-14 10:38:34 +02:00
Laurent Destailleur
7939daa225
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/index.php
2017-06-14 10:18:24 +02:00
Laurent Destailleur
9c482b9f2a
FIX CVE-2017-7886
2017-06-10 21:37:27 +02:00
Laurent Destailleur
890ac81e4d
Fix menu entried must be greyed, sub menus not visible fi not allowed on
...
parent.
2017-06-10 19:16:42 +02:00
Laurent Destailleur
ce470b8dd5
Fix css fot liste_total lines
2017-06-10 16:23:24 +02:00
Laurent Destailleur
87c8659e72
Fix responsive
2017-06-10 00:45:18 +02:00
Laurent Destailleur
58a407d9f1
Fix style and align when no permission on widget
2017-06-10 00:05:47 +02:00
Laurent Destailleur
884c6c674d
Fix css
2017-06-09 20:08:23 +02:00
Laurent Destailleur
0458b7d38f
Fix css subscription form
2017-06-09 17:29:34 +02:00
Laurent Destailleur
1af74b4c42
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/admin/perms.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/product/class/product.class.php
htdocs/product/class/service.class.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/public/members/new.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-06-09 12:50:56 +02:00
Laurent Destailleur
41586b76c0
Fix missing css
2017-06-09 11:40:35 +02:00
Laurent Destailleur
543630e487
Fix missing count of nb of columns into lists
2017-06-08 14:14:06 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Laurent Destailleur
c59d216cf5
NEW Can read time spent of others (hierarchy only or all if granted)
2017-06-02 13:24:45 +02:00
Laurent Destailleur
bebf2b33ea
CSS enhancement for mobile
2017-06-02 09:25:35 +02:00
Laurent Destailleur
e667d72547
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
2017-05-29 10:41:51 +02:00
Laurent Destailleur
7a1480d362
Look and feel v6
2017-05-26 00:02:41 +02:00
Laurent Destailleur
6eeb82ec70
FIX dialog window with md theme must not be hidden by left menu part.
2017-05-24 13:45:26 +02:00
Laurent Destailleur
80ce8da7a3
Fix migration errors and responsive design
2017-05-23 15:13:52 +02:00
Laurent Destailleur
2dd2ab1003
Look and feel v6
2017-05-20 20:59:54 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
Laurent Destailleur
d110292a1b
Uniformize code
2017-05-16 17:49:38 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Laurent Destailleur
b3245fb455
NEW Include an hourglass icon when we click on online payment button
2017-05-15 10:27:21 +02:00
Laurent Destailleur
57ba598b15
Merge pull request #6771 from aspangaro/6.0-stripe
...
New : Module Stripe
2017-05-13 19:55:29 +02:00
Laurent Destailleur
0d11fce834
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-12 15:45:30 +02:00
Laurent Destailleur
b09300ab61
NEW Can edit background color for odd and even lines in tables
2017-05-11 13:02:29 +02:00
Laurent Destailleur
0e4a209dd8
Fix normalize color settings
2017-05-11 11:50:21 +02:00
Laurent Destailleur
b8b91db007
Use function top_httphead to include headers in pages.
2017-05-09 21:46:57 +02:00
Laurent Destailleur
1748f1d451
Better tooltip for computed field
2017-05-09 17:00:07 +02:00
Alexandre SPANGARO
16a41242d3
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-05-08 06:39:14 +02:00
Laurent Destailleur
cea835744c
Look and feel v6
2017-05-05 23:06:46 +02:00
Laurent Destailleur
d53654e64f
Look and feel v6
2017-05-05 20:45:06 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
2120b9af85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/theme/eldy/style.css.php
2017-05-05 14:14:21 +02:00
Laurent Destailleur
39d9a0f979
Support of pdf preview on supplier orders
2017-05-04 19:11:19 +02:00
Laurent Destailleur
ff0f40ab37
Look and feel v6
2017-04-29 16:07:34 +02:00
Alexandre SPANGARO
586ea54bfc
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-29 07:05:02 +02:00
Laurent Destailleur
5e856e6923
More complete tooltip help to describe available substitution vars
2017-04-27 17:16:19 +02:00
Alexandre SPANGARO
c3fe1c963a
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-22 06:33:31 +02:00
Laurent Destailleur
0994622bf8
NEW Can use translations into all substitutions (watermark, freetext...)
2017-04-17 23:54:09 +02:00
Alexandre SPANGARO
fed6d71d8a
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-17 06:51:02 +02:00