Commit graph

14487 commits

Author SHA1 Message Date
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
Saurabh
a2f7da68ec [fix] patch sequence fixes (#4511) 2017-11-21 15:55:55 +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
Zarrar
e4684179a2 removed code meant only for accounts-tree (#4509) 2017-11-17 14:32:08 +05:30
Rushabh Mehta
236a2ad156 [fix] revert promises system 2017-11-17 14:18:56 +05:30
Saurabh
4bd0fb2638 Merge branch 'master' into develop 2017-11-17 14:00:08 +05:30
Saurabh
6de716847e Merge branch 'hotfix' 2017-11-17 14:00:07 +05:30
Saurabh
f91a0c57ce bumped to version 9.2.15 2017-11-17 14:30:07 +06:00
Saurabh
33ef610430
Merge pull request #4508 from saurabh6790/domain_fixes
[fix] do not translate domain records
2017-11-17 12:47:10 +05:30
Saurabh
d61b92dc1f [fix] do not translate domain records 2017-11-17 12:44:25 +05:30
Saurabh
a6f0f65763 [fix] do not translate domain records (#4507) 2017-11-17 12:28:28 +05:30
Rushabh Mehta
efe9886cd1 [fix] for quick_entry with only Prompt 2017-11-17 12:16:24 +05:30
Valmik
fe9ae224f6 Add timeout to click method (#4500) 2017-11-17 11:34:38 +05:30
Frappe PR Bot
1209597a71 [Translation] Updated Translations (#4501) 2017-11-16 14:31:17 +05:30
rohitwaghchaure
d5fc56cc36 Removed ignore link validation from the report, add ignore_link_validation is report js file (#4502) 2017-11-16 14:31:02 +05:30
Zarrar
4d60409814 disallow toolbar buttons for root node (#4505) 2017-11-16 14:30:00 +05:30
Prateeksha Singh
af9d7dc07c add disabling of dialog primary button (#4503) 2017-11-16 14:29:03 +05:30
Nabin Hait
347df7942a Merge branch 'master' into develop 2017-11-15 14:07:44 +05:30
Nabin Hait
26ca97dad1 Merge branch 'hotfix' 2017-11-15 14:07:43 +05:30
Nabin Hait
36027ad6c6 bumped to version 9.2.14 2017-11-15 14:37:43 +06:00
Nabin Hait
3e7a19e3bb
Update db_query.py 2017-11-15 14:05:01 +05:30
Saurabh
450a54ec69 [fix] prepare file list by including all nested files (#4491) 2017-11-15 13:59:23 +05:30
Manas Solanki
7031473915 fixed between filters (#4497) 2017-11-15 13:57:53 +05:30
Rishabh Nambiar
fe7a7d81b2 [fix] Allow capital letters in bucket name (#4494)
fix for https://github.com/frappe/erpnext/issues/11547
2017-11-15 10:50:54 +05:30
Saurabh
bb813c7fd5
Merge pull request #4489 from rish4bhn/develop
[fix] Allow capital letters in bucket name for S3 Backup DocType
2017-11-14 18:05:00 +05:30
Rushabh Mehta
3dd5e399fa [minor] base_document.py return empty list if not filters 2017-11-14 16:48:43 +05:30
Rishabh Nambiar
c509d73503 minor fix for capital letters in bucket name. 2017-11-14 16:43:56 +05:30
Prateeksha Singh
3ff990cf8e wait for trigger promises to finish before save (#4488) 2017-11-14 15:37:58 +05:30
Rushabh Mehta
b4001046d5 [fix] customize_form.py https://discuss.erpnext.com/t/delivery-note-appears-as-delivery-chalan-on-erpnext-cloud/30589 2017-11-14 15:28:28 +05:30
Manas Solanki
592dbcdd63 add the read permission for all (#4487) 2017-11-14 15:28:12 +05:30
Nabin Hait
3a65e4f066 Merge branch 'hotfix' 2017-11-14 14:15:37 +05:30
Nabin Hait
8e9304041d Merge branch 'master' into develop 2017-11-14 14:15:37 +05:30
Nabin Hait
5363b9ab29 bumped to version 9.2.13 2017-11-14 14:45:37 +06:00
Rushabh Mehta
9fd552d3f2 [fix] domain.remove_domain 2017-11-14 14:14:45 +05:30
Nabin Hait
4b5893509a Fixed Merge Conflict 2017-11-14 13:56:42 +05:30
Nabin Hait
2705e859fa Merge branch 'hotfix' 2017-11-14 13:51:37 +05:30
Nabin Hait
cf12fff0b8 bumped to version 9.2.12 2017-11-14 14:21:36 +06:00
Saurabh
21ee6ffed0 [fix] temporarily freeze html2text to version 2016.9.19 (#4478) 2017-11-14 13:46:24 +05:30
Manas Solanki
122e3b4c7b validate the link field in the report's filter (#4479) 2017-11-14 13:46:00 +05:30
rohitwaghchaure
0db18fdf91 [Fix] Letterhead appearing on PDF even when not selected (#4484) 2017-11-14 13:43:33 +05:30
rohitwaghchaure
dd0a237efe [Fix] Title field not set in the quotation if record has been created using data import tool (#4486) 2017-11-14 13:43:00 +05:30
Rushabh Mehta
c354c54065 [hot] revert domain_settings patch 2017-11-14 13:39:53 +05:30
Rushabh Mehta
effe13925e [hot] revert domain_settings patch 2017-11-14 13:36:35 +05:30
paurosello
b8723e72da Allow label and description translation in web forms (#4481) 2017-11-14 10:48:03 +05:30
Rushabh Mehta
07532c93d0 [minor] selenium_testdriver.py where message has no length 2017-11-14 09:33:51 +05:30