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

17384 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sagar Vora
2d166e7513 Merge branch 'master' into staging-fixes 2019-01-22 15:24:48 +05:30
Sagar Vora
3be02c067d Merge branch 'hotfix' 2019-01-22 15:19:38 +05:30
Sagar Vora
a00b063d36 bumped to version 10.1.70 2019-01-22 15:39:38 +05:50
Sagar Vora
3e47cd9a2b
Merge pull request #6788 from sagarvora/freeze-requests-oauthlib 
fix(requirements): freeze requests-oauthlib to 1.1.0
 2019-01-22 15:11:30 +05:30
Zarrar
c58d2c34d4 fix: don't append signature if it is already present (#6800) 2019-01-22 14:40:26 +05:30
Saif
c7c82ff972 WebsiteGenerator call super class clear_cache (#6786) 2019-01-22 11:28:26 +05:30
Aditya Hase
b2f559ce79 fix(list-view): Show count that matches number of rows (#6798) 2019-01-22 11:27:18 +05:30
Suraj Shetty
132a92e6cc fix: "list object has no get attribute" error while saving new doc (#6799) 
* Fix .get() function not found error while saving new doc

* Remove print statement
 2019-01-22 11:26:10 +05:30
Nabin Hait
555049b75f
fix(grid): Download hidden fields data from grid (#6796) 2019-01-22 11:25:47 +05:30
Faris Ansari
987a604749 fix: Use ImportError instead of ModuleNotFoundError (#6797) 
- ModuleNotFoundError is available in python 3.6
 2019-01-21 17:57:38 +05:30
Faris Ansari
6724b0fd26 fix(quill): Convert ol to ul before sending the value to server (#6795) 2019-01-21 17:42:21 +05:30
Suraj Shetty
95e9afa1f3 feat: Clear user permissions button (#6767) 
* Add button to delete user permissions in bulk

* Show no records deleted the delete count is 0

* Return this from show of dialog to make it chainable

* Add test for clear user permissions function

* Fix test

* Format code

* Reset the user

* Remove rollback from test

* Move clear user permission button to menu

* fix: Translations
 2019-01-21 16:52:12 +05:30
Suraj Shetty
818a37fa08
Merge pull request #6794 from netchampfaris/weird-event-emitter-fix 
fix: Make event emitter from blank object
 2019-01-21 16:01:51 +05:30
Faris Ansari
76380687ad fix: Make event emitter from blank object 
- If a function is passed to jQuery, it calls it 🤷🏻‍♂️
- In hindsight, it is not needed to pass the object to jQuery
- This fixes a weird bug explained here
https://github.com/frappe/frappe/pull/6791
 2019-01-21 15:17:06 +05:30
Suraj Shetty
f073b7ded3
Merge pull request #6728 from rohitwaghchaure/fixed_user_permissions_issue_dict 
fix: 'dict' object has no attribute 'applicable_for'
 2019-01-21 10:46:15 +05:30
Sagar Vora
98bd66ba00 fix(requirements): freeze requests-oauthlib to 1.1.0 2019-01-20 10:35:57 +05:30
Andrew McLeod
d9ee1674c5 fix: Add 'parent' argument to frappe.db.get_value. (#6570) 
Add 'parent' to call to get_value in data.js.
Fixes issues with lookups in data.js which check for already existing names. Without this, the get_value calls fail for child fields such as 'barcode' in Item Barcode with PermissionError warning.
 2019-01-18 13:59:12 +05:30
Zarrar
3d95621cd5 feat(email): Retry sending Email 3 times before deeming it as error (#6754) 
* added field to note number of retries

* incase of unprecedented errors increase retry counter and try sending again
 2019-01-18 13:33:59 +05:30
Charles-Henri Decultot
1234852568 fix: Removal of a logging line (#6778) 2019-01-18 12:09:45 +05:30
Suraj Shetty
4086d2edef
Merge pull request #6782 from netchampfaris/misc-fixes-6 
fix(timeline-item): User image urls dont load if they have a space
 2019-01-18 07:09:09 +05:30
Faris Ansari
e9b33630e9 fix(timeline-item): User images dont load if they have space in the url 2019-01-17 18:04:15 +05:30
Saif
a9b782b861 fix(Caching): Clear document_cache in clear_doctype_cache (which is called from bench migrate) (#6772) 2019-01-17 12:21:41 +05:30
Saurabh
d55d33ec9e fix: syntax-fix treat obj as list (#6776) 2019-01-16 18:57:22 +05:30
Deepesh Garg
19a8a6cdc0 fix: Address and contact report (#6763) 2019-01-16 18:54:37 +05:30
sahil28297
6d2b16cf42 fix(minor): assign_to field disappears while assigning a task/issue (#6775) 
* fix(minor): assign_to field while assigning

* fix: remove whitespaces
 2019-01-16 18:50:14 +05:30
Suraj Shetty
bb7a2f04ac
Merge pull request #6769 from netchampfaris/dt-date-filter-fix 
fix: DataTable date filter
 2019-01-16 14:23:01 +05:30
rohitwaghchaure
45fbd07af1 fix: increased threshold for making report as prepared report (#6773) 2019-01-16 12:04:40 +05:30
Saurabh
cb089b3154 bumped to version 11.0.3-beta.49 2019-01-15 19:44:05 +06:00
Saurabh
2fbf59522e Merge branch 'master' into staging-fixes 2019-01-15 19:05:42 +05:30
Saurabh
480b31587d bumped to version 10.1.69 2019-01-15 19:35:41 +06:00
rohitwaghchaure
4a20b550be
Merge pull request #6751 from rohitwaghchaure/emails_are_not_fetching 
fix: Email inbox, system not pulling the latest emails
 2019-01-15 18:46:50 +05:30
Aditya Hase
14cedc40ca fix(auth): Decode username, password obtained from cache (#6770) 2019-01-15 11:11:34 +05:30
Aditya Hase
220ac9a137 fix(list-view): Cast docnames to str before sorting (#6766) 
In Python 3 str and non-str comparison is not allowed.

Bulk delete operation fails when selected docnames meet following condition
1. at least on name can be casted to int or other types e.g. "1", "3123423524", "1.0"
2. at least on name that cannot be casted to other types e.g. "A", "56cd83dab1"

The root cause is $.data() which forcefully casts data-name to non string types when possible
 2019-01-14 16:44:54 +05:30
Faris Ansari
239d2dcfce style: missing semicolon 2019-01-14 14:19:52 +05:30
Faris Ansari
7e36e92148 fix: Custom Date filters in DataTable 
Date comparison won't work with simple string comparison. Now, datatable allows to hook into how cell values are compared.
 2019-01-14 14:08:48 +05:30
Rushabh Mehta
258c59c218 fix(ui): default icon for Web Page 2019-01-11 12:11:29 +05:30
Sagar Vora
fff2c5f6f4
fix: message.seen not a function, replace with valid function (#6753) 2019-01-10 18:27:36 +05:30
Rohit Waghchaure
59549eb9df [Fix] Emails are not fetching 2019-01-10 16:01:36 +05:30
Saurabh
ef7cb64fb4
Merge pull request #6747 from saurabh6790/requirement-fixes 
fix(requirements.txt): block oauthlib package version to 2.1.0
 2019-01-10 16:01:30 +05:30
Deepesh Garg
f79e48ee40 build: Upgraded frappe-datatable (#6732) 
* build: Upgraded frappe-datable

* Update datatable to 1.7.3
 2019-01-10 15:37:04 +05:30
Nabin Hait
f970a9fd61 fix(comments mention): Fix ascii issue in comments mention (#6742) 2019-01-10 15:34:39 +05:30
Saurabh
ebca5aabdb fix: block oauth package version to 2.1.0 2019-01-09 12:54:20 +05:30
Saurabh
22b1987dfa bumped to version 11.0.3-beta.48 2019-01-08 16:37:36 +06:00
Saurabh
f8810bbf9d
Merge pull request #6738 from surajshetty3416/fix-image-upload 
fix: No permission for System Settings while uploading image
 2019-01-08 15:34:19 +05:30
Suraj Shetty
cfca17c1be Commonify code 2019-01-08 14:27:16 +05:30
Nabin Hait
1d686e470b
fix(comp_dashboard): Company dashboard if goal is zero. (#6719) 2019-01-08 14:16:04 +05:30
Deepesh Garg
900392efa3 fix : Auto email report fix for XLSX and CSV format (#6729) 2019-01-08 14:09:10 +05:30
Suraj Shetty
c038318446 Remove unwanted network request to check setting 
- check use_socketio_to_upload_file flag from
frappe.boot.sysdefaults.use_socketio_to_upload_file
instead of making network request
 2019-01-08 13:03:00 +05:30
Nabin Hait
5590193c8d fix(version): getting version update (#6717) 
* fix(version): getting version update

* fix(version): getting version update
 2019-01-07 08:57:04 +05:30
Deepesh Garg
c274882fd0 Display all filters in report view (#6722) 2019-01-07 08:56:36 +05:30