Commit graph

686 commits

Author SHA1 Message Date
Nabin Hait
7266e673ac Merge branch 'master' into develop 2017-09-12 16:09:19 +05:30
Nabin Hait
6052800e15 bumped to version 8.10.5 2017-09-12 16:39:18 +06:00
mbauskar
6e746a72f7 Merge branch 'master' into develop 2017-09-09 10:50:01 +05:30
mbauskar
cec777538a bumped to version 8.10.4 2017-09-09 11:20:00 +06:00
mbauskar
17377a1ec9 Merge branch 'master' into develop 2017-09-07 20:02:11 +05:30
mbauskar
f891278265 bumped to version 8.10.3 2017-09-07 20:32:10 +06:00
mbauskar
cf3ba70e3e Merge branch 'master' into develop 2017-09-07 11:49:20 +05:30
mbauskar
d1ee33db22 bumped to version 8.10.2 2017-09-07 12:19:19 +06:00
mbauskar
0e1825992c Merge branch 'master' into develop 2017-09-06 19:26:32 +05:30
mbauskar
1c7e3a57ae bumped to version 8.10.1 2017-09-06 19:56:31 +06:00
mbauskar
8334d0ed1e Merge branch 'master' into develop 2017-09-05 20:42:01 +05:30
mbauskar
d4449c37d6 bumped to version 8.10.0 2017-09-05 21:12:00 +06:00
Rushabh Mehta
a3ff228dfd Merge pull request #4054 from rmehta/fix-switch-to-desk
[fix] [translation] switch to desk, #3328
2017-09-05 08:56:17 +05:30
mbauskar
c43e73d704 Merge branch 'master' into staging 2017-09-05 08:41:32 +05:30
mbauskar
226522746a resolved merge conflicts 2017-09-05 08:41:25 +05:30
mbauskar
03c695d60d bumped to version 8.9.4 2017-09-05 09:09:36 +06:00
Rushabh Mehta
faee27f773 [fix] [translation] switch to desk, #3328 2017-09-04 22:26:12 +05:30
Aditya Hase
f768de6734 Replace long with int in safe_eval 2017-09-04 16:05:58 +05:30
Aditya Hase
99f17c651c Use 'in' instead of 'has_key' 2017-09-04 16:05:58 +05:30
Aditya Hase
2974aa50e3 Fix all implicit relative imports in __init__.py 2017-09-04 16:05:57 +05:30
mbauskar
ad704aaa2a Merge branch 'master' into staging 2017-09-04 14:49:25 +05:30
mbauskar
eb6c04fca1 Merge branch 'master' into develop 2017-09-04 14:49:24 +05:30
mbauskar
29b4ac3760 bumped to version 8.9.3 2017-09-04 15:19:24 +06:00
mbauskar
3cc7afc8e0 Merge branch 'master' into staging 2017-09-01 10:18:36 +05:30
mbauskar
cf6de64c4d Merge branch 'master' into develop 2017-09-01 10:18:36 +05:30
mbauskar
c2891d5306 bumped to version 8.9.2 2017-09-01 10:48:35 +06:00
Makarand Bauskar
6fa9967a04 [hotfix] throw DoesNotExistError if doctype is not available on Delete api (#4013)
* [hotfix] throw DoesNotExistError if doctype is not available on Delete api

* [fixes] aded tests cases and codecy, travis fixes
2017-09-01 09:16:32 +05:30
mbauskar
bc733beaf3 Merge branch 'master' into staging 2017-08-31 15:31:04 +05:30
mbauskar
677abfb57e Merge branch 'master' into develop 2017-08-31 15:31:04 +05:30
mbauskar
029cb358ab bumped to version 8.9.1 2017-08-31 16:01:04 +06:00
mbauskar
f8e025d9e9 Merge branch 'master' into develop 2017-08-29 20:24:39 +05:30
mbauskar
1884269e95 bumped to version 8.9.0 2017-08-29 20:54:38 +06:00
Saurabh
24455398b5 Merge branch 'master' into staging 2017-08-28 16:15:39 +05:30
Saurabh
5070cbdab8 Merge branch 'master' into develop 2017-08-28 16:15:39 +05:30
Saurabh
4948353f87 bumped to version 8.8.5 2017-08-28 16:45:38 +06:00
Rushabh Mehta
fdb8e7d7b3 Merge pull request #3976 from rmehta/domain-restrict-fix
[fix] restrict domains, fixes frappe/erpnext#9813, frappe/erpnext#10235
2017-08-24 18:30:40 +05:30
Rushabh Mehta
efe88591c2 Merge branch 'master' into staging 2017-08-24 16:51:28 +05:30
Rushabh Mehta
2377434d39 Merge branch 'master' into develop 2017-08-24 16:51:27 +05:30
Rushabh Mehta
5882e5bc66 bumped to version 8.8.4 2017-08-24 17:21:27 +06:00
Rushabh Mehta
09a31f5ec0 [fix] tests 2017-08-23 15:37:08 +05:30
Nabin Hait
8f978ad2c3 Merge branch 'master' into staging 2017-08-23 14:45:55 +05:30
Nabin Hait
d5c9ad35b7 Merge branch 'master' into develop 2017-08-23 14:45:55 +05:30
Nabin Hait
e3e525d5ba bumped to version 8.8.3 2017-08-23 15:15:54 +06:00
Rushabh Mehta
94c7c83f77 [fix] frappe.get_active_domain 2017-08-23 14:44:02 +05:30
Rushabh Mehta
7a589a3bc2 [fix] restrict domains, fixes frappe/erpnext#9813, frappe/erpnext#10235 2017-08-23 13:14:29 +05:30
mbauskar
7efd470c0d Merge branch 'master' into develop 2017-08-23 13:05:20 +05:30
mbauskar
091cf22e92 bumped to version 8.8.2 2017-08-23 13:35:19 +06:00
Rushabh Mehta
60e9412dbb Merge pull request #3967 from ci2014/patch-11
Update __init__.py
2017-08-23 10:21:32 +05:30
mbauskar
b78491516b Merge branch 'master' into develop 2017-08-23 08:45:06 +05:30
mbauskar
483917e8e2 bumped to version 8.8.1 2017-08-23 09:15:05 +06:00