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

18780 commits

Author SHA1 Message Date
Suraj Shetty
5ff6d3fa0a
Merge branch 'develop' into notification_while_import 2020-06-29 19:53:18 +05:30
Sahil Khan
94bfc16bfb fix: declare site_config_backup_path variable before referencing 2020-06-29 19:30:43 +05:30
Suraj Shetty
5712a22a0e
Merge branch 'develop' into notification_while_import 2020-06-29 17:23:49 +05:30
mergify[bot]
389876f0a9
Merge pull request #10816 from prssanna/chart-start-date-fix 
fix(Dashboard Chart): include start date in chart result
 2020-06-29 11:11:20 +00:00
Faris Ansari
a317f675e7
Merge pull request #10663 from gavindsouza/dont-allow-downgrade 2020-06-29 14:30:20 +05:30
Gavin D'souza
478b87e5be fix: add verbosity in is_downgrade 2020-06-29 13:20:00 +05:30
mergify[bot]
6fa6d2edf8
Merge pull request #10829 from AfshanKhan/FR_ISS_204690 
fix: handle condition that "Setters" could be "Array" or "Object"
 2020-06-29 04:23:12 +00:00
mergify[bot]
af467d2cc9
Merge pull request #10833 from Codebrahma/fix_infinite_recursion 
fix(linked_docs): infinite recursion due to loops in linked docs graph
 2020-06-29 04:19:34 +00:00
