Commit graph

12574 commits

Author SHA1 Message Date
Nabin Hait
acd0dbdfd5 bumped to version 8.0.57 2017-05-23 17:45:43 +06:00
Rushabh Mehta
5cb26ac32c [minor] commit after sending email alert (#3361) 2017-05-23 17:10:45 +05:30
Faris Ansari
78c9278220 Fix print report (#3368) 2017-05-23 17:09:30 +05:30
Nabin Hait
fd06f8ea9c Merge branch 'hotfix' 2017-05-23 11:36:54 +05:30
Nabin Hait
20b4ca7d17 bumped to version 8.0.56 2017-05-23 12:06:54 +06:00
Faris Ansari
2c382ca054 Add package.json (#3364) 2017-05-23 11:20:20 +05:30
Rushabh Mehta
687af5ccc4 [minor] set response in app.py 2017-05-23 11:17:09 +05:30
Faris Ansari
bb88f30aea Fix build js for travis (#3359)
* Fix build.js

* let to var

* Added use_strict flag

* Add new build system requirements

* Fix array includes

* Fix indexof
2017-05-22 12:44:31 +05:30
Rushabh Mehta
6e3708de80 Merge branch 'master' into develop 2017-05-19 22:43:06 +05:30
Rushabh Mehta
ce8fecb654 Merge branch 'hotfix' 2017-05-19 22:43:05 +05:30
Rushabh Mehta
e051390317 bumped to version 8.0.55 2017-05-19 23:13:05 +06:00
Rushabh Mehta
26d431be1d [fix] sort_order 2017-05-19 22:42:00 +05:30
Rushabh Mehta
f4594a86ec Merge branch 'master' into develop 2017-05-19 20:44:34 +05:30
Rushabh Mehta
46731d9312 Merge branch 'hotfix' 2017-05-19 20:44:34 +05:30
Rushabh Mehta
f5ca153d34 bumped to version 8.0.54 2017-05-19 21:14:34 +06:00
Rushabh Mehta
9f0484754f [fix] typo in importer.py 2017-05-19 20:40:45 +05:30
Rushabh Mehta
7ade8fd825 Merge branch 'master' into develop 2017-05-19 20:25:38 +05:30
Rushabh Mehta
3c1b5aaf10 Merge branch 'hotfix' 2017-05-19 20:25:38 +05:30
Rushabh Mehta
2ba37e5881 bumped to version 8.0.53 2017-05-19 20:55:38 +06:00
Faris Ansari
dfbf616fac Fix build.js (#3355) 2017-05-19 20:24:45 +05:30
Rushabh Mehta
15bddf45c7 Merge branch 'master' into develop 2017-05-19 19:53:11 +05:30
Rushabh Mehta
14060f5b13 Merge branch 'hotfix' 2017-05-19 19:53:11 +05:30
Rushabh Mehta
a08b6cff66 bumped to version 8.0.52 2017-05-19 20:23:11 +06:00
Faris Ansari
d2b650838e Remove use strict from js files (#3352) 2017-05-19 19:50:41 +05:30
Rushabh Mehta
0d8b0b5c4d Merge branch 'master' into develop 2017-05-19 19:41:03 +05:30
Rushabh Mehta
4078c0e8d7 Merge branch 'hotfix' 2017-05-19 19:41:03 +05:30
Rushabh Mehta
483fae4db5 bumped to version 8.0.51 2017-05-19 20:11:03 +06:00
Faris Ansari
bafc3aa341 Disable minify (#3353) 2017-05-19 19:39:15 +05:30
Rushabh Mehta
c85f618325 Merge branch 'master' into develop 2017-05-19 19:23:34 +05:30
Rushabh Mehta
b9275455c2 Merge branch 'hotfix' 2017-05-19 19:23:33 +05:30
Rushabh Mehta
c92477be55 bumped to version 8.0.50 2017-05-19 19:53:33 +06:00
Faris Ansari
4e690ba8bd Set new build system as default (#3348) 2017-05-19 19:13:46 +05:30
Faris Ansari
63259159fb Remove use strict from js files (#3352) 2017-05-19 19:13:21 +05:30
Rushabh Mehta
60e04c82a9 Merge branch 'hotfix' 2017-05-19 18:20:37 +05:30
Rushabh Mehta
070d7e16f5 Merge branch 'master' into develop 2017-05-19 18:20:37 +05:30
Rushabh Mehta
12324230ad bumped to version 8.0.49 2017-05-19 18:50:37 +06:00
Rushabh Mehta
f02889a63b Delete zh-tw.csv 2017-05-19 18:17:16 +05:30
Rushabh Mehta
b8ac253478 Delete zh-cn.csv 2017-05-19 18:14:14 +05:30
Rushabh Mehta
784bc82f93 Delete zh-cn.csv 2017-05-19 18:13:08 +05:30
Rushabh Mehta
81cfdf931d Delete zh-tw.csv 2017-05-19 18:12:44 +05:30
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
330cb2e87d Merge branch 'hotfix' 2017-05-19 14:06:49 +05:30
Nabin Hait
0f7d92dab0 Merge branch 'master' into develop 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