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

26136 commits

This branch
This branch
All branches
Author SHA1 Message Date
Suraj Shetty
59e8564dc5
Merge branch 'develop' into fetch-from-validation 2020-06-15 22:06:10 +05:30
Suraj Shetty
0f78ba2216
fix: Query report failure (#10701) 2020-06-15 21:54:23 +05:30
mergify[bot]
dcb28bd104
Merge pull request #10678 from AminovE99/feat/expand_list_extensions 
feat: Expand list with extensions for template rendering
 2020-06-15 16:08:19 +00:00
Prssanna Desai
6ed35fd961
fix: fix report print currency formatting (#10584) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-06-15 17:12:05 +05:30
gavin
ebe0ccdcc1
Merge pull request #10669 from gavindsouza/web-log-name-conflict 
fix: rename web.log generated by frappe to frappe.web.log
 2020-06-15 16:36:35 +05:30
Emil
edcdb66b92
🎨 Change indetions to tabs 
Signed-off-by: Emil <amionv99@gmail.com>
 2020-06-15 12:30:44 +03:00
mergify[bot]
95e5cd97d2
Merge pull request #10664 from adityahase/fix-remove-from-installed-apps 
fix: Bypass ORM for removing apps from installed_apps list
 2020-06-15 07:05:14 +00:00
Faris Ansari
48b6c9543c
fix: Set fallback base_template if source found (#10670) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-06-15 12:17:25 +05:30
rohitwaghchaure
517a3f5e32
Merge pull request #10679 from surajshetty3416/fix-query-report-filter-random-failure 
fix: Refactor report settings selection to avoid random failure
 2020-06-15 10:42:55 +05:30
Suraj Shetty
2bbe449717 fix: Refactor report settings selection to avoid random failure 2020-06-14 19:16:17 +05:30
Emil
8a9ba93119
🎨 change construction for not in 
Signed-off-by: Emil <amionv99@gmail.com>
 2020-06-14 14:31:17 +03:00
mergify[bot]
035b31c4c4
Merge pull request #10675 from ruchamahabal/fix-dashboard-chart-permission-query 
fix: permission query for dashboard chart and number card
 2020-06-14 10:47:37 +00:00
Emil
267d3119f1
🐛 Return way of checking path 
Signed-off-by: Emil <amionv99@gmail.com>
 2020-06-14 13:26:43 +03:00
Rucha Mahabal
db4166279e fix: permission query for number card 2020-06-14 15:20:53 +05:30
Emil
3bc66bfea1
✨ add another way to check path 
Signed-off-by: Emil <amionv99@gmail.com>
 2020-06-14 12:28:21 +03:00
Emil
d25b141451
✨ Expand list with extensions for template rendering 
Signed-off-by: Emil <amionv99@gmail.com>
 2020-06-14 11:37:50 +03:00
mergify[bot]
a9cf1634b6
Merge pull request #10624 from prssanna/list-view-scroll 
fix: disable scroll to top for list view
 2020-06-13 15:09:24 +00:00
Suraj Shetty
280e86a446
Merge branch 'develop' into list-view-scroll 2020-06-13 20:22:46 +05:30
Suraj Shetty
a141a5c434
Merge branch 'develop' into fetch-from-validation 2020-06-13 20:22:32 +05:30
Suraj Shetty
62661704d3
feat: Show phone icon if phone call handler is available (#10626) 2020-06-13 20:21:09 +05:30
Rucha Mahabal
fa7faf4fe6 fix: permission query for dashboard chart 2020-06-13 18:23:23 +05:30
mergify[bot]
02e2a3abc3
Merge pull request #10662 from scmmishra/fix-get-config 
fix: catch all exception in get_config
 2020-06-13 12:28:03 +00:00
mergify[bot]
807c9d9da0
Merge pull request #10640 from scmmishra/fix-button-layout 
fix: button layout for hero
 2020-06-13 12:27:09 +00:00
mergify[bot]
7ba2ec8f93
Merge pull request #10665 from gavindsouza/update-google-auth 
chore: update google-auth deps to avoid pinning indirect ones
 2020-06-13 06:42:13 +00:00
mergify[bot]
d0b2cac0d3
Merge pull request #10672 from ruchamahabal/fix_email_error 
fix: attribute error while handling email exception
 2020-06-13 06:38:55 +00:00
Rucha Mahabal
e37cc9809d fix: attribute error while handling email exception 2020-06-13 11:43:50 +05:30
Gavin D'souza
fe22595e85 fix: rename web.log generated by frappe to frappe.web.log to avoid 
conflict with web.log file generated by gunicorn process in production
 2020-06-12 19:21:08 +05:30
Gavin D'souza
979d917113 chore: update google-auth deps to avoid pinning indirect 
deps

https://github.com/frappe/frappe/pull/10660
 2020-06-12 16:45:30 +05:30
Aditya Hase
8c4a85d13f fix: Bypass ORM for removing apps from installed_apps list 
Scenario:
a site (on older version) has a custom app xyz installed.
this site is to be restored on a new bench (without xyz) and migrated to recent version.

Problem:
`bench migrate` fails because xyz is not available.
`bench remove-from-installed-apps` might fail, because code is not compatible with the database.
 2020-06-12 16:33:34 +05:30
Shivam Mishra
a4e4b8ba26 fix: catch all exception in get_config 2020-06-12 15:54:24 +05:30
Faris Ansari
742d90a74e
fix: Reduce button top margin 2020-06-12 13:59:13 +05:30
Shivam Mishra
b8be8c3802 refactor: use styles instead of utilities 2020-06-12 13:05:31 +05:30
gavin
a95aa7adf1
fix: travis builds checks (via Python instead) (#10659) 2020-06-12 10:07:11 +05:30
mergify[bot]
3c630bf884
Merge pull request #10644 from scmmishra/notification-cascading-errors 
fix: catch exceptions when sending notification
 2020-06-12 04:01:08 +00:00
mergify[bot]
f70024e4b1
Merge pull request #10655 from AminovE99/feat/json_render 
feat: Add json as a non-static format
 2020-06-11 16:56:06 +00:00
mergify[bot]
1f973d6c30
Merge pull request #10658 from deepeshgarg007/custom_field_check 
fix: Duplicate custom field check
 2020-06-11 15:50:40 +00:00
Deepesh Garg
9a2a9555f7 fix: Duplicate custom field check 2020-06-11 21:00:17 +05:30
mergify[bot]
3a2ee06624
Merge pull request #10459 from hrwX/table_multiselect_filter 
fix: filter table multiselect datalist
 2020-06-11 13:39:05 +00:00
Shivam Mishra
7aa02b9ad4
fix: remove stray frappe.throw 2020-06-11 19:01:47 +05:30
Shivam Mishra
68c0450ac7
fix: better error title 
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-06-11 13:30:39 +00:00
AminovE99
80678534f2
✨ Add json render 
Implemented opportunity to use jinja code inside json files.
 2020-06-11 16:01:55 +03:00
mergify[bot]
2f14adb0b5
Merge pull request #10533 from netchampfaris/dib-fixes-2020-05-18 
refactor: Data Import Beta
 2020-06-11 12:20:47 +00:00
Suraj Shetty
6397af4e3c
Merge branch 'develop' into dib-fixes-2020-05-18 2020-06-11 15:59:41 +05:30
mergify[bot]
015ef15c77
Merge pull request #10647 from netchampfaris/fix-event-producer-test 
test: Simplify Event Producer test
 2020-06-11 10:26:35 +00:00
Rucha Mahabal
4135791e51 fix: reload doc after incoming change from consumer 2020-06-11 15:30:00 +05:30
Rucha Mahabal
5c7a9d28b8 fix: set send_welcome_email as 0 for user creation 2020-06-11 15:29:23 +05:30
Himanshu Warekar
25f09a87cb fix: check if custom filter exists 2020-06-11 14:43:11 +05:30
Himanshu Warekar
9e75cd246b Merge branch 'develop' of https://github.com/frappe/frappe into table_multiselect_filter 2020-06-11 14:30:44 +05:30
Rucha Mahabal
60dbf657f7 test: producer url 2020-06-11 14:11:03 +05:30
Rucha Mahabal
34704a2362 fix: reset configurations in Event Producer tests 2020-06-11 14:07:29 +05:30