Commit graph

1621 commits

Author SHA1 Message Date
Prateeksha Singh
ee220861c5 Desktop icons select dialog in place of page (#4843)
* [module_icon_setup] Initial bindings

* [module_icon_setup] replace with dialog

* [module_icon_setup] remove modules setup page

* [module_icon_setup] remove app installer
2018-01-23 15:26:49 +05:30
Prateeksha Singh
2bb25442fd
Merge pull request #4876 from pratu16x7/hotfix
ignore xss on barcode by default, fixes frappe/erpnext#11973
2018-01-19 15:16:19 +05:30
Prateeksha Singh
077230c922 ignore xss on barcode by default, fixes frappe/erpnext#11973 2018-01-19 15:11:27 +05:30
Rohit Waghchaure
87a0b6213b Merge branch 'master' into develop 2018-01-19 13:06:50 +05:30
Achilles Rasquinha
6a238b0048 Send me a Copy not in BCC (#4874) 2018-01-19 12:15:07 +05:30
rohitwaghchaure
3e187d7d50 [Fix] Showing status as Replied after adding the comment in the emails (#4865) 2018-01-18 15:37:46 +05:30
rohitwaghchaure
cf4060d632 [Fix] Feedback issue (#4867) 2018-01-18 15:37:28 +05:30
Aditya Hase
8c525fc5d4 Python 3 compatibility Frappe installation fixes (#4863)
* Use consistent indentation

* Fix print syntax

* Pass unicode argument to pymysql.escape_string
2018-01-18 13:52:46 +05:30
Faris Ansari
477f4b92ea
[fix] file test (#4861)
* [fix] file test

* minor

* [fix] refresh after apply filter
2018-01-18 13:12:34 +05:30
Achilles Rasquinha
7874abd830
Merge pull request #4841 from achillesrasquinha/fixes-chat
[frappe-chat] Updated System Settings
2018-01-16 12:08:54 +05:30
Achilles Rasquinha
eef939a638 updated system settings 2018-01-16 11:54:18 +05:30
Achilles Rasquinha
1c50e8afd4 updated system settings 2018-01-16 11:49:55 +05:30
Saurabh
3f43899839 resolved merge conflicts 2018-01-15 18:34:11 +05:30
Manas Solanki
edbbf4b464 add the field attach_to_field in the file (#4823) 2018-01-15 18:10:53 +05:30
Prateeksha Singh
1164c2d8d2 [fix] default for null folder sizes 2018-01-11 16:28:38 +05:30
Saurabh
11be75723b Merge branch 'master' into develop 2018-01-09 12:15:49 +05:30
rohitwaghchaure
7e7ecdb2ab [Fix] Submit option not visible in the role permisison manager (#4786) 2018-01-09 11:34:26 +05:30
Manas Solanki
f08836e8b4 change the data field into string if number is given (#4783) 2018-01-09 11:22:01 +05:30
Faris Ansari
ba508410d1 Fix Report route (#4789)
* Fix Report route

* minor

* fix Report route in modules

* fix module_view test
2018-01-09 11:16:21 +05:30
Shridhar Patil
56fa6e1cc8 Logout from all sessions on password change (#4542)
* Logout from all sessions on password change

Add checkbox to logout from all sessions
If checked logout from all sessions

https://github.com/frappe/frappe/issues/4383

* Changed spaces to tabs

* Send logout_all_sessions as 0 or 1

Convert it to in on server side and pass to update_password

* changed logout_all_sessions from bolean to int

* Move checkbox inside form
2018-01-09 10:57:42 +05:30
Achilles Rasquinha
6c6c47109c Fix Social Login Patch Break (#4762) 2018-01-05 13:02:03 +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
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
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
Achilles Rasquinha
2d5d367298 chat-fixes 2018-01-02 12:50:36 +05:30
Saurabh
8873935b36 Merge branch 'master' into develop 2018-01-02 12:11:29 +05:30
Manas Solanki
d5f970e2b7 provide translations in the background process (#4735) 2018-01-01 16:11:04 +05:30
Nabin Hait
87475865ed Merge branch 'master' into develop 2017-12-28 19:41:27 +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
Nabin Hait
6b15cfcfb0 Merge branch 'master' into develop 2017-12-28 13:12:23 +05:30
Manas Solanki
fa3c2a219d [Fix] Minor fix in data importer (#4690) 2017-12-28 12:37:02 +05:30
Faris Ansari
7595fb75ba
New ListView 💥 + DataTable (#4577)
* first cut

* Code refactoring, styling

* Added Sorting

* Revert query_report to use slickgrid

* cleanup

* Edit cell working

* Add regrid, remove datatable

* Add clusterize

* Update lib, fix get_checked_items

* New ReportView

* wip

* Enable editing, fix styles

* update lib

* wip

* fix refresh rows and editable cells

* Refresh list_view every 3s, decouple refreshing logic

* Report editing fixes

* Cleanup loading fields, add column then refresh list

* [wip] New List View

* [working] Render results

* ListView is now BaseList, add new ListView and GanttView

* Create new page for each ListView

* GanttView working

* CalendarView working

* KanbanView working

* Cache list_view based on page_name

* Gantt view buttons on mobile

* Add ReportView

* Refresh datatable on render

* Setup like

* [start][filters] clean up FilterList

* [filters] refactor FilterList

* [filters] minor fix

* [filters] fix remove filter

* filter utils

* more utils, remove apply

* rewrite as class, remove 'me' references

* [filter] implement on_change to decouple parent functions

* Integrate new filters with new BaseList

* Setup freeze area for ListView

* Set breadcrumbs on setup_page

* Trigger list update from events

* Setup footnote area

* Fix Kanban Board filters

* Add filters to standard filters, then filter_list

* Remove old files

* Fix ImageView

* Some more fixes for BaseList.init

* Fix order_by on load

* Report View: remember columns

* Fix for hidden filters

* Fix for delete items

* InboxView

* Shift select checkboxes

* Fix ESLint errors

* More refactoring

- Move ListMenu to Listview
- New FileView
- Ability to add custom breadcrumbs

* FileManager working

* Tags, set filters from route options

* Custom Reports Working

* List Sidebar reports

* Report Name as title

* Fix ESLint errors

* Fix UI tests

* Fix Kanban test

* Format ID column

* [fix] Kanban cards title

* Checkbox fix

* Fix Activity Page

* Update rows in Report in place

* Child Table columns in Report View
2017-12-27 11:24:25 +05:30
Manas Solanki
98036fd018 don't throw error if there is autoname controller (#4687) 2017-12-26 16:11:10 +05:30
rohitwaghchaure
337564eea2 [Fix] Sent email not displaying in the list (#4668) 2017-12-25 16:26:25 +05:30
Manas Solanki
2385c07873 fix the User Permission for Page and Report (#4664)
* fix the User Permission for Page and Report

* make 'make_role_for' reqd
2017-12-25 13:38:38 +05:30
Manas Solanki
4e95459410 set the desktop icon while saving the domain settings (#4657)
* set the desktop icon while saving the domain settings

* delete the custom icon only if the setup not complete
2017-12-20 11:53:27 +05:30
Manas Solanki
54b590653b fix the key error and add the default date-format in template 2017-12-19 16:09:43 +05:30
Manas Solanki
66a179507c fix for the new docs with the child table (#4654)
* fix for the new docs with the child table

* Update data_import.py
2017-12-19 15:11:42 +05:30
Manas Solanki
50d7caedbb include the error data of the last row (#4649)
* include the error data of the last row

* set the attachment for each doc
2017-12-19 11:49:25 +05:30
Zarrar
dda8ca42b0 add roles to the user (#4646) 2017-12-18 17:45:21 +05:30
Achilles Rasquinha
b31c4ed029 Remove jrumble from build.json, wiggle cleanup (#4643) 2017-12-18 11:40:21 +05:30
Nabin Hait
7888805f35 Data Import: Fixes in handling errored data 2017-12-15 20:01:36 +05:30
Faris Ansari
7576c01172 Various
- Data Import Status in listview
- Commit desk.css
- Remove refresh_fields from set_read_only
2017-12-15 14:50:47 +05:30
Prateeksha Singh
3030c6d212 replace rumble with simple cute wiggling (#4628) 2017-12-15 14:20:24 +05:30
Nabin Hait
2e46b1d70c Merge branch 'master' into develop 2017-12-15 12:52:55 +05:30
Manas Solanki
520bfc2ae4 New data import (#4601)
* created/moved the files

* added the model for the downloading the data

* add the file with the error data

* changes added other changes and fix codacy

* changes in the config and utils files

* fixed the test cases

* minor changes in the data keys dict

* changed the test file location

* fixed the tests

* set the route in the list view and show only erors

* minor fixes in the childtable import and log tables rendering

* Refactor Download dialog to use MultiCheck
2017-12-15 12:17:24 +05:30
Shreya Shah
e44ee0ae7f disabled user not allowed to reset password (#4630) 2017-12-15 12:15:58 +05:30
Manas Solanki
24cc7939c8 escape the user name in the show desktop page (#4599) 2017-12-11 14:29:27 +05:30