[jsx/Markdown.js] Markdown feature bullets by maltheism · Pull Request #5542 · aces/Loris

maltheism · 2019-11-05T19:41:20Z

Brief summary of changes

Adds Markdown "bullets" which is the equivalent to unordered html list.

First implementation of the bullets to the unordered html list (feature). I couldn't think of a way to do this with regex.
I'm not happy with the first attempt because it only works with single list. Next implementation need to make the function recursive for lists within a list. Although I thought it would be good to send a PR for now.

Testing instructions (if applicable)

Make a markdown file inside help for one of the modules with bullets.
View on the frontend.

Links to related tickets (GitHub, Redmine, ...)

Add bullet points to React Markdown rendering in LORIS #5259

Update master to the latest LORIS release.

Merging v19.1.0 to master

[POST RELEASE] PULL FORWARD OF 20.0.0 INTO MASTER

…master PUSH FORWARD of the v20.0.2 RELEASE INTO THE master branch

Pull back v20.1.1 into master

Pull back v20.1.2 into master

PUSH FORWARD OF THE 20.2.0 RELEASE TO MASTER

Push v20.3.0 into master

Allows the install script to continue if the command "hostnamectl" is not found.

…s were allowed to see statistics from sites they don't have access to. (aces#5315) A user with role Data Entry was able to see demographic statistics from sites it does not belong/have access For example if there are two users and two sites: user Site 1 is associate only to Site_1. user Site 2 is associate only to Site_2. (Both of them have the role Data Entry and nothing more in the permissions) When going to MainMenu->Reports->Statistics->Demographic Statistics The user of Site 1 is able to see the statistics for Site 2 and vice versa Now each user should be able to see only the demographic statistics for the sites it belong/have access Fixes aces#5086

When clicking on the breadcrumb in Candidate Parameters, the CandID was not being included in the link and thus was throwing a 500 error (specifically in the Consent Status tab).

