Commit graph

14692 commits

Author SHA1 Message Date
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
Revant Nandgaonkar
4b75ec13b3 [Fix] Codacy Errors 2017-09-10 18:30:50 +05:30
Revant Nandgaonkar
a928d7ac01 [Fix] Codacy 2017-09-10 12:03:50 +05:30
Revant Nandgaonkar
8c71042c67 [fix] Codacy errors 2017-09-10 11:49:53 +05:30
mbauskar
90ebd643a7 [hotfix] minor fixes for text editor, report print and 2fa 2017-09-10 11:21:17 +05:30
Revant Nandgaonkar
3d15e6a431 Cleanup 2017-09-10 11:09:50 +05:30
Revant Nandgaonkar
f8a1d55689 Fix and Documentation
webhook_doctype field made Mandatory in Webhook
Documentation and screenshot added
2017-09-10 10:58:33 +05:30
Revant Nandgaonkar
0b1a655da1 [Fix] filter only existing webhooks 2017-09-09 19:26:50 +05:30
Revant Nandgaonkar
0bfe6bcfeb Merge branch 'develop' of frappe/frappe into FrappeOAuth2Client 2017-09-09 14:12:17 +05:30
Revant Nandgaonkar
d6bfa7431b Webhooks for frappe doc_events 2017-09-09 14:10:09 +05:30
Revant Nandgaonkar
326e7a2e55 Merge branch 'develop' of frappe/frappe into web_hooks 2017-09-09 12:27:20 +05:30
Revant Nandgaonkar
69e0d4c930 Changes to Webhook DocType and Tests 2017-09-09 12:26:47 +05:30
mbauskar
7d6b125125 Merge branch 'master' into staging 2017-09-09 10:50:01 +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
Revant Nandgaonkar
ff8215331a [Add] Webhook DocType and Tests 2017-09-08 17:17:04 +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
pratu16x7
917d1e4500 check for incomplete slides before showing progress 2017-09-08 03:37:42 +05:30
pratu16x7
eb45f49dad [fix] remove on focus outline 2017-09-08 03:29:45 +05:30
Revant Nandgaonkar
9b972c6501 Merge branch 'develop' frappe/frappe into FrappeOAuth2Client 2017-09-07 21:24:29 +05:30
Doridel Cahanap
28445211c1 [minor] Increase Query Report Result Area size to 70vh (#4066) 2017-09-07 21:15:46 +05:30
mbauskar
f42e91a133 Merge branch 'develop' into staging 2017-09-07 21:07:47 +05:30
mbauskar
17377a1ec9 Merge branch 'master' into develop 2017-09-07 20:02:11 +05:30
mbauskar
ba38e945c1 Merge branch 'hotfix' 2017-09-07 20:02:10 +05:30
mbauskar
f891278265 bumped to version 8.10.3 2017-09-07 20:32:10 +06:00
Makarand Bauskar
2495f06aba [hotfix] fixes for UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 17: ordinal not in range(128) (#4082)
* [hotfix] fixes for UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 17: ordinal not in range(128)

* [hotfix] datetime field filters issue
2017-09-07 20:00:00 +05:30
Sunny
df343aec64 merge with upstream/frappe 2017-09-07 16:04:55 +08:00
Sunny
fe8bae82e8 merge with upstream/frappe 2017-09-07 15:58:56 +08:00
Sunny
a99216482d merge with upstream/frappe 2017-09-07 15:56:05 +08:00
Sunny
cfd35d414b correct field name and field value 2017-09-07 15:17:35 +08:00
Sunny
d902975080 Bypass 2FA if user login from restricted IP Address 2017-09-07 15:17:35 +08:00
mbauskar
cf3ba70e3e Merge branch 'master' into develop 2017-09-07 11:49:20 +05:30
mbauskar
2ea4b9479b Merge branch 'hotfix' 2017-09-07 11:49:19 +05:30
mbauskar
d1ee33db22 bumped to version 8.10.2 2017-09-07 12:19:19 +06:00
Makarand Bauskar
5a30cca165 [hotfix] fixed attachement issue on CommunicationComposer while reply from Communication (#4078) 2017-09-07 11:47:09 +05:30
pratu16x7
af6816330b [fix] hide progress by default 2017-09-07 10:51:38 +05:30
pawan
e3e276f424 [fix] #4075 2017-09-06 20:41:28 +05:30