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

17858 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
52bd7514ae Extract mention from post & comment and notify [WIP] 2019-02-12 12:40:41 +05:30
Suraj Shetty
5b3300e2ca Add social mention listener 2019-02-12 12:40:00 +05:30
Suraj Shetty
be75b73bd5 Merge branch 'develop' of git://github.com/frappe/frappe into social-improvements 2019-02-06 09:47:53 +05:30
Sagar Vora
89efa968d8 Merge branch 'master' into develop 2019-02-05 18:39:43 +05:30
Sagar Vora
492252a5b3 Merge branch 'hotfix' 2019-02-05 18:23:19 +05:30
Sagar Vora
228522b555 bumped to version 11.1.4 2019-02-05 18:43:18 +05:50
Chinmay Pai
6377bdf6db fix(data_import): use absolute url (#6875) 
there is no need to prepend the sitename to the url, since browsers/html are/is smart enough to handle absolute urls.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2019-02-05 10:53:31 +05:30
Chinmay Pai
9373125c0a fix(reportview): cast docname to string (#6876) 
* fix(reportview): cast docname to string

explicitly cast docnames to string to fix sorting in reportview.py:217

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

* fix: codacy changes

i hate codacy.

* fix(reportview): remove redundant safe_decode call
 2019-02-05 10:52:54 +05:30
Saurabh
96bff3cd9e fix: jinja local.conf data leak (#6884) 2019-02-05 10:52:00 +05:30
Chinmay Pai
cac2ca53f2 fix(chat_profile): rename chat profile when email is renamed (#6885) 
chat profile should be renamed when user renames their email id, else the chat profile won't be found

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

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
 2019-02-05 10:50:16 +05:30
Nabin Hait
ff3ee03f11
fix: Download read-only fields from grid 2019-02-04 14:30:29 +05:30
Suraj Shetty
993daa8e7f Separate function to make mention clickable 2019-02-04 14:28:09 +05:30
Suraj Shetty
59b55d4df0 Use comment control for post comment 2019-02-04 10:06:14 +05:30
Suraj Shetty
5b9c010a3e Merge branch 'develop' of git://github.com/frappe/frappe into social-improvements 2019-02-03 18:52:03 +05:30
Nabin Hait
94cd6ce59b fix: Order by param in report builder (#6877) 2019-02-02 22:07:12 +05:30
Suraj Shetty
18e54143d0
Merge pull request #6870 from surajshetty3416/fix-like-button-in-issue-timeline 
fix: Like button functionality in Issue doctype timeline
 2019-02-01 21:01:58 +05:30
Suraj Shetty
80614fde68 Merge branch 'develop' of git://github.com/frappe/frappe into fix-like-button-in-issue-timeline 2019-02-01 17:37:56 +05:30
Suraj Shetty
a67cecf981 fix(test): Use single quotes for empty string (constant) (#6871) 
* Use single quotes for empty string
since value inside double quotes is considered as Identifier in postgres

* Do not show change log modal when in test

* Revert "Do not show change log modal when in test"

This reverts commit 6c2c3fd80cad3ff491b7d3b60a2b756ba6823bf8.

* Do not show change log modal when in test

- To check it is test environment we are checking if Cypress is
loaded on window object
 2019-02-01 17:34:12 +05:30
Suraj Shetty
9acfebc0ae Return doctype field as well from get_communcation method 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2019-01-31 19:20:01 +05:30
Chinmay Pai
9873c04231 fix(sync_global_search): decode json object as str (#6867) 2019-01-31 15:16:47 +05:30
Faris Ansari
88364f764f fix: Validate length for int and bigint column types (#6804) 
* fix: Validate length for int and bigint column types

* fix: skip standard fields

* fix: Skip Check fields as well

Value of Check fields can be True or False, which are casted to 0 or 1 explicitly
 2019-01-31 14:01:08 +05:30
Aditya Hase
57196a8bbe fix(website): Enable socketio on website (for file upload) (#6866) 2019-01-31 13:54:42 +05:30
Sagar Vora
cf1818f989 Merge branch 'master' into develop 2019-01-31 13:31:00 +05:30
Sagar Vora
9591fb7660 Merge branch 'hotfix' 2019-01-31 13:28:38 +05:30
Sagar Vora
f904987d2d bumped to version 11.1.3 2019-01-31 13:48:38 +05:50
Suraj Shetty
02664204ae fix: Set modified and created value while creating user permissions from patch (#6847) 
* Set modified and created value while creating user permissions

* Add patch to set missing creation and modified value

* Pass dict with value to the query

* Fix query

* Use now instead of now_datetime

* Set actual creation and modified of user permission

* Remove unwanted import

* Remove bad, useless, garbage code
 2019-01-31 13:17:22 +05:30
rohitwaghchaure
7ccb5a21c4 fix: prepared report filters not working (#6864) 2019-01-31 09:31:19 +05:30
Sagar Vora
c8f23b4746 Merge branch 'master' into develop 2019-01-30 20:08:53 +05:30
Sagar Vora
09ac86861d Merge branch 'hotfix' 2019-01-30 20:05:49 +05:30
Sagar Vora
3f3dd0ddb1 bumped to version 11.1.2 2019-01-30 20:25:49 +05:50
Aditya Hase
6031e2bc9c fix(search): Fix possible reflected XSS attack vector (#6860) 2019-01-30 19:55:50 +05:30
Sagar Vora
6811d8396f
fix: fallback not reqd for section label, has default (#6865) 2019-01-30 19:44:13 +05:30
Faris Ansari
621cadcf22
Revert "fix: Print Format Builder not working unexpected string (#6861)" (#6863) 
This reverts commit 42ec843b24.
 2019-01-30 18:43:40 +05:30
Kartik Sharma
42ec843b24 fix: Print Format Builder not working unexpected string (#6861) 
* Fix Print Format Builder

* fix: add *working* fallback

* fix: keep quotes around attr value
 2019-01-30 18:41:12 +05:30
Nabin Hait
e3952cb199
fix: Better data import error log (#6862) 2019-01-30 18:34:41 +05:30
Robert
5ac851e420 fix: frappe.throw of 'Invalid Password:' not translatable on update-password page (#6725) 
* [Fix] throw 'Invalid Password:' when checking password strongness

* Update __init__.py
 2019-01-30 17:40:15 +05:30
Aditya Hase
13de5fa823 fix(search): Fix possible reflected XSS attack vector (#6856) 2019-01-30 14:16:54 +05:30
Shivam Mishra
577c139252 fix: removed help setup from test scripts (#6857) 2019-01-30 14:05:22 +05:30
Karthikeyan S
bd196ac43b fix(router): error handling for use in non-desk environment(marketplace) (#6848) 2019-01-30 13:47:28 +05:30
Saurabh
76bd4e4f19 Merge branch 'master' into develop 2019-01-30 12:36:43 +05:30
Saurabh
5f817ed5df Merge branch 'hotfix' 2019-01-30 12:29:38 +05:30
Saurabh
b6c0dad25c bumped to version 11.1.1 2019-01-30 12:59:38 +06:00
rohitwaghchaure
e458d7d0a7 feat: provision to enable/disable prepared report from permission for page and report document (#6831) 
* feat: provision to enable/disable prepared report from permission for page and report document

* Added progress bar in the report

* Removed cache and fixed message

* Show progress bar if execution time is greater than 2 seconds
 2019-01-30 12:25:29 +05:30
Suraj Shetty
f5ded9fd56 Fix "object has no attribute 'parent_doc'" error while saving doc (#6855) 2019-01-30 11:49:42 +05:30
Rushabh Mehta
0704928fd8 fix(global search): fallback if redis is not yet started 2019-01-30 11:26:07 +05:30
Rushabh Mehta
d09792c606 fix: refactor global search to not insert after every commit (#6845) 
* fix: refactor global search to not insert after every commit

* feat: configuration to disable_global_search
 2019-01-30 11:13:51 +05:30
rohitwaghchaure
4a1ee3e66f fix: modified date (#6854) 2019-01-30 11:07:13 +05:30
Suraj Shetty
955bddf469
Merge pull request #6757 from zerodhatech/framework_queries 
fix: primary key should not have default value
 2019-01-29 22:35:51 +05:30
Sagar Vora
26eb775803
fix: keep deprecated help commands (#6851) 2019-01-29 21:56:57 +05:30
Sagar Vora
4e3684ee2a
fix: there are 28 fields in Event, not 30 (#6850) 2019-01-29 21:31:11 +05:30