Commit Graph

Select branches

Hide Pull Requests

development

master

production

#1

#2

#3

Mono Color

• 5120adebc0 Fixed links CSS Anders 2020-08-05 08:32:27 +02:00
• 4ed1d18392 Fixed month frederikpyt 2020-08-05 08:27:33 +02:00
• 182b33fbaf Added href frederikpyt 2020-08-05 08:14:03 +02:00
• 072c5c65ab Fixes and todo's frederikpyt 2020-08-05 08:10:38 +02:00
• 286b78865b Fixed css and added no guides text frederikpyt 2020-08-05 07:51:30 +02:00
• c04f26eaa7 fixes frederikpyt 2020-08-04 17:45:10 +02:00
• 4d7acfa6bd fixes frederikpyt 2020-08-04 17:06:46 +02:00
• 64d1f785f9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp frederikpyt 2020-08-04 16:52:42 +02:00
• 1011165ca0 fixes frederikpyt 2020-08-04 16:50:08 +02:00
• 5aa1995cb8 fixes frederikpyt 2020-08-04 16:35:38 +02:00
• 50d8079da2 fixes frederikpyt 2020-08-04 15:29:21 +02:00
• 4f1ff3a823 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master vict3459 2020-08-04 15:29:18 +02:00
• 9dd09f2205 Made it so they can now make there own dynamic guide vict3459 2020-08-04 15:29:08 +02:00
• 0e72166ac4 Removed External Links Anders 2020-08-04 15:20:56 +02:00
• d15f406059 Fail message when making a reservation with taken machine and time Anders 2020-08-04 15:09:10 +02:00
• 2a3a728fa3 fixes frederikpyt 2020-08-04 14:27:11 +02:00
• 9d52e2e621 fixes frederikpyt 2020-08-04 14:23:07 +02:00
• 5973b94247 Merge remote-tracking branch 'origin/master' frederikpyt 2020-08-04 14:11:33 +02:00
• 66f7e3b86b fixes frederikpyt 2020-08-04 14:11:05 +02:00
• c8b85a6c9b fixed guide_article Anders 2020-08-04 13:37:06 +02:00
• 9ed3faedfe fixed table name guideArticles -> guide_articles Anders 2020-08-04 13:35:16 +02:00
• f5a0174939 Merge remote-tracking branch 'origin/master' frederikpyt 2020-08-04 13:23:42 +02:00
• 694bd35b33 Implemented forgot password frederikpyt 2020-08-04 13:21:56 +02:00
• 210aa00fc6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master vict3459 2020-08-04 13:21:39 +02:00
• c223cb967c Made it so they can now make there own dynamic guide vict3459 2020-08-04 13:21:23 +02:00
• d818d15b85 Implemented forgot password frederikpyt 2020-08-04 10:59:45 +02:00
• 408eb7090b Fixed CSS Anders 2020-08-04 10:40:01 +02:00
• 9d44432fc2 Session message on fail - Menuplans Anders 2020-08-04 10:11:18 +02:00
• e8b0f68e65 Merge remote-tracking branch 'origin/master' Anders 2020-08-04 09:35:03 +02:00
• 2edfd71de9 Session message on fail - Users / Roles / Events Anders 2020-08-04 09:34:56 +02:00
• 3064d412b3 Fixed app frederikpyt 2020-08-04 08:56:59 +02:00
• b59189eac0 Session message on fail - Washing machine Anders 2020-08-04 08:31:14 +02:00
• e8de894ae7 Merge remote-tracking branch 'origin/master' Anders 2020-08-04 08:05:07 +02:00
• f551d4c59f Changed session messages on fail or success Anders 2020-08-04 08:04:54 +02:00
• 6152d19ed4 Created android app frederikpyt 2020-08-03 22:03:54 +02:00
• 5e4b0fec76 Created android app frederikpyt 2020-08-03 21:45:42 +02:00
• 46154e43e9 Created android app frederikpyt 2020-08-03 21:21:21 +02:00
• 84a1045747 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp frederikpyt 2020-08-03 15:02:36 +02:00
• 4fe015a74c Fix frederikpyt 2020-08-03 15:02:26 +02:00
• 20d73c047f Fixed date and stuff Anders 2020-08-03 14:47:06 +02:00
• 0e9c054a12 Fix frederikpyt 2020-08-03 14:27:40 +02:00
• 898228637c Fix frederikpyt 2020-08-03 14:26:58 +02:00
• ae14081221 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp frederikpyt 2020-08-03 13:50:34 +02:00
• 093a944980 Fix frederikpyt 2020-08-03 13:50:27 +02:00
• 01f9502653 Removes - Console.log in feedback(s) Anders 2020-08-03 13:44:53 +02:00
• e8f6c2242a Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master vict3459 2020-08-03 13:21:56 +02:00
• e2847e9959 Fixed PageNation vict3459 2020-08-03 13:21:47 +02:00
• 679de4872d fixed vict3459 2020-08-03 13:14:58 +02:00
• a66b7aad92 Fixes frederikpyt 2020-08-03 12:57:14 +02:00
• 7abfbe27b2 Merge remote-tracking branch 'origin/master' Anders 2020-08-03 11:17:47 +02:00
• 11e3958f0a Added - orderBy to own events & own reservations Fixed - confirm message when deleting events Anders 2020-08-03 11:17:36 +02:00
• 5ad6fb129b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp frederikpyt 2020-08-03 10:48:24 +02:00
• 91f51d0689 Fixed css frederikpyt 2020-08-03 10:48:17 +02:00
• 90b58a8586 Fixed - Redirect in Event controler Fixed - orderBy function when searching, in Event & Feedback Anders 2020-08-03 10:46:48 +02:00
• ffb347b51d Merge remote-tracking branch 'origin/master' Anders 2020-08-03 10:37:04 +02:00
• b4263d8891 Fixed - Password & Confirm Password in create user now need to be the same. Added new "see password" function on all password sites. Fixed bugs Anders 2020-08-03 10:36:57 +02:00
• d7c4f2052b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master vict3459 2020-08-03 10:09:54 +02:00
• 84cd760b0f Made ris ros filter vict3459 2020-08-03 10:08:03 +02:00
• 93198e5a54 Fixed css frederikpyt 2020-08-03 09:53:57 +02:00
• c2a90c69f9 Merge remote-tracking branch 'origin/master' Anders 2020-08-03 09:43:51 +02:00
• f2895a00e3 Started working on a better see password button Anders 2020-08-03 09:42:17 +02:00
• 09fa8ce007 Fixed permissions frederikpyt 2020-08-03 09:39:32 +02:00
• 52f71abdd5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp frederikpyt 2020-08-03 09:09:53 +02:00
• b0b2a7b4f0 Fixed css frederikpyt 2020-08-03 09:09:46 +02:00
• 5f6546e399 Merge remote-tracking branch 'origin/master' Anders 2020-08-03 08:54:35 +02:00
• 1d63879117 Added "orderBy" function to event and feedback. Anders 2020-08-03 08:46:38 +02:00
• 073938a469 Fixed css frederikpyt 2020-08-03 08:45:45 +02:00
• f14dc22d92 Fixed permissions, seeders and security frederikpyt 2020-08-03 08:35:20 +02:00
• 27fd564e9f Fixed permissions, seeders and security frederikpyt 2020-08-03 08:33:11 +02:00
• 1f5660001e Fixed - Being able to change credentials without removing password Added - Checking if the password is the same to confirm password in admin Anders 2020-07-31 11:14:24 +02:00
• d8ff713b90 Added "see password" button in admin - With CSS & Script (Script in file) - Edited form style and input styles Anders 2020-07-31 10:38:10 +02:00
• 56cbe7ad41 Added success message when you change credentials Added "see password" button - With CSS & Script (Script in file) Anders 2020-07-31 09:28:58 +02:00
• 38f8bfa0c9 Fixed bugs frederikpyt 2020-07-30 15:25:37 +02:00
• ab12a46943 Fixed bugs frederikpyt 2020-07-30 14:52:40 +02:00
• 0e77da93b2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp frederikpyt 2020-07-30 14:51:50 +02:00
• 6a3068c95c Fixed bugs frederikpyt 2020-07-30 14:51:43 +02:00
• 991db2bab0 Fixed bugs frederikpyt 2020-07-30 14:51:23 +02:00
• e599d09aa7 Correct route to feedbacks x2 Anders 2020-07-30 14:51:03 +02:00
• 986a62009d Correct route to feedbacks Anders 2020-07-30 14:47:22 +02:00
• 6f11313362 Updated Seeders frederikpyt 2020-07-30 14:43:14 +02:00
• 264c44529a Updated Seeders frederikpyt 2020-07-30 14:38:32 +02:00
• 666e8cb7f3 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp frederikpyt 2020-07-30 12:28:11 +02:00
• be575a9515 Updated Seeders frederikpyt 2020-07-30 12:28:05 +02:00
• f4ba4f6c45 Edited text Anders 2020-07-30 12:20:52 +02:00
• bad88a5e51 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp vict3459 2020-07-30 11:03:11 +02:00
• 7830e31b21 Roles are now searchable vict3459 2020-07-30 11:02:41 +02:00
• b4f3be91e2 Link on front page are now centered Anders 2020-07-30 10:34:00 +02:00
• f36f460b14 Front Page now has all useable buttons and links. Added "Are you sure" when you unsubscribe from an event Anders 2020-07-30 10:31:04 +02:00
• cf4559874a Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp frederikpyt 2020-07-30 10:12:00 +02:00
• 06346d9675 Fixed css and created the washing reservation index for app frederikpyt 2020-07-30 10:11:52 +02:00
• 84b71731d9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp vict3459 2020-07-30 09:17:37 +02:00
• 62d73d0894 Vaskemaskine search er kogt vict3459 2020-07-30 09:17:27 +02:00
• 0ab41524c6 Added an account page for admin site Anders 2020-07-30 08:42:01 +02:00
• 4a1002edf3 Added more svg icons to the hamburger menu frederikpyt 2020-07-30 08:41:09 +02:00
• 9a6e1c4c4c Fixed bug frederikpyt 2020-07-30 08:20:30 +02:00
• 7f8b6a3222 Merge remote-tracking branch 'origin/master' Anders 2020-07-29 15:28:28 +02:00
• d0c8adf7f4 Added store, update, edit to UserEventController.php Anders 2020-07-29 15:28:21 +02:00
• d5ee1a2146 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp vict3459 2020-07-29 15:27:18 +02:00
• 4826725e07 Made washing-reservations search vict3459 2020-07-29 15:27:07 +02:00
• 0c5cb360f2 User can now remove themselves from an event - And get a success message after they've done so. Removed user_id from washingReservation Anders 2020-07-29 14:59:35 +02:00