 vasdfandGitHub
|
5ae5717585
|
Merge pull request #108 from ohtuprojekti-ilmo/configuration-page
added buttons leading to question config page
|
2018-12-15 15:35:23 +02:00 |
|
|
vasdfandGitHub
|
aa6bced6cf
|
Merge pull request #104 from ohtuprojekti-ilmo/configuration-page
Configuration page questions select
|
2018-12-15 14:31:15 +02:00 |
|
|
vasdfandGitHub
|
fb8540a889
|
Merge pull request #105 from ohtuprojekti-ilmo/fix-registration-redirect
Fix redirect and add alerts for succesful registration and failed one
|
2018-12-15 14:09:19 +02:00 |
|
|
vasdfandGitHub
|
47456b17c7
|
Merge pull request #66 from ohtuprojekti-ilmo/emergency
fixed bug with updating configurations
|
2018-12-14 15:16:47 +02:00 |
|
|
vasdfandGitHub
|
637f4ca0c6
|
Merge pull request #65 from ohtuprojekti-ilmo/configuration
Configuration
|
2018-12-13 23:48:12 +02:00 |
|
|
vasdfandGitHub
|
09df03f2c7
|
Merge branch 'master' into configuration
|
2018-12-13 23:32:05 +02:00 |
|
|
vasdfandGitHub
|
c4e6e8b7ab
|
Merge pull request #64 from ohtuprojekti-ilmo/email-additions
Email additions
|
2018-12-13 23:31:50 +02:00 |
|
|
vasdfandGitHub
|
c05fcf20af
|
Merge branch 'master' into email-additions
|
2018-12-13 23:28:50 +02:00 |
|
|
vasdfandGitHub
|
1db9a99208
|
fix
small fix
|
2018-12-13 15:51:53 +02:00 |
|
|
vasdfandGitHub
|
890f5edb2a
|
Merge pull request #60 from ohtuprojekti-ilmo/configuration
added checks and fixed bugs
|
2018-12-13 15:05:23 +02:00 |
|
|
vasdfandGitHub
|
a56d7787be
|
Merge pull request #89 from ohtuprojekti-ilmo/changeButtonColor
Changed button colors
|
2018-12-08 20:58:44 +02:00 |
|
|
vasdfandGitHub
|
689b786d1c
|
Merge pull request #88 from ohtuprojekti-ilmo/participants-list
Initial version of participants list
|
2018-12-08 20:57:12 +02:00 |
|
|
vasdfandGitHub
|
5c04432ce5
|
Merge branch 'master' into sequelize-model-registration-changes
|
2018-12-07 13:34:38 +02:00 |
|
|
vasdfandGitHub
|
19df9c6d34
|
Merge pull request #54 from ohtuprojekti-ilmo/configuration
Configuration
|
2018-12-07 13:34:22 +02:00 |
|
|
vasdfandGitHub
|
331706111c
|
Merge pull request #86 from ohtuprojekti-ilmo/email-update-request
Email update request
|
2018-12-07 11:13:43 +02:00 |
|
|
vasdfandGitHub
|
383c787f0c
|
Merge pull request #80 from ohtuprojekti-ilmo/registerPath
Set registration page path to /register and set path / redirect to login
|
2018-12-02 18:41:42 +02:00 |
|
|
vasdfandGitHub
|
b646899f14
|
Merge pull request #52 from ohtuprojekti-ilmo/email-fixes
cc and replyto to admin
|
2018-11-29 15:38:47 +02:00 |
|
|
vasdfandGitHub
|
593b74c58b
|
Merge branch 'master' into update-user
|
2018-11-29 14:31:03 +02:00 |
|
|
vasdfandGitHub
|
088233ed8f
|
Merge pull request #61 from ohtuprojekti-ilmo/registration-service
added service for creating registrations
|
2018-11-25 21:39:35 +02:00 |
|
|
vasdfandGitHub
|
9f4777006a
|
Merge branch 'master' into add-registration
|
2018-11-25 13:05:39 +02:00 |
|
|
vasdfandGitHub
|
e83052950f
|
Merge pull request #44 from ohtuprojekti-ilmo/topic-put-update
Topic put update
|
2018-11-23 13:34:42 +02:00 |
|
|
vasdfandGitHub
|
5cb9f45143
|
Merge pull request #51 from ohtuprojekti-ilmo/topic-service-fixes
changed topic services a bit + some code cleanup
|
2018-11-23 13:34:38 +02:00 |
|
|
vasdfandGitHub
|
575fdd872c
|
Merge pull request #47 from ohtuprojekti-ilmo/topic-edit-refactor
Topic edit page refactoring
|
2018-11-22 11:11:51 +02:00 |
|
|
vasdfandGitHub
|
0b0c4261bd
|
Merge pull request #42 from ohtuprojekti-ilmo/secret-change
changed secret_id generation slightly
|
2018-11-22 10:54:04 +02:00 |
|
|
vasdfandGitHub
|
a5397a0112
|
Merge branch 'master' into secret-change
|
2018-11-22 10:45:52 +02:00 |
|
|
vasdfandGitHub
|
b1dcb4d95b
|
Merge pull request #41 from ohtuprojekti-ilmo/topic-formatting
added formatting for returned topics
|
2018-11-22 10:45:41 +02:00 |
|
|
vasdfandGitHub
|
c5aa261a44
|
Merge branch 'master' into topic-formatting
|
2018-11-22 10:43:22 +02:00 |
|
|
vasdfandGitHub
|
a124ccf143
|
Merge pull request #39 from ohtuprojekti-ilmo/email-fixes
email is only sent if environment is production
|
2018-11-22 10:42:49 +02:00 |
|
|
vasdfandGitHub
|
e9cfcca815
|
Merge branch 'master' into email-fixes
|
2018-11-22 10:40:24 +02:00 |
|
|
vasdfandGitHub
|
98f95ab3a9
|
Merge pull request #38 from ohtuprojekti-ilmo/variable-name-refactoring
changed all occurences of '<modelname>_id' to 'id'
|
2018-11-17 19:58:50 +02:00 |
|
|
vasdfandGitHub
|
3721d5ff23
|
Merge pull request #46 from ohtuprojekti-ilmo/variable-name-refactoring
changed all occurences of 'topic_id' to 'id'
|
2018-11-17 19:55:15 +02:00 |
|
|
vasdfandGitHub
|
88d26fcfca
|
Merge pull request #45 from ohtuprojekti-ilmo/favicon
Favicon and site title renaming
|
2018-11-17 19:52:02 +02:00 |
|
|
vasdfandGitHub
|
01650af2ef
|
Merge pull request #44 from ohtuprojekti-ilmo/logout
Added log out button to navigation bar
|
2018-11-17 19:47:09 +02:00 |
|
|
vasdfandGitHub
|
f8efd2b8ab
|
Merge pull request #37 from ohtuprojekti-ilmo/email
Email
|
2018-11-17 18:17:00 +02:00 |
|
|
vasdfandGitHub
|
3e2077fef9
|
Merge pull request #36 from ohtuprojekti-ilmo/secret-link
Secret link
|
2018-11-16 11:44:29 +02:00 |
|
|
vasdfandGitHub
|
2f86d48ded
|
Merge pull request #41 from ohtuprojekti-ilmo/topic-edit-redux
Add content to topic edit page from redux
|
2018-11-16 10:42:13 +02:00 |
|
|
vasdfandGitHub
|
de6372e6f2
|
Merge pull request #35 from ohtuprojekti-ilmo/topic-sequelize
Add acronym and secret-link fields to topic model
|
2018-11-16 10:30:13 +02:00 |
|
|
vasdfandGitHub
|
9b01c1a7f5
|
Merge pull request #38 from ohtuprojekti-ilmo/topic-edit-redux
Added redux to topic editing form
|
2018-11-15 12:07:28 +02:00 |
|
|
vasdfandGitHub
|
0f195435d1
|
Merge branch 'master' into topic-edit-redux
|
2018-11-15 11:59:00 +02:00 |
|
|
vasdfandGitHub
|
ac3835df41
|
Merge pull request #39 from ohtuprojekti-ilmo/redirectFormSubmit
Added redirect after creating topic
|
2018-11-15 11:38:46 +02:00 |
|
|
vasdfandGitHub
|
df89a442af
|
Merge pull request #36 from ohtuprojekti-ilmo/single-topic-view
Single topic view
|
2018-11-11 19:06:16 +02:00 |
|
|
vasdfandGitHub
|
54c42e0ef2
|
Merge pull request #34 from ohtuprojekti-ilmo/fixes
fixed tokencheckrouter
|
2018-11-09 10:35:46 +02:00 |
|
|
vasdfandGitHub
|
ccc54e51c9
|
Merge pull request #32 from ohtuprojekti-ilmo/remove-check-from-topics
Removed checkLogin from get-route due to uncertainity around it
|
2018-11-08 12:11:38 +02:00 |
|
|
vasdfandGitHub
|
e90c525cb3
|
Merge pull request #31 from ohtuprojekti-ilmo/topic-date
Removed admincheck from topic dates get-request
|
2018-11-08 12:05:11 +02:00 |
|
|
vasdfandGitHub
|
788f0f1382
|
Merge pull request #30 from ohtuprojekti-ilmo/readme-update
Removed old instructions
|
2018-11-08 10:52:26 +02:00 |
|
|
vasdfandGitHub
|
855fb91a87
|
Merge branch 'master' into readme-update
|
2018-11-08 10:48:08 +02:00 |
|
|
vasdfandGitHub
|
4a0ce8d837
|
Merge pull request #29 from ohtuprojekti-ilmo/group-controller-error-fix
added missing catch
|
2018-11-08 10:43:46 +02:00 |
|
|
vasdfandGitHub
|
8e3dc7f95e
|
Merge branch 'master' into group-controller-error-fix
|
2018-11-08 10:39:40 +02:00 |
|
|
vasdfandGitHub
|
24bf1b9b67
|
Merge pull request #28 from ohtuprojekti-ilmo/topic-date
Topic date
|
2018-11-08 10:39:29 +02:00 |
|
|
vasdfandGitHub
|
a6ed06c7f3
|
Merge branch 'master' into topic-date
|
2018-11-08 10:35:18 +02:00 |
|
|
vasdfandGitHub
|
814d17c71e
|
Update README.md
|
2018-11-04 18:48:21 +02:00 |
|
|
vasdfandGitHub
|
d22a2161de
|
Update README.md
|
2018-11-04 18:45:53 +02:00 |
|
|
vasdfandGitHub
|
22ab8948c9
|
Merge pull request #26 from ohtuprojekti-ilmo/check-admin
Check admin
|
2018-11-04 16:56:59 +02:00 |
|
|
vasdfandGitHub
|
85351c1b4c
|
Merge branch 'master' into add-membership
|
2018-10-31 11:14:10 +02:00 |
|
|
vasdfandGitHub
|
5d4a02a5b3
|
Merge pull request #21 from ohtuprojekti-ilmo/put-topic
Put topic
|
2018-10-31 11:13:37 +02:00 |
|
|
vasdfandGitHub
|
70d94ce5fb
|
Merge pull request #16 from ohtuprojekti-ilmo/login-cleanup
Login cleanup
|
2018-10-17 10:16:35 +03:00 |
|
|
vasdfandGitHub
|
f346c964fa
|
Merge pull request #16 from ohtuprojekti-ilmo/urlConfig
Configured backend urls for staging and production environments
|
2018-10-12 16:34:27 +03:00 |
|
|
vasdfandGitHub
|
02cc93cedd
|
Merge pull request #15 from ohtuprojekti-ilmo/lint-add-test
Lint add test
|
2018-10-12 13:05:34 +03:00 |
|
|
vasdfandGitHub
|
fa1609d425
|
Merge pull request #15 from ohtuprojekti-ilmo/material-ui
Material ui components, routing modified, styles added
|
2018-10-12 12:58:38 +03:00 |
|
|
vasdfandGitHub
|
98f1619abb
|
Merge pull request #13 from ohtuprojekti-ilmo/add-group
Add group
|
2018-10-10 10:34:47 +03:00 |
|
|
vasdfandGitHub
|
8bb1304c08
|
Merge branch 'master' into add-group
|
2018-10-10 10:31:58 +03:00 |
|
|
vasdfandGitHub
|
1e986cff91
|
Merge pull request #11 from ohtuprojekti-ilmo/database-instructions
Update README.md
|
2018-10-10 10:31:16 +03:00 |
|
|
vasdfandGitHub
|
7d39bc4a6e
|
Update user.js
student_number changed from integer to string
|
2018-10-07 20:52:47 +03:00 |
|
|
vasdfandGitHub
|
80827985aa
|
Merge branch 'master' into database-instructions
|
2018-10-07 20:08:21 +03:00 |
|
|
vasdfandGitHub
|
95267d18b9
|
Update README.md
|
2018-10-07 20:05:51 +03:00 |
|
|
vasdfandGitHub
|
0bed601527
|
Merge pull request #10 from ohtuprojekti-ilmo/add-user
Add user
|
2018-10-07 19:13:04 +03:00 |
|
|
vasdfandGitHub
|
7e013aca96
|
travis.yml docker build command fixed
|
2018-09-19 13:16:51 +03:00 |
|
|
vasdfandGitHub
|
e539f61658
|
Update README
|
2018-09-11 20:06:48 +03:00 |
|