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

41360 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shariq Ansari
2d3efd34bd
Merge branch 'develop' into filter-with-content-value 2023-03-03 11:43:57 +05:30
Shariq Ansari
e589ef87f6 fix: compare with content value for Link fieldtypes 2023-03-03 11:39:57 +05:30
Shariq Ansari
9da09fd044
Merge pull request #20231 from shariquerik/better-error-msg 2023-03-03 11:00:19 +05:30
Ritwik Puri
b17af2c329
fix: token cache expiry calculation (#20228) 2023-03-02 23:23:36 +05:30
Shariq Ansari
52db146094
Merge branch 'develop' into better-error-msg 2023-03-02 19:36:53 +05:30
Shariq Ansari
a6db20fe3b fix(DX): better error message for notification from reference doctype 2023-03-02 19:35:18 +05:30
Ankush Menat
6022705093
fix: log raw text reponse instead of parsing JSON (#20226) 
Not every service responds in JSON, we shouldn't expect a JSON response.

[Skip ci]
 2023-03-02 16:59:29 +05:30
Ritwik Puri
92ca30074b
fix: dont get message attribute in error string in has_login_limit_exceeded 2023-03-02 15:59:34 +05:30
Suraj Shetty
2a81365adb
Merge pull request #20217 from frappe/mergify/bp/develop/pr-20215 2023-03-02 11:12:38 +05:30
Suraj Shetty
177e419b16 fix: Use word-break property for print media to avoid overflow 
(cherry picked from commit 0ed25cd36862247a2c262c263db64d387bd8b799)
 2023-03-02 05:42:13 +00:00
Sagar Vora
70ede18942
fix: improved implementation of between filter (#20190) 2023-03-02 09:51:02 +05:30
Shariq Ansari
f8dc121fbe
Merge pull request #20065 from Alchez/feat-number-card-workspace-dev 2023-03-01 19:33:45 +05:30
Shariq Ansari
c11c2303ad
Merge branch 'develop' into feat-number-card-workspace-dev 2023-03-01 19:16:21 +05:30
Shariq Ansari
f1a9e51687 test: UI test for number_card workspace block 2023-03-01 19:14:42 +05:30
Jaime
b10aea665e
fix: check if show_alert is returned for unseen error log alert (#20209) 2023-03-01 19:07:11 +05:30
Ritwik Puri
906b0ac310
Merge pull request #20205 from gavindsouza/misc-fixes-2023-001 
fix: Attempt to run after_hooks only if site is initialized
 2023-03-01 18:49:04 +05:30
Abdo Hamoud
6f8af9ca12
fix:child table issue on mobile touch in RTL (#20112) 
Co-authored-by: Shariq Ansari <sharique.rik@gmail.com>
 2023-03-01 18:17:25 +05:30
Ankush Menat
8a4c348808 fix: set owner and modified_by for rq job 2023-03-01 17:45:22 +05:30
Gavin D'souza
9e87596cf1 fix: Run after_hooks only if site is initialized 2023-03-01 16:52:58 +05:30
Ankush Menat
9c28368213
chore: simpler "*" check condition (#20201) 2023-03-01 15:48:02 +05:30
Bob Schulze
9df41d9e8e
fix mapview display (#20187) 
Co-authored-by: alias <dedaluk2>
 2023-03-01 15:37:46 +05:30
Ankush Menat
d8ae5cd187
Revert "chore(Database): simplify condition" (#20200) 2023-03-01 15:26:24 +05:30
Ankush Menat
5eca6e0b63 fix(UX): format date in user's format and TZ 
[skip ci]
 2023-03-01 14:38:50 +05:30
Sagar Vora
0446cda2c4
fix: use DOMParser instead of createElement to remove script and style (#20196) 2023-03-01 14:30:46 +05:30
Shariq Ansari
f65230fcb7
Merge pull request #20198 from shariquerik/load-workspace-skeleton-fix 2023-03-01 14:27:38 +05:30
Shariq Ansari
f263e3ba5e
Merge branch 'develop' into load-workspace-skeleton-fix 2023-03-01 14:08:08 +05:30
Shariq Ansari
7369671855 fix: also load workspace sidebar skeleton on workspace sidebar 2023-03-01 14:07:03 +05:30
Shariq Ansari
c2826d3046 fix: only load workspace skeleton on workspace body 2023-03-01 13:49:29 +05:30
Sagar Vora
512f86d747
Merge pull request #20192 from resilient-tech/simplify-condition 
chore(Database): simplify condition
 2023-03-01 12:11:19 +05:30
Sagar Vora
ad90ea888a chore(Database): simplify condition 2023-03-01 12:11:10 +05:30
Sagar Vora
e0d7c9d901
chore: remove dead helper function (#20191) 2023-03-01 12:05:30 +05:30
Suraj Shetty
1daa78d0a0
Merge pull request #20179 from surajshetty3416/newsletter-analytics 2023-02-28 19:42:56 +05:30
Ritwik Puri
e7f28b08c9
fix: cast primary value in compare util if fieldtype is present (#20092) 
* fix: cast primary value in compare util if fieldtype is present

* test: add test for date & datetime filters when using evaluate_filters
 2023-02-28 16:50:52 +05:30
Suraj Shetty
7abdad3282 Merge branch 'develop' of https://github.com/frappe/frappe into newsletter-analytics 2023-02-28 14:31:03 +05:30
Suraj Shetty
c4e31f435b feat: Add grouping based on source 
And a formatter for source column
 2023-02-28 14:17:19 +05:30
Suraj Shetty
540bf5a984 fix: Do not update modified while updating total views 2023-02-28 14:17:19 +05:30
Suraj Shetty
6c8f88b8cd refactor: Remove UTM references just set source in web page view to simplify things 2023-02-28 14:17:16 +05:30
Suraj Shetty
3eff93ea6e refactor: Only send email_read_tracker_url instead of method 2023-02-28 14:16:46 +05:30
Suraj Shetty
ad2d651e45 feat: Add Group By option to Website Analytics report 
- Also fixed order_by of main query
 2023-02-28 14:15:41 +05:30
Suraj Shetty
b9f632aa8d fix: Rename is_internal_link to is_site_link 2023-02-28 14:15:41 +05:30
Suraj Shetty
dc58680176 fix: Unique visit logic 2023-02-28 14:15:41 +05:30
Suraj Shetty
afd55a97fb fix: Web page view creation 
- Set path from backend via "Referer" to avoid bad data
- Add visitor_id to improve unique visit detection
 2023-02-28 14:15:41 +05:30
Shariq Ansari
d46ff2ed24 fix: include number_card in cleanup logic 2023-02-28 13:41:21 +05:30
Shariq Ansari
d37423916c fix: prioritize workspace_number_card doctype while installing 2023-02-28 13:40:40 +05:30
Shariq Ansari
0982628141 fix: added number_card icon 2023-02-28 11:55:43 +05:30
Dany Robert
d8ca421159
fix(workflow): move dom unfreeze to finally (#20161) 
* fix(workflow): move dom unfreeze to `finally`

* fix: keep only unfreeze in `finally`
 2023-02-28 11:54:46 +05:30
mergify[bot]
133b3bce7d
fix: Cancel All and Dashboard views title translations (#20173) (#20175) 
(cherry picked from commit 7253a10d07e7ad27f8b473af7e10fecd88080409)

Co-authored-by: gsi-joel <126265080+gsi-joel@users.noreply.github.com>
 2023-02-28 11:41:13 +05:30
Shariq Ansari
863987e6bb
Merge branch 'develop' into feat-number-card-workspace-dev 2023-02-28 10:57:38 +05:30
Shariq Ansari
7abb3e48e1 fix: only allow to add existing number card on workspace 
separated logic for dashboard and workspace implementation
 2023-02-28 10:56:56 +05:30
Shariq Ansari
bf6bd60b89 fix: keep number_card action only in readonly mode (not in customize mode) 2023-02-28 10:54:57 +05:30