Commit graph

13046 commits

Author SHA1 Message Date
mbauskar
f02145f63f Merge branch 'hotfix' 2017-07-18 16:37:50 +05:30
mbauskar
c512cd4718 bumped to version 8.5.2 2017-07-18 17:07:49 +06:00
rohitwaghchaure
019619958a [Fix] Unable to open calendar view of the task (#3727) 2017-07-18 16:37:09 +05:30
mbauskar
d53b87e39d Merge branch 'hotfix' 2017-07-18 15:25:22 +05:30
mbauskar
8d808253b3 bumped to version 8.5.1 2017-07-18 15:55:22 +06:00
Rushabh Mehta
8f88f68213 [fix] btn_enable_disable (#3725) 2017-07-18 15:24:00 +05:30
mbauskar
91e705e37a Merge branch 'develop' 2017-07-18 12:36:46 +05:30
mbauskar
91d9bb50ff bumped to version 8.5.0 2017-07-18 13:06:46 +06:00
Makarand Bauskar
9daa7b3751 [domainify] hide restrict to domain modules from modules page (#3677)
* [domainify] hide restrict to domain modules from modules page

* [minor] cleared the domainification cache and other minor fixes

* Update test_domainification.py
2017-07-18 12:29:57 +05:30
Prateeksha Singh
a19c7e61e5 [minor] long tags, fixes frappe/erpnext#9770 (#3716) 2017-07-18 12:16:45 +05:30
Makarand Bauskar
7aa013011e [minor][https://github.com/frappe/erpnext/issues/9892] enabled all roles and domain before running tests (#3719) 2017-07-18 11:17:36 +05:30
Rushabh Mehta
368bbeeb29 [fix] filters for calendars frappe/erpnext#9850 (#3686)
* [fix] filters for calendars frappe/erpnext#9850

* [add] tests
2017-07-18 10:50:26 +05:30
Prateeksha Singh
45cff1a195 [graph] set multiplier based on int length (#3720) 2017-07-18 10:33:57 +05:30
Frappe PR Bot
4885ecb116 [Translation] Updated Translations (#3710) 2017-07-17 17:50:51 +05:30
Prateeksha Singh
b4b2c685c6 [minor] graph fixes (#3711) 2017-07-17 17:47:07 +05:30
Prateeksha Singh
b602a07c7a Graphs, and target notifications (#3641)
* [sales goal] in company; graph, notifs

* cleanup notifications.js, summary and specific val in graph

* Add line graph, add goal data methods in goal.py

* [tests] targets in notification config

* [minor] type of graph as argument in parent

* Update graph docs

* remove company dependent test for notification

* [fix] test

* look for monthly history in cache

* check for cached graph data in field
2017-07-17 14:51:30 +05:30
Faris Ansari
55a0f98911 Show assertions result in console (#3701) 2017-07-17 12:41:22 +05:30
Makarand Bauskar
3779aa8379 [hotfix] get app version from app.__version__ instead of hooks (#3702) 2017-07-17 12:40:32 +05:30
Rushabh Mehta
b81946b217 [minor] test name for test_test_runner.py 2017-07-17 12:02:28 +05:30
Faris Ansari
081c7cffe7 [minor] List view fixes (#3698) 2017-07-17 11:51:39 +05:30
Revant Nandgaonkar
9fb5839f5c [Fix] OAuth2 Token validation (#3694)
Convert token expiration time to utc and compare with utcnow
2017-07-17 11:49:03 +05:30
rohitwaghchaure
983be1e506 [Fix] unsupported operand type(s) for /: 'unicode' and 'int' (#3689) 2017-07-17 11:44:14 +05:30
Doridel Cahanap
e92a8c3239 Show Company Address in Sidebar Menu of logged in user if user is a company contact (#3678) 2017-07-17 11:00:32 +05:30
mbauskar
5aceb1683c Merge branch 'hotfix' 2017-07-14 17:45:51 +05:30
mbauskar
8d6606f70c Merge branch 'master' into develop 2017-07-14 17:45:51 +05:30
mbauskar
b85f4d45f3 bumped to version 8.4.1 2017-07-14 18:15:51 +06:00
Utkarsh Yadav
f4c955d5b6 [UI Test] list view (#3684)
* [UI Test] List view

* some fixes in test_list_menu

* codacy fixes

* minor fixes

* removed menu test
2017-07-14 17:36:28 +05:30
Ashwini Save
918e426169 Mobile Screen Title and Timeline Title #9807 (#3672)
* Mobile Screen Title and Timeline Title #9807

* Left align Indicator and corrected “Add to Knowledge Base” button misalignment.

* Pushing title changes only, reverted timeline changes.
2017-07-14 17:35:09 +05:30
Ameya Shenoy
0a32ad83bf [tests] restructured tests to work with the new testing framework (#3683)
* minor changes and added global_test_search

* stashing the changes

* named assertions, modified test_lib to fit ES6 standard, added global search test

* modified to work with the new testing framework

* renamed files

* increased timeouts

* only calendar and desktop test

* modified travis.yml
2017-07-14 17:34:25 +05:30
Rushabh Mehta
dcd77e16b3 [fix] save button remaining disabled (#3685) 2017-07-14 17:23:05 +05:30
Revant Nandgaonkar
6a46a5ae1f [Fix] User frappe_userid set to read only (#3670) 2017-07-14 10:43:11 +05:30
Faris Ansari
f6d265b2ef Email inline_images enhancement, header (#3682)
* minor refactor

* update user.py to use new sendmail api

* On-demand attachments in email

* Replace inline_images by just specifying path

* Add header flag in frappe.sendmail

* Inline images can now be attached from assets/, files/ and private/files/

* Update tests

* Fix email_account test
2017-07-13 18:37:28 +05:30
Rushabh Mehta
ad7911fb96 [minor] better message for beta docs 2017-07-13 17:45:20 +05:30
Rushabh Mehta
7b4957d1f3 [tests] more timeouts 2017-07-13 15:26:11 +05:30
Rushabh Mehta
25ad8ef16c Test Runner - Refactored (#3679)
* [tests] test_runner to run one JS test at a time

* [tests] test_runner to run one JS test at a time

* [test] ignore failing tests

* [test] comment test_calendar_view

* [test] add timeout

* [test] add timeout
2017-07-13 15:17:12 +05:30
mbauskar
65f0cfce23 Merge branch 'develop' 2017-07-13 14:04:55 +05:30
mbauskar
d48377e8e2 bumped to version 8.4.0 2017-07-13 14:34:55 +06:00
Manas Solanki
96297e1ff4 restrict user for changing the option property except few fieldtype (#3666)
* restrict user for changing the option property

* test case modification
2017-07-13 13:59:56 +05:30
Saurabh
28fb74b412 [fix] exclude docfields from callable method generator (#3676) 2017-07-13 13:28:21 +05:30
Prateeksha Singh
bb861f4a50 [fix][awesomebar] remove saved new doc entries (#3673) 2017-07-13 11:50:45 +05:30
Makarand Bauskar
406155750d [minor] fixed the delete method call in frappeclient (#3671) 2017-07-13 11:47:27 +05:30
Makarand Bauskar
9540443438 [minor] don't parse the address if email field is empty (#3675) 2017-07-13 11:33:14 +05:30
Nabin Hait
e87f9f3618 Get default company address (#3674) 2017-07-13 10:37:53 +05:30
rohitwaghchaure
6ce5cc7bff [Fix] Auto increment of series not working if series has multiple dot(.) (#3661)
* [Fix] Auto increment of series not working if series has multiple dot(.)

* Test case for naming series
2017-07-12 17:06:37 +05:30
Makarand Bauskar
e86e69b4e7 [minor] return '' if template is none & ignore if _custom_html field has no options (#3664) 2017-07-12 15:51:08 +05:30
Faris Ansari
087e88fab5 Change datepicker position based on viewport (#3662) 2017-07-12 14:27:41 +05:30
Faris Ansari
044ac18cb5 Email (#3625)
* inline images working, ability to use template name for emails

* Extract header into separate file

* Remove erp-logo

* minor refactor

* [minor] codacy

* fix for test

* Add test case for email body

* remove unused imports

* Add more tests for email body
2017-07-12 14:02:55 +05:30
Faris Ansari
13a7b60f14 Color picker (#3649)
* Added new Color picker pallet for calendar

* Review changes for Color Picker.

* Refactor code as per reviews.

* Refactor code for blur event.

* Add Color to db_schema

* set_value on click, minor cleanup

* Remove test field from Event

* styling

* revert event.json
2017-07-12 14:02:18 +05:30
Saurabh
91415a6508 Download attachments backup (#3663)
* [enhance] provision to download attachments backup

* [fix] enqueue files backup job if job not in queue
2017-07-12 12:59:03 +05:30
Rushabh Mehta
d4fbbf6903 [test] dont run test_insert_many in travis 2017-07-12 12:57:35 +05:30