Commit graph

15648 commits

Author SHA1 Message Date
Nabin Hait
ef536e055b Merge branch 'master' into develop 2018-04-07 19:57:04 +05:30
Nabin Hait
7f721099a2 Merge branch 'hotfix' 2018-04-07 19:57:03 +05:30
Nabin Hait
755c0e0b05 bumped to version 10.1.19 2018-04-07 20:27:02 +06:00
rohitwaghchaure
4c032eabbe Removed owner of the document from the BCC (#5401) 2018-04-07 19:55:45 +05:30
Ameya Shenoy
a8f9a652e1 dropbox backup not ablt to find filepath (#5406) 2018-04-07 19:55:01 +05:30
Faris Ansari
3b335388e5 Fix In-App Documentation (#5398)
* Fix In-App Documentation

* remove unused var
2018-04-06 16:38:03 +05:30
Nabin Hait
944b45b62d fixed merge conflict 2018-04-06 15:05:15 +05:30
Nabin Hait
5a74b9668a Merge branch 'hotfix' 2018-04-06 15:03:57 +05:30
Nabin Hait
5f6bd7a775 bumped to version 10.1.18 2018-04-06 15:33:57 +06:00
rohitwaghchaure
0b251f44fb [Fix] Owner of the document not getting the notifications for transactions they follow (#5396) 2018-04-06 14:54:29 +05:30
Faris Ansari
47d8d7af71
[filters] MultiSelect control when fieldtype is "In" or "Not In" (#5380) 2018-04-06 14:37:47 +05:30
Rushabh Mehta
5a582564e3 [fix] add data integration to sync sequence 2018-04-06 13:20:11 +05:30
Rushabh Mehta
28923629f5 Merge branch 'develop' of github.com:frappe/frappe into develop 2018-04-06 13:01:43 +05:30
Gaurav Naik
fdc9de8c74 Made "refactor_social_login_keys" patch SQL-based (#5116)
* Made refactor_social_login_keys SQL based

* Fixed syntax

* Syntax fixes #2

* Syntax fixes #3

* OR instead of AND in null condition

* Refactored query to include standard columns. Reintroduced code for Social Login Keys

* Removed print statement

* Added provider to standard cols

* Complete refactor

* Corrections to columns and values

* Corrected insert_user_social_login and position of idx increment

* cstr in idx

* Corrected target column list

* Codacy fixes

* Fix Codacy Errors
2018-04-06 10:58:26 +05:30
Charles-Henri Decultot
68720c2a4f [New Feature] Google Calendar Connector (#5266)
* Addition of a filter for last sync timestamp

* Google calendar connector wip

* Google calendar integration

* Add test for account creation

* Codacy corrections

* Remove unused import

* New section Google Services

* Add no_copy to migration custom field
2018-04-06 10:43:49 +05:30
saurabh-bhosale
5307149a48 Part of telephony integration (#5308)
* Allow 'Add contact' button for phone communications

* Added telephony details section for Phone communication details

* Updated make_issue, make_lead methods to send phone numbers into respective doctypes

* Codacy fixes

* Removed redundancy

* Removed Call details section from Communication
2018-04-06 10:31:15 +05:30
Saurabh
4e98f1689e [fix] breakdown backup process into two parts #5365 (#5390) 2018-04-05 18:24:19 +05:30
Saurabh
6d4d6cb8ca check whether file path exists (#5375) 2018-04-05 16:38:48 +05:30
Rushabh Mehta
8488acf300
[fix] receive.py (#5369) 2018-04-05 16:35:43 +05:30
Faris Ansari
5a4334a35a Add error logs in rollup watch (#5385)
* Add error logs in rollup watch

* Show frame when it is available
2018-04-05 16:32:46 +05:30
Suraj Shetty
8041d04bf9 Patch for user permissions (#5389)
* Drop column apply_user_permissions from DocPerm and Custom DocPerm

* add patches.txt

* add __init__.py
2018-04-05 16:32:28 +05:30
Nabin Hait
833c24ebf6 Debounce while searching in link fields 2018-04-05 14:59:23 +05:30
Prateeksha Singh
a8b62f3cff
Merge pull request #5388 from pratu16x7/hub
[rename][minor] get_user_page_or_report()
2018-04-05 14:53:15 +05:30
Prateeksha Singh
8106b3839e [add] allowed app icons 2018-04-05 14:43:28 +05:30
Faris Ansari
6f65870e6d Email Notification Count fix (#5374)
* Email count should be for "Received" mails

* fix typo
2018-04-05 12:07:32 +05:30
Suraj Shetty
b123d4ab10 clears user permission which will allow creation of records (#5384)
* clears user permission which allow creation of records

* py3 fix

* minor ui fix
2018-04-05 10:46:24 +05:30
Faris Ansari
dc69074886
Dedupe filters in listview (#5382) 2018-04-04 21:08:35 +05:30
Faris Ansari
2b0236acba
[filters] Remove invalid field in fieldselect (#5381) 2018-04-04 18:34:00 +05:30
Rushabh Mehta
52b6c2a9e9
Delete ISSUE_TEMPLATE.md 2018-04-04 16:38:01 +05:30
rohitwaghchaure
3e58ec305c
Merge pull request #5373 from rohitwaghchaure/fotter_issue_in_report
[Fix] Footer for report print
2018-04-04 15:16:32 +05:30
Rohit Waghchaure
8044b8be89 [Fix] Footer for report print 2018-04-04 15:15:02 +05:30
Rushabh Mehta
4fb47cf434 [chat] hide logs 2018-04-04 12:58:10 +05:30
Suraj Shetty
ba91496378 Permission fixes (#5368)
* ui-fixes
- change help text
- remove if owner description and change label to Only If Creator
- adjust icon size (restricted list)
- add tags.less in build json

* remove block module for user check

* label change for module access
Rename module access section to desktop in user doctype to avoid confusion
2018-04-04 12:54:18 +05:30
Nabin Hait
82f1058ad4 Merge branch 'master' into develop 2018-04-04 11:23:21 +05:30
Nabin Hait
0d8ab5aac5 Merge branch 'hotfix' 2018-04-04 11:23:19 +05:30
Nabin Hait
15823b07c6 bumped to version 10.1.17 2018-04-04 11:53:19 +06:00
Manas Solanki
80e20c47c3 fix the import for item variant (#5344) 2018-04-04 11:08:26 +05:30
Achilles Rasquinha
414abfc24b
Merge pull request #5367 from frappe-pr-bot/translations-2018-04-03
[Translation] Updated Translations
2018-04-03 23:08:51 +05:30
frappe-pr-bot
f123eae4ca [Translation] Updated Translations 2018-04-03 15:48:59 +02:00
Suraj Shetty
0be4342649 User permissions redux (#5314)
* [start] removing simpler user permission structure

* permission changes
removed "apply user permission" from has_permission

* test fixes and other supporting fixes

* Removed Apply user permission code

* additional check to see if user has some user permissions related to a doctype

* test fixes

* removed a test

* Permission changes
- Code to restrict access if module is blocked for user.
- [Fix] ignore user perm if applicable

* List view restrictions ui changes

* removed unwanted apply user perm code

* permission (block module fix)

* permission fix

* change user permission
user permission will not be applied if user doesn't have role permission

* removed left "apply_user_permissions" property

* add user permission help template

* perm js refactor

* ui / ux changes
restrict list view before entering view if user is not permitterd
add description for if owner check in role permission manager

* codacy fixes

* permission code fix
add controller permission check
add blocked module check in build_permission

* optimized get blocked module method
2018-04-03 10:42:04 +05:30
Achilles Rasquinha
022e89cc9f updated translations (#5361) 2018-04-02 23:37:16 +05:30
Rushabh Mehta
d6f09c5325
[optimize] frappe.db.count with cache (#5355) 2018-04-02 19:24:41 +05:30
Shreya Shah
71d59f7ba3 sync.js fixes (#5358) 2018-04-02 19:23:59 +05:30
Zarrar
1654f2dfb1 fix clicking of upgrade button (#5356) 2018-04-02 18:31:41 +05:30
Zarrar
edd089d4a1 append now_time to the filename incase of duplicate (#5313) 2018-04-02 18:22:12 +05:30
Faris Ansari
0a837cd62d Add breadcrumbs in about and contact page (#5345)
- fixes frappe/erpnext#12868
2018-04-02 18:16:18 +05:30
Achilles Rasquinha
14f3bfb4c0
Merge pull request #5352 from achillesrasquinha/hf-fixes
[hotfix] get valid traceback
2018-04-02 16:42:18 +05:30
Achilles Rasquinha
91a297d85d get valid traceback 2018-04-02 16:41:09 +05:30
Achilles Rasquinha
ee31da8d7b
Merge pull request #5350 from achillesrasquinha/fix-cast-single
fix cast singles
2018-04-02 16:07:47 +05:30
Achilles Rasquinha
c973394bce fix cast singles 2018-04-02 16:06:21 +05:30