Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sprint10 #28

Open
wants to merge 78 commits into
base: master
Choose a base branch
from
Open

Sprint10 #28

wants to merge 78 commits into from

Conversation

sdejong
Copy link

@sdejong sdejong commented Jun 18, 2016

Here is the pull request for the final version of our app

Sander de Jong and others added 30 commits May 27, 2016 13:28
porting code to sprint10
d9afcfb
@sibrenvanvliet
Minor i18n adjustments
00c54f1
porting code to sprint10
c8498e3
porting code to sprint10
d12ea81
@sibrenvanvliet
Fixed adding custom subject locally
837ee6b
@sibrenvanvliet
Improved create page layout according to Hedderik's commentary
6a36ed0
@ewerkema
Showing login screen and selecting subject main screen
c645dac
@ewerkema
Sprint 10 merge
18ff809
@sibrenvanvliet
User now decides for how long they learn a dataset
00e13df
@ewerkema
Add synchronization of subjects
e9a93d7
@ewerkema
Merge branch 'selecttime' of https://github.com/RUGSoftEng/Team-5 int…
1380fbc 
…o sprint10
@ewerkema
Bug fix incorrect variable remotedatasets
738a962
@bhichem
slimstampen implement new updates, added responselist to database
74eeaba
@sibrenvanvliet
Internationalised selecttime and added minor features
d0c00ce
@ewerkema
Update database
cd2900a
@ewerkema
Merge sprint10 with master
671e07e
@ewerkema
Merge changes with sprint10
55b4386
permission message
fc37fc1
@bhichem
slimstampen implementation
bfc98af
@ewerkema
Fix navigate learn page and css fix
d01f10c
@ewerkema
Merge branch 'sprint10' of https://github.com/RUGSoftEng/Team-5 into …
5fc65eb 
…sprint10
permission message now working
203f94d
Merge branch 'sprint10' of https://github.com/RUGSoftEng/Team-5 into …
d995e5f 
…sprint10
@ewerkema
Add fontawesome loading screen
9942e1e
@sibrenvanvliet
User can now change interface language also on login and register pages
0d779e8
@ewerkema
Merge branch 'sprint10' of https://github.com/RUGSoftEng/Team-5 into …
bebb5bd 
…sprint10
@sibrenvanvliet
Redesigned back-buttons to be more intuitive
5996461
linter errors
919697f
fix lintererrors
b545ea6
@ewerkema
Custom subjects display in select
2aa9473
ewerkema and others added 28 commits June 3, 2016 09:19
@ewerkema
Add strength bar and fixed responseList null error
0bd187a
@bhichem
fixed update response list, added some missing strings for arabic
b47188b
@bhichem
arabic string
a9dc372
@ewerkema
Changes learning
fe10f98
@ewerkema
Merge branch 'sprint10' of https://github.com/RUGSoftEng/Team-5 into …
4a064bf 
…sprint10
@ewerkema
Fix forgot and disable devtools
1b2b1a7
@ewerkema
Fix new subject create
be72f15
@ewerkema
Presentation fixes
40a2b1b
@bhichem
arabic change
27592b9
@bhichem
responselist added correctly
0d6a383
@sibrenvanvliet
Strength bar now changes colour based on percentage
6aa1d7a
@sibrenvanvliet
Change language button label should always be English
f7aa46b
@sibrenvanvliet
Spinner now appears on all loading screens
4e2faf4
@sibrenvanvliet
I can't believe I never renamed that thing from 'mybutton'
4e8aea0
@sibrenvanvliet
Dataset titles no longer go out of bounds
a180df7
@sibrenvanvliet
Hidden the upload and download buttons for now
9fcd43d
@ewerkema
Php server added to databaseOnline.js through AJAX
17068f1
@sibrenvanvliet
Leaving a learning session now always opens the correct module on the…
7fda32f 
… index page
@ewerkema
Changed database to Temporal Cognition
6344945
@ewerkema
Fix merge errors in learning.js
a898117
@ewerkema
Merge errors fix
d7d6456
added cookies for permissions, fixed linter errors, removed hint button
6f08e6c
fixed variable name
b5f63c3
@ewerkema
Fixing phpserver registering and learning page
3488b22
merged sprint10
a293698
merged with smallchanges branch
19408ec
@ewerkema
Adding settings modal to main page
50465f4
@ewerkema
Fix lastinsertid
07fd2d0
@lauraBaakman lauraBaakman removed their assignment Jul 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sdejong @lauraBaakman @sibrenvanvliet @ewerkema @bhichem