Commit graph

336 commits

Author SHA1 Message Date
PriyankaGangar
65abe3d734 fix: update gender and update salutations 2020-04-08 17:49:14 +05:30
Suraj Shetty
0088f27f71
Merge branch 'develop' into setup-wizard-dev 2020-03-12 18:29:31 +05:30
Shivam Mishra
b15df49225 Merge branch 'develop' of github.com:frappe/frappe into dashdash 2020-03-06 12:11:50 +05:30
Shivam Mishra
138a0f880c feat: set title for user profile page 2020-03-02 18:49:57 +05:30
Shivam Mishra
29276a8954 feat: add workspace page as default home page 2020-03-02 18:49:56 +05:30
prssanna
67b1a9999a feat: add percentage and pie chart types to group by chart 2020-02-28 13:00:04 +05:30
prssanna
53fb84bd68 fix: codacy issues 2020-02-28 13:00:04 +05:30
prssanna
80fa4ccff0 fix: fix user profile page chart api 2020-02-28 13:00:04 +05:30
Shivam Mishra
3f056e4c6e feat: enabled logging for setup wizard 2020-02-19 13:08:52 +05:30
Shivam Mishra
8627cce88e feat: added in_setup_wizard flag 2020-02-19 12:45:04 +05:30
lijiming
c73d81cf43
Add translation for Leaderboard Title 2020-01-21 09:52:36 +08:00
prssanna
dd2fba419b fix: use form-group class for leaderboard search 2020-01-12 14:17:10 +05:30
prssanna
a6f516c973 fix: fix leaderboard search 2020-01-12 13:44:25 +05:30
prssanna
2b77c61f6b style: fix leaderboard searchbox padding 2020-01-12 13:43:53 +05:30
Andrew McLeod
07cedc581d feat: Optionally remove seconds from datetime (#8531)
* fix: Add updated datepicker; fixed seconds formatting bug.
Seconds between 0 and 9 were not zero-padded.

* feat: Add framework for time format

* feat: datetime server-side formatters.

* tests: Added server-side datetime formatter tests

* feat: Update client-side datetime formatters

* tests: Add Cypress client-side formatting tests.

* fix: JSON errors

* fix: Update to not hard-code admin password

* fix: Change to using bulk_update rather than the REST API

* tests: Use Custom doctype for testing, not Standard

* fix: Codacy style fixes

* fix: Commonify update_datetime_picker in date.js, datetime.js, time.js
Fix order of time_format in System Settings
Restore get_user_fmt in utils/datetime.js

* feat: Drastically reduce scale of Cypress testing (to make tests faster)
Full testing is possible by setting 'fast_mode' to false in the spec file.

* fix: Fix issues with datepicker/timepicker expansion

* fix: typo

* style: Various style fixes as requested by DeppSource: Python

* fix: Timepicker not hiding on 'now' button. Force hiding on click.

* style: Codacy style fixes.

* fix: Use datepicker from node_modules

* test: Refactor Datetime UI tests

- cy.get_field
- cy.set_value
- cy.insert_doc with ignore_duplicate
- Nominal datetime tests to cover most formats
- Formatting with prettier

* test: Datetime UI tests; wait for cur_frm.doc.datetime to update

* tests: Add whitespace to typed input

- Clear input only for Time field

* test: Wait timeout 200

* test: Fix form test

Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
2019-12-25 14:54:28 +05:30
Suraj Shetty
7107409531
Merge version-12-hotfix to develop (#9095)
* fix: REST API utf-8 decoding on creates/updates

Creating or updating a document via the REST API would generate an error of:

`TypeError: the JSON object must be str, not 'bytes'`

Because get_data() returns bytes which must be explicitly converted to a string before parsing as JSON.

Defect introduced by efe94886a and a71a92341e

* fix(patch): Handle failures in while making Prepared Report attachments private

* case insensitive search for postgres

* convert operator to lowercase while checking

* fix: Pass prepared_report_name as filter if exists

* fix: Add input to multiselect_list control

* 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>

* chore: remove useless encode

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix: Allow Rename in Website Route Meta

* fix: Add Visit Web Page button in form

* fix: next schedule date should be on or after current date

* test: next schedule date

* fix: Change modified by

* fix: do not allow bulk update for core, single doctypes and doctypes from inactive domains

* fix: switch to safe_decode

* test: Fix list_view test by removing clear-cache code (#8941)

* test: Fix listview test by waiting for clear-cache

* test: Move wait to list_view.js

* test: Try removing clear-cache

* fix(integration): Social Login Key (#8940)

add missing field

* fix: don't set filter for restrict_to_domain in Bulk Update Tool

* fix: query report chart options

* fix: Default and company address fixes

* fix: revert changes made to get_default_address function

* fix: Remove changes in notifications

* fix: list view group by filter ambiguous column name

* fix: changelog modal ui

* test: list view child table filter with created by filter

* fix: not able to download XML file

* fix(security): invalidate reset_password_key on password reset

currently there is no way to invalidate reset_password_key on updating
password through the user settings. so whenever the user sets a new
password we'll invalidate the reset_password_key, so that existing links
to reset user passwords cannot be used.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix: Pin faker version to avoid test failures

* perf: optimise globals search

* fix: add index on child table

* fix: do not pop item from list

* fix: dont add index for global search doctype

* fix: rename function to set

* tests: fix results being return

* fix: codacy fixes

* fix: Code cleanup

- Pass values so that db cursor can handle escaping

* fix: Convert list to tuple

* style: added semi-colon

* fix: add default role on sign up via SSO

* fix(autocomplete): parse options (#8999)

* fix(autocomplete): parse options

* fix: add ignore validation flag

* fix: minor change

* fix(email): try to encode email part to utf-8 (#8964)

fixes issues with class objects other than str

Traceback (most recent call last):
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/doctype/email_account/email_account.py", line 281, in receive
    communication = self.insert_communication(msg, args=args)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/doctype/email_account/email_account.py", line 338, in insert_communication
    email = Email(raw)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 372, in __init__
    self.parse()
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 393, in parse
    self.process_part(part)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 445, in process_part
    self.text_content += self.get_payload(part)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 489, in get_payload
    charset = self.get_charset(part)
  File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 484, in get_charset
    charset = chardet.detect(frappe.safe_encode(part))['encoding']
  File "/home/frappe/frappe-bench/env/lib/python3.6/site-packages/chardet/__init__.py", line 34, in detect
    '{0}'.format(type(byte_str)))
TypeError: Expected object of type bytes or bytearray, got: <class 'email.message.Message'>

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix: Ambiguous column error when going to next doc (#9005)

fix: Ambiguous column error when going to next doc

Co-authored-by: Prssanna Desai <prssud@gmail.com>

* fix(patch): auto commit on more than 10000 writes

fixes issue where patch fails with:

frappe.exceptions.ValidationError: Too many writes in one request. Please send smaller requests

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* revert: changes in currency formatting  (#9003)

* fix: reverted currency formatting

* ux: added description for currency's number format
* It doesn't have any effect on how the currency is formatted.

* fix: revert json changes in currency master

* fix(filters): set default id to empty string instead of 0 (#9014)

fixes issue where "undefined" value gets set to 0 in postgres, which causes ProgrammingError since the expected value is of type str and not int

* revert: changes in currency formatting  (#9003)

* fix: reverted currency formatting

* ux: added description for currency's number format
* It doesn't have any effect on how the currency is formatted.

* fix: revert json changes in currency master

* feat: add doc for email linking

* fix: missing commits while reverting currency changes

* fix(file): Public-private issue (#9032)

* fix: Pass file's is_private for doc creation

* fix: File is_private and file_url mismatch

* fix: Check if file_url exists

* fix: Validation check

* fix(postgres): Convert is_private to int

* fix: File path for content_hash

* fix: Show default currency as a fallback for currency fieldtype (#8992)

* fix: Show default currency as a fallback for currency fieldtype

* test: Add a test for currency formatting

* fix: Add a patch to fix all user's home settings (#9040)

* fix: Add a patch to fix all user's home settings

* fix: Remove limit

* fix: Allow field of submitted doc to edit if field has allow_on_submit enabled

* test: Add test to check if field is editable

* fix: Typo

* test: Add assert statement for value

* test: Clear cache after creating doctype

* fix: Codacy

* fix checkbox behavior in rtl view when clicking on label to check (#8898)

* fix checkbox behavior in rtl view when clicking on label to check

* fix: Undo changes in desk.css

* fix: Empty row validation

* style: Fix code formatting

* fix: Terminate regex

* fix: don't validate email for standard filters

* fix: before setting user default value, if fieldtype is Link check if doc exists

* Revert "fix: user default value for Link fields"

* before setting user default value, if fieldtype is Link check if doc exists

* fix: Remove Attachment on remove

* fix: minor changes

* style: fix Codacy issue

There should be no space before ','. (comma-spacing)

* fix: rfc5322 compliance for python3 (#9056)

* start of tests

* rfc compliant emails for frappe.

* fix for deepsource

* fix length of strings.

* fix bug that I'm not sure where it came from?

* codacy and deepsource issues trying to keep them happy

* take a punt in the dark

* fix: use SMTPUTF8 instead of SMTP and other minor fixes

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix: patch home_settings_for_all_users

* style: Fix Codacy

* fix: KeyError: 'hidden_modules'

* fix: TypeError in home_settings patch

Convert set to list

* refactor: override style for changelog modal

* Merge V12-pre-release to version-12-hotfix (#9094)

Merge V12-pre-release to version-12-hotfix

Co-authored-by: null <rohitw1991@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
Co-authored-by: Vishal Dhayagude <vishaldhayagude09@gmail.com>
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
Co-authored-by: null <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: null <sahilkhan28297@gmail.com>

* Revert queue.py

Co-authored-by: Ben Knowles <benknowles@users.noreply.github.com>
Co-authored-by: Aditya Hase <aditya@adityahase.com>
Co-authored-by: Shridhar Patil <shridharpatil2792@gmail.com>
Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Revant Nandgaonkar <revant.one@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
Co-authored-by: Rohan <Alchez@users.noreply.github.com>
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Saqib <thefalconx33@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Ammar Hararah <ammarkharara@gmail.com>
Co-authored-by: Vishal Dhayagude <vishdha@users.noreply.github.com>
Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
2019-12-23 12:24:52 +05:30
Himanshu
f9777268b8 feat: add default email account for email linking (#8833)
* feat: add default email account for email linking

* fix: remove unused import

* fix: remove try-catch
2019-12-12 16:10:56 +00:00
Prssanna Desai
90f89a754a fix(Leaderboard): Leaderboard timespan options (#8953)
* fix: change leaderboard timespan options and add select from date option

* fix: leaderboard timespan options grouping and add quarter_start and quarter_end to datetime.js

* fix: codacy

* fix: add last month
2019-12-11 21:28:59 +05:30
joelios
bece163af7 fix: Show heatmap in activity page (#8577)
fixes #8576
2019-10-20 11:51:58 +05:30
mergify[bot]
5f33dd17c6
Merge pull request #8489 from prssanna/leaderboard-refactor
feat(Leaderboard): Add Energy Points Leaderboard to Leaderboard
2019-09-30 09:47:09 +00:00
Suraj Shetty
b4e616c0de fix: Rename "Energy Point Log" with "User"
Because it's user's leaderboard
2019-09-30 13:21:03 +05:30
Suraj Shetty
258fea55f0 style: Fix Codacy 2019-09-30 13:07:50 +05:30
Rushabh Mehta
8e088cb990 fix(minor): count fix 2019-09-30 11:40:40 +05:30
prssanna
da8ad36cde fix: call leaderboard methods directly from config 2019-09-30 11:13:07 +05:30
prssanna
782f1cf098 fix: full name in energy point leaderboard chart 2019-09-27 17:49:34 +05:30
prssanna
3870f40367 fix: refactor leaderboard formatting 2019-09-27 16:13:31 +05:30
prssanna
14ec2e1ddb fix: formatting 2019-09-26 13:46:03 +05:30
prssanna
8bc843d26b fix: remove erpnext doctypes from leaderboard.js 2019-09-25 17:39:15 +05:30
prssanna
e0d1da6346 fix: formatting 2019-09-24 14:48:23 +05:30
prssanna
6489bda5ad refactor(Leaderboard): Use API to get leaderboards from ERPNext and add Energy Point Leaderboard 2019-09-24 13:03:04 +05:30
Himanshu Warekar
9d3b361da4 feat: Global Search with Priorities 2019-09-18 18:21:13 +05:30
Shivam Mishra
015ce906c4
Merge pull request #8387 from prssanna/user-profile-dashboards
fix: fix legends on charts on user profile page
2019-09-11 19:41:51 +05:30
prssanna
9c0f678a04 fix: fix legends on charts on user profile page 2019-09-10 13:45:28 +05:30
prssanna
0a3a157aa4 fix: fix monthly and all time rank query 2019-09-06 12:20:54 +05:30
prssanna
02f3b3f1b7 fix: change leaderboard links 2019-09-03 12:46:14 +05:30
prssanna
9b34d7395a fix: fix column spacing 2019-09-02 23:47:39 +05:30
prssanna
2553ba5664 feat: add energy points to leaderboard 2019-09-02 23:47:39 +05:30
Shivam Mishra
535c349f9a
Merge pull request #8097 from prssanna/user-profile
feat(User Profile): New User Profile Pages with Energy Points Insights
2019-08-24 10:51:31 +05:30
Faris Ansari
f89d842d00 fix: Remove declaration 2019-08-23 13:56:05 +05:30
Faris Ansari
87987a0dde fix: Use single quotes for Postgres
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2019-08-23 13:44:06 +05:30
prssanna
7491500142 fix: add init.py and refactor get_user_rank function 2019-08-22 12:14:14 +05:30
Faris Ansari
e0022944bd fix: Activity feed render and click 2019-08-21 01:46:10 +05:30
Faris Ansari
c3c1aa04c9 fix: Activity feed query 2019-08-21 01:45:53 +05:30
Prssanna Desai
7d53df4353 fix: formatting 2019-08-16 16:01:13 +05:30
Prssanna Desai
f47c1da238 fix: fetch 11 items in activity to show 'No more activity' and fix translated strings 2019-08-16 14:16:35 +05:30
Prssanna Desai
848e3bcc34 fix: use arrow function 2019-08-16 13:40:11 +05:30
Prssanna Desai
6647de2a6f fix: check if user exists in show() function 2019-08-16 13:33:06 +05:30
Prssanna Desai
052e2fbc43 fix: check for 0 energy points 2019-08-16 13:13:21 +05:30
Prssanna Desai
7bcdb69baa fix: show today's data in line chart and fix total energy points 2019-08-14 14:36:39 +05:30
Prssanna Desai
d71e95c5b5 fix: show review points in profile details 2019-08-13 13:29:07 +05:30