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

30569 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
473cb16093
fix: Miscellaneous changes (#12343) 2021-02-08 12:05:37 +05:30
mergify[bot]
1133f40dd2
fix: Don't overwrite source_name if source_name is defined (bp #12280) (#12341) 
Co-authored-by: Richard Case <64409021+casesolved-co-uk@users.noreply.github.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-02-07 12:49:43 +05:30
mergify[bot]
4d9b8f86f6
fix: Anomalous behaviour of save button (bp #12326) (#12336) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
 2021-02-06 11:45:10 +05:30
mergify[bot]
99f0b223ce
Merge pull request #12338 from hasnain2808/compile-re-before-execute 
fix: trailing spaces match only when re compile
 2021-02-06 03:17:47 +00:00
hasnain2808@gmail.com
81a7626815 fix: use search instead of match 2021-02-06 00:06:40 +05:30
hasnain2808@gmail.com
521968e72b fix: trailing spaces match only when re compile 2021-02-05 21:54:12 +05:30
mergify[bot]
bf4b80aa9c
Merge pull request #12333 from netchampfaris/misc-fixes-2021-02-04 
fix: Misc fixes
 2021-02-05 09:02:30 +00:00
Faris Ansari
46d2ede2e3 fix: Use hooks for handling /desk and /app routes 
No need for random if statements, use the framework!
 2021-02-05 13:05:14 +05:30
Rushabh Mehta
f95d34918d
chore(Snyk): Security upgrade markdown2 from 2.3.9 to 2.4.0 (#12331) 
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-MARKDOWN2-1063233

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
 2021-02-05 08:47:58 +05:30
Faris Ansari
e9be875b61 fix: No need to prefetch emojis 2021-02-04 22:31:35 +05:30
Prssanna Desai
40d3db402a
Merge pull request #12006 from rtdany10/patch-1 2021-02-04 15:36:23 +05:30
mergify[bot]
d35ac49ef7
Merge pull request #12244 from Anuja-pawar/fix_add_multiple_items 
fix: Item qty gets reset to default on adding items using Add Multiple button
 2021-02-04 07:40:26 +00:00
Anuja P
215cdc4422 fix: suggested changes 2021-02-04 10:47:16 +05:30
mergify[bot]
5e71041b5f
Merge pull request #12290 from saurabh6790/clear-session-on-password-reset 
fix: set logout from all sessions true as default for all users
 2021-02-04 03:16:02 +00:00
Raffael Meyer
322dcfdad0
fix: New currency symbol for Zimbabwe (#12308) 
* fix: New currency symbol for Zimbabwe

* fix: re-run patch
 2021-02-04 08:42:43 +05:30
Brian Pond
9e5dfc2859
refactor: Remove unused args in get_doc_files (#12298) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-02-03 22:32:01 +05:30
mergify[bot]
53ec2b2ff6
Merge pull request #12320 from alyf-de/fetch_contacts_auto_repeat_dev 
fix: Fetch contacts in Auto Repeat
 2021-02-03 16:49:22 +00:00
dependabot-preview[bot]
fdfdc6fa7f
chore(deps): [security] bump bleach from 3.1.4 to 3.3.0 (#12309) 
Bumps [bleach](https://github.com/mozilla/bleach) from 3.1.4 to 3.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/mozilla/bleach/releases)
- [Changelog](https://github.com/mozilla/bleach/blob/master/CHANGES)
- [Commits](https://github.com/mozilla/bleach/compare/v3.1.4...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-02-03 22:10:42 +05:30
barredterra
3ad56b2d5f fix: fetch contacts in auto repeat 2021-02-03 15:46:00 +01:00
DANY ROBERT
adaf43a779
fix: remove 'cond' parameter 2021-02-03 16:10:22 +05:30
prssanna
4e55c6c50b fix: show NaN if percentage diff is undefined 2021-02-03 15:49:43 +05:30
mergify[bot]
399311a699
Merge pull request #12315 from anupamvs/common-js-variable-scope 
fix: variable scope issue
 2021-02-03 10:01:34 +00:00
DANY ROBERT
d64c555515
NaN to None 2021-02-03 15:01:33 +05:30
Anupam
b440f1eb37 fix: variable scope issue 2021-02-03 14:45:44 +05:30
Prssanna Desai
4b73a7f2fb
Merge branch 'develop' into patch-1 2021-02-03 11:48:18 +05:30
Saurabh
d2b61f333c
Merge pull request #12293 from saurabh6790/validate-user-key 
fix: validate the key type while updating the password
 2021-02-03 11:41:24 +05:30
mergify[bot]
c3ba0ec68c
Merge pull request #12304 from amenat/update_docstrings 
docs: update docstring of top level module
 2021-02-02 16:58:15 +00:00
Ankush Menat
de0f7fd9d9
docs: update docstring of top level module 2021-02-02 22:04:41 +05:30
Faris Ansari
3129543185
Merge pull request #12307 from netchampfaris/force-reload-workspace-doctype 
fix(patch): Force reload Workspace doctypes
 2021-02-02 20:32:38 +05:30
Faris Ansari
5efe3a3bae fix(patch): Force reload Workspace doctypes 
Reload after rename doc doesn't actually update the workspace doctypes.
Fixing by adding the force flag.
 2021-02-02 20:31:22 +05:30
DANY ROBERT
42836a2ec8
Remove timespan filter. 2021-02-02 19:20:25 +05:30
DANY ROBERT
da7b930e53
Update number_card.py 2021-02-02 19:18:22 +05:30
Suraj Shetty
bdcb769c18 fix: Check if css file exists 2021-02-02 18:17:02 +05:30
Suraj Shetty
66194eaac9
Merge pull request #12303 from surajshetty3416/fix-rename-patch 2021-02-02 18:10:05 +05:30
Suraj Shetty
3504fcf7b4 fix: Desk Page rename patch 2021-02-02 18:08:06 +05:30
Saurabh
5087fef2a4
Merge branch 'develop' into clear-session-on-password-reset 2021-02-02 17:50:28 +05:30
Prssanna Desai
3868b1978c
Merge pull request #12288 from shariquerik/on-event-creation-assign-to-fix 2021-02-02 17:41:30 +05:30
Suraj Shetty
99fe0412b3
fix(patch): Pass if table is missing (#12302) 2021-02-02 17:39:05 +05:30
mergify[bot]
d3650b9051
Merge pull request #12301 from resilient-tech/fix-patch 
fix: reload workspace link in patch
 2021-02-02 11:47:06 +00:00
Shariq Ansari
8985130c80
Update frappe/public/js/frappe/views/interaction.js 
Co-authored-by: Prssanna Desai <prssud@gmail.com>
 2021-02-02 16:27:52 +05:30
Sagar Vora
69d942a488 fix: reload modified patch 2021-02-02 15:59:42 +05:30
Prssanna Desai
6b4ed06527
Merge pull request #12274 from this-gavagai/form-title-fix 2021-02-02 14:51:32 +05:30
Prssanna Desai
1b6d8e3b2d
Merge pull request #12275 from KieranSmith892/develop 2021-02-02 14:48:50 +05:30
Prssanna Desai
ff44523b04
Merge pull request #12278 from hasnain2808/fix-auto-login-redirect 2021-02-02 14:30:25 +05:30
Suraj Shetty
b9b00ffed4 Merge branch 'develop' of https://github.com/frappe/frappe into develop 2021-02-02 12:51:53 +05:30
Suraj Shetty
1cdca0c07e chore: Bump frappe-charts version 2021-02-02 12:51:48 +05:30
Sagar Vora
75f9eeeeaa fix: reload workspace link in patch 2021-02-02 12:31:13 +05:30
Prssanna Desai
cb3e57f914
Merge pull request #12300 from prssanna/patch-fixes 2021-02-02 11:27:52 +05:30
prssanna
f4362dbb26 fix: reload user and role doctype 2021-02-02 11:25:10 +05:30
prssanna
be634c99e1 fix: ignore route conflict validation while renaming desk page to workspace 2021-02-02 11:24:49 +05:30