Skip to content

Markhoeber/documentation/glossary - #1943

Merged
mhoeber merged 6 commits into
masterfrom
markhoeber/documentation/glossary
Dec 13, 2013
Merged

Markhoeber/documentation/glossary#1943
mhoeber merged 6 commits into
masterfrom
markhoeber/documentation/glossary

Conversation

@mhoeber

@mhoeber mhoeber commented Dec 13, 2013

Copy link
Copy Markdown
Contributor

trying to fix merge issue with sylvia/documentation/bld-556

srpearce and others added 6 commits December 10, 2013 17:01
First attempt at writing LTI documentation. Several questions for tech
reviewers.
Another draft of LTI documentation, including a table of options
available in the Studio UI
Extensive revisions to glossary and minor changes to Appendix E and a
couple of other files (adding links)
didn't see conflicts noted
Revisions to LTI information based on feedback from Valera
fixing header
@mhoeber

mhoeber commented Dec 13, 2013

Copy link
Copy Markdown
Contributor Author

resolved merge issue

mhoeber added a commit that referenced this pull request Dec 13, 2013
@mhoeber
mhoeber merged commit 39fddd1 into master Dec 13, 2013
@mhoeber
mhoeber deleted the markhoeber/documentation/glossary branch December 13, 2013 01:04
jenkins-ks pushed a commit to nttks/edx-platform that referenced this pull request Jun 23, 2017
* Fix bug. Unactivated user redirect to notice_unactivated. openedx#1941

* Fix bug. Send reactivation email to unactivated user. openedx#1942 openedx#1943

* Fix bug. Mod activation mail message. openedx#1944

* Mod bok-choy test. openedx#1941

* Fix review.

* Cancel bug. Activation mail message. openedx#1944

* Fix review.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants