vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
16587 commits 1 branch 0 tags 587 MiB
Commit graph

1214 commits

Author SHA1 Message Date
Saurabh
d2ce42fce4
Merge pull request #6060 from saurabh6790/get_app_version_and_branch_info 
[enhance] in get_app_info return application branch and branch version if exists
 2018-09-07 18:35:07 +05:30
Saurabh
dbb7ecb7fe [fix] check for developer mode before adding port to URL 2018-09-07 13:23:17 +05:30
Saurabh
371d7f87a9 [enhance] in get_app_info return application branch and branch version if exists 2018-09-06 17:41:26 +05:30
Faris Ansari
73c7984fcd fix: frappe.utils.get_url 2018-09-05 14:06:43 +05:30
Benji
8ef433ef45 Add safe_div() (#6006) 
* Update receive.py

* Update receive.py

* Update receive.py

* Added safemath_div()

* Update data.py

* style: fix trailing whitespace
 2018-09-03 10:59:23 +05:30
Faris Ansari
505a55474a feat: Add is_subset utility 2018-09-01 22:44:31 +05:30
Faris Ansari
3838247f4d
Merge branch 'develop' into async-keyword-fix 2018-08-28 18:47:17 +05:30
Faris Ansari
116a0bc99c fix(async): Pass async param using dict 2018-08-28 18:45:56 +05:30
Aditya Hase
f3b959b1fe frappe: refactor async to realtime (#6015) 
* frappe: refactor async to realtime

* frappe: refactor async to is_async
 2018-08-28 15:31:20 +05:30
Rushabh Mehta
ad9ce8a3a3 fix(test): test_scheduler.py 2018-08-27 11:20:25 +05:30
Ameya Shenoy
c60e976fdc
Merge pull request #5992 from codingCoffee/print 
[feature] print multiple docs from multiple doctypes
 2018-08-24 08:26:15 +00:00
Ameya Shenoy
8776376c13
multi fixes 
- [fix] removed _ as a variable since it is used in translations
- linting fixes
- added error logging for permission errors
 2018-08-23 10:47:01 +00:00
Benji
e166817c3c minor bugfix python 3 (#5997) 
bugfix
 2018-08-22 10:58:34 +05:30
Ameya Shenoy
65e96ff7a4 added docstring to download multi pdf 
- also made the PDF name as a parameter which is passed by the user
 2018-08-21 14:59:47 +05:30
rohitwaghchaure
a5d7182817 [Fix] Ascii code issue while downloading report (#5990) 2018-08-21 11:21:40 +05:30
Ameya Shenoy
4504bc1ebc
[feature] print multiple docs from multiple doctypes 2018-08-20 18:57:59 +00:00
Zarrar
c5ffec6c69 fix argument pass to class (#5989) 2018-08-20 12:38:10 +05:30
Himanshu Mishra
10361383c1 [fix]: use is_async in background jobs instead of async (#5986) 2018-08-20 10:36:26 +05:30
rohitwaghchaure
d13afe3e79
Merge pull request #5980 from rohitwaghchaure/download_report_not_working 
[Fix] Download report not working
 2018-08-17 13:22:17 +05:30
Rohit Waghchaure
c197ae6278 [Fix] Download report not working 2018-08-17 11:10:51 +05:30
Ameya Shenoy
5cee74e8db
python 2/3 fixes 2018-08-16 12:28:59 +00:00
Prateeksha Singh
d0a1565aa8 [csv-utils] don't decode when you've encoded special chars (#5970) 
* [csv-utils] don't decode when you've encoded special chars

* Update csvutils.py
 2018-08-15 11:25:56 +05:30
sivankar
a48b76b940 refactored code to add support in filters to get descendant or ancest… (#5847) 
* refactored code to add support in filters to get descendant or ancestor for tree type documents

* added semicolon and comments to imporve code quality

* refactored code to add not ancestor and not descendants of filters

* added test cases for ancestors of and descendants of

* Translate labels
 2018-08-14 12:19:18 +05:30
Prateeksha Singh
213279ec87
Merge pull request #5783 from szuyxy/global_search_support_and 
[Enhance] Global search multi key words to pin point search result
 2018-08-14 12:09:29 +05:30
Ameya Shenoy
5013405f45
Merge pull request #5748 from mhbu50/print_server 
Print with Print server (CUPS)
 2018-08-09 16:06:18 +05:30
Rushabh Mehta
e7c8b0c138 optimize(various): optimize with frappe.get_cached_value 2018-08-08 16:33:40 +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
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
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
db51e4441a fix(attach) for web forms 2018-08-04 21:51:49 +05:30
Rushabh Mehta
3600b55f58
fix(webform grid): click on edit and list view (#5922) 2018-08-04 16:24:38 +05:30
Faris Ansari
24b1f2bbc4 Pick port from webserver_port in get_url 2018-07-31 23:03:41 +05:30
Nabin Hait
854b068ee9 Fixed merge conflict 2018-07-31 13:15:15 +05:30
Shreya Shah
4c20d1f68f using regex instead of soup to parse pdf page margins (#5883) 
* using regex instead of soup to parse pdf page margins

* Fix codacy
 2018-07-30 14:32:33 +05:30
Ameya Shenoy
92f288bc2f added 2 fucntions to frappe.utils (#5877) 
* added 2 fucntions to frappe.utils

- get_db_count: to get the db count of any DocType
- call: a wrapper for frappe.call

* Update __init__.py
 2018-07-27 11:55:58 +05:30
Sagar Vora
5ddcf40a11 [python3] let PdfFileReader handle file opening (#5878) 
In Python 3, file() is deprecated. 
PdfFileReader can internally handle file opening and closing, so file() no longer necessary.

See description of stream parameter here:
https://pythonhosted.org/PyPDF2/PdfFileReader.html#PyPDF2.PdfFileReader

Alternatively, open() can be used.
 2018-07-27 11:55:48 +05:30
Rushabh Mehta
aef1046b1f
[email] remove style from email so it does not mess up desk (#5860) 
* [email] remove style from email so it does not mess up desk

* [fix] tests

* [fix] image parsing, #savedbyatestcase

* [fix] timeout issues in test

* [fix] timeout issues in test
 2018-07-24 17:00:14 +05:30
Ameya Shenoy
4e51f9ecf1
Merge branch 'develop' into print_server 2018-07-24 16:34:50 +05:30
Ameya Shenoy
2d10c8e074
minor fixes 
- [x] linting fixes
- [x] removed format as a parameter, instead used print_format
- [x] removed pycups as a requirement, user needs to manually install
- [x] moved import from global to inside a function to prevent errors
- [x] uncheck Enable Print Server is pycups is not installed
 2018-07-24 11:03:11 +00:00
Prateeksha Singh
ac6f938cd9 [fix][help] image links 2018-07-19 14:50:55 +05:30
Prateeksha Singh
f566850728
[help] revert assets path, fix broken images 2018-07-19 13:10:34 +05:30
Saurabh
176f3b6a15 Resolved merge conflicts 2018-07-18 16:20:06 +05:30
Prateeksha Singh
6d9ce9b6ab [merge] branch develop into background-report 2018-07-16 15:30:23 +05:30
rohitwaghchaure
7293311f72 [Fix] Handle the OverflowError exception in the in_words method (#5769) 2018-07-11 11:56:01 +05:30
rohitwaghchaure
6f84e922f8 [Fix] Brute force security (#5785) 
* [Fix] Brute force security

* Added patch and change the error message

* Added test case
 2018-07-11 11:14:05 +05:30
Aditya Hase
dca702d898 Allow multiple values to be passed as arguments to rpush and lpush (#5802) 2018-07-10 15:34:29 +05:30
Saurabh
2a4b8f1ec3 [fix] merge-conflicts 2018-07-09 15:56:43 +05:30
Prateeksha Singh
479f51e23a [global-search] add doc check for route 2018-07-09 12:49:26 +05:30
Saurabh
a135c6c431 resolved merge conflicts 2018-07-06 13:37:51 +05:30