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

22626 commits

This branch
This branch
All branches
Author SHA1 Message Date
mergify[bot]
fba8317a78
Merge pull request #8908 from surajshetty3416/fix-prepared-report 
fix: Pass prepared_report_name as filter if exists
 2019-11-29 06:56:36 +00:00
mergify[bot]
cc6ba94068
Merge pull request #8909 from zerodhatech/case_insensitive_search 
fix(postgres): Case insensitive search
 2019-11-29 06:20:18 +00:00
Shridhar
44c7f08ccf convert operator to lowercase while checking 2019-11-28 18:07:14 +05:30
Shridhar
acae06a36a case insensitive search for postgres 2019-11-28 16:13:20 +05:30
mergify[bot]
08d7ccae2d
Merge pull request #8880 from ruchamahabal/setup_wizard 
feat: Onboarding Wizard With Configurable Slides
 2019-11-28 09:04:35 +00:00
Suraj Shetty
29c0772449 fix: Add input to multiselect_list control 2019-11-28 12:32:34 +05:30
Suraj Shetty
9b4cd4a389 fix: Pass prepared_report_name as filter if exists 2019-11-28 12:17:41 +05:30
Suraj Shetty
450724cd51
Merge pull request #8903 from surajshetty3416/fix-css 
fix: Broken style
 2019-11-28 10:51:28 +05:30
mergify[bot]
002f60cd92
Merge pull request #8907 from frappe/revert-dependency 
chore(deps): [security] bump markdown2 from 2.3.5 to 2.3.6
 2019-11-27 17:55:32 +00:00
gavin
7daa6736f6
chore(deps): [security] bump markdown2 from 2.3.5 to 2.3.6 
redo https://github.com/frappe/frappe/pull/8811 after merging https://github.com/frappe/frappe/pull/8823
 2019-11-27 20:37:19 +05:30
mergify[bot]
e9f92bf4a3
Merge pull request #8823 from gavindsouza/updated-requirements 
chore: pinned requirements
 2019-11-27 14:20:24 +00:00
gavin
87fec89e97
Merge branch 'develop' into updated-requirements 2019-11-27 14:48:40 +05:30
Rucha Mahabal
0b415b3a49 fix: set onboarding dialog as static 2019-11-27 11:55:34 +05:30
Suraj Shetty
15a662a4b6 fix: Reivew pill font size 2019-11-27 09:53:41 +05:30
Suraj Shetty
62ad8c3fff fix: Show a fallback image if image set is invalid 2019-11-27 09:02:57 +05:30
Suraj Shetty
c7ed4342c0 fix: Move user-avatar style changes under .recent-item class 
So that it does not mess up other user-avatars
 2019-11-27 08:59:58 +05:30
