Commit graph

1342 commits

Author SHA1 Message Date
Sagar Vora
17b20b22a3 Merge branch 'master' into develop 2019-02-12 16:31:54 +05:30
Nabin Hait
6e659653a9 fix: filter object to list 2019-02-08 12:27:00 +05:30
Saif
1bb4c6275f fix: Don't send attachment/download header with PDF files (#6881) 2019-02-06 12:48:41 +05:30
Sagar Vora
89efa968d8 Merge branch 'master' into develop 2019-02-05 18:39:43 +05:30
Chinmay Pai
6377bdf6db fix(data_import): use absolute url (#6875)
there is no need to prepend the sitename to the url, since browsers/html are/is smart enough to handle absolute urls.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-02-05 10:53:31 +05:30
Saurabh
96bff3cd9e fix: jinja local.conf data leak (#6884) 2019-02-05 10:52:00 +05:30
Chinmay Pai
9873c04231 fix(sync_global_search): decode json object as str (#6867) 2019-01-31 15:16:47 +05:30
Aditya Hase
57196a8bbe fix(website): Enable socketio on website (for file upload) (#6866) 2019-01-31 13:54:42 +05:30
Saurabh
76bd4e4f19 Merge branch 'master' into develop 2019-01-30 12:36:43 +05:30
Rushabh Mehta
0704928fd8 fix(global search): fallback if redis is not yet started 2019-01-30 11:26:07 +05:30
Rushabh Mehta
d09792c606 fix: refactor global search to not insert after every commit (#6845)
* fix: refactor global search to not insert after every commit

* feat: configuration to disable_global_search
2019-01-30 11:13:51 +05:30
Sagar Vora
ef82f39f99 Merge branch 'staging' into develop 2019-01-29 18:24:11 +05:30
Sagar Vora
fe3fe0a4b8 Merge branch 'master' into staging-fixes 2019-01-29 17:08:58 +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
Rushabh Mehta
6c7be62f24 fix: file upload via url 2019-01-29 12:42:17 +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
Aditya Hase
36bc812c94 fix(security): Make server-side PDF rendering tighter 2019-01-28 12:41:21 +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
5ffdeb19fc feat: New filter type "Is Set", "Is Not Set" 2019-01-24 14:26:27 +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
Aditya Hase
6b72faf44f style: Linting fixes (#6809)
* style: Remove unused imports

* style: Remove unused local variables
2019-01-23 16:39:55 +05:30
Sagar Vora
47c0d10631 Merge branch 'staging' into develop 2019-01-22 15:43:40 +05:30
Deepesh Garg
2ecd805e0e fix: Router options for multiple values (#6779)
* fix(list_view): Router option support for multiple filters

* fix(utils): fix in get_link_to_report for route options

* fix(Codacy): Added semicolon and fixed indentation

* fix(route_options): Bug fix

* fix(router_options): Added safe encoding for get_link_to_report

* fix(router_options): fixed encoding issue

* Remove encoding

* fix(list_view): fix for find in awesomebar
2019-01-22 14:27:30 +05:30
Faris Ansari
987a604749 fix: Use ImportError instead of ModuleNotFoundError (#6797)
- ModuleNotFoundError is available in python 3.6
2019-01-21 17:57:38 +05:30
sahil28297
3644f5f4cd feat: relative timeframe filters (#6792)
* feat: relative timeframe filters

* fix: resolve syntax errors

* fix: Translated options
2019-01-21 16:02:40 +05:30
Saurabh
d1bed88f3f Merge branch 'staging' into develop 2019-01-15 19:14:06 +05:30
Saurabh
2fbf59522e Merge branch 'master' into staging-fixes 2019-01-15 19:05:42 +05:30
Saurabh
835fc2c1a3 Merge branch 'staging' into develop 2019-01-08 16:09:28 +05:30
Nabin Hait
1d686e470b
fix(comp_dashboard): Company dashboard if goal is zero. (#6719) 2019-01-08 14:16:04 +05:30
Deepesh Garg
817d0744f8 feat: Function for linking reports with filters (#6718) 2019-01-08 10:43:27 +05:30
Nabin Hait
5590193c8d fix(version): getting version update (#6717)
* fix(version): getting version update

* fix(version): getting version update
2019-01-07 08:57:04 +05:30
Faris Ansari
ae57e75b0e fix(is_html): Return false if text is not string 2018-12-30 22:43:21 +05:30
Faris Ansari
041e8dd4b2 fix(is_html): Return false if not string 2018-12-30 12:35:08 +05:30
Faris Ansari
3b86f16b73 New Control: Table MultiSelect (#6675)
* feat(control): Add Table MultiSelect control

* fix: Use btn-group instead of span

* fix: Remove functionality

* fix: Add 'Table MultiSelect' to Field doctypes

* fix: Replace usage of string 'Table' with array `table_fields`

* fix: Use internal array to store values instead of building from HTML elements

* fix(style): Add semicolon

* fix: Read only mode and click to navigate to form

* style: indent

* fix: fallback to empty array

* fix: Add formatters in js and py

* style: missing semicolon

* fix: Add docfield validation
2018-12-28 15:36:59 +05:30
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00
rohitwaghchaure
22fe10148a [Fix] Translation not working for the html data (#6647)
* [Fix] Translation not working for the html data

* Test cases

* Fixed codacy

* Fixed is html method

* Fixed test cases
2018-12-24 15:17:38 +05:30
Saurabh
2de5dfdbb3 Merge branch 'staging' into develop 2018-12-18 10:20:24 +05:30
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
Saurabh
b727233948 Merge branch 'staging' into develop 2018-12-13 10:37:25 +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
Frappe Bot
c1ce84e9fc Merge branch 'staging' into develop 2018-12-11 09:53:52 +00:00
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
Saurabh
7b7a492380 Merge branch 'staging' into develop 2018-12-07 17:56:57 +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
Frappe Bot
b2779c617a Merge branch 'staging' into develop 2018-12-06 09:31:40 +00:00
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
c5d276b813
Merge branch 'staging' into develop 2018-11-28 08:24:00 +00:00