Commit graph

101 commits

Author SHA1 Message Date
Rushabh Mehta
5cf73c4390 fix(charts): bump frappe charts to 1.2.2 2019-06-17 17:33:18 +05:30
Shivam Mishra
8621c3776b update branch 2019-06-12 11:13:23 +05:30
deepeshgarg007
426fced81f fix: Upgrade frappe datatable 2019-06-11 16:17:28 +05:30
Shivam Mishra
7045942e8d refactor: use es6 imports for charts 2019-06-11 15:41:44 +05:30
Deepesh Garg
2ae48532be fix: Update frappe-datatable (#7580) 2019-05-29 10:07:23 +05:30
deepeshgarg007
7d49df12ce fix: Update frappe datatable 2019-05-23 15:16:29 +05:30
Faris Ansari
c07944c2c4 fix(rollup): Use terser instead of uglify 2019-04-26 15:52:58 +05:30
Faris Ansari
25316da863 fix(ReportView): Remember column widths 2019-04-24 12:53:59 +05:30
Faris Ansari
51d0607977
fix: Re-enable cypress test recording (#7319) 2019-04-20 11:45:55 +05:30
Rushabh Mehta
7817b4e03b
Merge pull request #7088 from karthikeyan5/raw-printing
feat(Raw Printing): Adding Support for qz-tray
2019-04-19 11:43:47 +05:30
Suraj Shetty
40978eed7c
Merge pull request #7296 from netchampfaris/report-filter-numeric-d
fix: Allow numeric filter without using =
2019-04-18 11:11:44 +05:30
Faris Ansari
106c35cd34
Merge branch 'develop' into new-upload 2019-04-16 23:57:45 +05:30
Faris Ansari
b1c0f663ba
Merge branch 'develop' into report-filter-numeric-d 2019-04-16 23:57:36 +05:30
Faris Ansari
7a7ac3b85f fix: Remove --record flag 2019-04-16 18:39:22 +05:30
karthikeyan5
70c256f81b feat(Raw Printing): Adding Support for qz-tray 2019-04-16 15:40:56 +05:30
Faris Ansari
012137d0eb fix: Allow numeric filter without using = 2019-04-16 13:49:39 +05:30
Faris Ansari
a5c6dbf3ed test: Add UI test for FileUploader 2019-04-13 15:29:32 +05:30
Frappe Bot
ba682c5f14 Merge branch 'master' into develop 2019-04-08 09:16:59 +00:00
Frappe Bot
629a5e502a Merge branch 'master' into develop 2019-04-07 09:03:27 +00:00
Faris Ansari
c054961c3b fix(QueryReport): Expand/Collapse all for tree 2019-04-05 17:23:55 +05:30
Faris Ansari
55ba40a71e feat(DataTable): Add not equals (!=) filter 2019-04-03 23:19:59 +05:30
Faris Ansari
3415335423 fix: Add fast-deep-equal as a dependency 2019-04-01 10:42:40 +05:30
Faris Ansari
406c829c51 fix: Add fast-deep-equal as a dependency 2019-04-01 10:37:53 +05:30
Faris Ansari
fd43685695 fix: Datatable fixes
- Remove minWidth limit
- Double click to resize to perfect width
2019-03-30 23:21:43 +05:30
Faris Ansari
da9ae10946 fix: Datatable fixes
- Remove minWidth limit
- Double click to resize to perfect width
2019-03-30 18:37:50 +05:30
Rushabh Mehta
18f1e4a5ca fix(node-sass): upgrade node-sass 2019-03-04 21:54:51 +05:30
Faris Ansari
d84ed2e115
fix: Update vue and regenerate yarn.lock file (#7015) 2019-03-04 16:36:49 +05:30
Prateeksha Singh
39ad843b3b feat(desk): DeskModuleBox, get some links if not set 2019-03-04 12:39:45 +05:30
Faris Ansari
12d6ef89d3 fix(snyk): Upgrade bootstrap and generate .snyk file 2019-03-02 15:40:28 +05:30
Faris Ansari
28d350adf3 fix: Update rollup-plugin-node-resolve 2019-02-26 23:02:42 +05:30
Faris Ansari
5a96fc70de Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-02-20 19:25:25 +05:30
Aditya Hase
5e565dc92e refactor(recorder): Use vue-router 2019-02-19 21:58:56 +05:30
Aditya Hase
8863ec4be9 fix(rollup-vue): Downgrade rollup-plugin-vue 2019-02-19 21:58:54 +05:30
Faris Ansari
60dd8e0c83 fix: Update rollup and postcss plugin 2019-02-19 18:04:26 +05:30
Faris Ansari
b6d5607ebc Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-02-01 00:06:21 +05:30
Nabin Hait
1c30523869 Fix: merge conflict 2019-01-18 09:55:39 +05:30
Saurabh
d1bed88f3f Merge branch 'staging' into develop 2019-01-15 19:14:06 +05:30
Faris Ansari
17e2ea2cc5 fix: Cleanup Blog, List, Comment templates for Bootstrap 4
- Bootstrap 4 class migration
2019-01-15 09:54:05 +05:30
Faris Ansari
7e36e92148 fix: Custom Date filters in DataTable
Date comparison won't work with simple string comparison. Now, datatable allows to hook into how cell values are compared.
2019-01-14 14:08:48 +05:30
Deepesh Garg
f79e48ee40 build: Upgraded frappe-datatable (#6732)
* build: Upgraded frappe-datable

* Update datatable to 1.7.3
2019-01-10 15:37:04 +05:30
Faris Ansari
8641383ed1 Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2018-12-26 19:51:35 +05:30
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00
Faris Ansari
1d461ab5cc fix: Update datatable to 1.7.2 (#6665) 2018-12-24 13:05:58 +05:30
Saurabh
2de5dfdbb3 Merge branch 'staging' into develop 2018-12-18 10:20:24 +05:30
Faris Ansari
09077ae327 fix: Update DataTable (#6622)
- Now vertical scrollbar is shown always
2018-12-17 13:48:02 +05:30
Faris Ansari
5cb91ae57b Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2018-12-14 10:07:15 +05:30
Frappe Bot
c1ce84e9fc Merge branch 'staging' into develop 2018-12-11 09:53:52 +00:00
Faris Ansari
c1bd405afc Fix: Query Report (#6603)
* fix: Update frappe-datatable to 1.7.0

- Fix filtering with sorting
- Equals keyword for numeric columns

* fix: Show tip for inline filtering
2018-12-11 10:14:21 +05:30
Frappe Bot
a60cb001f6 Merge branch 'staging' into develop 2018-12-10 13:05:59 +00:00
Faris Ansari
e71d412fc8 fix: Totals row in Query Report (#6590)
* fix: Totals row in Query Report

* fix: Remove quotes around Total
2018-12-10 17:21:02 +05:30