Commit graph

112 commits

Author SHA1 Message Date
Achilles Rasquinha
1b5a1a22b6 Fix ip in case None 2018-01-23 18:01:03 +05:30
Achilles Rasquinha
43d1a74c16 Python 3 compatible GeoIP fetch (#4895)
* Python 3 compatible geolite

* Updated Sessions.py
2018-01-23 15:31:18 +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
Manas Solanki
3c7683e6a1 option to logout from all devices while changing password (#4419) 2017-11-10 12:11:22 +05:30
Rushabh Mehta
f0e23a5a6c [refactor] domain and domain settings (#4163)
* [refactor] domain and domain settings

* [fix] test_domain.py

* [fix] patches

* [fix] domain activation after setup

* [fix] tests and lint

* [fix] tests and lint

* [enhance] better prompt naming

* [fix] setup wizard test

* [fix] testing

* [minor] new item in quick entry from form dashboard
2017-10-17 12:29:08 +05:30
Faris Ansari
1f151ee825 [fix] webhooks cache 2017-09-22 17:23:35 +05:30
pratu16x7
70e1158c45 [fix] don't make toolbar while in setup 2017-09-22 03:07:44 +05:30
pratu16x7
7d2c96b2d4 [progress] add is_first_startup flag to show dialog 2017-08-31 14:57:14 +05:30
Rushabh Mehta
6b45f8a988 [minor] send me a copy is sticky, fixes frappe/erpnext#2367 (#3974) 2017-08-23 18:19:20 +05:30
Aditya Hase
16a9bdfd31 Replaced urllib.unquote imports with six.moves.urllib.parse.unquote (#3836) 2017-08-02 17:09:31 +05:30
Aditya Hase
e6bd1e4995 Replaced all instances of 'unicode' with 'six.text_type' (#3825) 2017-08-02 16:57:39 +05:30
Rushabh Mehta
83045eb36c [enhance] handle session expired in a graceful manner (#3022) 2017-04-10 12:44:39 +05:30
Rushabh Mehta
3076b2cc7a [fix] frappe.ready 2017-03-31 16:36:33 +05:30
Nabin Hait
d836d1367f Fixed merge conflict 2017-03-15 11:26:55 +05:30
Rushabh Mehta
9484ea1af3 [fix] clear notifications for user 2017-03-09 18:09:42 +05:30
Rohit Waghchaure
8a2c83918b changed user_roles to roles 2017-03-06 14:42:13 +05:30
Nabin Hait
985f1323ad Fixed merge conflict 2017-01-17 15:50:30 +05:30
mbauskar
c4c7d507a8 [minor] logout feed for activity logs 2017-01-16 15:26:09 +05:30
Nabin Hait
3a2642e3f7 Merge branch 'master' into develop 2017-01-10 18:00:52 +05:30
Rushabh Mehta
c711179fa6 [minor] commit update timestamp in sessions.py 2017-01-10 17:52:15 +05:30
Rushabh Mehta
0618b98c92 [minor] cleanup to comment update and maintenance mode page 2017-01-10 17:50:36 +05:30
Rushabh Mehta
b793f40259 [fix] sessions 2016-12-30 06:06:47 +05:30
Rushabh Mehta
6b637203f9 [minor] remove document_flow.py, use _sidebar.json and fix frappe/erpnext#7300 2016-12-23 09:42:15 +05:30
Rushabh Mehta
89885fe6a9 [fix] changing timezone does not reflect in system settings 2016-11-08 18:15:17 +05:30
Rushabh Mehta
1026a48a97 [refactor] code for integration service scheduled events 2016-10-13 14:59:23 +05:30
Rushabh Mehta
8899a46faa [enhance] added roles for portal users #2091 (#2093)
* [enhance] added roles for portal users #2091

* [fix] test

* [fix] make default roles have desk access
2016-09-23 21:44:20 +05:30
Nabin Hait
c1e5e5dabe Fixed version conflict 2016-09-14 15:52:32 +05:30
Shreyas Patil
e5bb0bb283 [Fix] Social login not allowed for a disabled user (#2032) 2016-09-12 16:06:35 +05:30
Rushabh Mehta
f20bf4ae25 [feature] show note to all users on popup (#2017) 2016-08-29 15:40:26 +05:30
Rushabh Mehta
f91977f7da [feature] allow multiple sessions per user 2016-08-10 17:31:29 +05:30
Anand Doshi
a7ace6ae38 [fix] limits and site_info 2016-06-25 21:56:27 +05:30
Rushabh Mehta
28f038aa90 [enhancement] desktop icons DocType 2016-03-16 11:17:29 +05:30
Rushabh Mehta
e1ac647a13 [cleanup] system settings, added deny_multiple_sessions 2016-02-16 15:05:59 +05:30
Rushabh Mehta
45048ac41a [realtime] ability to get socket working in website, now_datetime should not be timezone aware and web-form properties should take preceedence 2016-01-27 12:26:21 +05:30
Rushabh Mehta
6caf6fb6f1 [enhancement] prompt user to reload on migration 2016-01-07 15:35:17 +05:30
Anand Doshi
2dfbdac737 [minor] pass device in clear_sessions 2015-12-31 12:56:21 +05:30
Anand Doshi
3036f2a37d [fix] Track when user was last active 2015-10-29 18:00:03 +05:30
Anand Doshi
999cea874c [fix] Implemented caching in linked with 2015-10-15 12:51:04 +05:30
Anand Doshi
3657a80eb7 [fix] update csrf token if a user logs in again from another tab 2015-10-02 11:50:18 +05:30
Rushabh Mehta
60f0c1b6de [fix] mobile session expiry 2015-09-30 16:07:33 +05:30
Anand Doshi
6084775ed0 Added CSRF token verification for desk 2015-09-21 11:41:06 +05:30
Rushabh Mehta
9fe2c15356 [fixes] [session] expiry, session async 2015-09-18 14:52:56 +05:30
Anand Doshi
915bd7f17c [minor] changed no_async to disable_async for consistency 2015-08-17 16:01:58 +05:30
Anand Doshi
c9782e23e4 Merge remote-tracking branch 'frappe/develop' into v6-wip
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/communication/communication.json
	frappe/hooks.py
	frappe/model/document.py
	frappe/public/css/form.css
	frappe/public/less/form.less
	requirements.txt
	setup.py
2015-08-17 12:22:02 +05:30
Anand Doshi
755c7be7fa [fix] missing hash cache clearing and breadcrumbs fix 2015-08-11 16:19:42 +05:30
Pratik Vyas
05eaba9cba Don't connect to socketio if no_async 2015-07-24 10:08:29 +05:30
Pratik Vyas
e713d00600 Connect socketio to port 3000 if running a dev server 2015-07-24 10:08:09 +05:30
Pratik Vyas
422668a67f Async 2015-07-24 10:07:24 +05:30
Rushabh Mehta
35044784a3 [device] fix 2015-07-23 12:17:25 +05:30
Anand Doshi
465fa227bc [fix] Set user-info cookies on resuming session so that user's image is rendered in website 2015-07-13 17:56:25 +05:30