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

34317 commits

This branch
This branch
All branches
Author SHA1 Message Date
Deepesh Garg
dffd78d3fc fix: Validate server script for doc events 2021-09-27 12:02:31 +05:30
Deepesh Garg
49b3f19aa6 Merge branch 'develop' of https://github.com/frappe/frappe into server_script_enhancements 2021-09-07 18:33:44 +05:30
Deepesh Garg
a1251aace9 fix: Syntax Error 2021-09-07 18:29:04 +05:30
mergify[bot]
04b4417540
Merge pull request #14062 from saxenabhishek/aks-fix-postgres 
fix: miscellaneous Postgres issues
 2021-09-07 12:58:00 +00:00
Deepesh Garg
55e2af20c6 feat: Enhancements in Server Script 2021-09-07 17:51:46 +05:30
Abhishek Saxena
1d02d26a2b
Merge branch 'develop' into aks-fix-postgres 2021-09-07 17:42:03 +05:30
Your Name
74d6ed32d6 test: add frappe.db.add_index 2021-09-07 17:40:55 +05:30
gavin
620cad18d6
Merge pull request #14129 from gavindsouza/timeline-missing-comments 
fix: Bring back the missing Comments
 2021-09-07 11:35:46 +05:30
Gavin D'souza
07c5d0a28c fix(db_pg): Strip index size from each field 2021-09-07 11:27:38 +05:30
Gavin D'souza
2178ea7c96 style: Fix indentation for get_all query 2021-09-07 11:08:02 +05:30
Leela vadlamudi
8968653072
Merge pull request #14133 from frappe/mergify/bp/develop/pr-14132 
fix: customizing print formats (backport #14132)
 2021-09-07 06:50:47 +05:30
leela
3594890eb2 fix: customizing print formats 
Currently system managers can only customize the print formats even though
the other roles has a permissions to do so. Fixed it to show
customize button based on permissions.

(cherry picked from commit f9486fce5fb24402fce31e3d36370120c4524a9b)
 2021-09-07 01:16:16 +00:00
Suraj Shetty
92fceb88d5
Merge branch 'develop' into timeline-missing-comments 2021-09-06 22:57:59 +05:30
Suraj Shetty
ecf08e9886
Merge pull request #14108 from frappe/mergify/bp/develop/pr-14099 2021-09-06 22:55:35 +05:30
Suraj Shetty
084be78f95
Merge branch 'develop' into mergify/bp/develop/pr-14099 2021-09-06 22:51:29 +05:30
Suraj Shetty
fba196484c
ci: Conditionally run codecov upload 2021-09-06 22:50:42 +05:30
Suraj Shetty
8b252d493a
ci: Conditionally run codecov upload 2021-09-06 22:49:48 +05:30
Suraj Shetty
9d9ca1c2dd
Merge branch 'develop' into mergify/bp/develop/pr-14099 2021-09-06 22:45:25 +05:30
Suraj Shetty
4e200d13a5
Merge pull request #14127 from frappe/mergify/bp/develop/pr-14114 2021-09-06 22:44:25 +05:30
mergify[bot]
cea341ccf5
Merge pull request #13594 from shariquerik/custom-doctype-webform-perm 
fix: Webform Permission for custom doctype
 2021-09-06 17:06:13 +00:00
Gavin D'souza
d55254e7dc feat(minor): Show title for form timeline icons 2021-09-06 19:45:44 +05:30
Gavin D'souza
ab7dee13cf chore: Added return type for DatabaseQuery.execute 2021-09-06 19:44:25 +05:30
Gavin D'souza
f0b9eb5f7c fix: Update available Frappe icons 
* Added icons for milestone
* Updated Workflow and Branch icons for consistency
 2021-09-06 19:41:49 +05:30
Gavin D'souza
a233bf1061 fix: Add workflow comments in form timeline 
* Add Edit, Label along with Info timeline logs
* Added title field for timeline icon
 2021-09-06 19:39:08 +05:30
Gavin D'souza
6f0a02aaa5 fix: Handle multiple comment types in get_comments 2021-09-06 19:37:39 +05:30
Your Name
08b7430ba2 fix: change fieldname for postgres create index 2021-09-06 16:41:50 +05:30
Your Name
5669d9c559 fix: pass distinct as argument in set_modules 2021-09-06 16:41:41 +05:30
Rushabh Mehta
c3c4057866
Merge pull request #14111 from shariquerik/wspace-2-fixes 
fix: Dashboard Settings already exist error on first login
 2021-09-06 14:41:21 +05:30
Shariq Ansari
4f76c56347
Merge branch 'frappe:develop' into wspace-2-fixes 2021-09-06 14:32:08 +05:30
mergify[bot]
f4d260de0d
fix: Problems while using translations via Globe Symbol (#14128) 
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
(cherry picked from commit 40f2e915918860ade1e514c8b0bb4cf1bb6d0b2b)

Co-authored-by: vama <vamagithub@gmail.com>
 2021-09-06 14:16:27 +05:30
Saqib
62a205fe2e
feat: change custom button type (#14074) 
* feat: change custom button type using frm
 2021-09-06 12:43:17 +05:30
Leela vadlamudi
3527731b93
Merge pull request #14124 from frappe/mergify/bp/develop/pr-14113 
fix: RTL support for text editor (backport #14113)
 2021-09-06 12:35:24 +05:30
leela
768e4052f9 fix: node creation from tree view 
(cherry picked from commit f8cd2ad388c96eefff4730ce130806231bc0d87e)
 2021-09-06 07:04:05 +00:00
leela
5ccda1d5ac fix: RTL support for text editor 
(cherry picked from commit 99f914698f7b86048c25087eb74dbd1fae707ac4)
 2021-09-06 05:15:14 +00:00
Rushabh Mehta
ea27dd001a
Merge pull request #14123 from rmehta/packages 
feat(minor): Packages! also cleanup of DocField and other minor fixes
 2021-09-06 10:03:22 +05:30
Rushabh Mehta
d807e3b1e2 fix(minor): fix for aggregate functions, use special query 2021-09-06 09:11:58 +05:30
Rushabh Mehta
5befc80cd4 fix(minor): linting 2021-09-05 22:30:09 +05:30
Rushabh Mehta
c2e93256f2 fix(minor): remove test modules 2021-09-05 22:14:24 +05:30
Rushabh Mehta
20dea90670 feat(minor): Packages! also cleanup of DocField and other minor fixes 2021-09-05 22:01:55 +05:30
Shariq Ansari
b20e543de9 test: test hook to get website_list_context 2021-09-03 16:55:44 +05:30
gavin
b2f78de243
Merge pull request #14112 from gavindsouza/license-fixes 
chore: License fixes
 2021-09-03 13:10:35 +05:30
Gavin D'souza
cce3a381fc chore: Update copyright until date to 2021 
INAL but this date range is purely decorational. If the date hasnt been
updated in a while, doesn't really matter AFAIK. MIT license and
copyright is still under effect if the license exists in the published source
 2021-09-03 12:19:15 +05:30
Gavin D'souza
816dd709f4 chore: Ignore updating license header from blame 
This adds the previous style changes in the license header (for
consistency) in the ignore-revs file
 2021-09-03 12:14:45 +05:30
Gavin D'souza
3446026555 chore: Update header: license.txt => LICENSE 
The license.txt file has been replaced with LICENSE for quite a while
now. INAL but it didn't seem accurate to say "hey, checkout license.txt
although there's no such file". Apart from this, there were
inconsistencies in the headers altogether...this change brings
consistency.
 2021-09-03 12:02:59 +05:30
Gavin D'souza
65864c027f chore: Update module license header 
These modules were imported from the ERPNext codebase into Frappe.
License header was overlooked at that point. These were contributed
initially by Frappe Technologies Pvt Ltd under GPLv3 (ERPNext's license) and now
we, as Frappe Technologies Pvt Ltd converting them to MIT to comply with
Frappe's license.
 2021-09-03 11:51:01 +05:30
Shariq Ansari
ab09ebf696 fix: Dashboard Setting already exist error and linter fixes 2021-09-02 20:46:19 +05:30
Suraj Shetty
3f69350f09
ci: Add 0.5% as threshold for coverage failure 2021-09-02 18:49:04 +05:30
mergify[bot]
5b78407789
Merge pull request #14109 from vrslev/fix-qb-autocomplete 
feat: Query Builder autocomplete hack
 2021-09-02 09:50:18 +00:00
Raffael Meyer
ba07f3bc95
fix: resolve merge conflicts 2021-09-02 11:30:57 +02:00
Lev
6f114b1c19 chore: Query Builder autocomplete hack 2021-09-02 12:21:34 +03:00