vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
15561 commits 1 branch 0 tags 587 MiB
Commit graph

15561 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Austin Bischoff
bf7ad3f3f1 pdf.py does not handle output properly if ContentNotFoundError is thrown (#5296) 
If wkhtmltopdf throws a ContentNotFoundError exception (even though there is content) or other catchable exceptions the output keyword is not updated properly as it is in the try: section if no exception is thrown.   This causes the PDF being returned to be empty, empty PdfFileWriter() created in print_format.py line 26. This causes issues like https://github.com/frappe/erpnext/issues/13124 to occur where the viewer.js throws an error due to a bad pdf file.  The ContentNotFoundError exception is happening due to no header image in the letterhead or its a bad link being used when multi printing. 

The whole get_pdf() function should be rebuilt to test for ContentNotFoundError and other errors from wkhtmltopdf and then use a secondary try/catch to check for any other IOErrors related to being able to read the PDF back in from the file.  Right now this is not DRY since I basically copy and pasted lines 18 - 22 under line 31 so that if there is an error but the file exists the output will still be appended properly.
 2018-03-29 12:00:05 +05:30
Shreya Shah
19a8ef39c1 fix-checkbox-margin (#5288) 2018-03-29 11:52:29 +05:30
Achilles Rasquinha
608b3972ef move helper outside class definition 2018-03-29 11:41:46 +05:30
Achilles Rasquinha
03a072fe82 on_ to on 2018-03-29 11:39:13 +05:30
Achilles Rasquinha
5a3682a586 fix codacy 2018-03-29 11:27:51 +05:30
Achilles Rasquinha
499b2e7d93 fix toggling 2018-03-29 11:25:54 +05:30
Achilles Rasquinha
d4afe75e7e return immutable 2018-03-29 11:14:52 +05:30
Achilles Rasquinha
062c7fa283 fixed codacy 2018-03-29 11:06:48 +05:30
Achilles Rasquinha
3d0064332c get_meta alternative 2018-03-29 11:02:53 +05:30
Achilles Rasquinha
ed2af1d604
Merge pull request #5310 from achillesrasquinha/py3-returns 
fix json loading for error snapshots.
 2018-03-29 11:00:24 +05:30
Achilles Rasquinha
ecadb30ba2 remove garbage code 2018-03-29 10:59:50 +05:30
Faris Ansari
6a73d4024e Notifications via socketio (#5295) 
- Publish realtime message when notifications are cleared
- Refresh notifications on client on clear_notifications event
- refresh_notfications will be called only once in a 1 second window
- No more 30 sec polling
 2018-03-29 10:52:04 +05:30
Achilles Rasquinha
eef3491677 fix json loading str to bytes 2018-03-29 10:47:21 +05:30
Achilles Rasquinha
6340b5c4bf val to value 2018-03-29 10:36:41 +05:30
Achilles Rasquinha
881750df34 on_ to on 2018-03-29 10:35:30 +05:30
Achilles Rasquinha
8b5d24f89a fix minor variable call 2018-03-29 10:21:00 +05:30