Commit graph

1270 commits

Author SHA1 Message Date
Zarrar
863c54b0fa [Fix] Json data for Report Builder based reports (#6624)
* replace doctype name if already present

* patch to update json data for report builder based reports

* minor fix for auto email
2018-12-18 08:56:10 +05:30
Prateeksha Singh
31c9e5a078 [setup] check skip_setup_wizard from common_site_comfig 2018-12-11 16:10:02 +05:30
Prateeksha Singh
1f1e70d335 [fix] Better multiple root node message 2018-12-11 16:10:02 +05:30
Prateeksha Singh
0ccb159c6f Add make_records() 2018-12-11 16:10:02 +05:30
Saurabh
5dceb7fb42 provision to setup password while adding system manager 2018-12-11 16:10:02 +05:30
Rushabh Mehta
dad0b84847
fix(patch): check if table exists for old prepared reports (#6605)
* debug(test): test_scheduler_events

* fix(patch): check if table exists for old prepared reports

* debug(tests): add comments for debug
2018-12-11 11:08:50 +05:30
Aditya Hase
fc48597694 fix(prepared-report): Python 2 compatibility fix
gzip.compress and gzip.decompress were introduced in Python 3.2

Added gzip_compress and gzip_decompress to frappe.utils to add this functionality
to both Python 2 and 3
2018-12-06 16:01:41 +05:30
Ameya Shenoy
79bd1ed9d6 fix: identify production mode for PDF generation (#6559)
In regards to PDF generation, if developer_mode was set to true, the PDF
generated used to lack css styling. This was because the URL to the CSS
assets used to contain the webserver port number, but given the system
was running in production, the URL was invalid, thereby not being able
to load CSS assets. This fix does not rely on the value of
developer_mode to identify if the system is running in production,
rather, it uses the value of restart_superviosor or systemd_on_update,
to check for the same.
2018-11-29 10:31:53 +05:30
Ameya Shenoy
3669203acf fix(get_version): from hooks.py instaed of git (#6534) 2018-11-26 12:16:12 +01:00
Ameya Shenoy
d1d0edc636
Merge branch 'master' into staging-fixes 2018-11-23 08:07:36 +00:00
Juan Carlos Espinoza Zurita
7319853d58 [MINOR FEATURE] Export file to TXT #6737 (#6489) 2018-11-21 18:17:34 +05:30
Aditya Hase
fc085a2b39 fix(redis-wrapper): Do not assume existence of superclass of redis.Redis
RedisWrapper inherits from Redis which inherits from StrictRedis

In redis-py 3.0.0 StrictRedis was renamed to Redis.

This seems like a harmless change, but, instead of using
`self(RedisWrapper ...`, all methods use `self(Redis ...`
which assumes previous hierarchy (i.e. RedisWrapper <- Redis <- StrictRedis)
2018-11-15 20:06:03 +05:30
Frappe Bot
c373a172af Merge branch 'master' into staging-fixes 2018-11-09 10:08:19 +00:00
gshmu
a2642868a5 fix read_xlsx_file_from_attached_file when xlsx contain functions (#6400) 2018-11-09 10:53:03 +05:30
Faris Ansari
338c4c8794 fix: Email Reply Chain
Previous email is appended to the next reply, but was not rendered by
splitting it with a hardcoded comment string. Since Quill does not
support comments, created a new HiddenBlock for it.
2018-11-07 13:06:22 +05:30
Faris Ansari
fe334d2c92 fix(Quill): Add all quill attributes that are required to render it 2018-11-05 17:07:21 +05:30
Aditya Hase
e6b070e611 refactor: Deduplication (#6347)
* refactor: Deduplicate setup_perms_for

`setup_perms_for` has two identical definitions in

frappe/utils/reset_doc.py and
frappe/patches/v7_2/setup_custom_perms.py

Remove definition from setup_custom_perms.py, use import instead

* refactor: Deduplicate get_parent_doc and set_timeline_doc

`get_parent_doc` and `set_timeline_doc` are accidentally defined twice in

frappe/core/utils.py and
frappe/core/doctype/communication/communication.py

Remove definition from communication.py, use import instead

* fix(python3): Replace urlopen import with six.moves.urllib.request.urlopen
2018-11-05 11:01:59 +05:30
Faris Ansari
e0cf3f367b fix(Quill): Add data-row attr to whitelist
- data-row attribute is added by Quill for retaining table structure
2018-11-01 19:06:30 +05:30
Ameya Shenoy
25a0b8dba2
Merge branch 'master' into staging-fixes 2018-10-30 12:09:41 +00:00
Ameya Shenoy
dd0e7ba472
fix(help): mitigate security fix for docs
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-30 17:13:00 +05:30
Aditya Hase
3afb9ebcbc
fix(security): Make Jinja tighter 2018-10-30 13:13:42 +05:30
Ameya Shenoy
0279e957c6
Merge branch 'master' into staging-fixes 2018-10-23 12:51:30 +00:00
Ameya Shenoy
95c8b30d7d
Merge pull request #6281 from kennethsequeira/hotfix
Update in-app Docs Generation
2018-10-23 18:05:18 +05:30
Saif
25827755b5 PDF allow parsing header-spacing (#6286)
Simply allow parsing header-spacing from custom css.
2018-10-22 10:13:26 +05:30
Kenneth Sequeira
026bd0d2bc fixed image link 2018-10-19 14:42:56 +05:30
Kenneth Sequeira
1e0880493c remove rogue tab space 2018-10-19 14:33:30 +05:30
Kenneth Sequeira
f31e7ac8a3 added source link for frappe docs 2018-10-19 14:30:34 +05:30
Shreya Shah
8e0410bdb0
Update help.py 2018-10-19 14:21:36 +05:30
Shreya Shah
0473ea9c6b
Update help.py 2018-10-19 14:09:49 +05:30
Shreya Shah
1f8c8568ed
Update help.py 2018-10-19 11:44:51 +05:30
Kenneth Sequeira
28b5589c72 Docs setup code same as v11
Currently, in v10, the docs still point to ERPNext develop branch, before it being moved to erpnext.org app.

Co-authored-by: Shreya Shah <shreyashah115@gmail.com>
>
2018-10-19 03:22:17 +05:30
Ameya Shenoy
be8f37dc5b fix(update message): multiple fixes
- added GitPython as a dependency
- use git describe to find the branch version
- prevent version popup for prereleases
- check for update weekly instead of daily
- fixed bug in check for update which used to compare minor version even
if there was a mismatch in comparing major versions

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-18 13:56:32 +00:00
Ameya Shenoy
04d255bc5f fix(update message): multiple fixes (#6275)
- added GitPython as a dependency
- use git describe to find the branch version
- prevent version popup for prereleases
- check for update weekly instead of daily
- fixed bug in check for update which used to compare minor version even
if there was a mismatch in comparing major versions

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-18 12:33:00 +05:30
Rushabh Mehta
1f1a1ec810 fix(formatdate): always replace mm by MM for babel.dates 2018-10-15 10:34:17 +05:30
Saurabh
66a2d81df7 get link to reset password only if setup wizard is not completed 2018-10-11 14:43:37 +05:30
Saurabh
cdc2e17cbf get link to reset password only if setup wizard is not completed 2018-10-11 14:39:52 +05:30
Charles-Henri Decultot
09cdb2f39b [Fix] In-app documentation (#6185)
* In-app documentation correction

* In app images fix proposal
2018-10-05 11:29:37 +05:30
Ameya Shenoy
66073c360a
Merge branch 'master' into staging-fixes 2018-10-03 14:51:32 +00:00
Shreya Shah
f4c9d5d2b2
Merge pull request #6187 from shreyashah115/allow-images
Allow img src having data protocol
2018-10-03 16:13:32 +05:30
Shreya
487fd3e321 Allow img src having data protocol 2018-10-03 10:52:24 +05:30
Ameya Shenoy
1ba3f4a737 fix(release_popup): show only the non-beta release (#6169)
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-02 10:43:09 +05:30
Charles-Henri Decultot
98abda32b4 [Enhancement] Event timeline (#6133)
* Events in timeline wip

* Events in timeline

* Permission issue + split buttons between Frappe and ERPNext

* Add string type check

* Codacy corrections

* Permission issue

* Test and feedback corrections

* Codacy corrections

* Tests and codacy corrections

* Codacy correction

* Py3 correction

* Travis correction

* Py3 corrections"

* Travis and codacy corrections

* Removed space

* Add check for the removal of new lines

* Codacy rollup watch missing semicolon
2018-10-02 10:12:55 +05:30
rohitwaghchaure
8fe95f2876 Submit the attendance if it's in draft mode (#6156) 2018-09-30 21:11:01 +05:30
Aditya Hase
ab81036c20 fix(python3): subproess.check_output should always be decoded (#6135) 2018-09-25 13:14:20 +05:30
Sachin Mane
5e5623d7f9 fix - default timeouts never picked up (#6098) 2018-09-24 13:08:08 +05:30
Achilles Rasquinha
97c02cae82 Installation Failure Fix for Python 3 - safe_decode bytes to string (#6130)
* Installation Failure Fix for Python 3 - safe_decode bytes to string

* Installation Failure Fix for Python 3 - safe_decode bytes to string

* Fixed merge conflict

* Use --short instead of first 7 characters
2018-09-24 12:34:31 +05:30
Faris Ansari
c2ccc9886c
Merge pull request #6091 from netchampfaris/img-screenshot
fix(md_to_html): Add class screenshot to img elements
2018-09-14 14:44:30 +05:30
Faris Ansari
e8eb44c299
fix(change log): Import subprocess (#6093)
* fix(change log): Import subprocess

* fix: Ignore subprocess warning
2018-09-14 14:43:26 +05:30
Faris Ansari
e7c79b713e fix(md_to_html): Add class screenshot to img elements 2018-09-14 11:05:12 +05:30
Saurabh
3e7b387a7a [resolved] merge-conflicts 2018-09-12 14:52:46 +05:30