Commit graph

13769 commits

Author SHA1 Message Date
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
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
f32433d1f5 Merge pull request #4099 from rmehta/num2words-update-version
[minor] updated num2words
2017-09-12 10:42:43 +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
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
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
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
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
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
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
mbauskar
0e1825992c Merge branch 'master' into develop 2017-09-06 19:26:32 +05:30
mbauskar
518d9f742e Merge branch 'master' into hotfix 2017-09-06 19:26:32 +05:30
mbauskar
3d1027a79d Merge branch 'staging' 2017-09-06 19:26:31 +05:30
mbauskar
1c7e3a57ae bumped to version 8.10.1 2017-09-06 19:56:31 +06:00
Makarand Bauskar
41f03cd303 [hotfix] don't add trigger if the autoname field and fieldname is not same (#4074) 2017-09-06 19:25:30 +05:30
Makarand Bauskar
22036c363e Revert "[hotfix] don't add trigger if the autoname field and fieldname is not same (#4072)" (#4073)
This reverts commit a722b64eb1.
2017-09-06 19:04:05 +05:30
Makarand Bauskar
a722b64eb1 [hotfix] don't add trigger if the autoname field and fieldname is not same (#4072) 2017-09-06 18:57:47 +05:30
Rushabh Mehta
4bd7f409de Merge pull request #3975 from pratu16x7/document-get-doc-before-save
[minor] `_doc_before_save` wrapper
2017-09-06 18:20:26 +05:30
Makarand Bauskar
6e6fb684ec [hotfix] dont Patch Log, Module Def in Permission Manager (#4070) 2017-09-06 16:15:37 +05:30
Rushabh Mehta
2a5a6d6adc Merge pull request #4067 from gshmu/master
default value can't be true
2017-09-06 15:03:53 +05:30
Rushabh Mehta
9fa512e26f Update upload.js 2017-09-06 15:03:35 +05:30
Rushabh Mehta
98561b4f1b Update upload.js 2017-09-06 15:02:17 +05:30
Rushabh Mehta
b5a4c34131 Merge pull request #4069 from pratu16x7/setup-fixes
[fix] remove reload after setup
2017-09-06 14:59:54 +05:30
pratu16x7
35c09a7688 [fix] styles 2017-09-06 12:33:17 +05:30
Faris Ansari
3df0659c87 [Print Format] Align labels to right (#4068) 2017-09-06 12:17:48 +05:30
pratu16x7
c87710f25b [fix] remove reload after setup 2017-09-06 12:06:32 +05:30
gshmu
aa6f9b1b24 default can't be true
after set `opts.is_private` false, is private still true.
2017-09-06 13:59:19 +08:00