 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 |
|
|
Marijn Jansen
|
097ccf49b3
|
New Button
|
2017-01-18 15:27:51 +01:00 |
|
|
Hendrik
|
71dc7bae2c
|
add group search, add user individual actions
|
2017-01-18 15:19:07 +01:00 |
|
|
Marijn Jansen
|
34c4b11efb
|
"Deze finctie werkt nog niet"
|
2017-01-18 15:18:08 +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 |
|
|
Marijn Jansen
|
0e194ca084
|
Merge branch 'marijn-settings'
|
2017-01-18 15:09:21 +01:00 |
|
|
Marijn Jansen
|
37ad2e0ea4
|
New placeholder for date
|
2017-01-18 15:08:48 +01:00 |
|
|
Marijn Jansen
|
e7ceb254ce
|
No standard marijn user
|
2017-01-18 14:57:16 +01:00 |
|
|
Marijn Jansen
|
853b083c04
|
Merge branch 'marijn-projectplan-planning' into 'master'
Marijn projectplan planning
See merge request !57
|
2017-01-18 14:55:21 +01:00 |
|
|
Marijn Jansen
|
bd3ffafdef
|
Merge branch 'marijn-settings' into 'master'
Marijn settings
See merge request !56
|
2017-01-18 14:52:37 +01:00 |
|
|
Marijn Jansen
|
ab8c12c9d8
|
Merge branch 'master' into 'marijn-settings'
# Conflicts:
# website/queries/settings.php
|
2017-01-18 14:52:32 +01:00 |
|
|
Marijn Jansen
|
714760871c
|
Merge branch 'joey-testing' into 'master'
Almost finished login/register page
See merge request !55
|
2017-01-18 14:51:52 +01:00 |
|
|
Marijn Jansen
|
e73fcd420c
|
settings succes mesages
|
2017-01-18 14:51:03 +01:00 |
|
|
Marijn Jansen
|
4fe142eb51
|
Projectplan added to gitignore
|
2017-01-18 14:50:11 +01:00 |
|
|
Joey Lai
|
0808d46d9e
|
Added salting and no similar username
|
2017-01-18 14:46:32 +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 |
|
|
Marijn Jansen
|
d627c8a837
|
Projectplan
|
2017-01-18 13:46:50 +01:00 |
|
|
Marijn Jansen
|
b201d82878
|
Projectplan now has the "Planning"
|
2017-01-18 13:14:43 +01:00 |
|
|
Marijn Jansen
|
ed0d0990ad
|
Removed LaTeX pdf frop git
|
2017-01-18 13:14:06 +01:00 |
|
|
Joey Lai
|
afcd048260
|
Almost finished login/register page
|
2017-01-18 12:35:41 +01:00 |
|
|
Lars van Hijfte
|
eb2a343d5f
|
added live sending messages from user 2 to user 2
|
2017-01-18 12:08:53 +01:00 |
|
|
Marijn Jansen
|
dde463df6c
|
Added password change
|
2017-01-18 10:43:54 +01:00 |
|
|
Marijn Jansen
|
51378bf386
|
Merge branch 'joey-testing' into 'master'
Splitted login and register pages
See merge request !54
|
2017-01-18 09:21:10 +01:00 |
|
|
Joey Lai
|
9b4743d25a
|
Splitted login and register pages
|
2017-01-18 09:19:38 +01:00 |
|
|
Marijn Jansen
|
683fec805c
|
Merge branch 'marijn-settings' into 'master'
Settings work with sql, session is hardcoded to 2 glob db
See merge request !53
|
2017-01-17 16:50:19 +01:00 |
|
|
Marijn Jansen
|
176851b486
|
Added SQL Dialect
|
2017-01-17 16:48:57 +01:00 |
|
|
Marijn Jansen
|
11f2297d5a
|
Setting loadin, settings update, db is now global
|
2017-01-17 16:47:49 +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 |
|
|
Marijn Jansen
|
0966b3528e
|
Merge branch 'lars-algemeen' into 'master'
Lars algemeen
See merge request !52
|
2017-01-17 15:13:49 +01:00 |
|