Suraj Shetty
d623f5e073 fix: Romove unused code to avoid console errors 2019-11-27 08:58:06 +05:30
Aditya Hase
653c89b739
fix(patch): Handle failures in while making Prepared Report att… (#8899) 
fix(patch): Handle failures in while making Prepared Report attachments private
 2019-11-26 19:48:02 +05:30
Rucha Mahabal
06953a3dc0 fix: added slide order in Slide doctype, removed Settings doctype 2019-11-26 18:42:22 +05:30
Aditya Hase
333ea79d2d
fix(patch): Handle failures in while making Prepared Report attachments private 2019-11-26 18:33:54 +05:30
sahil28297
5ba9dba7e9
Merge pull request #8882 from frappe/version-12 
Merge Version-12 to develop
 2019-11-26 16:01:28 +05:30
Sahil Khan
94a211edb0 Merge branch 'v12-pre-release' into version-12 2019-11-26 15:23:01 +05:30
Sahil Khan
747fab0003 bumped to version 12.0.20 2019-11-26 15:43:01 +05:50
sahil28297
75d1aec6fc
Merge pull request #8891 from surajshetty3416/fix-list-view-render-p 
fix: Escape HTML for the value of field with HTML Editor fieldtype
 2019-11-26 15:16:15 +05:30
Suraj Shetty
130b0f6cfd fix: Escape HTML for the value of field with fieldtype HTML Editor 2019-11-26 15:15:32 +05:30
Rucha Mahabal
45c7ae96b9 fix: codacy 2019-11-26 15:12:56 +05:30
Rucha Mahabal
60c1829956 fix: code cleanup 2019-11-26 15:05:34 +05:30
Suraj Shetty
83124d8eee fix: Suppress unwanted quill warnings 2019-11-26 14:31:28 +05:30
Rucha Mahabal
afa40391cc feat: fallback creation method for slide actions 2019-11-26 14:28:52 +05:30
Suraj Shetty
2cb9f22e53 Revert "fix(List): standard filters with default value are saved when changed" 2019-11-26 14:21:06 +05:30
Aditya Hase
54f2da5a52 fix(security): Make all Prepared Report file attachments private 2019-11-26 14:20:16 +05:30
sahil28297
885d447f7b
Merge pull request #8892 from frappe/revert-8847-std-filter 
revert: "fix(List): standard filters with default value are saved when changed"
 2019-11-26 14:17:11 +05:30
Suraj Shetty
88fbf22619
Revert "fix(List): standard filters with default value are saved when changed" 2019-11-26 14:05:07 +05:30
Suraj Shetty
fdd698dc30
fix: don't save if not validated (#8890) 
fix: don't save if not validated
 2019-11-26 12:50:23 +05:30
mergify[bot]
d1cf393cec
Merge pull request #8884 from adityahase/fix-prepared-report-private-12 
fix(security): Make all Prepared Report file attachments private
 2019-11-26 06:38:02 +00:00
Suraj Shetty
121656d579 fix: Module view page issue (#8879) 
-  Filter link based on the name of the link config,
because label can be different if user switches the language.
- Return the value instead of label while updating links for module
- Show Customize option in DeskModuleBox
 even if there are no links selected by the user.
 2019-11-26 12:07:45 +05:30
mergify[bot]
4b122f90d3
Merge pull request #8817 from Alchez/dev-tags-filter 
fix: update sidebar tags on changing list filters (develop)
 2019-11-26 06:34:39 +00:00
Shivam Mishra
1c1b5aa4e7 style: linting fix 2019-11-26 12:00:37 +05:30
Shivam Mishra
1e9de53483 fix: don't save if not validated 2019-11-26 12:00:04 +05:30
Suraj Shetty
f618356748
chore(deps): [security] bump tar from 2.2.1 to 2.2.2 (#8803) 
chore(deps): [security] bump tar from 2.2.1 to 2.2.2
 2019-11-26 11:44:19 +05:30
mergify[bot]
e1b9a13384
Merge pull request #8886 from benknowles/patch-2 
fix: parameterize link name when clearing timeline references
 2019-11-26 06:11:09 +00:00
Suraj Shetty
046c43e0b5
fix: Parameterize link_doctype 2019-11-26 11:29:30 +05:30
mergify[bot]
3318b308a5
Merge pull request #8811 from frappe/dependabot/pip/markdown2-2.3.6 
chore(deps): [security] bump markdown2 from 2.3.5 to 2.3.6
 2019-11-26 05:41:10 +00:00
Suraj Shetty
8552019be9 fix: Escape HTML for the value of field with fieldtype HTML Editor 2019-11-26 10:56:49 +05:30
Suraj Shetty
1ed335d427
Merge pull request #8881 from surajshetty3416/fix-console 
fix: Suppress quill warnings
 2019-11-26 10:46:42 +05:30
mergify[bot]
edf35838c8
Merge pull request #8851 from netchampfaris/new-data-import-fixes 
fix: Data Import fixes
 2019-11-26 04:48:41 +00:00
Ben Knowles
2c16a86e86
fix: parameterize link name when clearing timeline references 
link_name could potentially include an apostrophe and cause:

`"mysql.err.ProgrammingError: (1064, "You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax"`

Adjusted the query to parameterize it
 2019-11-25 16:20:33 -06:00
Aditya Hase
17161976c6
fix(security): Make all Prepared Report file attachments private 2019-11-25 19:35:18 +05:30
Rucha Mahabal
75b8b1d967 fix: added ref doctype and slide type in all slides 2019-11-25 17:02:48 +05:30
Rucha Mahabal
1755e1b0ff feat: fetch mandatory fields from ref_doctype for slide fields child table 2019-11-25 17:02:18 +05:30