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

35613 commits

This branch
This branch
All branches
Author SHA1 Message Date
mergify[bot]
5172e9e5d2
Merge pull request #15179 from nextchamp-saqib/fix-sql-mask-error 
fix: IndexError while handling sql timeout error
 2021-12-03 13:27:19 +00:00
Suraj Shetty
522227a740
Merge branch 'develop' into fix-sql-mask-error 2021-12-03 18:08:52 +05:30
Summayya Hashmani
db951d2369
frefactor: padd separate padding (#15178) 
Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-12-03 11:52:07 +00:00
Saqib Ansari
6f7d030e82 fix: IndexError while handling sql timeout error 2021-12-03 16:06:23 +05:30
mergify[bot]
75cebace8c
Merge pull request #15157 from pateljannat/onboarding-step-enhancement 
fix: form tour field in onboarding step
 2021-12-03 08:52:41 +00:00
mergify[bot]
c6187150d3
Merge pull request #15165 from netchampfaris/newsletter-markdown 
fix(newsletter): use md_to_html instead of markdown
 2021-12-03 08:47:51 +00:00
mergify[bot]
8bce576eed
Merge pull request #15125 from ankush/max_attach 
fix(ux): validate max_attachment count on doctype
 2021-12-03 08:35:40 +00:00
Suraj Shetty
aa7f6348cd
Merge branch 'develop' into newsletter-markdown 2021-12-03 13:58:47 +05:30
Suraj Shetty
b4be189eae
Merge branch 'develop' into onboarding-step-enhancement 2021-12-03 13:58:26 +05:30
Suraj Shetty
8a84ae4f08
ci: Use node version 14 to avoid node-sass failure in patch testing build (#15176) 2021-12-03 13:57:57 +05:30
Suraj Shetty
49a790d47c
Merge branch 'develop' into onboarding-step-enhancement 2021-12-03 13:36:15 +05:30
Suraj Shetty
e4ad02f7e7
Merge branch 'develop' into newsletter-markdown 2021-12-03 13:29:59 +05:30
Faris Ansari
51c4738a04 fix(newsletter): use md_to_html instead of markdown 
because valid html is valid markdown and markdown method
doesn't convert markdown if it encounters some html tags
 2021-12-02 18:01:43 +05:30
rohitwaghchaure
dad4273997
Merge pull request #15162 from ankush/user_customization 
feat: reset user-wise grid config to default
 2021-12-02 16:59:03 +05:30
Ankush Menat
e0fadef11b feat: reset user grid config to default 2021-12-02 16:19:38 +05:30
Ankush Menat
66321b075e fix: show "Button" field in user grid config 2021-12-02 16:19:23 +05:30
Jannat Patel
a9b433e819 fix: semicolon 2021-12-02 11:42:49 +05:30
Jannat Patel
2fe2db5f94 fix: form tour field in onboarding step 2021-12-02 11:17:31 +05:30
Ankush Menat
ecca7f287e
chore: better message for system updates (#15154) 
closes https://github.com/frappe/frappe/issues/10997

[skip ci]
 2021-12-02 11:09:33 +05:30
mergify[bot]
ba094e76d1
fix: Add xcall to Frappe's web bundle (backport #15146) (#15152) 
Co-authored-by: Omar Younis <oimyounis@gmail.com>
 2021-12-02 10:58:36 +05:30
mergify[bot]
fe7b0719cd
Merge pull request #15150 from ruchamahabal/fix-time-format 
fix: Add fallback option for time format when system defaults are not set
 2021-12-02 05:28:08 +00:00
Rucha Mahabal
9e6cefba6c fix: Add fallback option for time format when system defaults are not set 2021-12-02 10:01:20 +05:30
Ankush Menat
f33be7592f refactor: common JS controller for DocType and customize form 2021-12-01 19:10:11 +05:30
Manuel
3a34bfc520
Fix: copy_email_data patch #15106 (#15115) 
Reload DocType `Email Account` in patch.
Changed `modified` in json files.

Removed linking of `imap_folder` in `Email Flag Queue` this connection
seems not necessary at this point. Also removed all parts that create
this connection.
 2021-12-01 12:41:27 +00:00
Ankush Menat
2f6b57cc0a fix(ux): validate max_attachment on doctype controller 2021-12-01 17:07:37 +05:30
Ankush Menat
db101e5ec3 fix(ux): ensure max_attachments is more than no of attach fields 2021-12-01 17:04:31 +05:30
mergify[bot]
5715bbda50
fix: multiple time global search minimize screen freeze (backport #15133) (#15134) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
 2021-11-30 22:50:43 +05:30
mergify[bot]
62247431ca
fix: scrolling issues after minimize global search (backport #15127) (#15131) 
Co-authored-by: Bhavesh Maheshwari <bhavesh.freelancer95863@gmail.com>
 2021-11-30 17:38:47 +05:30
mergify[bot]
029cba6204
Merge pull request #15128 from ruchamahabal/reset-lft-rgt 
fix: reset lft rgt in copy doc
 2021-11-30 10:23:15 +00:00
mergify[bot]
41f457f309
Merge pull request #15071 from saxenabhishek/aks-query-2 
refactor: convert doctype db.sql calls
 2021-11-30 10:19:06 +00:00
Suraj Shetty
2410dc66c1
style: Fix indentation 2021-11-30 15:36:06 +05:30
Rucha Mahabal
23ce93be73 fix: reset lft rgt in copy doc 2021-11-30 15:28:16 +05:30
saxenabhishek
9f183e6cf2 style: follow simple indenting standard 2021-11-30 14:16:13 +05:30
mergify[bot]
76cc6bf10b
Merge pull request #15104 from ankush/cancel_rest 
fix: allow cancelling by PUT docstatus=2
 2021-11-30 07:51:10 +00:00
abhishek
1bb8dcf176 refactor: convert core notifications db.sql calls 
get_unseen_likes()
get_unread_emails()
 2021-11-30 12:43:30 +05:30
abhishek
8eea80e14e refactor: convert doctype user db.sql calls 2021-11-30 12:43:23 +05:30
Ankush Menat
124407a70a fix: update EPS records when renaming doc 2021-11-30 11:16:46 +05:30
leela
72fa9a3c19 fix: Move site setup into background to fix timeouts 
Provide an option to trigger site setup as a background task.
 2021-11-30 10:34:04 +05:30
mergify[bot]
c616900c0a
Merge pull request #15102 from hrwX/disable_update_notification 
feat: Add an option to disable notification
 2021-11-30 03:45:51 +00:00
Suraj Shetty
ae420cc7e1
Merge branch 'develop' into disable_update_notification 2021-11-30 08:50:58 +05:30
Suraj Shetty
7047cb8301
refactor: Deferred insert for route history (#15120) 2021-11-30 08:33:31 +05:30
hrwx
db4476fc5f fix: reduce api call 2021-11-29 17:28:40 +00:00
hrwx
fa317538a9 Merge branch 'develop' of github.com:frappe/frappe into disable_update_notification 2021-11-29 17:02:14 +00:00
mergify[bot]
cb3533556b
Merge pull request #15114 from surajshetty3416/fix-deferred-insert 
fix: Use separate API to insert route history
 2021-11-29 13:38:17 +00:00
Ankush Menat
2a08f35836 fix: allow cancelling by PUT docstatus=2 2021-11-29 18:44:10 +05:30
Suraj Shetty
aa40abadb1 refactor: Simplify method naming 2021-11-29 17:06:29 +05:30
Suraj Shetty
0e32d52e3a fix: Use separate API to insert route history 2021-11-29 16:38:15 +05:30
mergify[bot]
ed916090b8
Merge pull request #14457 from Aradhya-Tripathi/at/aggregations 
refactor: removed aggregation functions at db level
 2021-11-29 09:25:25 +00:00
Gavin D'souza
43fc713dd7 refactor: Remove Aggregation methods from DB API 
* Make it DRY & make it "better"
* Add to patches.txt so the patch runs :')
* Style fixes - tabs > spaces for consistency, removed unnecessary
  blocks
 2021-11-29 13:53:27 +05:30
Aradhya
e503d81173 perf: reduced no. of db calls 2021-11-29 13:07:31 +05:30