Commit graph

14758 commits

Author SHA1 Message Date
mokhito
7d7d900f0d
Add endpoint_url param when connecting to object storage. 2018-01-06 13:01:24 +01:00
Achilles Rasquinha
b9599366d1
Merge pull request #4766 from achillesrasquinha/chat-fixes
[MIN] Fixes Message Timestamp for Chat
2018-01-05 20:07:21 +05:30
Achilles Rasquinha
5a3e817413 fix this.action.primary being empty 2018-01-05 13:48:56 +05:30
Achilles Rasquinha
5e705983c9 [MIN] Fix datetime creation 2018-01-05 13:36:18 +05:30
Achilles Rasquinha
a110444d1b [MIN] Fix datetime creation 2018-01-05 13:35:21 +05:30
Nabin Hait
161b423417 Merge branch 'master' into develop 2018-01-05 13:16:03 +05:30
Nabin Hait
648af86501 Merge branch 'hotfix' 2018-01-05 13:16:03 +05:30
Nabin Hait
566e25f1b3 bumped to version 10.0.7 2018-01-05 13:46:03 +06:00
Faris Ansari
69ca51fe35 Include dependent currency field with Currency fields (#4747)
* Include dependent currency field with Currency fields

* Escape HTML instead of encode

* Fix for LTR
2018-01-05 13:03:45 +05:30
Achilles Rasquinha
6c6c47109c Fix Social Login Patch Break (#4762) 2018-01-05 13:02:03 +05:30
Prateeksha Singh
b0c28d9280
Merge pull request #4761 from ci2014/patch-20
Fix indentation which causes error on restore
2018-01-05 11:57:01 +05:30
ci2014
eb8f38301a
Fix indentation which causes error on restore
Fixes error message, that document with a specific number already exists, even if it doesn't.
2018-01-04 22:15:01 +01:00
Achilles Rasquinha
337746b4a1
Merge pull request #4760 from achillesrasquinha/new-emoji
Load Emojis Async Using frappe.chat.emoji
2018-01-04 23:42:48 +05:30
Achilles Rasquinha
3b82f3cc13 Fix Codacy 2018-01-04 21:07:46 +05:30
Achilles Rasquinha
04c9d3e8be removed emoji.json from build.json 2018-01-04 19:57:32 +05:30
Achilles Rasquinha
c5d0207e28 deleted emoji.js 2018-01-04 19:49:53 +05:30
Achilles Rasquinha
79831dad81 load emojis async, covers all emojis 2018-01-04 19:47:41 +05:30
Achilles Rasquinha
131ac3b81e
Merge pull request #4753 from Sharath-Chikkanna/add_local_infile_param_to_pymysql_client
Local Infile param added to pymysql client to handle LOCAL keyword in…
2018-01-04 18:48:29 +05:30
Achilles Rasquinha
203675b112
Merge pull request #4756 from achillesrasquinha/chat-fixes
Chat Fixes
2018-01-04 17:19:49 +05:30
Achilles Rasquinha
25ecf977da Fixed Codacy 2018-01-04 17:04:35 +05:30
Achilles Rasquinha
9756e5dc50 Merge branch develop into chat-fixes 2018-01-04 16:48:59 +05:30
Achilles Rasquinha
7541886671 Merge branch 'develop' into chat-fixes 2018-01-04 16:38:51 +05:30
sharath.c
464e53f57c Local Infile param added to pymysql client to handle LOCAL keyword in custom BULK CSV's Import
Set local_infile = 1 in site_config for the pymsql to connect with LOCAL enabled state
> bench set_config local_infile 1
2018-01-04 11:52:29 +05:30
Achilles Rasquinha
d3db149144 updated message 2018-01-04 10:02:51 +05:30
Revant Nandgaonkar
bb0a2abdd5 [Fix] patch social login key refactor (#4749)
* [Fix] patch social login key refactor

* [Fix] import frappe in html_utils.py
2018-01-03 18:50:32 +05:30
Faris Ansari
6f4e2b046c
[fix] get_icon_html (#4748) 2018-01-03 18:07:38 +05:30
Sachin Mane
8d8358644c Fix JSON parse failure incase POST with no content is called. (#4743) 2018-01-03 17:48:10 +05:30
Achilles Rasquinha
e691a9e753 Added Design Consistencies 2018-01-03 17:36:20 +05:30
Achilles Rasquinha
3cb7f80336 Fixed Room Permissions and Message Permission Issues 2018-01-03 17:12:15 +05:30
Saurabh
c6a188321a
Merge pull request #4746 from saurabh6790/patch_fixes
run patch only if DocType Social Login Keys exists
2018-01-03 16:30:16 +05:30
Saurabh
0309eddec8 run patch only if DocType Social Login Keys exists 2018-01-03 16:26:28 +05:30
Achilles Rasquinha
f09cd2c1b7 Permission Fixes 2018-01-03 15:08:26 +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
Nabin Hait
abfbb0432c Fixed arabic translation for Sr 2018-01-03 12:13:23 +05:30
Prateeksha Singh
ba9f53bcce
Merge pull request #4745 from achillesrasquinha/cmd-restore-fix
[Minor] Print Error Fix during Backup Restore.
2018-01-02 21:53:18 +05:30
Achilles Rasquinha
112b42fb8a minor print error fix 2018-01-02 21:06:43 +05:30
Prateeksha Singh
cac28c5cd0
Merge pull request #4741 from achillesrasquinha/dialog-fix
Fix #4719
2018-01-02 19:55:24 +05:30
Faris Ansari
35811df7ef Remove get_count method, use the same db_query method for count (#4736)
* Remove get_count method, use the same db_query method for count

* Revert changes, db_query supported `count(name)` already
2018-01-02 17:55:51 +05:30
Shreya Shah
59dbde95ba removed a console statement (#4744) 2018-01-02 16:35:50 +05:30
Achilles Rasquinha
7bc6ceb22b Fix #4719 2018-01-02 12:58:54 +05:30
Achilles Rasquinha
2d5d367298 chat-fixes 2018-01-02 12:50:36 +05:30
ci2014
596717989f Align percentage values to the right (#4738)
Align percentage values to the right
2018-01-02 12:12:12 +05:30
Saurabh
f01e5c6b50 Merge branch 'hotfix' 2018-01-02 12:11:29 +05:30
Saurabh
8873935b36 Merge branch 'master' into develop 2018-01-02 12:11:29 +05:30
Saurabh
0fffaeebf5 bumped to version 10.0.6 2018-01-02 12:41:29 +06:00
Manas Solanki
93885ec8a5 Fix the customization (#4704)
* keep the json file for parent and child table different

* skip the child table customization if its file exists

* update the json of the child tables also
2018-01-02 11:56:17 +05:30
Faris Ansari
909234ab9d Listview get_count fix (#4740) 2018-01-02 11:55:49 +05:30
Saurabh
7d150a49a3 [fix] pass is root parameter on node creation (#4730) 2018-01-01 16:12:10 +05:30
Manas Solanki
d5f970e2b7 provide translations in the background process (#4735) 2018-01-01 16:11:04 +05:30
Prateeksha Singh
9299103b3e
Merge pull request #4698 from netchampfaris/offline-msg
Handle online/offline events
2018-01-01 15:25:35 +05:30