Suraj Shetty
4ca09d4a34
Merge branch 'develop' into assignment_rule 2020-06-29 09:21:57 +05:30
Rushabh Mehta
62a8774bb1
feat(role permission): if desk access is removed from a role, attempt to remove it from users too (#10838) 
* feat(minor): if desk access is removed from a role, attempt to remove it from users too

* fix(minor): exception for install;

* fix(minor): exception for install
 2020-06-29 02:43:23 +00:00
michellealva
500191f7fb fix: merge error in assigment rule 2020-06-28 11:09:13 +05:30
Anand Narayan
fc69f77f73 fix(linked_docs): infinite recursion due to loops 2020-06-27 22:05:24 -07:00
mergify[bot]
c96e238c04
Merge pull request #10836 from revant/feat-postgres-backup-restore 
feat: backup and restore postgres site
 2020-06-27 17:30:57 +00:00
Afshan
620fafeb96 fix: divide filter fields into 3 columns using index. 2020-06-27 22:19:27 +05:30
Revant Nandgaonkar
ec881a4977 fix: remove unused variable 2020-06-27 20:47:53 +05:30
Chinmay Pai
f8377a515a
Merge pull request #10837 from Mangesh-Khairnar/disable-google-drive 2020-06-27 20:10:49 +05:30
Mangesh-Khairnar
e0ad885944 fix: allow users to disable google drive sync 2020-06-27 19:20:38 +05:30
Afshan
f146d1ffb2 style: format according to sider 2020-06-27 18:01:26 +05:30
Revant Nandgaonkar
1bfa56cd0c feat: backup and restore postgres site 2020-06-27 16:01:30 +05:30
Deepesh Garg
4ce29c3120 fix: Notificaions on data import 2020-06-26 22:41:29 +05:30
Afshan
346937aed7 fix: handle condition that "Setters" could be "Array" or "Object" 2020-06-26 19:28:48 +05:30
prssanna
b482b2ce5c fix: test for daily charts 2020-06-26 17:47:59 +05:30
sahil28297
d39da928d7
Merge pull request #10825 from saurabh6790/email_notifications 
feat: do not send notifications for existing emails
 2020-06-26 16:47:13 +05:30
Saurabh
ad206edb20 feat: do not send notification for existing emails 2020-06-26 16:33:55 +05:30
Suraj Shetty
70871a344a
fix: Escape user input before regex search (#10812) 2020-06-26 10:33:45 +05:30
prssanna
1379a722f5 fix: append start date only if timegrain is daily 2020-06-26 00:03:35 +05:30
prssanna
04d0ce54af fix: include start date in chart result 2020-06-25 23:13:57 +05:30
sahil28297
c63a3e4993
Merge pull request #10808 from surajshetty3416/fix-pretty-date 
fix(prettyDate): Convert datetime to user's timezone first
 2020-06-25 12:45:15 +05:30
mergify[bot]
bf2ecc4e1e
Merge pull request #10668 from saurabh6790/script-naming 
fix: scrub script name while creating scheduler event
 2020-06-25 07:05:44 +00:00
Suraj Shetty
f328d7928c fix(prettyDate): Convert datetime to user's timezone first 2020-06-25 12:04:55 +05:30
Suraj Shetty
a58ba021e9
fix: Page primary action reset (#10801) 2020-06-25 10:19:37 +05:30
mergify[bot]
b8693495ca
Merge pull request #10710 from aliriocastro/add-silent-m 
fix: pass silent as an arg to frappe.call to avoid dialog if errors
 2020-06-25 04:03:24 +00:00
Prssanna Desai
5f94964b32
fix(Dashboard Chart): use now_datetime() for user timezone (#10788) 2020-06-24 19:23:03 +05:30
mergify[bot]
023d938899
Merge pull request #10804 from frappe/remove-custom-padding 
fix: Custom ol padding removed in text editor
 2020-06-24 13:49:38 +00:00
mergify[bot]
7ff1304182
Merge pull request #10769 from ernestoruiz89/patch-8 
fix: Route on onboarding widget for new document
 2020-06-24 13:39:34 +00:00
Shivam Mishra
dd18d91878
refactor: remove unnecessary comment 2020-06-24 18:49:05 +05:30
Shivam Mishra
1e913f101d
fix: URL translations for onboarding 2020-06-24 18:47:32 +05:30
mergify[bot]
c16dd7c37b
Merge pull request #10631 from gbm001/patch-1 
fix: colours missing from indicator.js
 2020-06-24 13:07:29 +00:00
KanchanChauhan
236c5db6e0
fix: Custom ol padding removed in text editor 2020-06-24 18:06:27 +05:30
mergify[bot]
b0c3929a9e
Merge pull request #10796 from netchampfaris/website-theme-public-folder 
fix: Create website theme file in public folder
 2020-06-24 07:27:46 +00:00
Revant Nandgaonkar
86ee3bae1f fix: site_config backup file naming 
naming matches other names
{time_stamp}-{site_slug}-{file_name}
 2020-06-24 12:26:46 +05:30
Mangesh-Khairnar
d213f0c4b6
fix(google-drive): check file list before finding latest (#10767) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-06-24 11:18:47 +05:30
Faris Ansari
a6eae56658 fix: Create website theme file in public folder 
Earlier theme files were generated in assets folder, so if a site was
moved to a different bench, theme files were not moved with the site.
Now, they will be generated in /public/files/website_theme folder so
they move along with the site.
 2020-06-24 11:03:10 +05:30
Kevin Wiesmüller
9b9f067db1
fix: API login inconsistency (#10427) 
* do not overwrite user if it's already set

* Update frappe/api.py

* chore: fix syntax error and translation syntax

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-06-24 04:22:30 +00:00
mergify[bot]
2275f8bc1d
Merge pull request #10790 from Mangesh-Khairnar/send-emails-now 
fix: send confirmation email instantly
 2020-06-24 04:19:34 +00:00
mergify[bot]
960bdd698d
Merge pull request #10776 from Mangesh-Khairnar/fix-notification-ux 
fix(notification): show alert fields after setting document type
 2020-06-24 04:07:05 +00:00
mergify[bot]
c1dab6af4e
Merge pull request #10582 from deepeshgarg007/currency_precison_fix 
fix: Incorrect currency precision
 2020-06-24 03:40:12 +00:00
mergify[bot]
fe09b8f8f1
Merge pull request #10598 from surajshetty3416/fix-text-editor-issues 
fix(text-editor): List UI
 2020-06-24 03:27:46 +00:00
mergify[bot]
9e1cd2698e
Merge pull request #10784 from prssanna/sidebar-users-fix 
fix: hide form sidebar users
 2020-06-24 03:26:47 +00:00
Suraj Shetty
bc728dc857
Merge branch 'develop' into currency_precison_fix 2020-06-24 08:56:05 +05:30