Commit graph

14692 commits

Author SHA1 Message Date
Manas Solanki
406bf1d962 reference doctype and name in the email queue while sending email from the auto email report (#4557) 2017-12-01 12:06:38 +05:30
tundebabzy
a5cd234326 remove psycop from requirements (#4562) 2017-12-01 12:06:15 +05:30
Faris Ansari
895f6605e9 [hotfix] doc.get (#4564) 2017-12-01 12:06:01 +05:30
Rushabh Mehta
5a9d38f767
[enhance] bench run-tests --doctype-list app/path/to/test.txt (#4561)
* [enhance] bench run-tests --doctype-list app/path/to/test.txt

* [fix] tests for doctype-list-path

* [fix] tests for doctype-list-path
2017-12-01 12:05:06 +05:30
Saurabh
cd8da87907 Merge branch 'master' into develop 2017-11-30 16:40:45 +05:30
Saurabh
605138f03e Merge branch 'hotfix' 2017-11-30 16:40:44 +05:30
Saurabh
a9801ba8e3 bumped to version 9.2.19 2017-11-30 17:10:44 +06:00
Ameya Shenoy
d746d1e8af Added test-list option to run-ui-tests (#4540)
* Added test-list option to run-ui-tests

will help bifurcating the ui tests into stages

* modified to add new parameters at the end
2017-11-30 16:26:43 +05:30
Rushabh Mehta
cfb34ca5d6 [fix] rename clientscriptAPI.js -> client_script_helpers.js 2017-11-30 14:45:17 +05:30
Rushabh Mehta
5fc14ee745 [fix] tests 2017-11-30 14:45:17 +05:30
Faris Ansari
74883d4f36 Set owner in Deleted Document (#4556) 2017-11-30 14:28:12 +05:30
Sushant Nadkar
0ca98a0c74 Added additional_offset parameter to scroll_to and login functions (#4545) 2017-11-30 14:27:53 +05:30
Zarrar
9927eecc9c fix issue with node delete for tree based doctypes (#4554) 2017-11-30 11:51:43 +05:30
rohitwaghchaure
ef7c6c3389 [fix] Item group test cases (#4555) 2017-11-30 11:48:59 +05:30
Zarrar
bef90ee10e making nestedset a bit more flexible (#4552) 2017-11-29 18:39:56 +05:30
Rushabh Mehta
3ed3b7badc [fix] tag error for hidden forms 2017-11-29 16:34:28 +05:30
Rushabh Mehta
7250481f38 [minor] make go premium button less annyoing 2017-11-29 16:10:38 +05:30
Nabin Hait
697a2be9f0 Merge branch 'creamdory-add_googlemaps' into develop 2017-11-29 15:51:09 +05:30
Nabin Hait
1ae64870be Minor fix in Google maps 2017-11-29 15:50:52 +05:30
Nabin Hait
0b8fe19224 Merge branch 'add_googlemaps' of https://github.com/creamdory/frappe into creamdory-add_googlemaps 2017-11-29 14:44:15 +05:30
Shreya Shah
ce066019ff [Fix] Trigger dirty when checkbox value is changed (#4541)
* trigger save on uncheck

* Update form.js

the reason for this condition was text editor
2017-11-29 12:28:20 +05:30
Saurabh
c042980765 Merge branch 'master' into develop 2017-11-29 11:14:05 +05:30
Saurabh
6591e5309e Merge branch 'hotfix' 2017-11-29 11:14:04 +05:30
Saurabh
e8d965452e bumped to version 9.2.18 2017-11-29 11:44:04 +06:00
Saurabh
1ce49c5b3e
Merge pull request #4544 from saurabh6790/usageinfo_fix
[fix] jinja syntax error in usage info
2017-11-29 11:12:57 +05:30
Saurabh
210685d39c [fix] jinja syntax error in usage info 2017-11-29 11:11:25 +05:30
Faris Ansari
fb6d079fe3 build.js - watch only .js files (#4520) 2017-11-29 09:33:43 +05:30
lasalesi
8a408300c9 added FreeOTP as two-factor authentication app (#4521) 2017-11-29 09:33:25 +05:30
Zarrar
d740ccc1ef fix issue of state no longer in workflow (#4530) 2017-11-29 09:32:59 +05:30
Zarrar
7cbc008c98 set focus on first field in dialog (#4538) 2017-11-29 09:32:14 +05:30
Umair Sayed
e4eddb03d4 fix load all by Faris in tree master (#4543) 2017-11-29 09:30:59 +05:30
Saurabh
d54b21880e Merge branch 'hotfix' 2017-11-28 11:04:57 +05:30
Saurabh
91a87da6fb Merge branch 'master' into develop 2017-11-28 11:04:57 +05:30
Saurabh
866e0a3b42 bumped to version 9.2.17 2017-11-28 11:34:57 +06:00
Manas Solanki
db2a6093fb set the dynamic filters in the reports (#4539) 2017-11-28 10:40:43 +05:30
Charles-Henri Decultot
4c42ff2296 Allow the creation of an organization lead (#4534) 2017-11-27 11:58:19 +05:30
Ameya Shenoy
4935014643 minor fix in bench run-ui-tests --help (#4537) 2017-11-27 11:50:07 +05:30
Saurabh
4b5e347ea1 [fix] show upgrade button on usage page for free users too (#4535)
* [fix] show upgrade button on usage page for free users too

* Update usage_info.html
2017-11-27 11:49:48 +05:30
Prateeksha Singh
b1e25ee7f4
Merge pull request #4524 from pratu16x7/update-charts
Update charts version
2017-11-24 14:19:51 +05:30
Nabin Hait
9cf4586efb Update name for single doctype after renaming 2017-11-23 15:57:57 +05:30
Saurabh
20fff6e874 Merge branch 'master' into develop 2017-11-22 18:02:53 +05:30
Saurabh
e4630bdbfb Merge branch 'hotfix' 2017-11-22 18:02:53 +05:30
Saurabh
5cd220dd0a bumped to version 9.2.16 2017-11-22 18:32:53 +06:00
Nabin Hait
ec33e82ec6 Minor patch fix 2017-11-22 16:56:27 +05:30
Shreya Shah
4c79799131 added try catch block in patch (#4522) 2017-11-22 16:23:27 +05:30
pratu16x7
7a41980b41 [charts] update color usage 2017-11-22 10:23:00 +05:30
pratu16x7
8507b41a39 update charts version 2017-11-21 23:22:24 +05:30
Prateeksha Singh
0d3cd6984b
Merge pull request #4523 from frappe/patches-typo
[fix] typo in patches.txt
2017-11-21 22:04:18 +05:30
Prateeksha Singh
a991786aaf
[fix] typo in patches.txt 2017-11-21 22:02:26 +05:30
Rushabh Mehta
54381b3ff3 [fix] patch sequence in patches.txt 2017-11-21 17:01:16 +05:30