Commit graph

372 commits

Author SHA1 Message Date
Achilles Rasquinha
e00242ffff
Merge pull request #4853 from achillesrasquinha/fixes-chat
[PATCH, frappe-chat] enable chat by default within system settings
2018-01-17 15:52:29 +05:30
Achilles Rasquinha
f21247cb0f [PATCH] enable chat by default within system settings 2018-01-17 12:46:51 +05:30
Revant Nandgaonkar
f5e08ce041 [Fix] Patch v10_0.refactor_social_login_keys 2018-01-09 11:43:51 +05:30
Saurabh
0309eddec8 run patch only if DocType Social Login Keys exists 2018-01-03 16:26:28 +05:30
Revant Nandgaonkar
02aa7b6f41 Social login refactor (#4519)
* Added DocType Social Login Key

WIP for https://github.com/frappe/frappe/issues/4496
added basic fields
after_insert add provider_username and provider_userid fields on User dt
on_trash deletes added fields on User dt

* Added field to store fontawesome icon for provider

* [Patch] Social Login Keys to Social Login Key

* [Patch] Social Login Keys to Social Login Key

* Social Login Key generates boilerplate

* patch fixed for social_login_refactor

* removed patch-not working

* use social login keys to initiate flow

* Login page shows Social Login Key

* show login via if base_url present

* removed boilerplate generator

* Multiple Changes

fix zxcvbn import in password_strength.py
use of child table instead of additional fields on user dt to store username and userid

* Fetched Template on Client JS

* Frappe social login template working

* Added Social Login Key Templates

* Codacy fixes and validate social login key urls

* [Patch] Social Login Keys (untested)

* [Fix] Patch refactor social login keys

* [Fix] Patch refactor_social_login_keys manually tested

* Refactor OAuth 2.0 related changes for Social Login Key

* [Fix] Patch refactor social login keys

* Test - Adding Frappe Social Login Key

* Social Login Key Tests

check added child table entry on user for provider frappe
it also checks if userid is created

* [WIP] Office 365 Social Login Key Template

* [Fix] Social Login - Redirect URL

* [Test] Single sign-on icons for added provider

* [Fix] Codacy Errors

* [Fix] Social Login Key Form JS

* Docs Added for Social Login Key

* [Fix] Patch Refactor Social Login Keys

* Handle different icon types

Handle different icon types (image, icon, emoji) with just icon field

* Move the login methods to a new py file

frappe.integrations.oauth2_logins added
copied whitelisted guest oauth2 redirect endpoints from login.py
removing the functions from login.py will break backward compatibility

* Social Login Key Form Changes

Moved Enable field to top
Fields which are not editable are collapsed

* [Fix] Codacy Errors

* Corrected Docs, sync.py

* [Docs] Adding a social login provider

* [Fix] set frappe userid from User Social Login

* [Fix] frappe userid in oauth.py

* removed icon_type

* Use frappe.utils.is_image
2018-01-03 14:57:16 +05:30
tundebabzy
1bb960664e Add New Currency - XCD (#4660)
* adds XCD currency

* add as a new patch

* clean up
2017-12-25 13:39:48 +05:30
Nabin Hait
8a09f915e9 Merge branch 'master' into develop 2017-12-25 13:30:48 +05:30
Nabin Hait
8463937acd Enqueued communication patch if more than 1 lakh records 2017-12-20 11:48:30 +05:30
Nabin Hait
7dad1a35e9
Update add_sms_sender_name_as_parameters.py 2017-12-18 11:50:46 +05:30
Shreya Shah
e6f294b782 Activity Log Patch fix (#4580) 2017-12-07 15:26:53 +05:30
Nabin Hait
ec33e82ec6 Minor patch fix 2017-11-22 16:56:27 +05:30
Shreya Shah
4c79799131 added try catch block in patch (#4522) 2017-11-22 16:23:27 +05:30
Shreya Shah
acdbb97ba5 Moved feed from Communication to Activity Log (#4435)
* Removed comment_type 'updated'

* New doctype activity log

* Moved feed.py to activity_log

* Updated feed gets stored in activity_log

* Activity page fetches feed from activity_log

* feed match condition change

* modified

* modified hooks.py

* modified sessions.py

* patch added

* naming in patch

* moved login, logout feed to activity_log

* changes in auth.py, hooks.py

* deleted doctype authentication_log and added test cases

* added utils.py in core

* moved some methods from communication.py to utils.py
2017-11-21 15:46:51 +05:30
Rushabh Mehta
c354c54065 [hot] revert domain_settings patch 2017-11-14 13:39:53 +05:30
Rushabh Mehta
effe13925e [hot] revert domain_settings patch 2017-11-14 13:36:35 +05:30
Faris Ansari
cd32e87b98 [fix] Domain Setting patch (#4464)
* [fix] Domain Setting patch

* minor fix

* Update domain.py
2017-11-10 19:13:54 +05:30
Saurabh
6e7bdba8a6 [fix] catch Link Validation exception (#4446) 2017-11-08 14:57:37 +05:30
Nabin Hait
812ea70dc8 Reload sms settings from json (#4355) 2017-10-21 10:45:10 +05:30
Makarand Bauskar
03ea138ca5 [hotfix] ingore_mandatory fields while saving the sms settings in add_sms_sender_name_as_paramenters patch (#4342) 2017-10-18 17:09:13 +05:30
Nabin Hait
aca3658f36 Removed SMS sender field from SMS Settings (#4334)
* Removed SMS sender field from SMS Settings

* patch for sms sender name
2017-10-17 15:09:13 +03:00
Makarand Bauskar
99fa65cb1a [hotfix] fixed patch sequence and removed the update_email_queue patch (#4330) 2017-10-17 14:47:06 +05:30
Nabin Hait
4140bf809f minor fix in old patch 2017-10-04 15:19:53 +05:30
Rushabh Mehta
579d907b21 Merge pull request #4101 from tundebabzy/add_new_currencies
Add new currencies
2017-09-18 13:00:36 +05:30
mbauskar
e462a90d20 Merge branch 'master' into develop 2017-09-14 15:24:18 +05:30
Nabin Hait
4d4e5dcc02 Fixes for align labels right 2017-09-14 12:25:21 +05:30
tunde
0650c5c951 Merge branch 'develop' into add_new_currencies 2017-09-12 14:10:56 +01:00
tunde
b19b7159b2 add BGN, XAF, XOF currencies 2017-09-12 14:07:35 +01:00
Nabin Hait
7266e673ac Merge branch 'master' into develop 2017-09-12 16:09:19 +05:30
pratu16x7
0aaaca9b1a [fix] ignore results with non-existent doctypes 2017-09-08 15:45:36 +05:30
Aditya Hase
99f17c651c Use 'in' instead of 'has_key' 2017-09-04 16:05:58 +05:30
mbauskar
f8fd415eec Merge branch 'master' into develop 2017-08-21 08:54:38 +05:30
Faris Ansari
473083ae9d fix event color patch (#3943) 2017-08-17 18:38:12 +05:30
Makarand Bauskar
7bf6c19a31 [hotfix] daily_emails limit fixes (#3942) 2017-08-17 10:59:26 +05:30
Nabin Hait
2243fe154c minor fix in email queue status patch 2017-08-17 10:55:54 +05:30
mbauskar
40e140d287 Merge branch 'master' into develop 2017-08-16 20:04:53 +05:30
Makarand Bauskar
965a7460ac [hotfix] set email queue status to Not Sent (#3941) 2017-08-16 20:04:10 +05:30
mbauskar
bc603de8be resolved conflicts 2017-08-16 18:24:21 +05:30
Faris Ansari
702dd1b73a codacy fix 2017-08-16 16:02:57 +05:30
Faris Ansari
73aa0a35c4 Patch old event colors to hex 2017-08-16 15:51:15 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
Rushabh Mehta
5cebfb26b9 [minor] fix patch and module command 2017-08-03 12:02:18 +05:30
Aditya Hase
62bb03ef6e Replaced Python 2 print syntax with Python 3 syntax (#3838)
* Replaced Python 2 print syntax with Python 3 syntax

* Update utils.py
2017-08-02 17:10:40 +05:30
Makarand Bauskar
20145b231e [minor] check if user exists or not (#3831)
* [minor] check if user exists or not

* [minor] remove the User Permission Link from module view
2017-08-01 16:11:05 +05:30
Nabin Hait
89860d7ef3 Update user permissions only if record if present (#3820) 2017-08-01 11:15:14 +05:30
Makarand Bauskar
e6e16d112b [minor] set apply_for_all_roles to 1 in update user permissions patch (#3809) 2017-07-31 10:53:40 +05:30
Rushabh Mehta
f609a478ae [refactor] user permissions (#3713)
* [refactor] user permissions

* [fix] tests

* [ux] user-permissions

* [minor] cleanup system settings

* [minor] end progress
2017-07-28 14:33:31 +05:30
Manas Solanki
81133888a8 [fix] add the parsed email id for the email group member (#3741)
* add the parsed email id of the email group member

* Minor fixe in the patch
2017-07-21 11:05:54 +05:30
Rushabh Mehta
4d9d66d916 [fix] patch 2017-07-11 11:04:45 +05:30
Rushabh Mehta
06f1eeff35 [fix] patch 2017-07-11 11:01:05 +05:30
Rushabh Mehta
9e5df7aeff [fix] patch 2017-07-11 11:00:10 +05:30