Commit graph

410 commits

Author SHA1 Message Date
Rushabh Mehta
2ab07f4275 [feature] autoname prompt, refactor control.js, fixes frappe/erpnext#8940 2017-08-24 18:35:07 +05:30
B H Boma
dcee43f646 Settings to send Qrcode as email to user 2017-07-27 17:59:43 +01:00
crossxcell99
aa45ffcac6 fix website user login bug refactor JS 2017-07-21 14:32:04 +01:00
B H Boma
cde8001369 Show twofactor auth in setup wizard 2017-07-18 17:30:11 +01:00
crossxcell99
9c144312eb show qr code for first otp login 2017-06-29 16:34:01 +01:00
Nabin Hait
aa2a8a9c3c fixed module for address 2017-06-15 14:25:44 +05:30
KanchanChauhan
f52e389d4f Salutation and Gender in Contact (#3079) 2017-06-13 15:25:53 +05:30
Saurabh
7e2972dee8 a[fix] move dropbox backup upload from short queue to long queue to avoid timeout exceptions 2017-06-12 16:14:12 +05:30
Faris Ansari
c03268c44f Change beta_version to 8.x.x-beta 2017-05-04 10:10:24 +05:30
Makarand Bauskar
d552ad86ed [minor] fixes for has_website_permission of address doctype (#3070) 2017-04-12 14:10:33 +05:30
mbauskar
685803900e [minor] updated the scheduler event to sync user settings 2017-03-30 17:05:47 +05:30
mbauskar
4ec430c454 [minor] permission query conditions for communication/email 2017-03-29 18:40:58 +05:30
Saurabh
4a31fbf0e2 [minor][fix] clean-up extra backups and calculate user space on hourly basis 2017-03-27 12:32:42 +05:30
Faris Ansari
0fa716c56d [kanban] private kanban board for Note, create new project for Task 2017-03-15 09:59:24 +05:30
Saurabh
7620bb3789 Deprecate Integration Broker (#2831)
* [fix] remove razorpay from integration service

* [fix] clean-up js side integration service dependancies

* [fix] remove integration service, .py cleanup, move integration request to integration

* [fix] move oauth to integrations and deprecate integration broker

* [fix] mark services enabled and update integrations listing

* [fix] V7.1 and V7.2 integration service related pathch fixes and move payment gateway dotype to core module

* [fix] create payment gateway records if not exists

* [fix] module page for integrations

* [minor][fix] minor checks

* [fix] remove integration broker module only if not allocated to any doctype
2017-03-14 11:24:26 +05:30
Rushabh Mehta
7a735739e1 [minor] show develop_version in branch 2017-03-10 09:38:19 +05:30
Nabin Hait
622c244ce5 Merge pull request #2697 from mbauskar/imap
[enhancement] IMAP mail syncing
2017-03-08 14:14:55 +05:30
Rushabh Mehta
1e7229c45f [enhance] global search in website (#2810)
* [enhance] global search in website

* [fix] create table query

* [website] navbar search in header if set

* [minor] navbar_search in website settings
2017-03-07 16:37:50 +05:30
mbauskar
62fe7d19a4 [minor] mark email as seen once open in ERPNext 2017-03-07 13:57:28 +05:30
Makarand Bauskar
99d97530b1 [enhancement] Feedback Feature (#2683) 2017-02-09 11:30:54 +05:30
Nabin Hait
b784138436 Fixed merge conflict 2017-02-08 11:31:58 +05:30
Rushabh Mehta
3848c657ca [fix] hotkeys 2017-02-03 10:13:25 +05:30
Makarand Bauskar
e422e16953 [WIP] Feedback Triggers (#2643)
* [wip] feedback

* [WIP] Feedback Trigger, Feedback Request, Feedback & Rating Timeline and Form Sidebar

* [minor] minor fixes in feedback trigger

* [Test Cases] Test Cases for Feedback Trigger

* [minor] replaced sql_list by get_all changed the button label

* [minor] removed whitespaces, fixed spelling mistakes
2017-02-02 15:15:23 +05:30
Makarand Bauskar
2119e9aed2 [minor] minor fixes breadcrumbs & clear auth log (#2663) 2017-02-02 11:14:37 +05:30
Rushabh Mehta
e4cba51275 [fix] address_and_contacts hooks 2017-01-31 14:16:53 +05:30
Rushabh Mehta
039a241a56 [fix] address_and_contacts hooks 2017-01-31 14:11:40 +05:30
Makarand Bauskar
dc59e978f7 [minor] fixes for Is Your Company Address validations (#2606)
* [WIP] Address & Contacts fixes

* [minor] included sales partner in Addresses and Contacts report

* [minor] filters in address and contact query

* [minor] address and contact utils
2017-01-24 14:38:33 +05:30
Nabin Hait
80e97a535b Merge branch 'master' into develop 2017-01-20 15:26:01 +05:30
Saurabh
d294082122 [fix] remove dropbox backup from hooks, backup call is handled by integration service (#2572)
* [fix] remove dropbox backup from hooks, backup call is handled by integration service

* [fix] test case fix for Integration Service scheduler events
2017-01-20 12:28:47 +05:30
Rushabh Mehta
d6c3c9a8e7 [enhance] moved contact to frappe 💥 2017-01-13 18:52:41 +05:30
Rushabh Mehta
2a8902326d [feature] merge knowledge base in Frappe, fixes frappe/erpnext#6030" 2016-11-28 17:26:53 +05:30
Rushabh Mehta
2fe0e2acad [fix] set Message-Id in email based on reference and tag replies to the same object 2016-11-17 09:45:44 +05:30
Revant Nandgaonkar
a16e6a143f OpenID Connect for Frappe (#2227)
* Add field for client_secret in Oauth Client Doctype

* openid_profile endpoint in oauth2.py

* added stub methods for OpenID Connect in RequestValidator

* [Fix] using werkzeug url_fix on uri

* added 3 oidc methods in RequestValidator

* Added Frappe Section in Social Login Keys

Add section in `Social Login Keys` for fields `Frappe Client ID` and `Frappe Client Secret` and additional field Frappe OAuth 2 Server because github, facebook and google have fixed urls, Frappe server URL can change as per the hosting domain/server/company

* [Fix] accept code id_token param for oidc

* generate id_token jwt alg HS256

* Updates to OAuth 2 and OIDC

`OAuth Authorization Code` and `OAuth Bearer Token` DocType made RO
Delete Invalid Codes and Revoked Tokens periodically
generate and send `id_token` only if scope of token is `openid`

* [Fix] Periodically delete revoked tokens

* Social Logins untested

* Enabled Frappe social login

* [Docs] OpenID Connect and Frappe social login

* [Fix] Allow multiple scopes for OAuth 2

* [Docs] Added screenshot steps to configure openid and frappe social login

* saved doctype to solve merge conflict

* [fix] re-added client_secret after resolving merge conlict

* [Fix] frappe_userid and default scope
2016-11-07 22:25:11 +05:30
Saurabh
205ae26751 [fix] refactor integration services (#2087)
* [fix] refactor integration services

* [fix] patch fix

* [fix] added redirect url.

* [fix] custom redirect to and reditect message for paypal and service setup information

* [minor][fix] remove ldap dependancy from requirements
2016-10-10 17:16:21 +05:30
Rushabh Mehta
bae97cfed4 Email Alert on any controller method (#2157)
* [docs] typo

* [email alert] now on any standard controller method

* [minor] install customizations with intall;

* [test] [fix] and truncate subject in email;

* [fix] error log seen issue
2016-10-08 11:11:36 +05:30
Rushabh Mehta
9d7ee83c5e [refactor] scheduler log is now error log and as MyISAM (commit not required) (#2152)
* [refactor] scheduler log is now error log

* [minor] new naming series

* [fix] engine

* [fix] saved by tests
2016-10-06 17:17:55 +05:30
Makarand Bauskar
dc30e57b60 [minor] removed the desktop_backgroud from frappe hooks (#2085) 2016-09-26 18:15:47 +05:30
Shreyas Patil
12422e75b0 [Minor] Allow user to set limit for downloadable backups for the site (#2059)
* [Minor] Allow user to set limit for downloadable backups for the site

* [Fix] Updated path for daily_long and weekly_long dropbox backup hooks

* [Fix] Updated system_settings.json
2016-09-21 11:10:41 +05:30
Makarand Bauskar
ac616e1e3e [minor] spelling fixes (#2066) 2016-09-19 13:09:03 +05:30
Saurabh
18c62f0470 Integration broker (#1968)
* [enhancement] integration borker and controller

* [minor][fix] parameter naming changes

* [fix] common scheduler for integration service

* [fix] integrations

* [patch] patch to move payment gateway in Integration Service

* [fix] add payment success, cancel and failuer handling pages

* [enhancment] dropbox integration merged in integration services

* provision to add custom parameters

* [fixes] patch fix to setup dropbox settings

* [fixes] removed dropbox backup, api usage note for paypal and razorpay

* [minor][fix] deprecate service events

* [fix] return type fix for checkout urls

* [fix] add custom settings via patch for dropbox backup frequency

* [fix] remove gride editting

* [enhance] ldap based login

* [enhance] login via ldap credentails

* [commit] remove parameter table, save params as json dict
2016-09-09 11:15:18 +05:30
Rushabh Mehta
303e7460c2 [feature] [wip] added Auto Email Report 2016-09-01 17:52:33 +05:30
Rushabh Mehta
7ef8f5f7a2 [minor] fixes to patches, ignore validate if in patch, move some events to hourly 2016-08-16 10:24:09 +05:30
Rushabh Mehta
07bdc7b111 [fix] enable website_theme 2016-08-03 11:49:18 +05:30
Valmik Jangla
4bdf8fab62 Email Group fixes 2016-07-12 23:37:43 -07:00
Kanchan Chauhan
a23ee192f3 Newsletter moved to Frappe 2016-06-28 18:28:24 +05:30
Anand Doshi
3854bcad04 [fix] limits variables and how usage is stored within limits + additional fixes 2016-06-25 17:41:19 +05:30
Rushabh Mehta
461adc7c37 [fix] more rename from bulk to email queue 2016-06-22 13:19:58 +05:30
Rushabh Mehta
da95b484db [fix] merge fixes and test 2016-06-22 13:10:23 +05:30
Rushabh Mehta
8a91f1a790 [rename] Bulk Email to Email Queue 2016-06-22 13:06:06 +05:30
Valmik Jangla
0687eb145d Added misc Frappe Subscription features 2016-06-22 12:37:33 +05:30