Commit graph

16399 commits

Author SHA1 Message Date
Rushabh Mehta
cbbca735b9 fix(database): fetch description only if results 2018-08-08 16:52:40 +05:30
Rushabh Mehta
e7c8b0c138 optimize(various): optimize with frappe.get_cached_value 2018-08-08 16:33:40 +05:30
Nabin Hait
b8f91f36fc fix(document): frappe.get_cached_doc 2018-08-08 13:16:04 +05:30
Nabin Hait
cdc8e2895e feat(document): frappe.get_cached_doc 2018-08-08 13:06:06 +05:30
Nabin Hait
7f2a14bdf1 feat(document): frappe.get_cached_doc 2018-08-08 13:04:23 +05:30
Faris Ansari
2535eb3131 [Website Slideshow] Button to fetch attached images from a doc (#5938) 2018-08-07 18:31:11 +05:30
Faris Ansari
12ea6c03e9
fix(webform): fallback values for sysdefaults (#5940) 2018-08-07 17:10:29 +05:30
Rushabh Mehta
0f95b2c964 fix(webform): ignore mandatory on insert only if files 2018-08-07 14:59:28 +05:30
Saurabh
d1d09448c8 In "bench version" command pull branch specific version if exists (#5898) 2018-08-07 14:47:49 +05:30
Benji
0330499bb9 Fixes error (#5902)
Fixes "TypeError: cannot use a string pattern on a bytes-like object"
2018-08-07 14:44:40 +05:30
Faris Ansari
d9e7654602 UI utils (#5909)
* Add scroll_to_bottom utility

* Add reset method in CommentArea

* Add class to user dropdown list item to for easy querying
2018-08-07 14:44:17 +05:30
Suraj Shetty
9a7dc7b4e5 Workflow action ui ux fixes (#5926)
* Allow cancel for doctype with workflow

* Fix child row deletion in workflows

-https://github.com/frappe/erpnext/issues/14731

* Add get_pdf_link method

* Refactor workflow action response

- Confirm before applying action

* Fix bug with confirmation page for workflow action

* Fix codacy

* Add cancel button and pdf link

* Fix Codacy

Remove trailing whitespace
2018-08-07 14:43:20 +05:30
Faris Ansari
b629080184 fix(email html): Allow pre and code tags in email html (#5929) 2018-08-07 14:43:07 +05:30
Faris Ansari
31511281b4 Update frappe-datatable to 1.1.6 (#5931)
- fixes border issue in firefox on ubuntu
2018-08-07 14:42:48 +05:30
Faris Ansari
b3249fd23a feat(build): Log build errors in browser console (#5932) 2018-08-07 14:42:39 +05:30
Faris Ansari
a406e5db68 Kanban board fixes (#5933)
* class.extend -> es6 class

* fix(kanban): Fix kanban creation from sidebar

Creating custom fields from client side breaks in cases when DDL
queries and normal queries were run simultaneously.
Now, we do the heavy lifting on the server side

Also, moved kanban specific code from list_sidebar to kanban_view

* style: replace function with arrow functions

* style: semicolon
2018-08-07 14:41:51 +05:30
Saurabh
bece82d6ab Resolved merge conflicts 2018-08-07 12:47:01 +05:30
Saurabh
c6a97a23db Merge branch 'hotfix' 2018-08-07 12:42:53 +05:30
Saurabh
e3382f8aec bumped to version 10.1.45 2018-08-07 13:12:53 +06:00
Saurabh
66ce0998b9
Merge pull request #5936 from codingCoffee/dropbox
[minor][feature] make dropbox and S3 backup successful email optional
2018-08-07 12:31:33 +05:30
Ameya Shenoy
1d89dcea75
[minor][feature] make email for successful S3 backup optional 2018-08-06 22:49:37 +00:00
Ameya Shenoy
51d5577bb1
[minor][feature] make dropbox backup successful message optional 2018-08-06 22:38:40 +00:00
Ameya Shenoy
d5aec6e80c
Merge pull request #5925 from netchampfaris/md_to_html
Add utility frappe.utils.md_to_html
2018-08-06 16:10:20 +05:30
Rushabh Mehta
1e84e63838 fix(webform): save first without checking mandatory if has files 2018-08-06 16:00:01 +05:30
Rushabh Mehta
9bcc89b750 fix(webform): process Attach Image type 2018-08-06 15:46:52 +05:30
Rushabh Mehta
11161c099d fix(webform): attach and save workflow 2018-08-06 14:28:44 +05:30
Rushabh Mehta
5863f5d4ec fix(webform): attachments and date 2018-08-06 14:28:44 +05:30
Prateeksha Singh
04bc51a398 [hotfix] prevent jinja exec in search title (#5930) 2018-08-06 13:02:03 +05:30
Prateeksha Singh
2bd8678357 prevent jinja exec in search title (#5928) 2018-08-06 12:59:23 +05:30
Ameya Shenoy
ed5e0b4628
Merge pull request #5916 from rohitwaghchaure/total_rows_not_showing_proper_value
[Fix] Total amount not showing proper if rows has blank value
2018-08-06 12:33:27 +05:30
Rushabh Mehta
a07e76d27e permission(webforms): attachments private 2018-08-05 22:29:06 +05:30
Faris Ansari
0a6deadc91 fix(syntax highlighting): Better syntax highlighting
- Update markdown2 to 2.3.5
- Only load syntax files for languages we support
- Enable highlightjs-lang extra to add class to code blocks
2018-08-05 20:04:13 +05:30
Faris Ansari
60f9e2c973 Add utility frappe.utils.md_to_html
- Replace all occurences of manual imports with this utility
- Also enable extras
  - fenced-code-blocks
  - tables with class 'table table-bordered'
  - header-ids
2018-08-05 18:19:25 +05:30
Rushabh Mehta
bb67915445
feature(web-form): enable client scripts in web form (#5924) 2018-08-05 14:49:55 +05:30
Ameya Shenoy
1a8b4812d5
Merge pull request #5923 from codingCoffee/section
allow 1st row to be a section/column break
2018-08-04 22:34:36 +05:30
Ameya Shenoy
9ee7c6a195
allow 1st row to be a section break 2018-08-04 16:40:03 +00:00
Rushabh Mehta
db51e4441a fix(attach) for web forms 2018-08-04 21:51:49 +05:30
Rushabh Mehta
a886fa1d6e fix(dependency) in field_group 2018-08-04 21:09:16 +05:30
Ameya Shenoy
2962b4c163 Print the doctype when migrations break (#5921) 2018-08-04 16:25:46 +05:30
Rushabh Mehta
3600b55f58
fix(webform grid): click on edit and list view (#5922) 2018-08-04 16:24:38 +05:30
Ameya Shenoy
42e97a6119
Merge pull request #5920 from codingCoffee/description
pull description in web form
2018-08-04 15:08:55 +05:30
Ameya Shenoy
e190024105
pull description in web form 2018-08-04 09:37:41 +00:00
Ameya Shenoy
079827aa50 fetch more fields in webform via get_fields (#5918) 2018-08-04 14:12:12 +05:30
Rohit Waghchaure
7a77093bed [Fix] Total amount not showing proper if rows has blank value 2018-08-03 15:59:27 +05:30
Ameya Shenoy
b939458ed6 Allow get list for webform (#5915) 2018-08-03 14:56:06 +05:30
Prateeksha Singh
55120189d3
Merge pull request #5914 from pratu16x7/upload
[webform][fix] add upload dependencies
2018-08-03 13:03:50 +05:30
Prateeksha Singh
54232b8bf1 [webform][fix] add upload dependencies 2018-08-03 13:03:11 +05:30
Prateeksha Singh
6518507091
Merge pull request #5913 from pratu16x7/webform-list
Webform list in Datatable, add show_in_grid flag in webform
2018-08-02 19:56:41 +05:30
Prateeksha Singh
93fd9dfce9 [webform-list] Abstract out grid_list 2018-08-02 19:54:53 +05:30
Prateeksha Singh
b2d1f00e50 add show_in_grid flag in webform 2018-08-02 19:47:36 +05:30