… - bugfix (aces#5203) Add this [Run make (for production instances) or make dev (for development sandboxes). ] into readme to help solve issue aces#5197 related to aces#5198 Resolves aces#3946

"ConfigException" doesn't exist and is causing LORIS to crash (for the wrong reason) when an exception is thrown.

Fixes aces#5376.

…re allowed to see imaging statistics from sites they don't have access to. (aces#5339) A user with role Data Entry was able to see imaging statistics from sites it does not belong/have access For example if there are two users and two sites: user Site 1 is associate only to Site_1. user Site 2 is associate only to Site_2. (Both of them have the role Data Entry and nothing more in the permissions) When going to MainMenu->Reports->Statistics->Imaging Statistics The user of Site 1 is able to see the imaging statistics for Site 2 and vice versa.

…nistration field aces#5367 Date of administartion min and max year are currently hard-coded, but should use the config values of study start and end date. Resolves aces#5361.

There was a slight issue with the logic during the install process that swallowed a DB exeption in favour of returning false; however, the return value of this function was never checked so the code kept trying to function without a DB connection. This could give a 500 error in some cases, making the install look messy and hard to debug.

When ajax/datadictionary.php is called, Notices are generated when the category or key params are checked when not present in the request. Add isset check to avoid them.

…ces#5205) Clean up install script and instruct user's to run make [dev] after.

…to view module (aces#5373) Previously only users with candidate_parameter_view could view the module. This allows users with candidate_parameter_edit to view it also.

Push v21.0.3 into master

ridz1208 · 2019-11-06T15:32:27Z

if this is not a bugfix please base it on major for now as it will only be part of the next release

maltheism · 2019-11-12T18:57:09Z

I messed up the rebase @ridz1208 :(
See #5615 for the new PR on major

christinerogers · 2019-11-13T01:31:33Z

@ridz1208 These markdown bullets should be a 22-release bugfix PR since existing bullets in the Help text are busted, and are being removed (undesirably) as @knoll-alex does a big update across all modules this week.
So far they're being removed from the Help text just because the markdown bullets are buggy. If they can be fixed/kept for 22, that's ideal.
cc @maltheism

driusan and others added 30 commits June 5, 2017 16:03

Merge pull request aces#2841 from aces/17.0-dev

22a5667

Update master to the latest LORIS release.

Merge LORIS v17.0.5 into master branch

7480e6b

Merge tag 'v18.0.0a' into HEAD

cc04ff2

Merge tag 'v18.0.3' into HEAD

5389098

Merge tag 'v19.1.0' into HEAD

020f270

Merge pull request aces#3704 from cmadjar/merging_v19.0.1_to_master

ef5c473

Merging v19.1.0 to master

Merge branch 'PUSH_19_1_2_TO_20_0' into PUSH_20_0_0_TO_MASTER

a9a39c0

Merge pull request aces#3874 from ridz1208/PUSH_20_0_0_TO_MASTER

8b0a367

[POST RELEASE] PULL FORWARD OF 20.0.0 INTO MASTER

Merge tag 'v20.0.2' into 2018_11_05_push_20.0.2_to_master

ea4ed83

Merge pull request aces#4059 from ridz1208/2018_11_05_push_20.0.2_to_…

178eb03

…master PUSH FORWARD of the v20.0.2 RELEASE INTO THE master branch

Merge tag 'v20.1.1' into PULL_BACK_v20.1.1_INTO_MASTER

b9e4484

Merge pull request aces#4199 from ridz1208/PULL_BACK_v20.1.1_INTO_MASTER

2edb271

Pull back v20.1.1 into master

Merge tag 'v20.1.2' into PULL_BACK_v20.1.2_INTO_MASTER

6b75874

Merge pull request aces#4224 from ridz1208/PULL_BACK_v20.1.2_INTO_MASTER

0b6eeab

Pull back v20.1.2 into master

Merge tag 'v20.2.0' into PUSH_v20.2.0_INTO_MASTER

9070530

Merge pull request aces#4310 from ridz1208/PUSH_v20.2.0_INTO_MASTER

1a51d60

PUSH FORWARD OF THE 20.2.0 RELEASE TO MASTER

Merge tag 'v20.3.0' into PUSH_v20.3.0_INTO_MASTER

34fd972

Merge pull request aces#4480 from ridz1208/PUSH_v20.3.0_INTO_MASTER

09d9eca

Push v20.3.0 into master

update

4d9f450

[tools/install.sh] fix for other operating systems (aces#5295)

577f838

Allows the install script to continue if the command "hostnamectl" is not found.

[candidate_parameters] Fixed breadcrumb (aces#5313)

0e8150a

When clicking on the breadcrumb in Candidate Parameters, the CandID was not being included in the link and thus was throwing a 500 error (specifically in the Consent Status tab).

[install README CentOS and Ubuntu] 21 install updates, including make…

0ec2819

… - bugfix (aces#5203) Add this [Run make (for production instances) or make dev (for development sandboxes). ] into readme to help solve issue aces#5197 related to aces#5198 Resolves aces#3946

[DQT] Fix 500 error (aces#5345)

bcf4e9c

"ConfigException" doesn't exist and is causing LORIS to crash (for the wrong reason) when an exception is thrown.

[data_team_helper] fixed broken link to visit (aces#5378)

976461d

Fixes aces#5376.

[media] Use study's start/end date as min/max values for Date of Admi…

b205ef5

…nistration field aces#5367 Date of administartion min and max year are currently hard-coded, but should use the config values of study start and end date. Resolves aces#5361.

[DQT] Fix PHP Notices (aces#5347)

5d16058

When ajax/datadictionary.php is called, Notices are generated when the category or key params are checked when not present in the request. Add isset check to avoid them.

[install.sh] Cleanup for 21: dependency checks, logic, user messages (a…

4f0ef14

…ces#5205) Clean up install script and instruct user's to run make [dev] after.

johnsaigle and others added 8 commits October 28, 2019 14:00

[Cand. Params] Users with cand param edit permission should be able …

4177841

…to view module (aces#5373) Previously only users with candidate_parameter_view could view the module. This allows users with candidate_parameter_edit to view it also.

Merge tag 'v21.0.3' into PUSH_v21.0.3_INTO_MASTER

79614b2

Merge pull request aces#5397 from ridz1208/PUSH_v21.0.3_INTO_MASTER

a5c143c

Push v21.0.3 into master

Merge branch 'master' of https://github.com/maltheism/Loris

ee7e49a

Merge remote-tracking branch 'aces/master'

8e89775

fix

d2c05a1

update

3e980fe

remove

4191c1f

maltheism added the Category: Feature PR or issue that aims to introduce a new feature label Nov 5, 2019

maltheism requested a review from driusan November 5, 2019 19:41

johnsaigle added the Area: UI PR or issue related to the user interface label Nov 5, 2019

ridz1208 added the State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) label Nov 6, 2019

johnsaigle mentioned this pull request Nov 6, 2019

Add bullet points to React Markdown rendering in LORIS #5259

Closed

maltheism changed the base branch from master to major November 12, 2019 18:51

maltheism closed this Nov 12, 2019

maltheism deleted the master_markdown_feature_bullets branch May 24, 2020 02:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[jsx/Markdown.js] Markdown feature bullets#5542

[jsx/Markdown.js] Markdown feature bullets#5542
maltheism wants to merge 38 commits into
aces:majorfrom
maltheism:master_markdown_feature_bullets

maltheism commented Nov 5, 2019 •

edited

Loading

Uh oh!

ridz1208 commented Nov 6, 2019

Uh oh!

maltheism commented Nov 12, 2019

Uh oh!

christinerogers commented Nov 13, 2019 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Conversation

maltheism commented Nov 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Brief summary of changes

Testing instructions (if applicable)

Links to related tickets (GitHub, Redmine, ...)

Uh oh!

ridz1208 commented Nov 6, 2019

Uh oh!

maltheism commented Nov 12, 2019

Uh oh!

christinerogers commented Nov 13, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

maltheism commented Nov 5, 2019 •

edited

Loading

christinerogers commented Nov 13, 2019 •

edited

Loading