Commit graph

23166 commits

Author SHA1 Message Date
mergify[bot]
2a12331da4
Merge pull request #8923 from gavindsouza/legacy-tests-cleanup
chore: cleanup redundant function definitions, sort imports
2019-11-30 11:52:10 +00:00
Suraj Shetty
5a2c2b8ec0
fix: Change modified user 2019-11-30 17:19:00 +05:30
Shivam Mishra
9ffd909c6d refactor: change letterhead image 2019-11-30 14:38:28 +05:30
Shivam Mishra
a8b16f1176 fix: multiple ui fixes 2019-11-30 13:58:59 +05:30
Gavin D'souza
e9a6927039 chore: fixed imports after module restructure 2019-11-29 21:08:30 +05:30
Gavin D'souza
450f5c3785 chore: moved 'get_html_for_route' to frappe.utils 2019-11-29 20:42:25 +05:30
mergify[bot]
4ec6061513
Merge pull request #8918 from Thunderbottom/csv-export-fix
fix(reportview): convert to unicode conditionally
2019-11-29 13:58:01 +00:00
mergify[bot]
250e293bec
Merge pull request #8925 from ruchamahabal/fix_auto_repeat_dates
fix: auto repeat next schedule date should be on or after the current date
2019-11-29 13:43:58 +00:00
Rucha Mahabal
f4b68b4c25 test: next schedule date 2019-11-29 18:27:42 +05:30
Rucha Mahabal
ace5ddad87 fix: next schedule date should be on or after current date 2019-11-29 18:27:18 +05:30
Gavin D'souza
aa1e698acf chore: cleanup redundant function definitions, sort imports 2019-11-29 18:00:40 +05:30
Faris Ansari
1e1903db40
Merge pull request #8805 from gavindsouza/drop-selenium
chore: drop legacy tests
2019-11-29 17:42:10 +05:30
Faris Ansari
598deb7c4a fix: Add Visit Web Page button in form 2019-11-29 17:01:02 +05:30
Faris Ansari
1a17c25ca4 fix: Allow Rename in Website Route Meta 2019-11-29 17:00:53 +05:30
Chinmay D. Pai
56b0385841
chore: remove useless encode
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-11-29 16:25:31 +05:30
deepeshgarg007
649759fc3f fix: Default and company address fixes 2019-11-29 14:56:37 +05:30
Chinmay D. Pai
29fcd291b1
fix(reportview): convert to unicode conditionally
fixes TypeError: decoding str is not supported

Traceback (most recent call last):
  File "/home/frappe/frappe-bench/apps/frappe/frappe/app.py", line 57, in application
    response = frappe.handler.handle()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 22, in handle
    data = execute_cmd(cmd)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 61, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 1038, in call
    return fn(*args, **newargs)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 511, in wrapper_fn
    retval = fn(*args, **get_newargs(fn, kwargs))
  File "/home/frappe/frappe-bench/apps/frappe/frappe/desk/reportview.py", line 177, in export_query
    frappe.response['result'] = text_type(f.read(), 'utf-8')
