Rushabh Mehta
33caea5e21
Merge pull request #4023 from schilgod/develop
...
Bypass 2FA if user login from restricted IP Address
2017-09-14 11:23:16 +05:30
Revant Nandgaonkar
f60a04c4ed
Merge branch 'develop' of frappe/frappe into FrappeOAuth2Client
2017-09-12 21:36:06 +05:30
Nabin Hait
81dc1cf4eb
Set 5 mins timeout for long test cases
2017-09-12 16:20:39 +05:30
Nabin Hait
7266e673ac
Merge branch 'master' into develop
2017-09-12 16:09:19 +05:30
Nabin Hait
116a123f50
Wait for after_ajax after setting form values
2017-09-12 15:37:35 +05:30
mbauskar
90ebd643a7
[hotfix] minor fixes for text editor, report print and 2fa
2017-09-10 11:21:17 +05:30
Sunny
df343aec64
merge with upstream/frappe
2017-09-07 16:04:55 +08:00
Sunny
d902975080
Bypass 2FA if user login from restricted IP Address
2017-09-07 15:17:35 +08:00
Revant Nandgaonkar
eae44d1923
[Fix] Codacy Issue
...
https://www.codacy.com/app/frappe/frappe/pullRequest?prid=889323#new-file-issues-9785172778
2017-09-06 18:45:23 +05:30
Revant Nandgaonkar
b4d1ad2d9a
[Fix] TestFrappeOAuth2Client
2017-09-06 18:34:07 +05:30
Revant Nandgaonkar
e8fc75b46b
Test for FrappeOAuth2Client
2017-09-06 14:10:34 +05:30
Rushabh Mehta
a8a10a9d72
Merge pull request #3882 from pratu16x7/user-progress
...
User Progress dialog
2017-09-04 11:13:35 +05:30
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
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
Rushabh Mehta
0214a3717a
Merge pull request #3990 from manassolanki/listview-sorting
...
sorted the select field options in permission manager as per translated string
2017-08-30 14:04:49 +05:30
Zlash65
b7b77609ce
added workflow mechanism to add user
2017-08-29 11:08:40 +05:30
pratu16x7
674308958a
[setup-wiz] UI test command
2017-08-29 10:03:04 +05:30
Manas Solanki
244e927a4e
fix the test case
2017-08-28 13:03:01 +05:30
Rushabh Mehta
09a31f5ec0
[fix] tests
2017-08-23 15:37:08 +05:30
Rushabh Mehta
6357633de0
Merge pull request #3933 from netchampfaris/currency-precision
...
Currency precision
2017-08-18 14:21:02 +05:30
tunde
a0e95877f6
adds some jsdocs style function comments
2017-08-17 20:23:06 +01:00
tunde
4996771f8e
adds new function is_disabled_field
2017-08-17 14:17:02 +01:00
Faris Ansari
80b9e5aa3c
fix codacy
2017-08-17 12:50:15 +05:30
Faris Ansari
18538184d7
Fix fmt_money tests
2017-08-17 11:51:35 +05:30
Faris Ansari
af74d7a729
codacy fix
2017-08-16 16:04:41 +05:30
Faris Ansari
1dc9baf9d3
Add tests
2017-08-16 13:15:35 +05:30
Faris Ansari
7397b68290
Scrub urls fix ( #3918 )
...
* Don't expand mailto urls
* Add test case
2017-08-11 13:00:10 +05:30
Aditya Hase
769338f136
Replaced all instances of basestring with six.string_types
2017-08-11 00:10:11 +05:30
Rushabh Mehta
6081c30971
[tests] less verbose logs
2017-08-10 11:11:04 +05:30
Rushabh Mehta
a6e1210162
[fix] tests
2017-08-08 14:42:02 +05:30
Rushabh Mehta
4e42ed65e1
Merge branch 'twofactor' of https://github.com/manqala/frappe into manqala-twofactor
2017-08-08 11:58:22 +05:30
Faris Ansari
44ee24aa75
Colors in Event Calendar using color picker ( #3857 )
...
* Add Color field to Event, show colored event in calendar
* [minor] handle edge cases
* Fix test boilerplate
* Add test for event
* fix codacy
* fix test
2017-08-07 13:36:27 +05:30
B H Boma
64048e14ac
Enable 2fa in sites config instead of system settings, also enabled for admin
2017-08-04 15:59:29 +01:00
Rushabh Mehta
784603acf1
[fix] selenium
2017-08-03 17:55:34 +05:30
Vishal Dhayagude
9d9cef9c0b
[fix] multiple grid_row fetch ( #3856 )
2017-08-03 16:52:18 +05:30
Aditya Hase
375dfd601d
Replaced urlparse imports with six.moves.urllib.parse ( #3847 )
2017-08-03 11:43:28 +05:30
mbauskar
53167626ab
resolved merge conflicts
2017-08-02 18:32:30 +05:30
mbauskar
f646af1c33
resolved merge conflicts
2017-08-02 18:12:49 +05:30
mbauskar
80a2beb32c
resolved merge conflicts
2017-08-02 18:10:23 +05:30
Rushabh Mehta
eb2c725dba
[fix] stop action if trigger fails for validate and before_, fixes frappe/erpnext#10200 ( #3842 )
...
* [fix] stop action if trigger fails for validate and before_, fixes frappe/erpnext#10200
* [fix] stop action if trigger fails for validate and before_, fixes frappe/erpnext#10200
* [fix] codacy
* [fix] add test to tests.txt
2017-08-02 17:53:28 +05:30
Makarand Bauskar
fc715efdbb
[hotfix] fixes for AttributeError: 'NoneType' object has no attribute 'split' ( #3840 )
...
* [hotfix] fixes for AttributeError: 'NoneType' object has no attribute 'split'
* [tests] added test cases for not in and in filters
2017-08-02 12:47:10 +05:30
B H Boma
746c2d6ac8
Tests for twofactor
2017-08-01 14:24:42 +01:00
Makarand Bauskar
ecaf4f6cd1
merged hotfix branch into staging ( #3821 )
...
* [hotfix] Linked with and List item click (#3803 )
* [hotfix] Linked with and List item click
* Run a single test using Test Runner
* Add test for Linked With
* [minor] List view fixes
* bumped to version 8.6.3
* [Fix] Getting an error datetime.datetime is not iterable during importing purchase invoice data (#3818 )
* Update quick_entry.js (#3815 )
Fix typo
* bumped to version 8.6.4
2017-08-01 11:05:22 +05:30
ckosiegbu
86bfd7bf68
Merge branch 'develop' into twofactor
2017-07-31 00:15:17 +01:00
mbauskar
11da197bba
resolved merge conflicts
2017-07-28 16:07:36 +05:30
Rushabh Mehta
f609a478ae
[refactor] user permissions ( #3713 )
...
* [refactor] user permissions
* [fix] tests
* [ux] user-permissions
* [minor] cleanup system settings
* [minor] end progress
2017-07-28 14:33:31 +05:30
Faris Ansari
67277507f0
[hotfix] Linked with and List item click ( #3803 )
...
* [hotfix] Linked with and List item click
* Run a single test using Test Runner
* Add test for Linked With
* [minor] List view fixes
2017-07-28 14:30:18 +05:30
Prateeksha Singh
7fa8148d33
Graph additions ( #3776 )
...
* remove hardcoded height and width
* [graph] relative measures, offsets, generalise all base jobs
* Multiple datasets! (individually colored)
* [graph] Tooltips
* [graph] animate and change values
* [graph] percentage graph
* [graph] custom height, window resize refresh
* [graph] style changes
* [graph] update docs
* [graphs] make graphs.less
* [graphs] prefix classes with 'graph-', nest inside parent class
2017-07-28 11:14:33 +05:30
ckosiegbu
cbee42f2d6
Merge branch 'develop' into twofactor
2017-07-27 21:52:42 +01:00
