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

32188 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
shariquerik
31b94e6b7e refactor: Used css variables also added missing colors 
(cherry picked from commit 9fd6491631)
 2021-05-03 03:59:08 +00:00
shariquerik
8a6fb8d535 fix: Changed shorcut widgets color picker to dropdown 
(cherry picked from commit 509d482541)
 2021-05-03 03:59:07 +00:00
hasnain2808
0baab913d5 fix: focus jumps to first field 
(cherry picked from commit f25a6c5fee)
 2021-04-30 20:20:27 +00:00
Suraj Shetty
1722d2f863
Merge pull request #13064 from frappe/mergify/bp/version-13-hotfix/pr-13062 
fix: error for bench drop-site. Added missing import. (backport #13062)
 2021-04-30 21:49:10 +05:30
Steffen
e9e4529e79 fix: error for bench drop-site. Added missing import. 
(cherry picked from commit 80e009f806)
 2021-04-30 15:24:35 +00:00
Suraj Shetty
42868e3ec6
Merge pull request #13053 from frappe/mergify/bp/version-13-hotfix/pr-13028 
fix: Respond to /api requests as JSON by default (backport #13028)
 2021-04-30 11:41:46 +05:30
Gavin D'souza
6ca0af82b5 fix: Respond to /api requests as JSON by default 
If header 'Accept: application/json' isn't set, the failure
responses to /api endpoints is HTML. Success responses are of type JSON.

(cherry picked from commit fcf63622bc)
 2021-04-30 06:08:15 +00:00
Suraj Shetty
c7658d9d98
Merge pull request #13045 from frappe/mergify/bp/version-13-hotfix/pr-12997 2021-04-30 10:46:27 +05:30
Revant Nandgaonkar
2b5da6c3c2 fix: remove six imports and use py3 defaults 
(cherry picked from commit c4a9238549)
 2021-04-29 14:14:30 +00:00
Revant Nandgaonkar
0fb703ae9d fix: sider issues 
(cherry picked from commit 72fbcac70c)
 2021-04-29 14:14:30 +00:00
Revant Nandgaonkar
c75eb8933f feat: OAuth 2 openid-configuration and introspect_token endpoint 
(cherry picked from commit 4e8b00ba1f)
 2021-04-29 14:14:30 +00:00
Revant Nandgaonkar
f7fb2809f4 test: oauth2 pkce and openid 
(cherry picked from commit bb483d59af)
 2021-04-29 14:14:30 +00:00
Revant Nandgaonkar
1f2b3e502e fix: sider issues 
(cherry picked from commit 1f54b8b973)
 2021-04-29 14:14:30 +00:00
Revant Nandgaonkar
dfd5651dbe refactor: improve oauthlib implementation 
implement openid provider
implement PKCE
improve errors

(cherry picked from commit 96d6971ee4)
 2021-04-29 14:14:30 +00:00
Suraj Shetty
2ca9db0477
Merge pull request #13042 from frappe/mergify/bp/version-13-hotfix/pr-13019 2021-04-29 18:40:24 +05:30
Sagar Vora
243d0c040d fix: use css variable for themeability 
(cherry picked from commit 2fefa24462)
 2021-04-29 13:08:29 +00:00
Sagar Vora
b61e183029 fix: add box-shadow on :focus for tab key navigation 
(cherry picked from commit 0742a754b8)
 2021-04-29 13:08:28 +00:00
Sagar Vora
bed628a4cd fix(UI): consistent checkboxes on all browsers 
(cherry picked from commit 47630b8ea0)
 2021-04-29 13:08:28 +00:00
Suraj Shetty
0c4053f17d
Merge pull request #13040 from frappe/mergify/bp/version-13-hotfix/pr-13034 2021-04-29 18:37:58 +05:30
Suraj Shetty
b678eb01ee fix: Set placeholder value before creating input 
(cherry picked from commit ca9cafb999)
 2021-04-29 13:01:57 +00:00