TypeError: decoding str is not supported

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-11-29 13:18:48 +05:30
gavin
695e212575
Merge branch 'develop' into drop-selenium 2019-11-29 13:13:33 +05:30
mergify[bot]
fba8317a78
Merge pull request #8908 from surajshetty3416/fix-prepared-report
fix: Pass prepared_report_name as filter if exists
2019-11-29 06:56:36 +00:00
mergify[bot]
cc6ba94068
Merge pull request #8909 from zerodhatech/case_insensitive_search
fix(postgres): Case insensitive search
2019-11-29 06:20:18 +00:00
Shridhar
44c7f08ccf convert operator to lowercase while checking 2019-11-28 18:07:14 +05:30
Faris Ansari
ae0bf912c7 fix: Add label to standard print format sections
data-label is now added to each section so they can be targeted via CSS
2019-11-28 16:34:41 +05:30
Faris Ansari
6a0d8f306d feat: Add Refresh button to Print Format selector 2019-11-28 16:33:34 +05:30
Faris Ansari
45138df076 fix: Add syntax highlighting to Edit HTML dialog 2019-11-28 16:32:37 +05:30
Faris Ansari
bbd99139ad fix: Add CSS highlighting to Custom CSS field 2019-11-28 16:32:20 +05:30
Shridhar
acae06a36a case insensitive search for postgres 2019-11-28 16:13:20 +05:30
mergify[bot]
08d7ccae2d
Merge pull request #8880 from ruchamahabal/setup_wizard
feat: Onboarding Wizard With Configurable Slides
2019-11-28 09:04:35 +00:00
Suraj Shetty
29c0772449 fix: Add input to multiselect_list control 2019-11-28 12:32:34 +05:30
Suraj Shetty
9b4cd4a389 fix: Pass prepared_report_name as filter if exists 2019-11-28 12:17:41 +05:30
Suraj Shetty
450724cd51
Merge pull request #8903 from surajshetty3416/fix-css
fix: Broken style
2019-11-28 10:51:28 +05:30
mergify[bot]
002f60cd92
Merge pull request #8907 from frappe/revert-dependency
chore(deps): [security] bump markdown2 from 2.3.5 to 2.3.6
2019-11-27 17:55:32 +00:00
gavin
7daa6736f6
chore(deps): [security] bump markdown2 from 2.3.5 to 2.3.6
redo https://github.com/frappe/frappe/pull/8811 after merging https://github.com/frappe/frappe/pull/8823
2019-11-27 20:37:19 +05:30
mergify[bot]
e9f92bf4a3
Merge pull request #8823 from gavindsouza/updated-requirements
chore: pinned requirements
2019-11-27 14:20:24 +00:00
gavin
87fec89e97
Merge branch 'develop' into updated-requirements 2019-11-27 14:48:40 +05:30
Rucha Mahabal
86ff0a6354 fix: list view group by filter ambiguous column name 2019-11-27 14:12:44 +05:30
Himanshu Warekar
7f82ee873e fix: dont add index for global search doctype 2019-11-27 14:08:45 +05:30
Himanshu Warekar
633e2b546c fix: do not pop item from list 2019-11-27 12:59:50 +05:30
Himanshu Warekar
f6858c1744 Merge branch 'develop' of https://github.com/frappe/frappe into pref_global_search 2019-11-27 12:57:56 +05:30
Rucha Mahabal
0b415b3a49 fix: set onboarding dialog as static 2019-11-27 11:55:34 +05:30
Suraj Shetty
15a662a4b6 fix: Reivew pill font size 2019-11-27 09:53:41 +05:30
Suraj Shetty
62ad8c3fff fix: Show a fallback image if image set is invalid 2019-11-27 09:02:57 +05:30
Suraj Shetty
c7ed4342c0 fix: Move user-avatar style changes under .recent-item class
So that it does not mess up other user-avatars
2019-11-27 08:59:58 +05:30
Suraj Shetty
d623f5e073 fix: Romove unused code to avoid console errors 2019-11-27 08:58:06 +05:30
Aditya Hase
653c89b739
fix(patch): Handle failures in while making Prepared Report att… (#8899)
fix(patch): Handle failures in while making Prepared Report attachments private
2019-11-26 19:48:02 +05:30
Rucha Mahabal
06953a3dc0 fix: added slide order in Slide doctype, removed Settings doctype 2019-11-26 18:42:22 +05:30
Aditya Hase
333ea79d2d
fix(patch): Handle failures in while making Prepared Report attachments private 2019-11-26 18:33:54 +05:30
sahil28297
5ba9dba7e9
Merge pull request #8882 from frappe/version-12
Merge Version-12 to develop
2019-11-26 16:01:28 +05:30
Sahil Khan
94a211edb0 Merge branch 'v12-pre-release' into version-12 2019-11-26 15:23:01 +05:30
Sahil Khan
747fab0003 bumped to version 12.0.20 2019-11-26 15:43:01 +05:50
Shivam Mishra
c25f1438e7 fix: new doc button click event 2019-11-26 15:21:27 +05:30