Commit graph

16123 commits

Author SHA1 Message Date
Prateeksha Singh
bd2f992dad
Merge pull request #5818 from netchampfaris/concat-build
Create a moment bundle and include it in webform
2018-07-12 16:29:47 +05:30
Faris Ansari
32b4977596 Create a moment bundle and include it in webform 2018-07-12 16:23:25 +05:30
Faris Ansari
72494339dd
Update frappe-datatable styles (#5813) 2018-07-11 15:04:58 +05:30
Faris Ansari
0b44529dc9
Moment (#5808)
- Add npm packages
- Add moment builds in frappe-web
- Remove import statements to avoid duplicate loading of moment
2018-07-11 14:52:07 +05:30
Sushant Nadkar
f8dc45c3c1 Convert doc field value to string type before using (#5795) 2018-07-11 11:11:55 +05:30
Rushabh Mehta
c07e85c6da [fix] frappe.query_report_filters_by_name 2018-07-11 11:11:15 +05:30
Zarrar
cb66682b2f skip property setter for naming series (#5796) 2018-07-11 11:05:14 +05:30
Frappe PR Bot
eab1a5a605 [Translation] Updated Translations (#5801) 2018-07-11 11:04:09 +05:30
Saurabh
93165d4a5c test case fixes (#5807) 2018-07-11 11:02:27 +05:30
Prateeksha Singh
85a817cc71
Merge pull request #5806 from pratu16x7/website-datetime
[fix] fulfill datetime requirement for webform
2018-07-10 22:18:02 +05:30
Prateeksha Singh
15308750e4 [fix] fulfill datetime requirement for webform 2018-07-10 22:16:58 +05:30
Rushabh Mehta
aae580a53d [style] make page-card self contained 2018-07-10 18:36:58 +05:30
Rushabh Mehta
a4dd9ec91b [test] [style] 2018-07-10 16:10:08 +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
Rushabh Mehta
05d68968ca [fix] test 2018-07-10 15:26:43 +05:30
Suraj Shetty
7f2b4df144 Run user-permission patch before droping apply_user_permission column (#5794) 2018-07-10 15:23:22 +05:30
Rushabh Mehta
8eb5e51042 [style] for webforms and login 2018-07-10 15:22:40 +05:30
Saurabh
2a4b8f1ec3 [fix] merge-conflicts 2018-07-09 15:56:43 +05:30
Saurabh
8ad60a25b9 Merge branch 'hotfix' 2018-07-09 15:55:22 +05:30
Saurabh
34505037cc bumped to version 10.1.39 2018-07-09 16:25:22 +06:00
Saurabh
cc9ba4d9b9
Merge pull request #5798 from pratu16x7/hotfix
[global-search] add doc check for route
2018-07-09 14:42:44 +05:30
Prateeksha Singh
479f51e23a [global-search] add doc check for route 2018-07-09 12:49:26 +05:30
Rushabh Mehta
db3a950db3
[email] smtp connection per sender (#5791)
* [fix]email error due to incorrect smtp server auth

- A dict of smtpserver objects is created for every sender
- A smtp server object is created if not present for the given sender
- smtpserver object is picked based on the sender of the mail

* [fix] remove cache from queue.py
2018-07-06 18:31:13 +05:30
Rushabh Mehta
53a298a5c1 [fix] test_db_query.py 2018-07-06 18:27:08 +05:30
Ameya Shenoy
f23efed7f5
Merge pull request #5792 from codingCoffee/mail_fix_123
safe encode is not required
2018-07-06 18:25:33 +05:30
Zarrar
f32467dde8 make content as read only (#5787)
if message type is file, make content read only
2018-07-06 18:16:58 +05:30
Ameya Shenoy
ab7b862a49 safe encode is not required 2018-07-06 18:15:17 +05:30
Rushabh Mehta
58733cdf29 [remove] mycli 2018-07-06 17:53:54 +05:30
Saurabh
a135c6c431 resolved merge conflicts 2018-07-06 13:37:51 +05:30
Saurabh
c656704cd7 Merge branch 'hotfix' 2018-07-06 13:26:04 +05:30
Saurabh
aec04731db bumped to version 10.1.38 2018-07-06 13:56:04 +06:00
IOWEB TECHNOLOGIES
44f045ca04 Fix bug with smtplib and crammd5 servers that prevents email sending (#5687)
* Fix bug with smtplib and crammd5 servers that prevents email sending

* Use frappe.safe_decode instead of str

* Revert "Use frappe.safe_decode instead of str"

This reverts commit 272aa167fd86f90129517666b2cad85363026f87.

* Using frappe_encode to 'ascii' to send the password

* Update smtp.py

* Update smtp.py
2018-07-06 12:06:02 +05:30
felixvarghese
c55127f7a2 Connect to LDAP Server using StartTLS (#5784)
* Connect to LDAP Server using StartTLS

Connect to LDAP server using StartTLS for security. An option to require trusted certificates is also included.

* fix try

* remove trailing whitespace
2018-07-06 11:58:27 +05:30
Zarrar
430e93b17d [ Fixes ] Data Import / Data Export (#5776)
* add button to toggle check all or none

* add 'M' to label for mandatory field - manual selection

* add select_all / deselect_all button to toggle checkbox

* multicheck control fix
call refresh of parent class as its overridden, ignore pushing same data in selected_options

* pass with_data parameter as 1 or 0 to be interpreted using cint

* make fields visible and disabled according to option selected

* allow editing for non mandatory field when mandatory option selected
simplified columns selection logic when passing it to be exported
2018-07-06 11:55:17 +05:30
Prateeksha Singh
4fc37a6cf1
Merge pull request #5786 from pratu16x7/float-precision
[formatters] add check for boot.sysdefaults, fixes frappe/erpnext#14796
2018-07-06 10:29:14 +05:30
Prateeksha Singh
3f5968d4f7 [formatters] add check for boot.sysdefaults, fixes frappe/erpnext#14796 2018-07-06 10:28:00 +05:30
Saurabh
da4206a48b
Merge pull request #5782 from saurabh6790/filter_sanitizer_test_case_fixes
[fix][test-case] filter sanitizer
2018-07-05 18:19:40 +05:30
Saurabh
9aeb79b874 [fix][test-case] filter sanitizer 2018-07-05 17:33:30 +05:30
Rushabh Mehta
d0dd120298 [fix] frappe.safe_decode in desk.py 2018-07-05 15:40:40 +05:30
Fisher Yu
b912b40f62 [New Feature] Global Search By User Tag for every doc (#5711)
* Update global_search.py

add user tag

* Update tags.py

trigger update global search table

* Update tags.py

remove trailing space

* Update global_search.py

remove trailing space

* Update global_search.py

remove title user tag

* Update global_search.py

* Update global_search.py
2018-07-05 10:49:43 +05:30
Rushabh Mehta
cd9d085944
[patch] Get apps for docs (#5772)
* [docs] add getting docs patch

* [fix] get apps for docs
2018-07-04 11:09:55 +05:30
Rushabh Mehta
20547d270a [quick-entry] show all fields if less than 7 2018-07-04 10:43:17 +05:30
Suraj Shetty
2bd48e3799 Remove hardcoded roles for editing users (#5726)
* Remove hardcoded roles for editing users

- Allow user edit if user has role which
has access with permlevel >= 1 to user doctype

* Fix codacy
2018-07-04 10:41:05 +05:30
Nabin Hait
9a1112b8f3 minor fix 2018-07-03 18:03:39 +05:30
Ameya Shenoy
5c6b02515a regex fix (#5765)
courtesy: @netchanpfaris
initally the regex used to allow only digits 0-9, not it considers the
entire number range
2018-07-03 14:55:21 +05:30
Zarrar
10f7fa7fcc [Fix] Defaults doesn't comply with user permission fix (#5735)
* added additional check for user permission
If the key for default is found in user permission, then the value is checked if its permitted to the user or not

* user permission check on defaults

* test case for defaults
2018-07-03 10:52:56 +05:30
Shridhar Patil
e808da398e removed on_trash method (#5757)
trying to update in doctype issue
fails to update if erpnext is not installed
2018-07-03 10:51:25 +05:30
Frappe PR Bot
dda83a841c [Translation] Updated Translations (#5763) 2018-07-03 10:50:58 +05:30
Fisher Yu
294fca309f [Bug Fix] Data import from non EN language template failed (#5760)
* Update importer.py

clear user cache to force get most updated user lang when user only changed language not login again
fix the bug of too many values to unpack

* Update importer.py

fix the bug failure to import from non EN template
2018-07-03 10:27:15 +05:30
Prateeksha Singh
cfec4c13df [build-docs][context] look for _sidebar.json in parent directories (#5715)
* [build-docs][context] look for _sidebar.json in parent directories

* [build-docs] stop sidebar search at /www dir

* [website-render] use look_for_sidebar_json hook

* [website-sidebar] add hooks check
2018-07-02 21:51:02 +05:30