Commit graph

18574 commits

Author SHA1 Message Date
Faris Ansari
eeb8fe98eb fix: Don't escape traceback
Traceback breaks when there is a python object <frappe.model.Document>.
This is occasional, and other tracebacks are not clean, so reverting.
2019-03-14 13:20:11 +05:30
Shivam Mishra
9e5bff71b0
Merge pull request #7075 from frappe/revert-7072-fix-rest
Revert "fix(request): Pop data from form_dict when it isn't needed"
2019-03-14 12:00:10 +05:30
Shivam Mishra
77abf5fc19
Revert "fix(request): Pop data from form_dict when it isn't needed" 2019-03-14 11:58:46 +05:30
Rushabh Mehta
a9d9b0b3ea
Merge pull request #7074 from pratu16x7/xml-file-browser-handling
feat(response): force download html or xml private files
2019-03-14 11:27:29 +05:30
Rushabh Mehta
de91f1ba55
Merge pull request #7054 from surajshetty3416/social-improvements
feat(social): User list, unseen posts indicator, clickable popover item
2019-03-14 10:48:38 +05:30
Rushabh Mehta
2067792264
Merge pull request #7067 from prssanna/assigned-to
feat(Sidebar): Add "Assigned To" Dropdown
2019-03-14 10:47:14 +05:30
Shivam Mishra
38be97f619
Merge pull request #7072 from adityahase/fix-rest
fix(request): Pop data from form_dict when it isn't needed
2019-03-14 10:29:57 +05:30
Prateeksha Singh
a25e8ca570
Merge pull request #7071 from adityahase/desk-fix
fix(desk): Set routes for unhandled shortcut tags
2019-03-14 08:48:28 +05:30
Prateeksha Singh
14693b4327 feat(response): force download html or xml files 2019-03-14 08:47:02 +05:30
Aditya Hase
55220a0eab fix(request): Pop data from form_dict when it isn't needed 2019-03-13 19:51:15 +05:30
Aditya Hase
6b3c1b33e1 fix(desk): Set routes for unhandled shortcut tags
Route for shortcut tags like Chart of Accounts and
Gantt Chart aren't set properly, handle them
2019-03-13 19:32:46 +05:30
Prateeksha Singh
92a74537de
Merge pull request #7069 from pratu16x7/desk-fixes
fix(desk): check if settings not found for home
2019-03-13 15:03:50 +05:30
Prateeksha Singh
b6b4aa2cb0 fix(desk): check if not settings found for home 2019-03-13 15:01:34 +05:30
Shivam Mishra
c2ff91b6e9 fix: editor does not allow html rendering (#7061)
Port of https://github.com/frappe/frappe/pull/7062
2019-03-13 13:59:53 +05:30
Prssanna Desai
e5eade2fa1 feat(Sidebar): Add "Assigned To" Dropdown 2019-03-13 11:59:47 +05:30
Prateeksha Singh
77a03b3caf
Merge pull request #7065 from pratu16x7/desk-fixes
fix(desk): Add default value for custom settings in utility
2019-03-12 19:27:13 +05:30
Prateeksha Singh
e24a2afa47 fix(desk): Add default value for custom setting in utility 2019-03-12 19:24:35 +05:30
Anurag Mishra
99c0388ae7 fix: Reload doc for Document Follow (#7053) 2019-03-12 18:05:54 +05:30
Prateeksha Singh
41d9ee873b
Merge pull request #7064 from pratu16x7/desk-fixes
fix(desk): check for no settings data
2019-03-12 15:56:23 +05:30
Prateeksha Singh
c9ade7ea68 fix(desk): check for no settings data 2019-03-12 15:54:11 +05:30
Prateeksha Singh
5536f2d48f
Merge pull request #7060 from pratu16x7/desk-custom-settings
feat(desk): Overlay customizations over default settings
2019-03-12 15:02:28 +05:30
Prateeksha Singh
3f519de474 feat(desk): Overlay customizations over default settings 2019-03-12 12:58:45 +05:30
Prateeksha Singh
6fd3c811ac fix(desk): build default settings 2019-03-12 12:32:03 +05:30
Suraj Shetty
3ac3ea931f Add ctrl+enter message 2019-03-12 11:07:00 +05:30
Suraj Shetty
5f83808bd4 Fix codacy 2019-03-12 10:04:22 +05:30
Suraj Shetty
5c12024276 Remove trailing whitespaces 2019-03-11 22:41:11 +05:30
Suraj Shetty
62ab14c565 Show social alerts only if the current page is not social 2019-03-11 22:10:43 +05:30
Suraj Shetty
a9739c453b Fix mention message 2019-03-11 22:04:08 +05:30
Suraj Shetty
9eadc918f0 Index view log fields for faster query 2019-03-11 21:33:21 +05:30
Suraj Shetty
c941b5e104 Add posts seen indicator 2019-03-11 21:32:32 +05:30
Suraj Shetty
fbf67b78b1 Move get_safe_filters to frappe.utils 2019-03-11 19:41:50 +05:30
Faris Ansari
44f52aa5a4
Merge pull request #7051 from netchampfaris/desktop-boot-fix
fix: Use .get instead of box accessor
2019-03-11 16:14:56 +05:30
Suraj Shetty
2d19495923 Init social unseen count 2019-03-11 14:02:33 +05:30
Suraj Shetty
e67567a13d Show post button only on home page 2019-03-11 14:01:35 +05:30
Suraj Shetty
5280e45f79 Merge branch 'develop' of git://github.com/frappe/frappe into social-improvements 2019-03-11 12:18:07 +05:30
Suraj Shetty
2de678b6e8 Merge branch 'develop' of git://github.com/frappe/frappe into social-improvements 2019-03-11 12:17:07 +05:30
Suraj Shetty
9ef188cb7d
Merge pull request #7052 from netchampfaris/v12-patch-fixes
fix: Miscellaneous fixes for v12
2019-03-11 12:14:54 +05:30
Faris Ansari
9f9a579b0a
fix: Revert auto-commit 2019-03-11 12:00:54 +05:30
Suraj Shetty
076985156c Limit bio text on user list to 100 characters 2019-03-11 11:44:33 +05:30
Suraj Shetty
2b71c182b8 Fix user list UI 2019-03-11 11:29:35 +05:30
Faris Ansari
5ac4a34f24 fix: Update modified to pick up field change
- Default Print Language is not picked up in some migrations
2019-03-11 05:32:03 +00:00
Faris Ansari
015937f334 fix: Error log link when error in notification 2019-03-11 05:31:23 +00:00
Faris Ansari
2c2ca66cfd fix: Always commit error logs 2019-03-11 05:30:24 +00:00
Faris Ansari
f9b3a6c242 fix: Minor changes for smooth migration to v12 2019-03-11 05:29:50 +00:00
Faris Ansari
c735f60d95 fix: Use .get instead of box accessor 2019-03-11 10:21:04 +05:30
Rushabh Mehta
af605948bc fix(document_follow): ignore column missing if in patch 2019-03-11 08:55:12 +05:30
Suraj Shetty
d447b87cfb refator: Remove frappe_vue.js file and setup frappe_vue at startup 2019-03-10 22:04:21 +05:30
Faris Ansari
2fa90a29b5
Merge pull request #7026 from adityahase/fast-list
feat(desk): List View Settings
2019-03-09 10:38:24 +05:30
Faris Ansari
095067f11f
Merge branch 'develop' into fast-list 2019-03-08 21:10:06 +05:30
Faris Ansari
b61a37a233 fix: Notification test in Postgres (#7044) 2019-03-08 20:47:21 +05:30