Anders
|
ca3e2689ea
|
Frontpage fixed
|
2020-07-27 14:58:56 +02:00 |
Vedran Zelen
|
a51517036d
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-27 14:37:59 +02:00 |
Neerholt
|
1169aedeea
|
Merge pull request #1 from sebathefox/LiveSearch
Live search
|
2020-07-27 14:23:33 +02:00 |
|
Neerholt
|
519bd70ace
|
Merge branch 'master' into LiveSearch
|
2020-07-27 14:23:13 +02:00 |
 victor
|
b9633d36a9
|
Made Live search is done
|
2020-07-27 16:03:49 +02:00 |
|
victor
|
f1fb73beec
|
Fix css on live search, live search now works
|
2020-07-27 14:03:57 +02:00 |
|
Anders
|
222a255fe7
|
Merge remote-tracking branch 'origin/master'
|
2020-07-27 14:01:12 +02:00 |
|
Anders
|
42449ae091
|
Comments Added
|
2020-07-27 14:01:04 +02:00 |
frederikpyt
|
4eaf3de6d5
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-27 13:35:15 +02:00 |
|
frederikpyt
|
661d8a0f69
|
Fixed users and role implementation
|
2020-07-27 13:35:00 +02:00 |
|
frederikpyt
|
0c8cad9668
|
Fixed contacts
|
2020-07-27 13:34:45 +02:00 |
|
Vedran Zelen
|
d99892613b
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-27 13:25:57 +02:00 |
|
Vedran Zelen
|
715b188ecd
|
removed useless comment
|
2020-07-27 13:24:35 +02:00 |
|
Anders
|
39af9758ee
|
User can now change password
|
2020-07-27 13:22:45 +02:00 |
|
Anders
|
a59c36ab1a
|
Merge remote-tracking branch 'origin/master'
|
2020-07-27 13:09:56 +02:00 |
|
Anders
|
52a9c6ba1a
|
User can now change password
|
2020-07-27 13:09:51 +02:00 |
|
victor
|
2dd20ac85a
|
Semi fix live search
|
2020-07-27 13:07:19 +02:00 |
|
Vedran Zelen
|
4558e8d958
|
added more comments
removed silly debug.
|
2020-07-27 12:40:45 +02:00 |
|
Anders
|
01b556faba
|
Merge remote-tracking branch 'origin/master'
|
2020-07-27 12:03:49 +02:00 |
|
Vedran Zelen
|
6979d0c0b4
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-27 10:43:40 +02:00 |
|
Vedran Zelen
|
131ac97afa
|
added helpful comments to models
|
2020-07-27 10:43:22 +02:00 |
|
Anders
|
4b571781a5
|
Worked on base.blade.php
|
2020-07-27 10:31:57 +02:00 |
 Sebastian Davaris
|
cbb01782fa
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-27 10:20:49 +02:00 |
|
Sebastian Davaris
|
010322b605
|
Fixed frontend fuckup #3
|
2020-07-27 10:20:29 +02:00 |
|
Vedran Zelen
|
ce3c8e6459
|
added comment
|
2020-07-27 09:35:36 +02:00 |
|
Sebastian Davaris
|
79e5e95695
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/public/css/admin.css
|
2020-07-27 08:25:42 +02:00 |
|
Sebastian Davaris
|
a755fd9680
|
Working on ResourceController.php again..
|
2020-07-27 08:24:16 +02:00 |
|
Neerholt
|
9c17623518
|
Live search
|
2020-07-07 19:29:21 +02:00 |
|
frederikpyt
|
6eb198011f
|
Fixed redirect
|
2020-07-02 10:06:17 +02:00 |
|
frederikpyt
|
471a2897a5
|
Fixed redirect
|
2020-07-01 11:59:48 +02:00 |
|
frederikpyt
|
330b895a35
|
Fixed redirect
|
2020-07-01 11:56:44 +02:00 |
|
frederikpyt
|
37f6016199
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 11:54:46 +02:00 |
|
frederikpyt
|
cd828725b6
|
Fixed redirect
|
2020-07-01 11:54:33 +02:00 |
|
Neerholt
|
4e69768ae8
|
Lavet controller og et forsøg på GUI
|
2020-07-01 11:46:29 +02:00 |
|
Anders
|
2368573ee7
|
Merge remote-tracking branch 'origin/master'
|
2020-07-01 11:44:20 +02:00 |
|
Anders
|
a174b47258
|
Fail message when there is no activity.
You can now use the button "Kontoret" in the menu navbar
|
2020-07-01 11:44:14 +02:00 |
|
frederikpyt
|
b84b9dbe04
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 11:41:08 +02:00 |
|
frederikpyt
|
9d757dc536
|
Fixed washing machine reservation, creation, edit and deletion
|
2020-07-01 11:38:09 +02:00 |
|
Vedde
|
32a7e3d3d0
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 11:29:58 +02:00 |
|
Vedde
|
9f48d2372f
|
added a few comments
|
2020-07-01 11:29:45 +02:00 |
|
Anders
|
9870556c5a
|
Now able to delete washing machines
|
2020-07-01 10:56:04 +02:00 |
|
frederikpyt
|
432d9042fd
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 10:32:52 +02:00 |
|
frederikpyt
|
2846dac2dc
|
Fixed Washing machine creation and editing
|
2020-07-01 10:30:28 +02:00 |
|
Neerholt
|
32b7b3c925
|
Test commit
|
2020-07-01 10:29:47 +02:00 |
|
Anders
|
b4f79c6f5e
|
Merge remote-tracking branch 'origin/master'
|
2020-07-01 10:13:57 +02:00 |
|
Anders
|
03b7f4236a
|
Users able to change password
|
2020-07-01 10:13:49 +02:00 |
|
frederikpyt
|
6ecc96ef55
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:50:36 +02:00 |
|
Neerholt
|
eb48514545
|
Made it so you get send to index after you make,edit and update user information
|
2020-07-01 09:50:37 +02:00 |
|
frederikpyt
|
ca744a33e9
|
Removed feedback create button from admin dashboard
|
2020-07-01 09:50:29 +02:00 |
|
Neerholt
|
2b69938251
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:43:24 +02:00 |