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

41326 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Abdo Hamoud
9324fcecaf
fix: icon picker filter when loop on all icons (#20163) 2023-02-27 17:15:06 +05:30
Ankush Menat
9321a2e86a fix(UX): Better message for read only mode 
- The default message keeps confusing user because it doesn't contain the word "site update" which is usually the reason for putting site in read only mode.
- Also fixes annoying popup while opening notifications in read only mode.

[skip ci]
 2023-02-27 16:16:22 +05:30
Ritwik Puri
6a37c19d0e
fix: dont try to connect to server again when appending email to sent folder 2023-02-27 12:52:13 +05:30
Shariq Ansari
4c3cfd7873
fix: download upload button is hidden if grid row length is < 50 (#20164) 2023-02-27 12:23:41 +05:30
Suraj Shetty
f617c8e88b
Merge pull request #20152 from surajshetty3416/print-grid-overflow-issue 2023-02-24 17:03:51 +05:30
Suraj Shetty
305628bb21 fix: Remove fallback empty string for value 
- Might cause issue if the value is 0 (a number)
 2023-02-24 17:00:20 +05:30
Ankush Menat
34beb65009
fix: link webhook logs with webhook document (#20155) 2023-02-24 16:30:29 +05:30
Ankush Menat
27093cf606
Merge pull request #20129 from ankush/docreminders 
feat: Document Reminders
 2023-02-24 14:44:20 +05:30
Ankush Menat
e7f604ef48 refactor: rename DocReminder -> Reminder 2023-02-24 13:47:58 +05:30
Ankush Menat
2b32dc054c chore: rename "field" -> "notification_log" 
field makes no sense here.
 2023-02-24 12:40:56 +05:30
Ankush Menat
c1740955f7 fix(UX): Set default time to 1hr and update selector 2023-02-24 12:40:56 +05:30
Ankush Menat
9a3a16f25b fix(UX): enable datetime selection on custom period only 2023-02-24 12:40:56 +05:30
Ankush Menat
73cd823a0a feat: Document Reminders 
There is `Notification` doctype but it doesn't work so well for small
one-off reminders. Imagine these scenarios:

1. Remind me to follow up on this lead in 5 days.
2. Remind me to revoke temporary access I am giving to this user.

For such scenarios, I am proposing a simple reminder system built into
framework. All it does is:

1. For any document you can set a reminder with time and message.
2. When time comes you'll get a system notification with message and
   link to the document.

Permissions:
1. Users can only see their own set reminders.
 2023-02-24 12:40:54 +05:30
Ankush Menat
0925453adb chore: format doctype controller boilerplate 2023-02-24 11:39:27 +05:30
Ankush Menat
23bfd5d1b6 fix: doctype editing message 2023-02-24 11:39:27 +05:30
Suraj Shetty
d217c94a08 fix(print): Overflow wrap anywhere if a long word is found 
overflow-wrap: anywhere; breaks anywhere in the string intead of just word end.
This is helpful to avoid breaking of print grid when an unexpectedly long word is passed.
 2023-02-24 11:04:19 +05:30
Jannat Patel
19249aec4e
fix: send updates from google calendar events (#20075) 2023-02-23 18:10:08 +05:30
Ankush Menat
9ec643f8cb
Merge pull request #20091 from deepeshgarg007/webhook_request_log_update 
refactor: Better webhook loging
 2023-02-23 16:48:50 +05:30
Suraj Shetty
7d5c98c206 feat: Add UTM tracking parameters to internal links in newsletters 
- Also, extend web page view to store UTM tracking data.
 2023-02-23 16:19:07 +05:30
Ankush Menat
22f5a60ebb feat: make webhook requests log clearable 2023-02-23 15:56:13 +05:30
Ankush Menat
1fbd6badd1 fix: log full traceback 2023-02-23 15:56:06 +05:30
Ankush Menat
e6d5f1fe2e revert: engine change 2023-02-23 15:56:06 +05:30
Deepesh Garg
66ef29907f chore: Better webhook loging 2023-02-23 15:56:06 +05:30
mergify[bot]
3a130abfc5
fix: extension extracted if at least one dot, because if not dot (#19946) (#20142) 
(cherry picked from commit 53c41e0ce6bf9985786a570c43fd32c79332c44c)

Co-authored-by: Jaime <developmentforpeople@gmail.com>
 2023-02-23 15:03:11 +05:30
Suraj Shetty
b397ec3858 feat: Track count of views on newsletter emails 2023-02-23 13:45:53 +05:30
Suraj Shetty
d978450a15
Merge pull request #20138 from surajshetty3416/fix-modified-conflict-develop 2023-02-23 10:45:56 +05:30
Suraj Shetty
4bda4bd8c3 fix: Reload form on "doc_update" trigger to avoid timestamp conflict 2023-02-23 10:36:01 +05:30
Suraj Shetty
71d3448200 fix(UX): Freeze form while applying workflow 2023-02-23 10:34:05 +05:30
gavin
3406b6d752
fix(db_query): selecting linked fields as alias (#20085) 
* fix(db_query): Don't track link_tables separately

Treat all joined tables the same, expand the fieldnames whether Table or
Link type with their respective table names

* fix(db_query): Add link join conditions for all relevant fields

* Revert "fix(db_query): Add link join conditions for all relevant fields"

This reverts commit 79622ab4cea5aa73a24f4ba7afde8e83510a79fb.

* Revert "fix(db_query): Don't track link_tables separately"

This reverts commit b8364f781e52e7ffaa7faa8878ef409b023f2288.

* fix: Check link field tables permissions in permlevel checks

* test: Fix, add for test_permlevel_fields

Previous assertion was wrong :')
added extra to check if access is fine
 2023-02-22 22:14:15 +05:30
Devin Slauenwhite
d5ce94d6a5
feat: disable comment count on list view settings. (#20039) 
* feat: add list view setting disable column count.

* fix: cast using sbool

* fix: make modified last-child if comment_count is disabled.
 2023-02-22 18:17:45 +05:30