Commit graph

12534 commits

Author SHA1 Message Date
Faris Ansari
4cb49f4fc5 Delete zh-tw.csv (#3349) 2017-05-19 18:05:52 +05:30
almeidapaulopt
e65b1216d5 search translations bug (#3318)
* prefix removal

* cleanup console.log

* update search_utils

* another fix
2017-05-19 15:51:03 +05:30
Ayush Shukla
7ff1985257 Email praseaddr fix, fixes frappe/issues#3004 (#3345)
* email_parse address fix

* travis check for email-parseaddr

* email parseaddr fix

* fixes

* Added test case

* minor change

* Added few email_ids

* condition change
2017-05-19 15:50:21 +05:30
Gaurav Naik
25a7fe8eb5 Phone based login (#3340)
* Mobile no based login.

Added Mobile No field to User doctype, unique.
Added check for searching user by mobile no in authenticate method in auth.py
Changed placeholder Email address to Email address or Mobile number in login.html

* Mobile no login option in System Settings

* Modified By to Administrator

* Update login.html
2017-05-19 15:48:13 +05:30
Nabin Hait
0f7d92dab0 Merge branch 'master' into develop 2017-05-19 14:06:49 +05:30
Nabin Hait
330cb2e87d Merge branch 'hotfix' 2017-05-19 14:06:49 +05:30
Nabin Hait
ce6f0e4822 bumped to version 8.0.48 2017-05-19 14:36:48 +06:00
Ashwini Save
ae1b456498 Added “POST” method in app.py and updated csrf_token accessible from “frappe.session” (#3302) 2017-05-19 11:14:08 +05:30
rohitwaghchaure
4e2749354b [fix] Refresh the page error during configuration in dropbox (#3338) 2017-05-19 11:13:47 +05:30
Rushabh Mehta
ee122a7053 Update render.py 2017-05-19 11:11:06 +05:30
rohitwaghchaure
0a12f631ef [fix] User not able to access the print format from the browser view (#3339) 2017-05-19 11:09:43 +05:30
Prateeksha Singh
eaacdb097c [multiselect]Add search term, filter by date range, pagination (#3333)
* add search term, filter by date range, pagination

* filters on the same row, ellipsis, translate msg

* Rename page_len to page_length
2017-05-19 11:08:05 +05:30
almeidapaulopt
aba3f3691f reportview translation fixes (#3337)
* reportview translation fixes

* Update reportview.js
2017-05-19 10:42:24 +05:30
Faris Ansari
70e8e007f1 [Printview] Show Landscape view if columns more than 10 (#3336)
- frappe/erpnext#6596
2017-05-19 10:40:14 +05:30
Makarand Bauskar
6069751b1e [minor] added error log if there is any exception in email alert (#3335) 2017-05-19 10:39:30 +05:30
Faris Ansari
bec6b5c827 Update Custom Field background color in Customize Form (frappe/erpnext#6432) (#3334) 2017-05-19 10:37:43 +05:30
tundebabzy
6a92612e45 changes mysql-python to mysqlclient for py3 support (#3301) 2017-05-19 10:35:14 +05:30
Nabin Hait
d6654f4fe3 Fixed merge conflict 2017-05-18 14:03:14 +05:30
Nabin Hait
787666f54c Merge branch 'develop' 2017-05-18 13:40:47 +05:30
Nabin Hait
89f07fb8d6 bumped to version 8.0.47 2017-05-18 14:10:47 +06:00
Faris Ansari
f16854559d [minor] Handle string with no html tag in xlsxutils (#3332) 2017-05-18 13:39:07 +05:30
Faris Ansari
0eb16baf82 Fix Ctrl + G not working in other languages (frappe/erpnext#7627) (#3331) 2017-05-18 12:22:45 +05:30
Rushabh Mehta
0fbaf93f89 [fix] set title_prefix if set in website settings, fixes frappe/erpnext#4848 (#3294)
* [fix] set title_prefix if set in website settings, fixes frappe/erpnext#4848

* Update context.py
2017-05-18 12:21:03 +05:30
Prateeksha Singh
743cfc625e [fix] hide popovers on blur frappe/erpnext#8721 (#3330) 2017-05-18 12:19:52 +05:30
Faris Ansari
1f47653ca5 Fix Custom Report freeze (Fixes frappe/erpnext#6806) (#3305) 2017-05-18 12:14:52 +05:30
almeidapaulopt
e7cf2bb588 translation fixes (#3327) 2017-05-18 12:14:31 +05:30
Frappe PR Bot
2f1043cfa0 [translation] translation updates (#3312) 2017-05-18 12:14:01 +05:30
Neil Trini Lasrado
c4e8ac47f6 Changed Introduction feild type to text editor (#3297) 2017-05-18 12:12:28 +05:30
Prateeksha Singh
4fa5a25d77 [fix] Tree breadcrumb fix (#3308)
* [fix] set tree doctype breadcrumb to last_view

* [minor]
2017-05-18 12:09:40 +05:30
Makarand Bauskar
ae52c7a487 [minor] added error message if the encryption_key in the site_config is changed (#3326) 2017-05-18 12:08:06 +05:30
tundebabzy
c8d8baeaff fixes frappe/erpnext#8606 (#3322)
* fixes frappe/erpnext#8606

* fixes frappe/erpnext#8606
2017-05-18 12:06:52 +05:30
Makarand Bauskar
f26fa3816a [minor] fixed UnicodeEncode error for item name (#3321)
* [minor] fixed UnicodeEncode error for item name

* Update router.py
2017-05-18 12:05:22 +05:30
Faris Ansari
d8d8db819a Reset comment input when form is refreshed (frappe/erpnext#8151) (#3300) 2017-05-18 11:58:46 +05:30
Faris Ansari
de00b1db4c Update gantt library (#3299)
- Fixes frappe/erpnext#8531
2017-05-18 11:57:01 +05:30
Faris Ansari
1eb9562a3c Obey slickgrid's inline filter for (#3291)
- Print PDF
- Export to Excel

Fixes frappe/erpnext#3747
2017-05-18 11:54:20 +05:30
Manas Solanki
5315bea77f Data Import Tool in excel file format (#3231)
* Data Import in excel file format

* Include test case and minor fixes

* typos
2017-05-18 11:40:44 +05:30
Nabin Hait
44619bcf38 Insert records into global search table in small batches, added progress bar in patch (#3313) 2017-05-17 19:51:44 +05:30
Faris Ansari
8657751554 Fix duplicate cards in Kanban Board (fixes frappe/erpnext#8850) (#3316) 2017-05-17 19:51:06 +05:30
Nabin Hait
dd4d12e5cc Merge branch 'develop' 2017-05-17 13:53:18 +05:30
Nabin Hait
9cdaed84b3 bumped to version 8.0.46 2017-05-17 14:23:18 +06:00
Nabin Hait
7242128dd9 Show results based on get_query method, process based on dict (#3320) 2017-05-17 13:52:07 +05:30
Nabin Hait
5520a5b6cf Merge branch 'develop' 2017-05-17 11:06:23 +05:30
Nabin Hait
a71d4acb4a bumped to version 8.0.45 2017-05-17 11:36:23 +06:00
Nabin Hait
df9c5c71c4 Show all records in multi-select dialog (#3319) 2017-05-17 11:05:42 +05:30
Nabin Hait
d9c559777e Ignore single doctypes for global search 2017-05-16 16:47:11 +05:30
Nabin Hait
20519ffde9 Merge branch 'develop' 2017-05-16 13:35:38 +05:30
Nabin Hait
3fce6cb78b bumped to version 8.0.44 2017-05-16 14:05:38 +06:00
Rushabh Mehta
9abcaff48a [fix] disable email alert on wrong field. fixes frappe/erpnext#3372 (#3290) 2017-05-16 12:49:47 +05:30
rohitwaghchaure
0aa97b7aaa Made seprate method to parse the naming series (#3293) 2017-05-16 12:46:58 +05:30
Faris Ansari
adfc692668 Update field when editing via SlickGrid (Fixes frappe/erpnext#5064) (#3296) 2017-05-16 12:44:39 +05:30