Marijn Jansen
|
46b47d5f8d
|
Merge branch 'master' into marijn-button
|
2017-01-23 13:24:35 +01:00 |
|
Lars van Hijfte
|
76eb2dee7c
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !94
|
2017-01-23 13:17:57 +01:00 |
|
Lars van Hijfte
|
1ec8de71f0
|
Changed menu view
|
2017-01-23 13:17:01 +01:00 |
|
Lars van Hijfte
|
a165878aa8
|
Merge branch 'master' into lars-algemeen
|
2017-01-23 11:34:09 +01:00 |
|
Lars van Hijfte
|
93b6835ea4
|
Changed style and added friendrequests
|
2017-01-23 11:33:27 +01:00 |
|
Marijn Jansen
|
8ba7583e85
|
Merge branch 'marijn-settings' into 'master'
Changed binParam for bindValue
See merge request !93
|
2017-01-22 11:24:02 +01:00 |
|
Marijn Jansen
|
2a44057233
|
Changed binParam for bindValue
|
2017-01-22 11:23:13 +01:00 |
|
Lars van Hijfte
|
71202ab857
|
Merge branch 'joey-testing' into 'master'
Fixed redirect to profile page after going back 1 page
See merge request !88
|
2017-01-20 16:26:19 +01:00 |
|
Joey Lai
|
95aaba7e7e
|
Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing
|
2017-01-20 16:25:38 +01:00 |
|
Joey Lai
|
e33210ce5e
|
Merge branch 'master' into joey-testing
|
2017-01-20 16:24:59 +01:00 |
|
Lars van Hijfte
|
9edf065c81
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !92
|
2017-01-20 16:22:52 +01:00 |
|
Marijn Jansen
|
bf78b80a30
|
Merge branch 'marijn-settings' into 'master'
Kind of works now: Profile update
See merge request !91
|
2017-01-20 16:22:18 +01:00 |
|
Lars van Hijfte
|
3ae00f52bf
|
Merge branch 'master' into lars-algemeen
|
2017-01-20 16:21:54 +01:00 |
|
Marijn Jansen
|
ac96200d16
|
Kind of works now: Profile update
|
2017-01-20 16:20:34 +01:00 |
|
Lars van Hijfte
|
a08e5a346a
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !89
|
2017-01-20 16:20:29 +01:00 |
|
Lars van Hijfte
|
3039839656
|
Merge branch 'hendrik-search' into 'master'
Hendrik search
See merge request !90
|
2017-01-20 16:20:03 +01:00 |
|
Joey Lai
|
e456591db6
|
Merge branch 'master' into joey-testing
|
2017-01-20 16:18:57 +01:00 |
|
Hendrik
|
581f6e18f0
|
Merge branch 'master' into hendrik-search
|
2017-01-20 16:18:53 +01:00 |
|
K. Nobel
|
a87b5e709b
|
Merge branch 'master' into kevin-prototype
|
2017-01-20 16:18:36 +01:00 |
|
K. Nobel
|
18185020c3
|
Added improvements to profile page.
|
2017-01-20 16:18:12 +01:00 |
|
Hendrik
|
9152ae4f75
|
add searching users, searching groups, remembering search options
|
2017-01-20 16:18:09 +01:00 |
|
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 |
|
Lars van Hijfte
|
696f4ebc1e
|
Merge branch 'hendrik-testing' into 'master'
Hendrik testing
See merge request !87
|
2017-01-20 15:40:43 +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 |
|
Marijn Jansen
|
0eb292d654
|
Merge branch 'kevin-prototype' into 'master'
Changed links to absolute path.
See merge request !85
|
2017-01-20 15:06:03 +01:00 |
|
K. Nobel
|
cda439be8d
|
Merge branch 'master' into kevin-prototype
|
2017-01-20 15:04:47 +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 |
|
Lars van Hijfte
|
3bd2b3c02e
|
Merge branch 'kevin-prototype' into 'master'
Fixed script tags and @import. Has to be absolute path in order to work with the .htaccess file.
See merge request !84
|
2017-01-20 14:49:05 +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
|
0956dce303
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !83
|
2017-01-20 14:41:11 +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 |
|
Lars van Hijfte
|
c88f3b6423
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !80
|
2017-01-20 14:36:37 +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
|
756589b323
|
Merge branch 'lars-algemeen' into 'master'
Made chat xss prove
See merge request !82
|
2017-01-20 13:33:35 +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
|
28578adb11
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !79
|
2017-01-20 12:54:24 +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 |
|
Marijn Jansen
|
1db998c1bd
|
Merge branch 'kevin-prototype' into 'master'
Kevin prototype
See merge request !78
|
2017-01-20 12:27:58 +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 |
|
Lars van Hijfte
|
3752f3cd33
|
Merge branch 'joey-testing' into 'master'
fixed ;
See merge request !77
|
2017-01-20 12:02:12 +01:00 |
|
Joey Lai
|
44bbbfeaae
|
fixed ;
|
2017-01-20 12:01:27 +01:00 |
|
Lars van Hijfte
|
d962d12023
|
Merge branch 'joey-testing' into 'master'
added echo
See merge request !76
|
2017-01-20 11:59:14 +01:00 |
|
Joey Lai
|
66e4fa189c
|
added echo
|
2017-01-20 11:58:33 +01:00 |
|
Lars van Hijfte
|
eeba421e3c
|
Merge branch 'joey-testing' into 'master'
added script to window.onload
See merge request !75
|
2017-01-20 11:58:14 +01:00 |
|
Joey Lai
|
dfc04be8b6
|
added script to window.onload
|
2017-01-20 11:56:30 +01:00 |
|
Lars van Hijfte
|
f388993f63
|
Merge branch 'joey-testing' into 'master'
added checked already logged in function
See merge request !74
|
2017-01-20 11:54:02 +01:00 |
|
Joey Lai
|
db2fb1b353
|
added checked already logged in function
|
2017-01-20 11:51:50 +01:00 |
|
Lars van Hijfte
|
afb7424117
|
Merge branch 'joey-testing' into 'master'
fixed spelling
See merge request !73
|
2017-01-20 11:26:27 +01:00 |
|
Joey Lai
|
2a086844c3
|
fixed spelling
|
2017-01-20 11:25:38 +01:00 |
|
Lars van Hijfte
|
4713defff5
|
Merge branch 'joey-testing' into 'master'
Added comments to checkinput.php
See merge request !72
|
2017-01-20 11:23:40 +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 |
|
K. Nobel
|
2f1bbd0a8e
|
Merge branch 'master' into kevin-prototype
|
2017-01-19 16:07:14 +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 |
|
K. Nobel
|
f535bb10ca
|
added .htaccess
|
2017-01-19 15:50:57 +01:00 |
|
Lars van Hijfte
|
64bf448808
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !70
|
2017-01-19 14:56:41 +01:00 |
|
Lars van Hijfte
|
f5fa36c09c
|
added 404 image
|
2017-01-19 14:55:58 +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 |
|
Marijn Jansen
|
dd0c9b35e9
|
No autologin
|
2017-01-19 13:53:49 +01:00 |
|
Marijn Jansen
|
d27538a164
|
Email change implemented!
|
2017-01-19 13:44:47 +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
|
2bdcca3ad9
|
Merge branch 'lars-chat' into 'master'
Made $db global
See merge request !67
|
2017-01-19 11:58:39 +01:00 |
|
Lars van Hijfte
|
186cdf1445
|
Made $db global
|
2017-01-19 11:57:54 +01:00 |
|
K. Nobel
|
b37d06e2cc
|
Updated queries
|
2017-01-19 11:55:23 +01:00 |
|
Lars van Hijfte
|
54b1b0dcc0
|
Merge branch 'lars-chat' into 'master'
Fixed chat
See merge request !66
|
2017-01-19 11:17:02 +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
|
08e0447d4c
|
Ignore .idea folder
|
2017-01-19 11:00:55 +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 |
|
Lars van Hijfte
|
28061671d8
|
Merge branch 'lars-chat' into 'master'
added this file because it is needed
See merge request !63
|
2017-01-18 16:22:39 +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 |
|
Lars van Hijfte
|
380b256d29
|
added this file because it is needed
|
2017-01-18 16:20:33 +01:00 |
|
K. Nobel
|
880db2d325
|
Merge branch 'master' into kevin-prototype
|
2017-01-18 16:20:15 +01:00 |
|
Lars van Hijfte
|
fddeba821d
|
Merge branch 'lars-chat' into 'master'
fixed menu more friends bug
See merge request !61
|
2017-01-18 16:13:36 +01:00 |
|
Lars van Hijfte
|
d06ad5a44d
|
fixed menu more friends bug
|
2017-01-18 16:12:38 +01:00 |
|
Marijn Jansen
|
7390898721
|
Merge branch 'hendrik-testing' into 'master'
Hendrik testing
See merge request !60
|
2017-01-18 16:08:49 +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 |
|
K. Nobel
|
62d77fc616
|
Added query needed to get userID
|
2017-01-18 15:56:59 +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 |
|
Hendrik
|
71dc7bae2c
|
add group search, add user individual actions
|
2017-01-18 15:19:07 +01:00 |
|
Lars van Hijfte
|
cd954a8c4c
|
Merge branch 'master' into lars-chat
|
2017-01-18 15:10:17 +01:00 |
|
Lars van Hijfte
|
95fd3c0040
|
chat is done?
|
2017-01-18 15:09:52 +01:00 |
|
Lars van Hijfte
|
19f525d168
|
Live chatting now shows up in the chat-history
|
2017-01-18 14:34:15 +01:00 |
|
K. Nobel
|
bdf5c221a7
|
Added queries related to users.
|
2017-01-18 14:23:36 +01:00 |
|
K. Nobel
|
e80ce3b793
|
Improved selectAllFriends query
|
2017-01-18 14:22:03 +01:00 |
|
Hendrik
|
b5ceb1b5e0
|
add pagetype selector, add search filter
|
2017-01-18 14:20:32 +01:00 |
|
Lars van Hijfte
|
eb2a343d5f
|
added live sending messages from user 2 to user 2
|
2017-01-18 12:08:53 +01:00 |
|
Hendrik
|
8ce6cd1aa2
|
add rudimentary search
|
2017-01-17 16:23:44 +01:00 |
|
Hendrik
|
d1d07ce37d
|
Merge remote-tracking branch 'origin/lars-algemeen' into hendrik-testing
|
2017-01-17 15:15:14 +01:00 |
|
Hendrik
|
146fc7108b
|
add usersearch query
|
2017-01-17 15:13:32 +01:00 |
|
Hendrik
|
877072f9e3
|
add sql usersearch base in adminpanel
|
2017-01-17 15:12:56 +01:00 |
|
Hendrik
|
e3e72b8ef6
|
fixed connect.php location in head
|
2017-01-17 14:02:33 +01:00 |
|
K. Nobel
|
bb637853ef
|
Merge branch 'master' into kevin-prototype
|
2017-01-17 13:12:43 +01:00 |
|
Hendrik
|
7c6a3cc252
|
Merge branch 'master' into hendrik-testing
|
2017-01-17 12:56:09 +01:00 |
|
Hendrik
|
f00b3d9a23
|
add page selector in adminpanel
|
2017-01-17 12:55:15 +01:00 |
|
Hendrik
|
b60d118ac6
|
added form complete on search in adminpanel
|
2017-01-17 12:40:41 +01:00 |
|
K. Nobel
|
3901b32e6e
|
Merge branch 'master' into kevin-prototype
|
2017-01-17 12:25:44 +01:00 |
|
Hendrik
|
3a9b851009
|
Merge branch 'master' into hendrik-testing
|
2017-01-17 10:58:17 +01:00 |
|
Hendrik
|
c6bdf349a8
|
fixed forms for php, user status and page type
|
2017-01-17 10:34:30 +01:00 |
|