Commit graph

15577 commits

Author SHA1 Message Date
Achilles Rasquinha
701d59b5ae fix decimal split 2018-04-01 00:44:31 +05:30
Achilles Rasquinha
159a20e5f8 fix fmt_moeny 2018-03-31 23:59:10 +05:30
Achilles Rasquinha
d0bd66a4c2
Merge pull request #5339 from achillesrasquinha/fixes
fix data import test case
2018-03-31 18:12:05 +05:30
Achilles Rasquinha
3a5c090bde fix test case 2018-03-31 18:01:11 +05:30
Achilles Rasquinha
0563788cb2 fix data import test case 2018-03-31 17:47:16 +05:30
Achilles Rasquinha
6c8863021d
Merge pull request #5338 from achillesrasquinha/fixes
fix timestamp mismatch for all singles
2018-03-31 17:46:46 +05:30
Achilles Rasquinha
b4be0a79c1 fix timestamp mismatch for all singles 2018-03-31 17:34:36 +05:30
Achilles Rasquinha
6b0e6059c5
Merge pull request #5337 from achillesrasquinha/fixes
[min] remove dead code
2018-03-31 17:33:52 +05:30
Achilles Rasquinha
c269d433bd [min] remove dead code 2018-03-31 16:40:59 +05:30
Achilles Rasquinha
38f02abdd3
Merge pull request #5335 from achillesrasquinha/fixes
cast for standard fieldnames
2018-03-31 14:59:16 +05:30
Achilles Rasquinha
6598be192f cast for standard fieldnames 2018-03-31 14:57:42 +05:30
Achilles Rasquinha
2371780ce7
Merge pull request #5334 from achillesrasquinha/fixes-wc
[NEW] Quick Edit DocTypes
2018-03-31 14:23:45 +05:30
Achilles Rasquinha
f64c4dccdc remove frappe namespace 2018-03-31 13:15:27 +05:30
Faris Ansari
69976b8bee
Listview fixes (#5316)
- Kanban filters will now save on change
- List skeleton won't show in other views
- Show only single row skeleton in list view
2018-03-31 13:14:26 +05:30
Achilles Rasquinha
e1be2a19c6 Added Quick Edit 2018-03-31 12:57:24 +05:30
Achilles Rasquinha
4acf4b4605 fixed sizing 2018-03-31 11:43:05 +05:30
Achilles Rasquinha
ccfa4125c8
Merge pull request #5333 from himanshugarg/patch-1
Corrected Typos on Frappe landing page
2018-03-31 10:42:11 +05:30
Himanshu
d1c0adb76d
Corrected Typos on Frappe landing page 2018-03-31 06:29:46 +05:30
Achilles Rasquinha
aff416d626
Merge pull request #5331 from achillesrasquinha/fixes-wc
increased comment size
2018-03-30 23:28:45 +05:30
Achilles Rasquinha
58d4ff346b increased comment size 2018-03-30 23:27:38 +05:30
Achilles Rasquinha
801b5f71ef
Merge pull request #5325 from achillesrasquinha/hf-11760
Fix DropBox path read with os.walk
2018-03-30 16:27:35 +05:30
Achilles Rasquinha
7da1989779 fix dropbox 2018-03-30 16:25:33 +05:30
Prateeksha Singh
cf4b17484a
Merge pull request #5321 from pratu16x7/heatmap
handle Math.max() for and empty array
2018-03-30 13:05:08 +05:30
Prateeksha Singh
2515fdf5b2 handle Math.max() for and empty array 2018-03-30 13:02:38 +05:30
Achilles Rasquinha
b07ae851d4
Merge pull request #5320 from achillesrasquinha/website-chat
Website Chat Fixes
2018-03-30 11:49:40 +05:30
Achilles Rasquinha
8e15053087 Fix Chat Rendering 2018-03-30 11:36:54 +05:30
Achilles Rasquinha
0b90b17c9d Fix Desk and Website Rendering 2018-03-30 11:20:05 +05:30
Prateeksha Singh
2010ce78d0
Merge pull request #5318 from pratu16x7/heatmap
Yet another heatmap fix
2018-03-30 11:06:11 +05:30
Achilles Rasquinha
edf2fa5511 Merge branch 'develop' into website-chat 2018-03-30 10:55:07 +05:30
Achilles Rasquinha
7078ed8658 Merge branch 'develop' of https://github.com/achillesrasquinha/frappe into develop 2018-03-30 10:54:56 +05:30
Prateeksha Singh
d20de2167c yet another heatmap fix 2018-03-30 10:53:20 +05:30
Achilles Rasquinha
e83d799f55 Fixed Chat Token 2018-03-30 10:46:47 +05:30
Achilles Rasquinha
2d0bd610cb Fixed Chat Token 2018-03-30 10:17:31 +05:30
Achilles Rasquinha
9442f14fe9
Merge pull request #5242 from achillesrasquinha/website-chat
🎉 🎉 🎉Website Chat + Desktop Chat View + Attachments and Media
2018-03-29 17:22:51 +05:30
Achilles Rasquinha
034935db13 Fixed Website Chat updates 2018-03-29 16:57:22 +05:30
Faris Ansari
6dfa272d62
Rollup error logs (#5289)
* Log errors in rollup build

* fix codacy
2018-03-29 16:09:21 +05:30
Achilles Rasquinha
777002291d
Merge pull request #5315 from achillesrasquinha/indentation
fix indentation
2018-03-29 15:44:03 +05:30
Achilles Rasquinha
796348cd60 fix indentation 2018-03-29 15:39:49 +05:30
Achilles Rasquinha
bb8bfb647a
Merge pull request #5312 from achillesrasquinha/fixes
Fix in case DocType Not found for cast_singles
2018-03-29 14:27:42 +05:30
Achilles Rasquinha
569732e7c8 fix in case doctype not found 2018-03-29 14:26:20 +05:30
Achilles Rasquinha
bb58bd8d19 fix in case doctype not found 2018-03-29 14:24:59 +05:30
Achilles Rasquinha
ddd226c1a1 fix in case doctype not found 2018-03-29 14:23:11 +05:30
Nabin Hait
cc251a0869 Fixed merge conflict 2018-03-29 13:52:00 +05:30
Nabin Hait
1d007b9774 Merge branch 'hotfix' 2018-03-29 13:51:14 +05:30
Nabin Hait
7cb0a2641a bumped to version 10.1.16 2018-03-29 14:21:14 +06:00
Achilles Rasquinha
12b628d885 Added Attachments 2018-03-29 13:50:49 +05:30
Achilles Rasquinha
6fcd9ad18e
Merge pull request #5309 from achillesrasquinha/cast-singles
cast singles fieldtype
2018-03-29 13:22:22 +05:30
Ameya Shenoy
a5788e1746 Child table permission error fix (#5311)
Initially there were no permission checks on child table, which made the
child table data exposable through the API. The fix issued in commit
807a300fd8 involved default denying
permission to access child tables via client.py . The current fix checks
the permissions on the parent doctype and allows access if the user has
access on the parent
2018-03-29 13:11:36 +05:30
Raghavendra Kamath
aea40d64cf Lint variable.less and common.less (#5291)
* Lint variables.less

* lint common.less
2018-03-29 12:56:49 +05:30
Achilles Rasquinha
8685ae68b7 desktop view 2018-03-29 12:21:07 +05:30