Nabin Hait
342e3ec10a
Merge branch 'master' into develop
2016-11-14 17:39:07 +05:30
Nabin Hait
4e45053d5d
Merge pull request #2311 from rmehta/website-css-fix
...
[fix] css for shopping cart
2016-11-14 17:18:22 +05:30
Rushabh Mehta
faba31b556
[fix] css for shopping cart
2016-11-14 14:54:26 +05:30
Nabin Hait
2ffa35b38a
Fixed merge conflict
2016-11-11 15:10:35 +05:30
Rushabh Mehta
33a48cd957
[fix] z-index for datepicker should be above grid row
2016-11-11 13:24:11 +05:30
Rushabh Mehta
9486968891
[fix] z-index for datepicker ( #2271 )
2016-11-07 17:18:58 +05:30
Rushabh Mehta
95fdfe44d3
[minor] added default standard filters ( #2270 )
...
* [minor] added default standard filters
* [fix] frappe.sendmail
* [fix] frappe.sendmail
2016-11-07 17:18:49 +05:30
pratu16x7
13661acbe5
Merge pull request #2265 from frappe/#6718-website-footer-reorg
...
Reorganise footer links
2016-11-05 15:55:12 +05:30
pratu16x7
edf4fcb522
Reorganise footer links
2016-11-05 15:48:50 +05:30
Rushabh Mehta
de1d4b2056
[minor] rebuilt desk.css
2016-11-04 18:42:44 +05:30
Nabin Hait
4a5fa154ac
Fixed merge conflict
2016-11-03 15:16:33 +05:30
Faris Ansari
b724c36c82
[ui] yet another z-index fix ( #2248 )
2016-11-03 13:15:27 +05:30
Nabin Hait
9ecfebd38c
Merge branch 'master' into develop
2016-10-31 15:05:37 +05:30
Faris Ansari
bebf211ed8
[ui] z-index fix
2016-10-31 13:10:01 +05:30
Faris Ansari
8a5f214963
[ui] cleanup filter dashboard css
2016-10-29 22:05:43 +05:30
Faris Ansari
67a376cd70
[ui] fix z-index problem
2016-10-29 20:48:25 +05:30
Faris Ansari
49b677a77c
[ui] z-index fix, added compiled css
2016-10-28 18:21:37 +05:30
Nabin Hait
7c4f40b631
fixed conflict
2016-10-27 19:13:44 +05:30
Faris Ansari
2002d097c8
[fix] datepicker z-index
2016-10-27 12:49:00 +05:30
Rushabh Mehta
8f6d3d9a11
[fix] in_standard_filter should be in docfield, not doctype
2016-10-26 19:33:04 +05:30
Rushabh Mehta
603f163dd8
[minor] fix style for no data
2016-10-26 19:33:04 +05:30
Rushabh Mehta
424f99e6f3
[cleanup] dashboard filters
2016-10-26 19:33:04 +05:30
robert schouten
5c07b355fe
filter_dashboard
2016-10-26 19:33:04 +05:30
Faris Ansari
8d7d47db9f
[ui-fix] ui-autocomplete z-index fix ( #2191 )
2016-10-25 11:26:25 +05:30
Faris Ansari
700566bcf5
[gantt] show popover on hover, code cleanup ( #2177 )
...
* [gantt] show popover on hover, code cleanup
* [gantt] use variables instead of hex
2016-10-24 17:07:36 +05:30
Faris Ansari
623b271c11
[ui-fix][mobile] calendar view ( #2170 )
2016-10-18 14:16:01 +05:30
Faris Ansari
c650d6a87d
Gantt: fixes and features ( #2169 )
...
* [gantt] refactor code, hide progress handle for 0% progress
* [gantt] limit progress resize
* [gantt] invalid bar in task
2016-10-18 14:15:34 +05:30
Faris Ansari
1259518074
[ui-fixes] Report: Pick columns frappe/erpnext#3678 frappe/erpnext#3676 ( #2163 )
...
* [update] Sortable to 1.4.2
* [mobile] fix scroll in pick columns view
2016-10-17 12:22:05 +05:30
Rushabh Mehta
87b3816cf4
[fixes] print format cleanup, options for alignment and print from web form ( #2159 )
...
* [fixes] print format cleanup, options for alignment and print from web form
* [print-format] select module for export
2016-10-10 16:16:52 +05:30
Faris Ansari
0d469e65f8
[gantt] dependency arrow ( #2154 )
2016-10-08 11:04:39 +05:30
Faris Ansari
c3bb5930f7
[mobile-ui] small modal, focus awesome bar ( #2153 )
2016-10-06 17:17:43 +05:30
Rushabh Mehta
4dc37d216f
[style] for web forms
2016-10-05 17:25:48 +05:30
Faris Ansari
58ff01a284
[ui] fix text editor field overflow ( #2133 )
2016-10-03 12:13:07 +05:30
Faris Ansari
5a6698cb8c
[gantt] progress resizable, today highlight
2016-09-29 15:03:15 +05:30
Faris Ansari
7b7740c4bf
[ui][fix] text editor field in child table
2016-09-28 14:17:35 +05:30
Nabin Hait
d97d13dc22
Fixed version conflict
2016-09-28 10:48:58 +05:30
Faris Ansari
1ee9ee886e
Gantt #1932 ( #2073 )
...
* [wip] added frappe/gantt
* frappe/gantt
[gantt] added view modes
[gantt] added vertical grid, view modes fixed
[gantt] fix bar_onclick
[gantt] fix view_mode rendering
[gantt] drag, resize gantt bar
[gantt] fixed month view
[gantt] separate styling
[gantt] save on datechange, progress field added
[gantt] fixed drag to snap on week/month
2016-09-26 18:15:09 +05:30
Rushabh Mehta
74bc80d982
[fix] pass_does_not_exist_error
2016-09-26 11:15:45 +05:30
Rushabh Mehta
8899a46faa
[enhance] added roles for portal users #2091 ( #2093 )
...
* [enhance] added roles for portal users #2091
* [fix] test
* [fix] make default roles have desk access
2016-09-23 21:44:20 +05:30
Rushabh Mehta
2c40d683a7
[fix] navbar and strip before translating
2016-09-22 15:21:06 +05:30
Faris Ansari
24b07f6445
[ui][fix] overflow navbar breadcrumbs
2016-09-22 12:27:24 +05:30
Faris Ansari
1391bac6d6
[ui][fix] notification indicator bg grey
2016-09-22 12:11:44 +05:30
Rushabh Mehta
74cb41ae71
[enhance] web form pagination frappe/shishuvan#3 ( #2076 )
...
* [enhance] web form pagination frappe/shishuvan#3
* [minor] add label in web form grid
* [minor] select module for exporting web form
* [fix] more fixes, #2057
2016-09-20 17:47:39 +05:30
Nabin Hait
9ccd5ab20a
Merge pull request #2070 from netchampfaris/ui-fixes
...
[ui][fix] frappe/erpnext#6378
2016-09-20 11:01:47 +05:30
Rushabh Mehta
72ed223d41
[minor] more options for frappe.set_query and set_indicator in dashboard
2016-09-19 16:08:34 +05:30
Faris Ansari
f66672ea02
[ui][fix] notification indicator bg
2016-09-19 13:37:10 +05:30
Faris Ansari
5e577c6ea4
[mobile][fixes] (frappe/frappe#2048) (frappe/erpnext#6386) ( #2053 )
...
* [mobile][fix] uploaded images not visible
* [mobile][fix] overflow title
2016-09-19 13:16:00 +05:30
Rushabh Mehta
3726aacb8a
[fix] reportview click on edit features
2016-09-16 15:57:50 +05:30
Rushabh Mehta
2e66bd044b
[docs] and other minor fixes
2016-09-15 13:55:37 +05:30
Rushabh Mehta
37eb4eaffc
[wip] grid in web form ( #2044 )
...
* [wip] grid in web form
* [complete] webform in grid
* [minor] configurable sidebar items in web form
* [fix] tests
* [style]
2016-09-13 14:38:38 +05:30