Commit graph

22218 commits

Author SHA1 Message Date
mergify[bot]
9bed16f12c
Merge pull request #8629 from ruchamahabal/bulk_update_fix
fix: bulk update tool updating records but not showing result
2019-10-29 09:45:47 +00:00
mergify[bot]
c57961e931
Merge pull request #8694 from surajshetty3416/apply-rule-only-once
feat(EPS): Apply rule only once
2019-10-29 08:53:13 +00:00
Shivam Mishra
fbef91da14
Merge pull request #8696 from scmmishra/group-by-enhance
refactor: add data and int to group by
2019-10-29 13:10:38 +05:30
mergify[bot]
0ab6a823ba
Merge pull request #8697 from scmmishra/clear-filter
fix: layout for clear filter
2019-10-29 07:17:57 +00:00
Shivam Mishra
3d396adf34 style (codacy): added semi-colon 2019-10-29 12:32:17 +05:30
Shivam Mishra
c8419d5e03 fix: show clear-filter button is default filter exists 2019-10-29 12:25:13 +05:30
Shivam Mishra
e4c21740d0 fix: clear filter button layout 2019-10-29 12:10:55 +05:30
Shivam Mishra
b4039e1a91 refactor: add data and int to group by 2019-10-29 12:07:10 +05:30
Suraj Shetty
5a67279f59 test: Replace assertEquals with assetEqual
Since assertEquals will be eventually depricated
2019-10-29 11:19:48 +05:30
Suraj Shetty
bebf7535e8 test: Fix test 2019-10-29 10:37:51 +05:30
mergify[bot]
5fe4bc45c5
Merge pull request #8690 from prssanna/leaderboard-fix
fix(Leaderboard): Show only enabled system users in EP leaderboard
2019-10-28 16:19:49 +00:00
Prssanna Desai
70f49546c1 fix(Notifications): Improvements for Notifications (#8671)
* fix: seen notification logic

* fix: rename upcoming events to today's events, fix padding

* fix: truncate title

* fix: don't allow self notifications

* fix: don't check for same  user for energy point notifications

* fix: codacy

* fix: truncate title client side

* fix: use data-action to mark as seen

* fix: don't send emails for auto energy points
2019-10-28 16:13:40 +00:00
mergify[bot]
a21b5bde75
Merge pull request #8674 from rohitwaghchaure/disabled_shrinking_for_version_0_12_5
fix: disable smart shrinking for version 0.12.5
2019-10-28 12:32:10 +00:00
prssanna
c093518ecd fix: show only enabled system users in EP leaderboard 2019-10-28 17:54:25 +05:30
Suraj Shetty
359c5fc411 test: Add test to check "Apply Only Once" condition 2019-10-28 14:33:14 +05:30
Suraj Shetty
c52f88d4d3 feat: Ability to apply Energy Point Rule only once 2019-10-28 14:32:26 +05:30
mergify[bot]
5d60421ef9
Merge pull request #8689 from gavindsouza/merge-docs-fix
fix: merge documents
2019-10-27 14:00:34 +00:00
Gavin D'souza
5255513fff fix: merge documents without error 2019-10-27 18:52:37 +05:30
mergify[bot]
c43478d214
Merge pull request #8683 from frappe/add-deepsource
chore: Add Deepsource
2019-10-27 03:01:12 +00:00
Saurabh
39f510b06f
Merge pull request #8687 from frappe/v12-pre-release
V12 pre release
2019-10-26 20:11:45 +05:30
sahil28297
772d79764d
Merge pull request #8686 from frappe/revert-8685-v12-pre-release
Revert "V12 pre release"
2019-10-26 20:10:47 +05:30
Saurabh
87e764f5f1 Revert "V12 pre release (#8685)"
This reverts commit 5451e823f9.
2019-10-26 20:09:43 +05:30
sahil28297
5451e823f9 V12 pre release (#8685)
* fix(list-view): Remove ugly scroll from list view

* bumped to version 12.0.17
2019-10-26 20:08:34 +05:30
Faris Ansari
8594324629
fix(multiselectlist): Clear values on backspace (#8666) 2019-10-26 19:02:43 +05:30
Faris Ansari
f40a2e253f
fix(printview): Make before_print hookable (#8684) 2019-10-26 18:58:53 +05:30
Saif Ur Rehman
11a2a2a3c1 fix(printview): Make before_print hookable 2019-10-26 18:56:49 +05:30
mergify[bot]
f9feb17db8
Merge pull request #8662 from hrwX/tags_on_click
fix: search tag on click
2019-10-26 13:10:45 +00:00
Faris Ansari
efbda0e730
chore: Add Deepsource 2019-10-26 18:28:11 +05:30
Rohit Waghchaure
7494328106 fix: disable smart shrinking for version 0.12.5 2019-10-25 18:36:26 +05:30
Sahil Khan
0b03e9b70e Merge branch 'v12-pre-release' into version-12 2019-10-24 17:29:13 +05:30
Sahil Khan
4e54240bb8 bumped to version 12.0.17 2019-10-24 17:49:12 +05:50
Sahil Khan
51ef2e3aa1 Merge branch 'v12-pre-release' of https://github.com/frappe/frappe into v12-pre-release 2019-10-24 16:29:05 +05:30
sahil28297
86e585c1f4
Merge pull request #8668 from scmmishra/hide-file-browser
fix: hide file browser for web forms
2019-10-24 16:28:01 +05:30
Shivam Mishra
d73ded3217
Update webform_script.js 2019-10-24 16:24:06 +05:30
Sahil Khan
b62386de73 Merge branch 'v12-pre-release' of https://github.com/frappe/frappe into v12-pre-release 2019-10-24 15:58:02 +05:30
Shivam Mishra
28e9321304 refactor: added prop to index.js 2019-10-24 13:49:09 +05:30
Shivam Mishra
d44e29bc70 refactor: use props 2019-10-24 13:03:56 +05:30
Shivam Mishra
ab7c268fce fix: hide file browser for web forms 2019-10-24 12:40:29 +05:30
Faris Ansari
f8507dec01
Merge pull request #8665 from adityahase/faster-desk-2
perf(desk): Faster desk
2019-10-23 23:28:18 +05:30
mergify[bot]
f24b2688c0
Merge pull request #8664 from adityahase/wtf-fix
perf(desk): Use cached meta
2019-10-23 17:30:39 +00:00
Aditya Hase
2fd835803a
perf(notifications): Let database do the counting 2019-10-23 23:00:03 +05:30
Aditya Hase
7630ce6d3e
perf(moduleview): Query all disabled reports once 2019-10-23 23:00:03 +05:30
Aditya Hase
ea2c971d58
perf(boot): Query all report_types at once 2019-10-23 23:00:03 +05:30
Aditya Hase
b483aa40db
perf(moduleview): JOIN with CONCAT is slow 2019-10-23 23:00:03 +05:30
Aditya Hase
10bd8012ce
perf(orm): Use cached table_columns instead of querying the database 2019-10-23 23:00:02 +05:30
mergify[bot]
d3de54aaa1
Merge pull request #8663 from hrwX/rename-doc-fix
fix: Rename Document Fix
2019-10-23 17:13:10 +00:00
Himanshu Warekar
604b659353 fix: check for old and new names 2019-10-23 22:26:45 +05:30
Himanshu Warekar
31cef1ac5b fix: arguments not passed 2019-10-23 22:26:32 +05:30
Aditya Hase
e3df3f0b17
perf(desk): Use cached meta 2019-10-23 22:21:49 +05:30
Himanshu Warekar
cc63b3d9f9 fix: search tag on click 2019-10-23 21:31:38 +05:30