Commit graph

1376 commits

Author SHA1 Message Date
Faris Ansari
b61a37a233 fix: Notification test in Postgres (#7044) 2019-03-08 20:47:21 +05:30
Frappe Bot
94ea028db3 Merge branch 'master' into develop 2019-03-08 09:38:18 +00:00
Anurag Mishra
cd191439fd feat: Document subscription (#6745) 2019-03-07 14:06:22 +05:30
FinByz Tech Pvt. Ltd
245a8186af fix: Allowed guest to attach files to web forms (#7017)
Created the fix for the issue [#6774](https://github.com/frappe/frappe/issues/6774), in which guest can attach files in web forms like job application.
2019-03-06 22:48:11 +05:30
Rushabh Mehta
9df07891ff fix(xmlx): handle unparseable HTML 2019-03-06 16:11:06 +05:30
Faris Ansari
5d1ecb2e47 fix: Global Search fixes
- Update title, route and published in sync_value
- Update search_template for BS4
2019-03-03 00:27:13 +05:30
Faris Ansari
fadedb0062 Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-03-02 15:15:22 +05:30
Frappe Bot
497a14046e Merge branch 'master' into develop 2019-03-01 09:10:17 +00:00
Rohit Waghchaure
ae67ced14d fix: errprint not working 2019-02-28 20:23:06 +05:30
Rushabh Mehta
abfb44a047
Merge pull request #6993 from zerodhatech/fixtures
export fixtures of a specific app
2019-02-28 13:01:21 +05:30
Shridhar Patil
8aadcdf73e export fixtures of a specific app 2019-02-27 12:18:46 +05:30
Faris Ansari
3258acb5c9 Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-02-26 23:24:23 +05:30
Rushabh Mehta
08d5d9ae2c fix: default None to empty string for markdown conversions 2019-02-26 15:07:08 +05:30
Suraj Shetty
ce18b5ab2f
Fix minor formatting 2019-02-21 12:10:49 +05:30
Himanshu Warekar
121ffc0cf7 renamed function to get_weekdays 2019-02-21 11:17:52 +05:30
Himanshu Warekar
a6ce45240d add function to get weekdays 2019-02-21 11:11:38 +05:30
Faris Ansari
5a96fc70de Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-02-20 19:25:25 +05:30
Aditya Hase
c08bdd88a8 fix: Jinja template error (#6958)
https://github.com/frappe/frappe/pull/6957
2019-02-19 14:22:01 +05:30
Aditya Hase
4b4d59026f fix: Jinja template error (#6957)
Errors in Custom Print Format are not framework errors and should not have a "Report Issue" button
2019-02-19 14:19:51 +05:30
Suraj Shetty
c19befeb5b
fix: Don't assume async value == True
fix: Don't assume async value == True
2019-02-18 08:45:38 +05:30
Rushabh Mehta
fcaadf78ad
Merge pull request #6891 from rmehta/refactor-comments
BREAKING CHANGE: Comments are now handled separately from Communication and Version
2019-02-16 16:54:16 +05:30
Frappe Bot
bfc25ad1e5 Merge branch 'master' into develop 2019-02-15 10:21:47 +00:00
Rushabh Mehta
e850721d05
Merge pull request #6843 from Zlash65/enh-treeview
feat: Minor additional enhancements to Treeview
2019-02-15 14:30:38 +05:30
Aditya Hase
683be9e096 feat(error-report): Collect frame locals in error report (#6938)
* feat(error-report): Collect frame locals in error report

* style: Linting fixes
2019-02-15 14:24:08 +05:30
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
Rushabh Mehta
ae097e5139 fix: tests, check for spam comments 2019-02-07 16:35:50 +05:30
Himanshu Mishra
8c40a59fde
Merge pull request #1 from frappe/develop
Merge develop into patch-1
2019-02-06 22:06:34 +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
Zlash65
1d8f35ce97 fix: use orm instead of query 2019-02-01 15:53:01 +05:30
Zlash65
04b3a5cabc feat: added a utility method to get all the descendants of a node 2019-02-01 12:14:45 +05:30
Zlash65
a7e127e498 fix: get ancestors for a node with more filters 2019-02-01 12:14:45 +05:30
Faris Ansari
b6d5607ebc Merge branch 'develop' of https://github.com/frappe/frappe into website-bootstrap-4 2019-02-01 00:06:21 +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
Sagar Vora
3121a60292
fix: remove trailing whitespace. 2019-01-29 11:00:04 +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
Faris Ansari
ac28b0373d feat: Add get_single_value in jinja methods 2019-01-26 13:49:28 +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