Commit graph

14729 commits

Author SHA1 Message Date
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
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
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
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
ci2014
596717989f Align percentage values to the right (#4738)
Align percentage values to the right
2018-01-02 12:12:12 +05:30
Saurabh
8873935b36 Merge branch 'master' into develop 2018-01-02 12:11:29 +05:30
Saurabh
f01e5c6b50 Merge branch 'hotfix' 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
Faris Ansari
4ad23ed871
More Listview fixes (#4733)
* Keep indexes in Sr. No after sort, fix flash on render

* List Activity style fix

* Fix cell formatting for currency
2018-01-01 11:37:08 +05:30
Faris Ansari
b77525d268 Merge with develop 2017-12-30 11:36:49 +05:30
Prateeksha Singh
995a384d46 [refactor] UI Tree component (#4700)
* tree refactor

* [tree] Tree as the only class

* [tree] style tweaks

* [ui-tree] remove frappe.call, add async handler

* [minor] add way to add raw elements to sidebar

* [ui-tree] cleanups

* [ui-tree] default icon-set
2017-12-29 18:21:04 +05:30
Achilles Rasquinha
90390765d3 Fixed grid paste (#4726) 2017-12-29 17:43:54 +05:30
Achilles Rasquinha
868c7b13bb Add help to navbar (#4720) 2017-12-29 17:43:20 +05:30
Faris Ansari
4a30a52568
Keep indexes in Sr. No after sort, fix flash on render (#4728) 2017-12-29 17:43:02 +05:30
Achilles Rasquinha
1d21006de4 throw error in case a user creates a room with himself (#4721) 2017-12-29 15:16:34 +05:30
Achilles Rasquinha
2fd65ba4da [Dialog] Click Fix on Quick Entry. (#4718)
* click is not defined on quick entry

* Update dialog.js
2017-12-29 14:00:29 +05:30
Faris Ansari
ed6afe9c74
Listview fixes (#4714)
* Include std_fields always

* Include Status field if has_indicator is false

* [fix] Edit Child Table columns
2017-12-29 13:46:20 +05:30
Achilles Rasquinha
b54cf5d282 Fix user namespace creation on new-site, fails to login (#4717) 2017-12-29 13:45:59 +05:30
Achilles Rasquinha
6e1fa60ccb remove tag element from list (#4708) 2017-12-29 11:47:36 +05:30
Achilles Rasquinha
98a37076ef Fix ERPNext #12234 (#4709) 2017-12-29 11:18:33 +05:30
Prateeksha Singh
18d0271aa2
Merge pull request #4710 from achillesrasquinha/depchat-fix
[URGENT] Delete references of Previous Chat.
2017-12-29 11:12:05 +05:30
Achilles Rasquinha
4be9297386 Supressing Chat Profile test cases for now, fixed frappe-chat-toggle on navbar 2017-12-29 10:56:17 +05:30
Achilles Rasquinha
0e68b8b175 remove socketio logs 2017-12-29 10:38:48 +05:30
Achilles Rasquinha
882220cf4f removed coverage 2017-12-29 10:28:04 +05:30
Achilles Rasquinha
e28d497724 delete references of deprecated chat 2017-12-29 10:08:15 +05:30
Prateeksha Singh
0c3eb1ece9
Merge pull request #4707 from pratu16x7/awesome-bar-fixes
[awesome-bar] handle report route via list view
2017-12-29 09:17:12 +05:30
Prateeksha Singh
52ad39c899 [awesome-bar] handle report route via list 2017-12-29 09:14:35 +05:30
Nabin Hait
87475865ed Merge branch 'master' into develop 2017-12-28 19:41:27 +05:30
Nabin Hait
01438f0cd5 Merge branch 'hotfix' 2017-12-28 19:41:26 +05:30
Nabin Hait
ae18969f1e bumped to version 10.0.5 2017-12-28 20:11:26 +06:00
Faris Ansari
f46865017c More Listview fixes (#4705)
* Include std_fields always

* Include Status field if has_indicator is false
2017-12-28 19:35:10 +05:30
Manas Solanki
7c6004e981 minor fix for the data import (#4706) 2017-12-28 19:34:35 +05:30
Achilles Rasquinha
005cfe3dc8 🎉 NEW Frappe Chat (#4612)
* added doctypes, created frappe chat ui

* added component layout with state-like abilities, added apis

* updated user doctype, moved from state-like feature and component abstraction

* added room component

* fixed publish_realtime with after_commit = True

* created room component and searchbar

* minor fix

* functional message parsing

* update

* Added Chat Profile

* added chat message

* more changes into chat room

* fixed APIs, added client side scripting

* added chat message attachements, more doc updates

* Brand New UI with socket io room integration

* completed socketio integration. off to room subscription and publish

* realtime room update

* raw update

* initialized docs, added p2p connection for call tests

* updated docs

* added coverage, updated api for ease of use

* raw commit

* added test cases

* Chat Room updates and new room creation

* added chat group creation

* added collapsible plugin

* toggable room view

* updated

* [RAW]

* updated UI for chat

* Deleted Previous Chat Page

* moved from frappe.Chat.Widget to frappe.Chat

* modularized frappe-fab

* added more docstrings

* tried adding conversation tones

* Added conversation_tones and refurbished chat popper

* modified frappe.ui.Dialog, moved from AppBar to ActionBar, responsive for Mobile 💃

* moved RoomList item namespace

* Configurable Desktop update, moved profile updates to on_update

* added state change listeners

* removed AppBar to ActionBar customizable 💃

* added destroy method

* removed coverage, refactored group creation

* Successful Chat Rooms and Group creation

* sort rows based on last_message_timestamp or creation

* added frappe._.compare

* removed redundant less variables

* Chat Room back button with custom routing and destroy methods

* Added EmojiPicker

* fixed multiple dialog render

* setup quick access

* added chat chime, functional chat message list updates at room list

* deleted package-lock.json

* realtime date updates

* updated chat message list

* functional message render and updates

* added track seen

* added typing status

* updated typing status

* valid typing statuses and quick search

* Functional Quick Search

* reverted fix

* some more cleanup and promisifed

* fixed hints close on click

* updated fab boldness

* close popper on click panel

* close popper on click panel

* reverted octicon-lg, fixed popper heading click

* new frappe capture

* removed webcamjs

* added uploader and capture

* removed chat FAB, added as notification instead

* on message update
2017-12-28 18:58:43 +05:30
Faris Ansari
b5f9d363f6 codacy 2017-12-28 16:04:37 +05:30
Faris Ansari
2f86cd82ff
Strip HTML for ListView columns (#4703)
* Don't show Text Editor columns in ListView

* [ListView] Strip HTML for all columns

* [DataTable] Edit Text Editor fields in dialog

* [fix] strip_html

* [fix] Dynamic title fields
2017-12-28 15:36:19 +05:30
Nabin Hait
6b15cfcfb0 Merge branch 'master' into develop 2017-12-28 13:12:23 +05:30
Nabin Hait
80004c10e4 Merge branch 'hotfix' 2017-12-28 13:12:22 +05:30