 Lars van Hijfte
|
173ef3e50c
|
Added a notification bar
|
2017-01-20 16:17:56 +01:00 |
|
 Joey Lai
|
6ff70440e6
|
history back -> profile.php
|
2017-01-20 16:14:32 +01:00 |
|
|
Joey Lai
|
82fc1e5266
|
Merge branch 'master' into 'joey-testing'
# Conflicts:
# website/views/login_head.php
|
2017-01-20 16:06:16 +01:00 |
|
|
Joey Lai
|
e17a55e82d
|
Fixed redirect to profile page after going back 1 page
|
2017-01-20 16:01:08 +01:00 |
|
 Marijn Jansen
|
7e3648d36c
|
Merge branch 'marijn-settings'
|
2017-01-20 15:42:00 +01:00 |
|
|
Marijn Jansen
|
587d0e6ac3
|
fixed crosssitescripting on settings pagw
|
2017-01-20 15:41:13 +01:00 |
|
 Hendrik
|
b1348a3d0e
|
Merge branch 'master' into hendrik-testing
|
2017-01-20 15:39:44 +01:00 |
|
|
Marijn Jansen
|
b1e01699eb
|
Merge branch 'master' into marijn-settings
|
2017-01-20 15:36:10 +01:00 |
|
|
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 |
|
|
K. Nobel
|
ada54561c7
|
Merge branch 'master' into kevin-prototype
|
2017-01-20 14:40:36 +01:00 |
|
|
K. Nobel
|
6478ce920f
|
Fixed .htaccess
|
2017-01-20 14:40:21 +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
|
adb7f2f37d
|
Fixed .htaccess
|
2017-01-20 14:31:49 +01:00 |
|
|
K. Nobel
|
ea3f1c9693
|
Merge branch 'master' into kevin-prototype
|
2017-01-20 14:29:55 +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 |
|
|
K. Nobel
|
b7620fe4db
|
Moved .htaccess
|
2017-01-20 14:05:20 +01:00 |
|
|
Lars van Hijfte
|
61c148e127
|
Made chat xss prove
|
2017-01-20 13:30:40 +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 |
|
|
K. Nobel
|
dbb497cce5
|
Merge branch 'master' into kevin-prototype
|
2017-01-20 13:08:07 +01:00 |
|
|
K. Nobel
|
bfdf9e989b
|
Fixed profile page, now shows current user when no username is given in get variable.
|
2017-01-20 13:07:47 +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 |
|
|
Lars van Hijfte
|
a2846c392c
|
Merge branch 'master' into lars-algemeen
|
2017-01-20 12:48:22 +01:00 |
|
|
Joey Lai
|
cc9ec9d54a
|
Merge branch 'master' into joey-testing
|
2017-01-20 12:33:39 +01:00 |
|
|
Joey Lai
|
eb1fc15401
|
script on right lines
|
2017-01-20 12:32:39 +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 |
|
|
K. Nobel
|
1cfcba80fc
|
Merge branch 'master' into kevin-prototype
|
2017-01-20 12:18:47 +01:00 |
|
|
Hendrik
|
c93579913d
|
Merge branch 'master' into hendrik-testing
|
2017-01-20 12:14:17 +01:00 |
|
|
K. Nobel
|
142bae139b
|
Profile will now show the current users page when a username is not given in a get request.
|
2017-01-20 12:14:05 +01:00 |
|
|
Hendrik
|
3152839dae
|
add javascript for userlist tablehead checkall box, fix pageselector css
|
2017-01-20 12:06:23 +01:00 |
|
|
Joey Lai
|
44bbbfeaae
|
fixed ;
|
2017-01-20 12:01:27 +01:00 |
|
|
Joey Lai
|
66e4fa189c
|
added echo
|
2017-01-20 11:58:33 +01:00 |
|
|
Joey Lai
|
dfc04be8b6
|
added script to window.onload
|
2017-01-20 11:56:30 +01:00 |
|
|
Joey Lai
|
db2fb1b353
|
added checked already logged in function
|
2017-01-20 11:51:50 +01:00 |
|
|
Joey Lai
|
2a086844c3
|
fixed spelling
|
2017-01-20 11:25:38 +01:00 |
|
|
Joey Lai
|
5e31590403
|
Fixed include checkinput.php
|
2017-01-20 11:19:54 +01:00 |
|
|
Joey Lai
|
0389d05e51
|
Merge branch 'master' into joey-testing
|
2017-01-20 10:48:19 +01:00 |
|
|
Joey Lai
|
7df182676a
|
Added comments to checkinput.php
|
2017-01-20 10:45:53 +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 |
|