Commit graph

14692 commits

Author SHA1 Message Date
tundebabzy
09863bdf38 System Setting Password Policy Issue (frappe/erpnext#11255) (#4353)
* use get for getting key

* PEP8 changes
2017-10-25 12:37:14 +05:30
Prateeksha Singh
6f891cc3bb make User Permissions importable (#4367) 2017-10-25 12:34:47 +05:30
tundebabzy
f5c66a0d38 cover NoneType use case (#4375) 2017-10-25 12:28:03 +05:30
Faris Ansari
4d26930bba fix codacy 2017-10-25 12:10:05 +05:30
Faris Ansari
0176e202fa fix codacy 2017-10-24 18:40:17 +05:30
Faris Ansari
b2a6a86e15 minor 2017-10-24 12:35:23 +05:30
Faris Ansari
bc45beb868 Show record count in list header 2017-10-23 20:10:15 +05:30
Faris Ansari
1fbc8ff448 Add Show Calendar button 2017-10-23 19:06:59 +05:30
Faris Ansari
8c291c9b20 List renderer
- load_last_view
- refresh calendar view on route change
2017-10-23 19:00:57 +05:30
Faris Ansari
2d156345ae [minor] fallback for invalid start or end date 2017-10-23 18:06:05 +05:30
Faris Ansari
29e72a92f1 Add Calendar View Doctype
- get_events method
- show dropdown in list view
- save last calendar view
2017-10-23 17:49:14 +05:30
Faris Ansari
91861c7769 [minor]
- watch js files
- add frappe.db.get_list in js
2017-10-23 17:48:35 +05:30
Nabin Hait
8db6c97f8a Merge branch 'master' into staging 2017-10-23 13:02:09 +05:30
Nabin Hait
e19fc9bd53 Merge branch 'hotfix' 2017-10-23 13:02:08 +05:30
Nabin Hait
e4ec49a603 Merge branch 'master' into develop 2017-10-23 13:02:08 +05:30
Nabin Hait
87c45d881e bumped to version 9.1.10 2017-10-23 13:32:08 +06:00
Nabin Hait
c4adaa653a [fix] Two factor authentication via SMS (#4359) 2017-10-23 13:01:30 +05:30
Faris Ansari
5c9146fe9c [formatdate] Return empty string if no date provided (#4356) 2017-10-23 12:12:52 +05:30
Nabin Hait
da53939d51 Merge branch 'master' into staging 2017-10-21 11:18:53 +05:30
Nabin Hait
137e6b4652 Merge branch 'hotfix' 2017-10-21 11:18:53 +05:30
Nabin Hait
d2b5f78a8e Merge branch 'master' into develop 2017-10-21 11:18:53 +05:30
Nabin Hait
69818cd075 bumped to version 9.1.9 2017-10-21 11:48:53 +06:00
Nabin Hait
812ea70dc8 Reload sms settings from json (#4355) 2017-10-21 10:45:10 +05:30
Rushabh Mehta
64748a0905 [fix] test_html_control.js 2017-10-20 11:45:07 +05:30
joezsweet
68efe914e9 Added ability to set JSBarcode options (#4351)
* - added ability to set JSBarcode options

* - codacy fix
2017-10-20 11:33:11 +05:30
Nabin Hait
b8ee39b7cf Merge branch 'develop' into staging 2017-10-19 10:57:10 +05:30
Makarand Bauskar
03ea138ca5 [hotfix] ingore_mandatory fields while saving the sms settings in add_sms_sender_name_as_paramenters patch (#4342) 2017-10-18 17:09:13 +05:30
mbauskar
ee7508347d resolved merge conflicts 2017-10-18 16:22:06 +05:30
mbauskar
de1037b6b8 Merge branch 'hotfix' 2017-10-18 16:19:55 +05:30
mbauskar
165b59cdcb bumped to version 9.1.8 2017-10-18 16:49:55 +06:00
Faris Ansari
8eac4bc124 Styling for Attach control (#4340)
* Update attach.js

* Add attach control styling to form.less

* Add margin
2017-10-18 12:54:58 +05:30
Faris Ansari
4b3d13b0ed [fix] Form set viewers (#4341) 2017-10-18 10:02:20 +03:00
Barakat
14ba7ce375 Stop reloading the HTML content after every document change (#4307) 2017-10-18 10:01:29 +03:00
Prateeksha Singh
1e253b9d13 [controls] Barcode Control (#4335)
* [start] display barcode based on input

* [wip]

* [barcode] use set_value

* parse and set

* remove quagga

* [barcode] set in db

* [fix] set height

* cleanup

* remove from build.json, require instead

* [fix] declare JsBarcode global in .eslintrc
2017-10-18 12:24:58 +05:30
Juan F Fernández
3c8689e4a2 [FIX] Fixed problem with margins in pdf (see #3451 #4235 #4239) (#4297) 2017-10-18 09:21:36 +03:00
Revant Nandgaonkar
4df6135c3c enqueue_after_commit option added to frappe.enqueue (#4167)
* enqueue_after_commit option added to frappe.enqueue

* Fixes

Codacy https://www.codacy.com/app/frappe/frappe/pullRequest?prid=934733
clear frappe.flags.enqueue_after_commit after executing enqueued jobs

* sync_global_search() uses enqueue_after_commit=True

* Update database.py

* webhooks enqueue after commit

* Update __init__.py
2017-10-18 11:43:02 +05:30
Valmik
5aa676c688 [fix] make test records for dependencies for app tests (#4336) 2017-10-18 11:38:14 +05:30
Omar Jaber
071947cd32 Fix fields style in reports for RTL direction (#4178)
This code will fix fields style of the reports in RTL direction
2017-10-17 15:19:04 +03:00
Aditya Hase
d5d9fd5283 More Python 3 compatibility Frappe test fixes (#4321)
* stream object should be BytesIO instead of StringIO

* Convert filter to list explicitly before checking length

* Decode sent_email and content before string operations
2017-10-17 17:45:49 +05:30
Aditya Hase
38d63f7dc7 Python 3 compatibility Frappe test fixes (#4318)
* Read image file in binary mode

* Read files in binary mode

* Don't use bytestrings unnecessarily

* Correctly convert byte strings to unicode in frappe.as_unicode

* Convert content to bytes before writing to file
2017-10-17 17:45:25 +05:30
Nabin Hait
aca3658f36 Removed SMS sender field from SMS Settings (#4334)
* Removed SMS sender field from SMS Settings

* patch for sms sender name
2017-10-17 15:09:13 +03:00
Faris Ansari
c06383a260 Disable socketio file upload in text editor frappe/erpnext#10991 (#4333) 2017-10-17 17:16:00 +05:30
Shridhar Patil
51c944fd24 Hide email footer in report (#4323)
* Hide footer in auto email reports

https://github.com/frappe/frappe/issues/3249

* convert to int to comapare
2017-10-17 14:48:54 +05:30
Makarand Bauskar
99fa65cb1a [hotfix] fixed patch sequence and removed the update_email_queue patch (#4330) 2017-10-17 14:47:06 +05:30
crossxcell99
161ea7dc0e send via post request and specify header (#4316) 2017-10-17 12:46:58 +05:30
Rishabh Nambiar
0e412de72e [major] AWS S3 Integration for Frappé (#4272)
* Added S3 Integration, need to add backup limit

* Fix validation in s3 doctype

* Added auto-deletion of old backups and backup_limit usage

* Fixes for codacy PR review

* Improved exception handling.

* Update s3_backup_settings.py
2017-10-17 12:45:25 +05:30
Rushabh Mehta
f0e23a5a6c [refactor] domain and domain settings (#4163)
* [refactor] domain and domain settings

* [fix] test_domain.py

* [fix] patches

* [fix] domain activation after setup

* [fix] tests and lint

* [fix] tests and lint

* [enhance] better prompt naming

* [fix] setup wizard test

* [fix] testing

* [minor] new item in quick entry from form dashboard
2017-10-17 12:29:08 +05:30
Juan F Fernández
6efcd2e13d [HOTFIX] Fixed email sending on non ascii sender name (resolves #4313) (#4317) 2017-10-17 12:24:34 +05:30
Rushabh Mehta
69e08f8e97 [minor] web form (#4302) 2017-10-17 12:24:06 +05:30
Zarrar
f81bee7d05 minor fix to suppport treeview for task (#4279) 2017-10-17 12:23:42 +05:30