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

35209 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sagar Vora
af41d9f8a5 fix: stricter validation 2021-11-11 12:29:49 +05:30
Sagar Vora
9503e7788a fix: restore validate_link 2021-11-11 12:24:22 +05:30
mergify[bot]
20e3ed9ff9
revert: "feat(minor): Implement __getitem__ in Base Document" (backport #14945) (#14946) 
* Revert "feat(minor): Implement __getitem__ in Base Document (#14855)"

This reverts commit 583a7ef23923d362c85beeabe57703c2d5b12a65.

(cherry picked from commit d165fb3d477e65f7a395118f69278f2cb5c7f4e5)

* fix: keyerror in auto email report

(cherry picked from commit aac20f5d159875a5f3c9b4a6d74beec390e617dd)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-11 12:13:52 +05:30
mergify[bot]
318d4faed2
Merge pull request #14874 from pateljannat/github-email-issue 
fix: Github API endpoint
 2021-11-10 11:19:59 +00:00
mergify[bot]
6457d58ece
Merge pull request #14928 from ankush/modified_nsm 
fix: dont update `modified` for changes due to nsm implementation
 2021-11-09 12:40:42 +00:00
Ankush Menat
6a50442936 refactor(minor): better variable names 2021-11-09 17:11:41 +05:30
Ankush Menat
fb929566cc fix: don't change modified when updating lft/rgt 
These are implementation details and not explicitly modified by user.
IMO these `modified` value shouldn't change just because node has moved
around due to NSM change.

as
 2021-11-09 17:11:39 +05:30
mergify[bot]
1787128b44
Merge pull request #14926 from codescientist703/remove-chat 
chore: Remove Chat Module
 2021-11-09 10:30:57 +00:00
codescientist703
e8c25cf0f3 fix: added socketio initialization 2021-11-09 15:09:12 +05:30
Jannat Patel
7771e0b2c9 fix: removed unused imports 2021-11-09 14:49:27 +05:30
Nihal Mittal
6fdd34630e
Merge branch 'develop' into remove-chat 2021-11-09 14:37:42 +05:30
Jannat Patel
845c589497 test: ignore permissions 2021-11-09 14:33:41 +05:30
codescientist703
6232bfbd39 fix: remove unused assets 2021-11-09 14:33:28 +05:30
Anurag0911
8b7629c064
feat: Encrypted Backups (#14513) 
* feat: backup-encryption

* fix: Using encryption key and Minor changes.

* fix: Sider.

* fix: Closing curly brace does not appear on the same line as the subsequent block.

* fix: Review Suggestions.

* fix: Minor changes.

* chore: Icon

* fix: Icon and Privileges Changes.
 2021-11-09 13:58:57 +05:30
codescientist703
ed13182573 chore: Remove Chat Module 2021-11-09 13:44:57 +05:30
Jannat Patel
08faf731e0 test: github login 2021-11-09 13:38:17 +05:30
mergify[bot]
6740f1c360
Merge pull request #14913 from Aradhya-Tripathi/at/query/functions 
refactor: converting raw SQL queries
 2021-11-09 06:41:41 +00:00
Suraj Shetty
31d5d81e31
revert: "chore: Remove chat module" (#14922) 2021-11-09 10:30:00 +05:30
Aradhya-Tripathi
7ba23ed39d fix: fixed sider issues 2021-11-09 10:21:15 +05:30
Aradhya-Tripathi
5e818198be refactor: converted queries in rename doc 2021-11-09 10:19:54 +05:30
Rushabh Mehta
da6b86ef4f
Merge pull request #14411 from codescientist703/remove-chat 
chore: Remove chat module
 2021-11-09 09:54:22 +05:30
Jannat Patel
88d8c1e56a fix: public info api 2021-11-08 20:17:07 +05:30
mergify[bot]
04ac92634b
Merge pull request #14879 from alyf-de/add-date-format 
feat: add format dd.mm.yy to dateutils
 2021-11-08 12:11:47 +00:00
Aradhya-Tripathi
34a5e447e6 refactor: converted queries in property setter 2021-11-08 17:12:00 +05:30
Aradhya-Tripathi
dbe6e81d67 refactor: converted queries in tags 2021-11-08 17:11:46 +05:30
Aradhya-Tripathi
18fd175c7c fix: fixed erroneous query 2021-11-08 16:04:37 +05:30
Aradhya-Tripathi
241104bf6e refactor: Converted query in user.py 2021-11-08 15:57:39 +05:30
Aradhya-Tripathi
97f85c88e2 feat: Added tests for Criterion objects in get_value 2021-11-08 15:57:06 +05:30
Aradhya-Tripathi
b8340fff58 feat: Added support for Criterion objects as fieldnames 2021-11-08 15:56:20 +05:30
mergify[bot]
b3bc419a11
fix: for frappe._dict deepcopy; Opened issue 14833 (#14889) (#14914) 
* fix: DFP "__deepcopy__" exception" within _dict __getattr__

* fix: for frappe._dict deepcopy; Opened issue 14833 #14889 (accepted gavindsouza suggestion)

Co-authored-by: gavin <gavin18d@gmail.com>

* fix: for frappe._dict deepcopy; Opened issue 14833 #14889 (accepted gavindsouza suggestion)

Co-authored-by: gavin <gavin18d@gmail.com>

Co-authored-by: gavin <gavin18d@gmail.com>
(cherry picked from commit db6996a763ec2ffd85470d991f860192e87ca7e3)

Co-authored-by: Development for People <47140294+developmentforpeople@users.noreply.github.com>
 2021-11-08 11:18:55 +01:00
Aradhya-Tripathi
4eabb7129e feat: Added concat_ws in frappe.qb 2021-11-08 13:55:17 +05:30
Aradhya-Tripathi
a29d7bbd82 fix: merge conflicts 2021-11-08 12:02:54 +05:30
Aradhya-Tripathi
0b5b234e93 Merge branch 'develop' of https://github.com/Aradhya-Tripathi/frappe into at/queries 2021-11-08 11:52:29 +05:30
Aradhya-Tripathi
a4a638de6a refactor: converting select queries 2021-11-08 11:46:29 +05:30
mergify[bot]
b0de865eb2
Merge pull request #14883 from lukptr/prepared-report-read-only-develop 
feat: prepared report read from replica (backport to develop)
 2021-11-08 05:37:30 +00:00
mergify[bot]
177f85b4cd
Merge pull request #14888 from abdgad/auto_email_report-cleanup 
refactor: minor code cleanup in auto_email_report.py
 2021-11-08 05:31:44 +00:00
Sagar Vora
77e0b59525
fix: minor fixes to whitelisted methods (#14569) 2021-11-07 19:13:26 +05:30
abdgad
29785af915
refactor: minor code cleanup in auto_email_report.py 2021-11-06 11:41:46 +01:00
lukptr
e907f77ccd feat: prepared report read from replica 2021-11-05 15:35:43 +07:00
mergify[bot]
2a8a979a09
Merge pull request #14594 from resilient-tech/fix-api 
fix: minor fixes for API Access section in User
 2021-11-05 04:35:05 +00:00
barredterra
a0d2e19b95 feat: add dateformat dd.mm.yy 2021-11-04 17:16:54 +01:00
mergify[bot]
b76f79c06c
Merge pull request #14547 from Aradhya-Tripathi/query-conversion 
refactor: Converting raw SQL queries using frappe ORM and frappe.qb
 2021-11-03 12:06:35 +00:00
Gavin D'souza
6d212c2d02 refactor(minor): Don't re-write var, use set_value 
* doctype variable was being re-defined which broke functionality. Fixed
  that, re-used getattr for consistency
* Use set_value instead of raw query
* Style fixes
 2021-11-03 16:13:09 +05:30
Gavin D'souza
e989bfa41d style: Indents & file headers 2021-11-03 16:12:27 +05:30
Jannat Patel
49e084868b fix: indentation and filter condition 2021-11-03 15:24:23 +05:30
mergify[bot]
46dcf0eccd
Merge pull request #14868 from revant/build-on-rel 
chore: migrate docker to github actions
 2021-11-03 09:42:59 +00:00
Jannat Patel
f3f01d1978 fix: github api endpoint 2021-11-03 14:58:16 +05:30
Revant Nandgaonkar
9b68a9e5b4 ci: change GITHUB_PAT to CI_PAT 2021-11-03 13:51:46 +05:30
mergify[bot]
91f446ef04
Merge pull request #14356 from shariquerik/primary-navbar-css-fix 
fix: Fixed css for Primary Navbar template
 2021-11-03 05:57:57 +00:00
mergify[bot]
92ad320917
Merge pull request #14489 from shariquerik/custom-report-dependency-fix 
fix: Multi level custom report fix
 2021-11-02 14:15:51 +00:00