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

23166 commits

This branch
This branch
All branches
Author SHA1 Message Date
Himanshu Warekar
b1eb2d1ab6 fix: escape everything! and batch insert query 2019-09-07 14:39:46 +05:30
Faris Ansari
dddb39abb0 fix: Fetch fullname from User then Contact 2019-09-07 13:11:01 +05:30
Sagar Vora
cfd7f8bf37 fix: incorrect if condition in smtp module 2019-09-07 12:54:52 +05:30
Suraj Shetty
639da6ec54
fix(Email): Could not find row fix (#8364) 
fix(Email): Could not find row fix
 2019-09-07 11:46:13 +05:30
Himanshu Warekar
a5e327216a fix: could not find row fix 2019-09-07 11:32:00 +05:30
Himanshu Warekar
aef0fb7b89 fix: remove _comments from json 2019-09-06 17:19:25 +05:30
Himanshu Warekar
e3d044473d chore: fix reference link for api in docstring 2019-09-06 17:14:12 +05:30
Himanshu Warekar
db331620f2 fix: remove unused hooks 2019-09-06 16:41:42 +05:30
mergify[bot]
6b41a07981
Merge pull request #8357 from prssanna/dashboard-fix 
fix: dashboard chart get function
 2019-09-06 09:05:41 +00:00
Himanshu Warekar
124b1918b0 fix: pass etag parameter for updation 2019-09-06 14:12:31 +05:30
Himanshu Warekar
6de3e9a1bf feat: push contacts to google contacts 2019-09-06 13:56:00 +05:30
prssanna
8962f05f4c fix: whitespace 2019-09-06 13:53:52 +05:30
prssanna
15371ae435 fix: fix dashboard chart tests 2019-09-06 13:26:08 +05:30
mergify[bot]
f4b2616e8d
Merge pull request #8358 from adityahase/fix-file 
fix(file): Don't overwrite private files
 2019-09-06 07:50:31 +00:00
mergify[bot]
6e264c9e4a
Merge pull request #8356 from prssanna/user-profile-fix 
fix: fix monthly and all time rank query
 2019-09-06 07:41:48 +00:00
Aditya Hase
5b662ea56b
fix(file): Don't overwrite private files. 2019-09-06 12:56:50 +05:30
prssanna
6f564e46c5 fix: pass chart name or chart object to dashboard get function 2019-09-06 12:51:14 +05:30
prssanna
0a3a157aa4 fix: fix monthly and all time rank query 2019-09-06 12:20:54 +05:30
Himanshu Warekar
0c86588bf4 fix: variable names 2019-09-06 10:57:07 +05:30
Himanshu Warekar
ab8b338b92 feat: migrate to google python api 2019-09-06 10:44:51 +05:30
mergify[bot]
b30cec042b
Merge pull request #8345 from frappe/pr-stale-time 
chore: Reduce PR stale and close time
 2019-09-06 02:39:27 +00:00
Aditya Hase
fe0c399750
fix(cypress): Use cypress:run command 2019-09-05 17:57:13 +05:30
Sahil Khan
a7a9ec020a Merge branch 'develop' into version-12 2019-09-05 17:29:09 +05:30
Sahil Khan
ab3e228dda bumped to version 12.0.11 2019-09-05 17:49:09 +05:50
mergify[bot]
27568c0c41
Merge pull request #8350 from adityahase/fix-ldap 
fix(login): ldap_settings not defined
 2019-09-05 11:42:36 +00:00
mergify[bot]
a56b325433
Merge pull request #8348 from surajshetty3416/fix-field-label 
fix: Rename Reference DocType -> Reference Document Type
 2019-09-05 11:28:51 +00:00
Aditya Hase
a2e2f67f16
fix(login): ldap_settings not defined 2019-09-05 16:44:06 +05:30
Chinmay Pai
6028b6602f
chore: remove unused get_limits method (#8346) 
* chore: remove unused get_limits method

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove misleading docstring from email_queue

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-09-05 16:12:04 +05:30
Chinmay Pai
4aedbb58a7
chore: remove unused get_limits method (#8347) 
* chore: remove unused get_limits method

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove misleading docstring from email_queue

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-09-05 16:11:52 +05:30
Suraj Shetty
2242146c82 fix: Rename Reference DocType -> Reference Document Type 2019-09-05 15:47:40 +05:30
stephen
f61bffdcef fix: docname should not be compared with doctype for inequality… (#8334) 2019-09-05 15:09:57 +05:30
Rucha Mahabal
11fbfeeec1 fix: set_route not working for multiple filters in query report (#8341) 2019-09-05 15:04:19 +05:30
Himanshu
720b6bc70f fix(Customize Form): Strip column name in search field list (#8337) 2019-09-05 15:03:57 +05:30
Marica
d33d2ee60e fix(minor): Changed error message display in printview (#8200) 
* fix(minor): Changed error message display in printview

* fix: Check for HTML on creation of Print Format

The printview will remain as it is.
Validation of HTML while Custom Format is checked and Raw Printing isn't checked in Print Format.

* fix: Improved handling of no template found in Printview

User will see 'No preview found' instead of error prompt with path in it
Validation on Print Format refactored slightly.

* Codacy fixes
 2019-09-05 15:02:15 +05:30
Faris Ansari
6bb9edbb85
chore: Reduce PR stale and close time 
Pull Requests will be marked stale after 10 days. Stale Pull Requests will be closed after 3 days.
 2019-09-05 14:59:08 +05:30
mergify[bot]
e94707af07
Merge pull request #8338 from hrwX/auto-comm-fix 
fix(Timeline): Empty comments added
 2019-09-05 09:10:06 +00:00
mergify[bot]
0f79d997e1
Merge pull request #8343 from surajshetty3416/fix-key-error-2 
fix: Key Error while opening report
 2019-09-05 08:18:59 +00:00
gavin
f3b1846901 fix: added FileNotFoundError compatability (#8342) 2019-09-05 13:17:40 +05:30
Suraj Shetty
0b2e236546 fix: Key Error while opening report 2019-09-05 08:44:13 +05:30
Chinmay Pai
ce3bc8e133
chore: add missing return statement (#8339) 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-09-04 20:37:37 +05:30
Chinmay Pai
5243c6fb01
chore: add missing return statement (#8340) 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2019-09-04 18:40:17 +05:30
Himanshu Warekar
be433a8182 fix: empty comments added 2019-09-04 16:36:04 +05:30
Sahil Khan
1da536a3fd Merge branch 'develop' into version-12 2019-09-03 22:44:19 +05:30
Sahil Khan
92b5dd9361 bumped to version 12.0.10 2019-09-03 23:04:19 +05:50
sahil28297
2f233d849a
Merge pull request #8333 from frappe/sahil28297-patch-1 
fix(nestedset): check if meta has nsm_parent_field
 2019-09-03 22:39:10 +05:30
sahil28297
ac1c8c7c3f
fix(nestedset): check if meta has nsm_parent_field 2019-09-03 22:15:59 +05:30
stephen
1233cf0b6e fix: Make sure we also display rooms that have been opened (#8331) 2019-09-03 17:13:02 +05:30
Sahil Khan
574605f00b Merge branch 'develop' into version-12 2019-09-03 16:31:18 +05:30
Sahil Khan
71d406a0b0 bumped to version 12.0.9 2019-09-03 16:51:17 +05:50
Saurabh
2f83e1783c fix: check if field is_tree exists (#8328) 2019-09-03 15:06:51 +05:30