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 |
|
Rushabh Mehta
|
5a5089d7f7
|
Merge pull request #4064 from revant/FrappeOAuth2Client
Added FrappeOAuth2Client
|
2017-09-14 11:22:10 +05:30 |
|
Prateeksha Singh
|
71e71d0514
|
[graphs] explicitly call setup() for every graph object (#4120)
|
2017-09-14 11:21:37 +05:30 |
|
tundebabzy
|
bd6bea9fec
|
edit documentation and add correct image url (#4116)
|
2017-09-14 11:04:40 +05:30 |
|
Nabin Hait
|
1d2525d6ce
|
[refactor] Load languages on load of slide
|
2017-09-13 19:41:33 +05:30 |
|
Prateeksha Singh
|
57730794b6
|
heatmap default empty data fix (#4115)
|
2017-09-13 16:16:02 +05:30 |
|
Rushabh Mehta
|
0642343940
|
[tests] test_runner.js show full js stack
|
2017-09-13 14:04:04 +05:30 |
|
Prateeksha Singh
|
d0d216475f
|
[graphs] check for start date (#4107)
|
2017-09-13 11:25:29 +05:30 |
|
Revant Nandgaonkar
|
f60a04c4ed
|
Merge branch 'develop' of frappe/frappe into FrappeOAuth2Client
|
2017-09-12 21:36:06 +05:30 |
|
Nabin Hait
|
6c31daecd3
|
Initialize start date in heatmap if not provided
|
2017-09-12 19:02:30 +05:30 |
|
Rushabh Mehta
|
ad13ee5d94
|
Merge pull request #4096 from mbauskar/search
[minor] fixes for https://github.com/frappe/frappe/issues/3314, set emplty string to keywords if value is undefined
|
2017-09-12 18:28:54 +05:30 |
|
Nabin Hait
|
c2452a9e74
|
Initialize start date in heatmap if not provided
|
2017-09-12 18:00:02 +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
|
87d5c071ae
|
Merge branch 'hotfix'
|
2017-09-12 16:09:18 +05:30 |
|
Nabin Hait
|
6052800e15
|
bumped to version 8.10.5
|
2017-09-12 16:39:18 +06:00 |
|
Nabin Hait
|
bd5d7717e7
|
Disable custom checkbox for doctype if not administrator or in developer mode (#4092)
|
2017-09-12 15:46:41 +05:30 |
|
Nabin Hait
|
116a123f50
|
Wait for after_ajax after setting form values
|
2017-09-12 15:37:35 +05:30 |
|
Rushabh Mehta
|
c5837f28fe
|
Merge pull request #4027 from pratu16x7/c3-to-graph
[charts] Heatmap
|
2017-09-12 11:39:12 +05:30 |
|
Rushabh Mehta
|
f57dfc04c7
|
Merge pull request #4089 from mbauskar/minor-fixes
[hotfix] minor fixes for text editor, report print and 2fa
|
2017-09-12 11:34:25 +05:30 |
|
pratu16x7
|
6fb4984e41
|
remove cal_heatmap
|
2017-09-12 11:34:15 +05:30 |
|
pratu16x7
|
2b200bcf7f
|
[heatmap] choose continuous for dashboard
|
2017-09-12 10:52:25 +05:30 |
|
Rushabh Mehta
|
028e166d5f
|
Merge pull request #4094 from nabinhait/csv_export_encoding
Fixed encoding issue on exporting report in csv
|
2017-09-12 10:43:03 +05:30 |
|
Rushabh Mehta
|
f32433d1f5
|
Merge pull request #4099 from rmehta/num2words-update-version
[minor] updated num2words
|
2017-09-12 10:42:43 +05:30 |
|
Rushabh Mehta
|
b2b2db1a9e
|
Merge pull request #4097 from nabinhait/deadlock_fix
Changed order to avoid deadlock
|
2017-09-12 09:52:15 +05:30 |
|
Rushabh Mehta
|
a7fa035d37
|
Create CODE_OF_CONDUCT.md
|
2017-09-12 09:14:34 +05:30 |
|
Rushabh Mehta
|
4e7a6f7c28
|
[minor] updated num2words
|
2017-09-12 09:10:29 +05:30 |
|
Nabin Hait
|
e9eb5c4021
|
Changed order to avoid deadlock
|
2017-09-11 19:22:58 +05:30 |
|
mbauskar
|
b846c728f4
|
[minor] fixes for https://github.com/frappe/frappe/issues/3314, set emplty string to keywords if value is undefined
|
2017-09-11 18:20:13 +05:30 |
|
Nabin Hait
|
18cd78e7d7
|
Fixed encoding issue on exporting report in csv
|
2017-09-11 16:17:39 +05:30 |
|
Revant Nandgaonkar
|
56214bd70c
|
Merge branch 'develop' of frappe/frappe into FrappeOAuth2Client
|
2017-09-11 16:04:52 +05:30 |
|
Frappe PR Bot
|
88bb8bfcab
|
[Translation] Updated Translations (#4093)
|
2017-09-11 15:30:20 +05:30 |
|
Rushabh Mehta
|
a574c2fd4b
|
Merge pull request #4091 from mbauskar/develop
[lang] added new languages
|
2017-09-11 11:06:55 +05:30 |
|
mbauskar
|
2f587f0298
|
[lang] added new languages
|
2017-09-11 10:49:04 +05:30 |
|
Rushabh Mehta
|
64b81cffc9
|
Merge pull request #4087 from pratu16x7/hotfix
[hotfix] global search: ignore results with non-existent doctypes
|
2017-09-11 10:19:55 +05:30 |
|
pratu16x7
|
63824d0012
|
Heatmap for month domain
|
2017-09-11 08:53:07 +05:30 |
|
pratu16x7
|
8718b7702e
|
[graphs] tooltip object
|
2017-09-11 08:53:06 +05:30 |
|
pratu16x7
|
1856d18092
|
[graphs] c3 data mapper
|
2017-09-11 08:53:06 +05:30 |
|
mbauskar
|
90ebd643a7
|
[hotfix] minor fixes for text editor, report print and 2fa
|
2017-09-10 11:21:17 +05:30 |
|
Revant Nandgaonkar
|
0bfe6bcfeb
|
Merge branch 'develop' of frappe/frappe into FrappeOAuth2Client
|
2017-09-09 14:12:17 +05:30 |
|
mbauskar
|
6e746a72f7
|
Merge branch 'master' into develop
|
2017-09-09 10:50:01 +05:30 |
|
mbauskar
|
80b0aadb19
|
Merge branch 'hotfix'
|
2017-09-09 10:50:00 +05:30 |
|
mbauskar
|
cec777538a
|
bumped to version 8.10.4
|
2017-09-09 11:20:00 +06:00 |
|
Shreya Shah
|
c5cf341f48
|
integer conversion fix (#4085)
|
2017-09-09 10:45:51 +05:30 |
|
pratu16x7
|
9cee53c33f
|
[fix] specify exception
|
2017-09-08 16:03:51 +05:30 |
|
Rushabh Mehta
|
f66cfcece5
|
Update global_search.py
|
2017-09-08 15:47:32 +05:30 |
|
pratu16x7
|
1a3d0bb459
|
[fix] clear messages on exception
|
2017-09-08 15:46:03 +05:30 |
|
pratu16x7
|
0aaaca9b1a
|
[fix] ignore results with non-existent doctypes
|
2017-09-08 15:45:36 +05:30 |
|
Rushabh Mehta
|
0f2aaffa3b
|
Merge pull request #4077 from pratu16x7/setup-fix
[fix] hide progress by default
|
2017-09-08 09:04:35 +05:30 |
|
Rushabh Mehta
|
9b576396c0
|
Merge pull request #4076 from PawanMeh/fixes_4075
[fix] #4075
|
2017-09-08 09:03:54 +05:30 |
|