Suraj Shetty
|
948e68bfcb
|
Merge pull request #7217 from Delte/patch-1
fix: Wrong Type of TR-Turkish
|
2019-04-09 22:48:13 +05:30 |
|
Suraj Shetty
|
77cb9a58a9
|
Merge pull request #7242 from netchampfaris/quill-ordered-list-d
fix(Quill): Numbering in ordered list
|
2019-04-09 22:44:29 +05:30 |
|
Faris Ansari
|
8528c4553c
|
fix(Quill): Numbering in ordered list
|
2019-04-09 17:54:58 +05:30 |
|
Suraj Shetty
|
d169c8c672
|
Merge pull request #7185 from Alchez/develop-todo-priority
fix(todo): Use priority in source document, if available, for ToDo
|
2019-04-09 14:34:50 +05:30 |
|
Suraj Shetty
|
688b8ec064
|
Merge pull request #7236 from surajshetty3416/fix-form
fix: Do not render form review section for new(local) documents
|
2019-04-09 14:31:15 +05:30 |
|
Suraj Shetty
|
9feb6503bc
|
fix: Do not render review section for new(local) documents
|
2019-04-09 13:07:33 +05:30 |
|
Chinmay Pai
|
e2ff6013b1
|
fix(web_form): fix hidden state for webform fields (#7234)
fixes an issue where any field set to be hidden in the webform would not actually be hidden.
|
2019-04-09 00:50:35 +05:30 |
|
Rushabh Mehta
|
428bcd71a9
|
feat(minor): frappe.utils.nestedset.get_descendants_of now accepts ignore_permissions
|
2019-04-08 19:04:39 +05:30 |
|
Rushabh Mehta
|
ca548b8003
|
Merge pull request #7227 from rmehta/dashboard-fixes
fix: dashboard loading state and caching
|
2019-04-08 15:54:06 +05:30 |
|
Rushabh Mehta
|
82d899ff9a
|
fix: dashboard loading state and caching
|
2019-04-08 15:52:31 +05:30 |
|
Frappe Bot
|
ba682c5f14
|
Merge branch 'master' into develop
|
2019-04-08 09:16:59 +00:00 |
|
Frappe Bot
|
5d0e02ae18
|
Merge branch 'hotfix'
|
2019-04-08 09:15:01 +00:00 |
|
Frappe Bot
|
75fa6f4038
|
bumped to version 11.1.21
|
2019-04-08 09:15:01 +00:00 |
|
Himanshu
|
1d577da7d2
|
fix(Data Import): get doctype fields on change (#7213)
|
2019-04-08 14:30:05 +05:30 |
|
Faris Ansari
|
2eeee7d020
|
fix(Query Report): Show totals row in Print (#7206)
|
2019-04-08 14:26:19 +05:30 |
|
Suraj Shetty
|
9f64ff1ed9
|
Merge pull request #7211 from netchampfaris/expand-collapse-report
fix(QueryReport): Expand/Collapse all for tree
|
2019-04-08 12:36:57 +05:30 |
|
Rushabh Mehta
|
b88f192284
|
Merge pull request #7092 from prssanna/group-by
feat(desk): Add "Group By" in Report View
|
2019-04-08 10:59:29 +05:30 |
|
Rushabh Mehta
|
42a7d0d527
|
Merge branch 'develop' into group-by
|
2019-04-08 10:59:19 +05:30 |
|
Rushabh Mehta
|
548f55f2d2
|
Merge pull request #7203 from igrekus/desktop-fix
fix: hide empy categories in Desktop
|
2019-04-08 10:58:09 +05:30 |
|
Suraj Shetty
|
838571d22b
|
Merge pull request #7156 from hrwX/adresses_and_contacts_report_fix
fix(Addresses and Contacts Reports): display all addresses and contacts
|
2019-04-08 10:51:41 +05:30 |
|
Suraj Shetty
|
f2720e15e3
|
Merge pull request #7205 from hrwX/addresses_and_contacts_v12_fix
fix(Addresses and Contacts Reports): display all addresses and contacts
|
2019-04-08 10:50:38 +05:30 |
|
Suraj Shetty
|
0334950a8b
|
feat(leaderboard): Load more logs (#7226)
* feat: Load more logs
* fix: Use v-show instead of v-if to avoid network repeated calls
|
2019-04-08 10:34:34 +05:30 |
|
Frappe Bot
|
629a5e502a
|
Merge branch 'master' into develop
|
2019-04-07 09:03:27 +00:00 |
|
Frappe Bot
|
a757f227b4
|
Merge branch 'hotfix'
|
2019-04-07 08:47:11 +00:00 |
|
Frappe Bot
|
acd7c99db6
|
bumped to version 11.1.20
|
2019-04-07 08:47:11 +00:00 |
|
Suraj Shetty
|
9457e2424d
|
Merge pull request #7223 from surajshetty3416/fix-login-develop
revert: "fix: Update user activity using ORM"
|
2019-04-07 14:08:20 +05:30 |
|
igrekus
|
f31e8f0ffa
|
fix: Hide empty categories in Show / Hide Cards dialog (#7215)
|
2019-04-07 13:27:16 +05:30 |
|
Faris Ansari
|
d2a81910d6
|
Merge pull request #7222 from surajshetty3416/fix-login
revert: "fix: Update user activity using ORM"
|
2019-04-07 13:14:23 +05:30 |
|
Suraj Shetty
|
42b6faabe7
|
fix: Add quotes
|
2019-04-07 13:10:10 +05:30 |
|
Suraj Shetty
|
e3d0a84e64
|
Revert "fix: Update user activity using ORM"
This reverts commit b963868f61.
|
2019-04-07 12:53:21 +05:30 |
|
Suraj Shetty
|
2d51a1ec7e
|
Revert "fix: Update user activity using ORM"
This reverts commit b963868f61.
|
2019-04-07 12:47:45 +05:30 |
|
Himanshu Warekar
|
293a924244
|
fix: make report py2 py3 compatible
|
2019-04-06 23:35:21 +05:30 |
|
Himanshu Warekar
|
5c3121ab84
|
fix: making it py2 and py3 compatible
|
2019-04-06 22:50:05 +05:30 |
|
Himanshu Warekar
|
b3359f5eb2
|
fix: code refactor
|
2019-04-06 21:53:09 +05:30 |
|
N. Emre Özbakır
|
e78907737a
|
fix: Typo of TR-Turkish
fixed wrong typo of Turkish in respected language.
|
2019-04-05 21:31:36 +03:00 |
|
Faris Ansari
|
bb1d5f7107
|
Merge pull request #7204 from surajshetty3416/energy-points-enhancements
feat: Revert points and other energy points enhancements
|
2019-04-05 22:51:33 +05:30 |
|
Suraj Shetty
|
8abd261c18
|
fix: Super class call in dialog.js
|
2019-04-05 22:03:30 +05:30 |
|
Suraj Shetty
|
0c31d9c814
|
fix: Allow revert for logs only with type auto
|
2019-04-05 22:00:53 +05:30 |
|
Suraj Shetty
|
a418e87444
|
fix: Refresh timeline after getting a new review
|
2019-04-05 21:57:17 +05:30 |
|
Suraj Shetty
|
b7cbf9e11f
|
Merge branch 'develop' of https://github.com/frappe/frappe into energy-points-enhancements
|
2019-04-05 21:15:34 +05:30 |
|
Suraj Shetty
|
04a40d286d
|
fix: Show alert message
- Append indicator element instead of adding
class to parent div to avoid css bleed
|
2019-04-05 21:14:21 +05:30 |
|
Suraj Shetty
|
743086dc41
|
fix: Rename revert_for -> revert_of
|
2019-04-05 21:08:10 +05:30 |
|
Suraj Shetty
|
520a6b8020
|
feat: Add revert dialog to get the reason of revert
- Show type and doctype in list view
- Track changes for energy point logs
|
2019-04-05 21:07:33 +05:30 |
|
Suraj Shetty
|
d1cc18b508
|
feat: Init revert point system
|
2019-04-05 19:48:15 +05:30 |
|
Suraj Shetty
|
950ce155f7
|
fix: format energy point log for history and form separately
|
2019-04-05 19:46:43 +05:30 |
|
Suraj Shetty
|
e8cd9dc4c6
|
fix: Include only appreciation and criticism logs for review pills
|
2019-04-05 19:42:16 +05:30 |
|
Suraj Shetty
|
7e8fc8f69e
|
fix: Skip review logs
- while adding to enegy point logs to docinfo
|
2019-04-05 19:16:15 +05:30 |
|
Faris Ansari
|
c054961c3b
|
fix(QueryReport): Expand/Collapse all for tree
|
2019-04-05 17:23:55 +05:30 |
|
Saurabh
|
fb4ef2e3d2
|
Merge branch 'hotfix'
|
2019-04-05 16:39:04 +05:30 |
|
Saurabh
|
1972ff2375
|
bumped to version 11.1.19
|
2019-04-05 17:09:04 +06:00 |
|