Marijn Jansen
|
064fe93ba7
|
Merge branch 'joey-testing' into 'master'
Joey testing
See merge request !86
|
2017-01-20 15:35:15 +01:00 |
|
K. Nobel
|
e7d63c2f57
|
Changed how name is displayed on profile page.
|
2017-01-20 15:34:01 +01:00 |
|
Joey Lai
|
15a3640eea
|
Added arrow button for going to login.php
|
2017-01-20 15:25:37 +01:00 |
|
K. Nobel
|
e547712b2a
|
Changed links to absolute path.
|
2017-01-20 15:02:05 +01:00 |
|
Marijn Jansen
|
59d4740ad5
|
Alpha 0.0.1 profile picture upload shizzle!
|
2017-01-20 14:55:47 +01:00 |
|
K. Nobel
|
ca28724274
|
Fixed script tags and @import. Has to be absolute path in order to work with the .htaccess file.
|
2017-01-20 14:48:00 +01:00 |
|
Hendrik
|
4218860936
|
remove testinput
|
2017-01-20 14:43:04 +01:00 |
|
Lars van Hijfte
|
c9bdbcf3b5
|
Merge branch 'hendrik-testing' into 'master'
Hendrik testing
See merge request !81
|
2017-01-20 14:36:58 +01:00 |
|
K. Nobel
|
0e5f7dc9fb
|
Fixed no friends text and no groups text.
|
2017-01-20 14:10:32 +01:00 |
|
K. Nobel
|
f9c55323ad
|
Made friends and groups clickable.
|
2017-01-20 14:09:04 +01:00 |
|
Hendrik
|
14d96e89ad
|
Merge branch 'master' into hendrik-testing
|
2017-01-20 13:15:06 +01:00 |
|
Hendrik
|
6418b2b679
|
move js to /js
|
2017-01-20 13:14:28 +01:00 |
|
Hendrik
|
0f02859124
|
fix queries for global and prepared
|
2017-01-20 12:58:34 +01:00 |
|
Lars van Hijfte
|
6c41e825fe
|
Removed absolute path
|
2017-01-20 12:53:23 +01:00 |
|
Hendrik
|
daff2f41fa
|
minor fix
|
2017-01-20 12:29:34 +01:00 |
|
Lars van Hijfte
|
b6f6c44cea
|
Merge branch 'master' into lars-algemeen
|
2017-01-20 12:26:22 +01:00 |
|
Lars van Hijfte
|
50cec9beed
|
Added things to the menu.
Extra item for a random friend,
If you have no groups, it has a message.
|
2017-01-20 12:25:18 +01:00 |
|
Hendrik
|
c93579913d
|
Merge branch 'master' into hendrik-testing
|
2017-01-20 12:14:17 +01:00 |
|
Hendrik
|
3152839dae
|
add javascript for userlist tablehead checkall box, fix pageselector css
|
2017-01-20 12:06:23 +01:00 |
|
Hendrik
|
e0d02d283d
|
add page functionality for groups
|
2017-01-19 16:42:45 +01:00 |
|
Hendrik
|
1640d38baa
|
add user page functionality
|
2017-01-19 16:29:38 +01:00 |
|
K. Nobel
|
56b17675fa
|
Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB
|
2017-01-19 16:04:07 +01:00 |
|
Lars van Hijfte
|
7792ceaeeb
|
Merge branch 'joey-testing' into 'master'
Functions with validating
See merge request !71
|
2017-01-19 15:59:00 +01:00 |
|
Joey Lai
|
64ea5d3f68
|
Functions with validating
|
2017-01-19 15:55:28 +01:00 |
|
Lars van Hijfte
|
1be1f393ff
|
Merge branch 'master' into lars-chat
|
2017-01-19 14:54:42 +01:00 |
|
Lars van Hijfte
|
a71cb8adb6
|
Fixed some extra things
|
2017-01-19 14:53:12 +01:00 |
|
Lars van Hijfte
|
cd1a2855de
|
Merge branch 'marijn-settings' into 'master'
Marijn settings
See merge request !69
|
2017-01-19 13:56:39 +01:00 |
|
Lars van Hijfte
|
e71054c654
|
Merge branch 'joey-testing' into 'master'
Fixed login/register and added logout.php
See merge request !68
|
2017-01-19 13:37:56 +01:00 |
|
Joey Lai
|
049dee6381
|
Fixed login/register and added logout.php
|
2017-01-19 13:11:24 +01:00 |
|
Hendrik
|
4c9223cba2
|
add user and group batch change
|
2017-01-19 12:57:10 +01:00 |
|
K. Nobel
|
84719529bb
|
Fixed queries and profile page.
|
2017-01-19 12:01:39 +01:00 |
|
Lars van Hijfte
|
186cdf1445
|
Made $db global
|
2017-01-19 11:57:54 +01:00 |
|
Lars van Hijfte
|
b71cf36798
|
Fixed chat
It now has a userID again,
displays which user you are chatting withhover over user changes different background
|
2017-01-19 11:08:55 +01:00 |
|
Hendrik
|
c4d78e54bc
|
fixed form with get, fix accompanying css
|
2017-01-19 11:08:45 +01:00 |
|
Marijn Jansen
|
ff19b5e1b9
|
Settings messages now uses a Class (:
|
2017-01-19 11:01:29 +01:00 |
|
Marijn Jansen
|
5f7b934d2b
|
Merge branch 'marijn-header' into 'master'
Session Start doubble fixes
See merge request !65
|
2017-01-18 16:42:13 +01:00 |
|
Marijn Jansen
|
1fb6c90fa6
|
Session Start doubble fixes
|
2017-01-18 16:41:45 +01:00 |
|
Marijn Jansen
|
f5a6b401a8
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !62
|
2017-01-18 16:23:36 +01:00 |
|
Marijn Jansen
|
4d20e32ac7
|
Merge branch 'marijn-header' into 'master'
Added personal Header
See merge request !64
|
2017-01-18 16:23:22 +01:00 |
|
Kevin Nobel
|
99bffc6f47
|
Merge branch 'master' into 'kevin-prototype'
# Conflicts:
# website/queries/friendship.php
# website/queries/user.php
|
2017-01-18 16:22:29 +01:00 |
|
Marijn Jansen
|
e4ec666e03
|
Added personal Header
|
2017-01-18 16:22:27 +01:00 |
|
K. Nobel
|
3ee5488a88
|
Improved profile page, profile now takes data from the DB!
|
2017-01-18 16:02:11 +01:00 |
|
Hendrik
|
38e5b28ff5
|
Merge branch 'master' into hendrik-testing
|
2017-01-18 16:02:02 +01:00 |
|
K. Nobel
|
e86a6a6d6f
|
Changed queries include
|
2017-01-18 16:01:26 +01:00 |
|
Hendrik
|
e7e3ae9c8b
|
add changing single group status
|
2017-01-18 15:57:39 +01:00 |
|
Lars van Hijfte
|
32ff271b5e
|
Merge branch 'lars-chat' into 'master'
Lars chat
See merge request !59
|
2017-01-18 15:55:41 +01:00 |
|
Marijn Jansen
|
b95705df29
|
Merge branch 'joey-testing' into 'master'
Fixed login link
See merge request !58
|
2017-01-18 15:54:36 +01:00 |
|
Lars van Hijfte
|
df9f782809
|
Friends in the menu now redirects to the users profile.
|
2017-01-18 15:54:13 +01:00 |
|
Joey Lai
|
455705e286
|
Fixed login link
|
2017-01-18 15:53:10 +01:00 |
|
Lars van Hijfte
|
7469a10f13
|
Fixed Chat!
|
2017-01-18 15:37:49 +01:00 |
|