Skip to content

Update 1229 : JohnR2 Version#1

Open
TLOGBen wants to merge 59 commits intomasterfrom
JohnR2
Open

Update 1229 : JohnR2 Version#1
TLOGBen wants to merge 59 commits intomasterfrom
JohnR2

Conversation

@TLOGBen
Copy link
Copy Markdown
Collaborator

@TLOGBen TLOGBen commented Dec 29, 2017

No description provided.

TLOGBen and others added 30 commits December 29, 2017 15:41
包含成績顯示 node js ckediter等變更
about historyscore
about historyscore
about historyscore
=======================
* open file browser
* new Readonly mode function
* change some function content
* open file browser 
* new Readonly mode function
* change some function content
=======================
* open file browser
* new Readonly mode function
* change some function content
# Conflicts:
#	recourse/js/Ckeditor.js
=======================
* open file browser
* new Readonly mode function
* change some function content
=======================
* fix bug
=======================
* open file browser
* new Readonly mode function
* change some function content
鎖住ck不要讓老師改動題目
=======================
* open file browser
* new Readonly mode function
* change some function content
=======================
* fix bug
=======================
* open file browser
* new Readonly mode function
* change some function content
=======================
* url test
=======================
* fix bug
=======================
* fix bug
=======================
* Update Url things
=======================
* Update Url things
* auto submit
包含成績顯示 node js ckediter等變更
about historyscore
about historyscore
about historyscore
TLOGBen and others added 29 commits April 14, 2018 21:43
=======================
* open file browser
* new Readonly mode function
* change some function content
=======================
* open file browser
* new Readonly mode function
* change some function content
鎖住ck不要讓老師改動題目
=======================
* open file browser
* new Readonly mode function
* change some function content
=======================
* fix bug
=======================
* open file browser
* new Readonly mode function
* change some function content
=======================
* url test
=======================
* fix bug
=======================
* fix bug
=======================
* Update Url things
=======================
* Update Url things
* auto submit
# Conflicts:
#	README.md
#	application/controllers/Question.php
#	application/controllers/Rating.php
#	application/views/Example/Index.html
#	application/views/FOUNDCLASS/LoginAction.php
#	application/views/FOUNDCLASS/QuizForTeacherView.html
#	application/views/FOUNDCLASS/Rating.html
#	application/views/FOUNDCLASS/TeacherHome_EditQuestion.html
#	application/views/FOUNDCLASS/TeacherHome_NewQuestion.html
#	recourse/js/bootboxdemo.js
# Conflicts:
#	application/config/routes.php
#	application/controllers/Enterclass.php
#	application/controllers/Login.php
#	application/controllers/Startquiz.php
#	application/core/MY_Controller.php
#	application/views/FOUNDCLASS/ShowPinAndQR.html
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.

3 participants