Commit graph

17492 commits

Author SHA1 Message Date
Faris Ansari
72a244f9e6
Merge pull request #6903 from sahil28297/fix_email_group_subscribers
fix(email_group): show correct total subscribers after updating email group members
2019-02-08 19:37:51 +05:30
sahil28297
5ad6131e8f
Merge branch 'hotfix' into fix_email_group_subscribers 2019-02-08 18:33:35 +05:30
Sahil Khan
91ac1608db fix: remove print statements 2019-02-08 18:26:04 +05:30
Sahil Khan
192cba460e fix(email_group): show correct total_subscribers after inserting or deleting email group members 2019-02-08 18:22:01 +05:30
rohitwaghchaure
f674ccc3d9
Merge pull request #6895 from surajshetty3416/perm-message-fix
fix(permission): Permission failure message
2019-02-08 16:30:27 +05:30
Rushabh Mehta
97815fb19d
Merge pull request #6897 from kennethsequeira/rep-exec
fix(typo in report): Exection Time -> Execution Time
2019-02-07 20:27:23 +05:30
Rushabh Mehta
ef23c57106
Merge pull request #6896 from netchampfaris/default-print-lang-notification
fix: Set default print language in Notification
2019-02-07 20:26:33 +05:30
Kenneth Sequeira
7b45ca5fef Fix Typo: Exection Time -> Execution Time 2019-02-07 19:23:24 +05:30
Faris Ansari
1d5310166d fix: Set default print language in Notification 2019-02-07 18:18:01 +05:30
Suraj Shetty
06892149a9 Show permission failure message based on passed user
- only if user passed is equal to session user or if no user is passed
2019-02-07 17:48:05 +05:30
Rushabh Mehta
9bb0f63ce8
Merge pull request #6873 from britlog/unsubscribe-encoding
Fix encoding error
2019-02-07 07:05:44 +05:30
Rushabh Mehta
57cbac7feb
Merge pull request #6888 from sunnyakaxd/patch-4
fix: (Critical) Close read_only db connection
2019-02-07 07:05:12 +05:30
Rushabh Mehta
9b35a090c3
Merge pull request #6887 from sunnyakaxd/patch-3
fix: remove distinct from count
2019-02-07 07:03:38 +05:30
Himanshu Mishra
53930a12eb
Close read_only db connection
Close read only db connection, else one might end up with 'Too many connections' error from mysql.
2019-02-06 22:32:26 +05:30
Himanshu Mishra
5c14f2c256
remove distinct from count
We shouldn't do a distinct count on primary key, as it is not required, and is also slow. See below query run times.

MariaDB [c6b2c772b91fd3d8]> select count(distinct name) from `tabStock Ledger Entry`;
+----------------------+
| count(distinct name) |
+----------------------+
|              3268372 |
+----------------------+
1 row in set (14.65 sec)

MariaDB [c6b2c772b91fd3d8]> select count(name) from `tabStock Ledger Entry`;
+-------------+
| count(name) |
+-------------+
|     3268372 |
+-------------+
1 row in set (0.24 sec)
2019-02-06 21:04:20 +05:30
Saif
1bb4c6275f fix: Don't send attachment/download header with PDF files (#6881) 2019-02-06 12:48:41 +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
Nabin Hait
94cd6ce59b fix: Order by param in report builder (#6877) 2019-02-02 22:07:12 +05:30
britlog
c79abc6d77 Fix encoding 2019-01-31 22:34:15 +01:00
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
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
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
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
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