Commit graph

14531 commits

Author SHA1 Message Date
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
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
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
e4630bdbfb Merge branch 'hotfix' 2017-11-22 18:02:53 +05:30
Saurabh
20fff6e874 Merge branch 'master' into develop 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
ci2014
a896ebeab6 Allow users to confirm the message by enter (#4476)
Users can confirm the message and proceed by pressing enter, not necessary to use the mouse.
2017-11-21 16:01:58 +05:30
Revant Nandgaonkar
387a3ad9e3 [Fix] Breadcrumbs for Help Article (#4515) 2017-11-21 16:01:06 +05:30
rohitwaghchaure
922b1237e7 [Fix] Desktop icon page not showing for french language (#4518) 2017-11-21 15:57:49 +05:30
rohitwaghchaure
84aa0a6b33 [Fix] On add new row, data is not displaying in the previous row (#4517) 2017-11-21 15:56:50 +05:30
Saurabh
a2f7da68ec [fix] patch sequence fixes (#4511) 2017-11-21 15:55:55 +05:30
Saurabh
2045e4f1f9 [fix] while deleting a record also check links in single (#4447)
* [fix] while deleting a record also check links in single

* [fix] no HTML in translatable text

* [fix] commonified message for link validation on document delelte
2017-11-21 15:47:30 +05:30
Shreya Shah
acdbb97ba5 Moved feed from Communication to Activity Log (#4435)
* Removed comment_type 'updated'

* New doctype activity log

* Moved feed.py to activity_log

* Updated feed gets stored in activity_log

* Activity page fetches feed from activity_log

* feed match condition change

* modified

* modified hooks.py

* modified sessions.py

* patch added

* naming in patch

* moved login, logout feed to activity_log

* changes in auth.py, hooks.py

* deleted doctype authentication_log and added test cases

* added utils.py in core

* moved some methods from communication.py to utils.py
2017-11-21 15:46:51 +05:30
Nabin Hait
947c4bbc2b Reload doctype before saving to get updated schema 2017-11-21 15:22:44 +05:30
Prateeksha Singh
cf90f61024
Merge pull request #4516 from pratu16x7/fix-page-form-field-position
[fix] align checkboxes with text inputs
2017-11-20 19:02:13 +05:30
pratu16x7
f4151a3e0b [fix] align checkboxes with text inputs, fixes frappe/erpnext#11588 2017-11-20 12:45:28 +05:30
ci2014
282d3a0b6f Fix typo in render.py (#4512) 2017-11-20 11:37:46 +05:30