Commit graph

17440 commits

Author SHA1 Message Date
Sagar Vora
c5cc95a7ca
Merge branch 'hotfix' into patch-1 2019-01-29 20:05:06 +05:30
gmplab
bcb121bd03
Update purifycss.py
minor fix print_funciton->print_function
2019-01-29 21:34:50 +08:00
Sagar Vora
4f81bc4801 Merge branch 'master' into hotfix 2019-01-29 18:56:02 +05:30
Sagar Vora
d3735cd107
fix: remove staging version 2019-01-29 18:48:29 +05:30
Sagar Vora
8849ed5330
fix: update version to 11.1.0! 2019-01-29 18:47:35 +05:30
Sagar Vora
2b6e13bbb6 Merge branch 'staging' 2019-01-29 18:44:58 +05:30
Sagar Vora
3e28e047b0 Merge branch 'staging-fixes' into staging 2019-01-29 18:00:37 +05:30
Sagar Vora
ae205fcdd2 bumped to version 11.1.0 2019-01-29 18:20:37 +05:50
Sagar Vora
ce3dafe63a fix: change changlog version to 11.1.0 2019-01-29 17:47:29 +05:30
Sagar Vora
fe3fe0a4b8 Merge branch 'master' into staging-fixes 2019-01-29 17:08:58 +05:30
Sagar Vora
a66189b28c Merge branch 'hotfix' 2019-01-29 16:39:33 +05:30
Sagar Vora
92324c740c bumped to version 10.1.71 2019-01-29 16:59:33 +05:50
Sagar Vora
60d671dce9
Merge pull request #6844 from sagarvora/changelog
docs: changelog for v11.0.4
2019-01-29 16:28:39 +05:30
Shivam Mishra
dad1c04aae feat: Deprecate In App Help (#6801)
* [feat] Removed help from toolbar.js

* [feat] Removed help from global search

* [feat] redirected search in help to docs website

[] Url needs to be configurable from hooks

* [Feat] Removed search functions for help

* [fix] Help links not redirecting

* [feat] Modified "Help" menu on desk toolbar

* [feat] Removed docs search from desk toolbar

* Removed Search from toolbar.js

* Removed /search_docs from website

* Removed help from migrate

* Deprecated help from command utils

* Removed help.py

* Removed help setup from travis.yml

* [fix] Fixed formatting issues

* [fix] Deleted commented code from toolbar.js

* [fix] Minor link fix

* [Fix] Fixed a small typo

* Removed docs_app dependency from pathces

* [fix] Removed commented code

* [fix] Typo in function name

* fix: remove commented code

* [fix] Changed 'Deprecated' message to 'Removed'

Removed will be the correct term instead of deprecated
2019-01-29 14:59:39 +05:30
Sagar Vora
113354084e docs: changelog for v11.0.4 2019-01-29 14:35:54 +05:30
Aditya Hase
e4224ea5d8 fix(report): Use key matching label if key with fieldname doesn't exist (#6839) 2019-01-29 13:01:17 +05:30
Saif
a5db88843b fix(Rounded Total): Use Banker's Rounding in JS round_based_on_smallest_currency_fraction (#6840) 2019-01-29 12:38:09 +05:30
Aditya Hase
434b518ebf fix(unicode): Set default encoding to utf-8 in Python 2 (#6833) 2019-01-29 10:51:12 +05:30
Suraj Shetty
ca28bab1d5 Remove unwanted field in edit-profile web form (#6837) 2019-01-29 10:50:23 +05:30
Suraj Shetty
5af8d4d1bb
Merge pull request #6824 from netchampfaris/feat-is-set-is-not-set
feat: New filter type "Is Set", "Is Not Set"
2019-01-29 07:27:57 +05:30
Suraj Shetty
356d0b77ec
Merge pull request #6838 from adityahase/import-fix
fix(import): Import print_function once
2019-01-29 07:22:54 +05:30
Suraj Shetty
9fccd64824
Merge pull request #6836 from adityahase/pdf-fix
fix(security): Make server-side PDF rendering tighter
2019-01-29 07:16:59 +05:30
Aditya Hase
928ec12d35 fix(import): Import print_function once 2019-01-28 14:54:55 +05:30
Aditya Hase
36bc812c94 fix(security): Make server-side PDF rendering tighter 2019-01-28 12:41:21 +05:30
Aleksas Pielikis
ecb3d3f56d feat(email): Allow emails to be sent without SMTP authentication by setting (#6816)
* Add email_account option to disable SMTP Authentication.

* Partially reverting email_account.py changes. Unnecessary incoming_server logic was added.

* Codacy code style issue fix.

* Suppress 'Password is required or select Awaiting Password' message if only smtp is used an no athentication is required.

* Suppress 'Password is required or select Awaiting Password' message if only smtp is used an no athentication is required.

* Simplified logic.

* Reverted excessive changes.

* fix: remove description and make label clear
2019-01-28 12:22:28 +05:30
Saif
c294ee3583 feat: Show average of Percent field in report totals row (#6785)
* feat: Use a new report accumulator function for DataTable totals row

* fix: Updated accumulator function according to changes in DataTable
2019-01-28 12:21:37 +05:30
Shivam Mishra
d3b4a165f2 feat: [v10] Deprecate In App Help (#6834)
* [feat] Removed help from global search

* [feat] redirected search in help to docs website

[] Url needs to be configurable from hooks

* [Feat] Removed search functions for help

* [fix] Help links not redirecting

* [feat] Modified "Help" menu on desk toolbar

* [feat] Removed docs search from desk toolbar

* Removed Search from toolbar.js

* Removed help from migrate

* Deprecated help from command utils

* Removed help setup from travis.yml

* [fix] Fixed formatting issues

* [fix] Deleted commented code from toolbar.js

* [fix] Minor link fix

* [fix] Removed accidentally added autodeploy
2019-01-28 12:20:24 +05:30
Suraj Shetty
2a431be19b Set empty string if the value is null or undefined (#6803) 2019-01-25 11:59:13 +05:30
Faris Ansari
36775a8b62 fix: Breadcrumbs in File View (#6802)
* fix: Breadcrumbs in File View

* fix: style and duplication
2019-01-25 11:58:25 +05:30
Aditya Hase
837bfc0995 fix(unicode): Import unicode_literals in every file (#6805)
* fix(unicode): Import unicode_literals in every file

* fix(unicode): Test if safe_json_loads return unicode instead of bytes
2019-01-25 11:56:27 +05:30
Faris Ansari
d5cd34457e fix: Bypass filters that cannot be applied (#6818)
Use case:

When you enable Workflow for any DocType, it's status is now tracked by
`workflow_field` and not `docstatus`. When you navigate from
Notification dropdown, it applied a `docstatus` filter on the List View
which cannot be applied. This can be ignored and user can apply his
own filters.
2019-01-25 11:54:55 +05:30
Aditya Hase
51fc91563d feat(email): Check Send Read Receipt checkbox by default (#6817) 2019-01-25 11:53:47 +05:30
Anurag Mishra
37393399ce fix: offset in calendar view (#6815) 2019-01-25 11:28:24 +05:30
Zarrar
94d0489674 fix: Customize Form and Custom DocType related fixes (#6645)
* display Customize option in menu bar only for standard DocType

* disallow opening of custom doctype in Customize Form

* make fields dependent on is_submittable property visible for child table

* throw message that custom fields can only be added to standard doctype

* set query similar to the one in Customize Form for DocType selection

* only hide customize option [fix]

* add core doctypes list in model and use it from there

* avoid editing of core doctype from Customize Form or Custom Field

* test case updated and additional test for core doctypes added

* codacy fix
2019-01-25 11:21:10 +05:30
Faris Ansari
cc033a67eb fix(PrintFormat): Section Labels with spaces in them got truncated (#6819) 2019-01-25 11:19:57 +05:30
Chinmay Pai
3250553738 fix(notifications): ignore mysql internal error 1684 for concurrent ddl statements (#6826)
apparently this occurs when get_notifcations is called, and at the same time, a table is being modified. to fix this, we just skip the table that is currently being modified.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-01-25 11:19:17 +05:30
Zarrar
d8187a3f9d fix: unicode character throws error for python 2 (#6822) 2019-01-25 10:24:40 +05:30
Saurabh
97152b5a1e fix: return empty dict if setup wizard is not completed (#6830) 2019-01-25 10:22:13 +05:30
Saurabh
a5d18beefb
Merge pull request #6829 from saurabh6790/notification_fix
fix: return empty dict if site is in installation state or setup wiz …
2019-01-24 19:58:01 +05:30
Saurabh
14911900c8 fix: return empty dict if site is in installation state or setup wiz not completed 2019-01-24 19:56:03 +05:30
Faris Ansari
75f8847ad4
fix: Skip get_notifications before setup_complete (#6828) 2019-01-24 19:15:49 +05:30
Faris Ansari
5f5ea18a72 style: missing semicolon 2019-01-24 15:13:13 +05:30
Faris Ansari
2b336c235c tests: Add tests for "Is Set" and "Is Not Set" filter 2019-01-24 14:43:44 +05:30
Faris Ansari
5ffdeb19fc feat: New filter type "Is Set", "Is Not Set" 2019-01-24 14:26:27 +05:30
Suraj Shetty
fdecd002b7
Merge pull request #6807 from adityahase/fix-mail
fix(email): Pass args as unicode in Py2 & bytes in Py3 to SMTP.login
2019-01-23 20:53:25 +05:30
Zarrar
8bdb0dc5f8 feat: Download json file (#6793)
* feat: download file as json type

* fix: make raw type files downloadable
2019-01-23 16:51:02 +05:30
Deepesh Garg
236fa87051 fix(comment): Encoding issue in jinja for mention in comment (#6813) 2019-01-23 16:47:16 +05:30
Aditya Hase
7bd056c2d1 fix: Use ImportError instead of ModuleNotFoundError (#6808)
ModuleNotFoundError is available in python 3.6

This should have been included in Frappe PR #6797
2019-01-23 16:43:37 +05:30
Aditya Hase
6b72faf44f style: Linting fixes (#6809)
* style: Remove unused imports

* style: Remove unused local variables
2019-01-23 16:39:55 +05:30
Frappe Bot
1212139117 Merge branch 'staging-fixes' into staging 2019-01-23 08:10:32 +00:00