vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
32208 commits 1 branch 0 tags 587 MiB
Commit graph

32208 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
ffcb5969be
Merge pull request #13118 from frappe/mergify/bp/version-13-hotfix/pr-13095 2021-05-05 09:47:55 +05:30
Deepesh Garg
1fdafc43a4 fix: Errors 
(cherry picked from commit 4e4e0fa3d9)
 2021-05-05 04:17:20 +00:00
Deepesh Garg
7f12d2b053 fix: Error while exporting reports with duration field 
(cherry picked from commit eafadcca47)
 2021-05-05 04:17:19 +00:00
Suraj Shetty
c5ee45f905
Merge pull request #13111 from frappe/mergify/bp/version-13-hotfix/pr-13098 
fix(setup): do not show messsage when exception is handled (backport #13098)
 2021-05-04 10:56:56 +05:30
Sagar Vora
710bc1a5bf fix(setup): do not show messsage when exception is handled 
(cherry picked from commit ac9fe71733)
 2021-05-04 05:26:34 +00:00
Suraj Shetty
001438effd
Merge pull request #13110 from frappe/mergify/bp/version-13-hotfix/pr-13103 
chore: remove py2 specific code from boilerplate (backport #13103)
 2021-05-04 10:43:19 +05:30
Ankush Menat
6e0b256afa chore: remove py2 specific code from boilerplate 
(cherry picked from commit a617348a79)
 2021-05-04 05:11:20 +00:00
Suraj Shetty
e8edc92a60
Merge pull request #13109 from frappe/mergify/bp/version-13-hotfix/pr-13099 2021-05-04 10:39:12 +05:30
Sagar Vora
09e406395a fix: add docstring 
(cherry picked from commit e288b781bf)
 2021-05-04 05:08:50 +00:00
Sagar Vora
65b6d14dcf fix: disable reloading files in __pycache__ directory 
(cherry picked from commit b214a993da)
 2021-05-04 05:08:50 +00:00
Suraj Shetty
1b70fe7be8
Merge pull request #13094 from hasnain2808/version-13-hotfix-coveralls 2021-05-03 16:50:04 +05:30
Mohammad Hasnain Mohsin Rajan
17f6f8c893 fix: different service name for push and pull request events 2021-05-03 14:40:25 +05:30
Suraj Shetty
6c0d39fa01
Merge pull request #13091 from frappe/mergify/bp/version-13-hotfix/pr-13080 
fix: Add breadcrumbs for list view (backport #13080)
 2021-05-03 14:26:56 +05:30
Suraj Shetty
5c18667c86
Merge pull request #13093 from frappe/mergify/bp/version-13-hotfix/pr-13056 
feat: Add password fieldtype option for Web Form (backport #13056)
 2021-05-03 14:26:47 +05:30
Suraj Shetty
d69ec91401
Merge pull request #13090 from frappe/mergify/bp/version-13-hotfix/pr-12944 2021-05-03 14:26:37 +05:30
pateljannat
9c167cd868 fix: added password field in web form 
(cherry picked from commit 2f6e722934)
 2021-05-03 08:40:27 +00:00
shariquerik
32309dbdbc fix: No breadcrumbs for list view 
(cherry picked from commit 018369e188)
 2021-05-03 08:38:53 +00:00
Suraj Shetty
cd6ff896a8
fix: Resolve conflicts 2021-05-03 13:54:12 +05:30
barredterra
dfa8c18248 fix: add context to filter columns 
(cherry picked from commit 6250c4ac9d)

# Conflicts:
#	frappe/translate.py
 2021-05-03 08:20:02 +00:00
barredterra
806f2c87db fix: translate report filter labels 
(cherry picked from commit bf4a73c3d4)

# Conflicts:
#	frappe/translate.py
 2021-05-03 08:20:02 +00:00
barredterra
bc758b3f69 fix: translate report column labels 
(cherry picked from commit f84aee8abe)

# Conflicts:
#	frappe/translate.py
 2021-05-03 08:20:01 +00:00
Suraj Shetty
5e90e66c16
Merge pull request #13089 from frappe/mergify/bp/version-13-hotfix/pr-13088 
fix: Add __ function in vue global for translation in recorder (backport #13088)
 2021-05-03 13:26:27 +05:30
Suraj Shetty
3c53739f4a fix: Add __ function in vue global for translation in recorder 
(cherry picked from commit 86ce27e413)
 2021-05-03 07:56:06 +00:00
Suraj Shetty
48184d9385
Merge pull request #13086 from frappe/mergify/bp/version-13-hotfix/pr-13085 
fix: Typo in RecorderDetail.vue (backport #13085)
 2021-05-03 12:58:02 +05:30
Suraj Shetty
c768e1a3f2 fix: Typo in RecorderDetail.vue 
(cherry picked from commit 021aea5b4f)
 2021-05-03 07:24:43 +00:00
Suraj Shetty
b7b57b1b32
Merge pull request #13083 from frappe/mergify/bp/version-13-hotfix/pr-12943 2021-05-03 12:40:32 +05:30
barredterra
66b7b7b5f7 fix: translate report filter labels 
(cherry picked from commit bf4a73c3d4)
 2021-05-03 06:54:00 +00:00
barredterra
8bc1a3aab0 fix: translate report column labels 
(cherry picked from commit f84aee8abe)
 2021-05-03 06:54:00 +00:00
Suraj Shetty
b236cff989
Merge pull request #13082 from frappe/mergify/bp/version-13-hotfix/pr-13011 
fix: replace parseFloat by Number (backport #13011)
 2021-05-03 11:13:12 +05:30
developers@erpnext.com
1e0039a14f fix: replace parseFloat by Number 
(cherry picked from commit dac9db258c8559bba7e15be24a906ba1d74bf343)
 2021-05-03 05:26:38 +00:00
mergify[bot]
04f9822164
fix(UI): Add margin to download backup card (backport #13050) (#13079) 
Co-authored-by: Ernesto Ruiz <ernesto_ruiz89@hotmail.com>
 2021-05-03 10:09:10 +05:30
Suraj Shetty
2d6deaeb0e
Merge pull request #13078 from frappe/mergify/bp/version-13-hotfix/pr-13001 
fix(kanban): Freeze screen till the background request is complete (backport #13001)
 2021-05-03 09:58:10 +05:30
Suraj Shetty
5c558dab2c fix: Freeze screen till the background request is complete 
(cherry picked from commit e7832b3198)
 2021-05-03 04:26:34 +00:00
Suraj Shetty
59a5d5fb76
Merge pull request #13077 from frappe/mergify/bp/version-13-hotfix/pr-13070 
feat: switch theme with left/right keys (backport #13070)
 2021-05-03 09:54:24 +05:30
Sagar Vora
5b2eb49234 feat: switch theme with left/right keys 
(cherry picked from commit 835daa18ed)
 2021-05-03 04:15:28 +00:00
Suraj Shetty
0c71b5b4ce
Merge pull request #13075 from frappe/mergify/bp/version-13-hotfix/pr-13071 
fix: Added conditional rendering for content field in split section w… (backport #13071)
 2021-05-03 09:43:36 +05:30
Suraj Shetty
9f07453b02
Merge pull request #13076 from frappe/mergify/bp/version-13-hotfix/pr-13046 
fix: Make strings translatable (backport #13046)
 2021-05-03 09:43:24 +05:30
Ernesto Ruiz
8fdb69cc75 fix: Make strings translatable (#13046) 
Co-authored-by: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit b0af8886d5)
 2021-05-03 04:10:21 +00:00
codescientist703
2d72d8e166 fix: Added conditional rendering for content field in split section with image template 
(cherry picked from commit 9c5ac3a1a4)
 2021-05-03 04:06:15 +00:00
Suraj Shetty
9ba9c4c604
Merge pull request #13074 from frappe/mergify/bp/version-13-hotfix/pr-13052 2021-05-03 09:34:53 +05:30
Suraj Shetty
fb05b0794a fix: Show icon instead of a different color for group 
(cherry picked from commit 9bb0ea0301)
 2021-05-03 04:03:23 +00:00
Suraj Shetty
b7e139a7bf fix: Typo 
(cherry picked from commit 43a4f1861e)
 2021-05-03 04:03:23 +00:00
Suraj Shetty
f58c9529d4 style: Fix formatting 
(cherry picked from commit 395eed225f)
 2021-05-03 04:03:23 +00:00
Suraj Shetty
690746f729 fix: Link user mention to User Profile 
(cherry picked from commit 183af96465)
 2021-05-03 04:03:22 +00:00
Suraj Shetty
0edc05fda8 fix: Show pointer on hovering on mention list 
(cherry picked from commit 22a2803f7b)
 2021-05-03 04:03:22 +00:00
Suraj Shetty
ad3149c733 fix: Bust user / user group cache on change 
(cherry picked from commit 959b27ef0e)
 2021-05-03 04:03:22 +00:00
Suraj Shetty
78aedb3778 refactor: Remove unnecessary code 
(cherry picked from commit d8c777e98c)
 2021-05-03 04:03:22 +00:00
Suraj Shetty
8cd8f32993 refactor: Move mention list generation logic to server-side 
- Moved mention list generation logic to server-side to get latest mention list everytime
- To indicate group option, added a users icon.

(cherry picked from commit 1af59ce16c)
 2021-05-03 04:03:21 +00:00
Suraj Shetty
691b2689d9
Merge pull request #13073 from frappe/mergify/bp/version-13-hotfix/pr-13055 2021-05-03 09:29:46 +05:30
Suraj Shetty
c8933eeb11
Merge pull request #13067 from frappe/mergify/bp/version-13-hotfix/pr-13012 
fix: focus jumps to first field (backport #13012)
 2021-05-03 09:29:27 +05:30