nilsding
|
5f8533ec9d
|
Merge remote-tracking branch 'origin/master'
|
2014-11-30 18:24:11 +01:00 |
|
nilsding
|
52ec2cffba
|
colours
|
2014-11-30 18:23:57 +01:00 |
|
pixeldesu
|
1979f528a9
|
revert remove newline
|
2014-11-30 18:17:39 +01:00 |
|
pixeldesu
|
7a795dc290
|
remove newline
|
2014-11-30 18:16:27 +01:00 |
|
pixeldesu
|
616589f678
|
updated inbox question display
|
2014-11-30 18:15:00 +01:00 |
|
nilsding
|
b1eb0f72d0
|
a
|
2014-11-30 18:10:53 +01:00 |
|
nilsding
|
ae4952db28
|
deleting questions from the inbox is now possible
|
2014-11-30 18:05:51 +01:00 |
|
pixeldesu
|
05591f51ef
|
default
|
2014-11-30 17:58:11 +01:00 |
|
pixeldesu
|
7230098075
|
fix meta tag fuckup
|
2014-11-30 17:53:38 +01:00 |
|
pixeldesu
|
5b0c180b1d
|
add webapp meta tags for apple devices
|
2014-11-30 17:51:00 +01:00 |
|
pixeldesu
|
7364de190f
|
more fixes
|
2014-11-30 17:40:31 +01:00 |
|
pixeldesu
|
63276a57ef
|
fixes
|
2014-11-30 17:36:26 +01:00 |
|
pixeldesu
|
f5231ec304
|
hiding smiled-text on mobile devices
|
2014-11-30 17:35:03 +01:00 |
|
pixeldesu
|
5829046402
|
added smile to timeline page
|
2014-11-30 17:31:42 +01:00 |
|
pixeldesu
|
a6af5e7609
|
added spans
|
2014-11-30 17:28:28 +01:00 |
|
pixeldesu
|
33d42b6a76
|
dash o
|
2014-11-30 17:24:24 +01:00 |
|
pixeldesu
|
7933e9073b
|
Merge branch 'master' of git.rrerr.net:nilsding/justask
|
2014-11-30 17:22:42 +01:00 |
|
pixeldesu
|
ecdaf7d45f
|
added buttons that don't do a thing yet
|
2014-11-30 17:22:34 +01:00 |
|
nilsding
|
d3c2b43a73
|
added statistics to about page
|
2014-11-30 16:53:04 +01:00 |
|
nilsding
|
842e9059e7
|
sorting
|
2014-11-30 16:41:28 +01:00 |
|
nilsding
|
4220091eae
|
added a few iOS® meta tags
|
2014-11-30 16:41:18 +01:00 |
|
pixeldesu
|
09ecb0e189
|
update meta theme
|
2014-11-30 16:26:10 +01:00 |
|
pixeldesu
|
af1d3cbb27
|
Merge branch 'master' of git.rrerr.net:nilsding/justask
|
2014-11-30 16:19:27 +01:00 |
|
pixeldesu
|
249c4cd587
|
oh boy profile updates
|
2014-11-30 16:19:20 +01:00 |
|
nilsding
|
155b60f8b2
|
"answered by xyz" should not be shown on the user page
|
2014-11-30 16:09:39 +01:00 |
|
pixeldesu
|
dbdb3c81ab
|
removed newline
|
2014-11-30 16:07:56 +01:00 |
|
nilsding
|
03bce30714
|
fixed indentation
|
2014-11-30 16:06:42 +01:00 |
|
pixeldesu
|
c0c6ac182b
|
added username of user who answered the question
|
2014-11-30 16:04:37 +01:00 |
|
nilsding
|
01aff9b673
|
added jbuilder templates
|
2014-11-30 15:47:12 +01:00 |
|
Georg G
|
be8a9fdc10
|
Merge branch 'follow-users' into 'master'
Follow users
See merge request !1
|
2014-11-30 15:40:18 +01:00 |
|
nilsding
|
e8974415c9
|
timeline now actually shows entries
|
2014-11-30 15:39:13 +01:00 |
|
nilsding
|
814a509f60
|
added JS for following/unfollowing
|
2014-11-30 15:34:23 +01:00 |
|
nilsding
|
81c4f14a62
|
added user/actions partial
|
2014-11-30 15:28:58 +01:00 |
|
nilsding
|
d4c1ce83de
|
added ids to counts
|
2014-11-30 15:28:38 +01:00 |
|
nilsding
|
1b15add6b1
|
added ajax controller thing
|
2014-11-30 15:13:37 +01:00 |
|
nilsding
|
928addf5db
|
added methods for following/unfollowing users
|
2014-11-30 15:13:17 +01:00 |
|
nilsding
|
63be00f70f
|
justask:recount now recounts the friend/follower_count
|
2014-11-30 14:56:06 +01:00 |
|
nilsding
|
4db8f8f33f
|
added some Ajax routes
|
2014-11-30 14:45:32 +01:00 |
|
nilsding
|
eecdecfda9
|
added validations and everything
|
2014-11-30 14:43:35 +01:00 |
|
pixeldesu
|
3496cd7f0a
|
hide images if anonymous and links to profiles
|
2014-11-30 14:43:27 +01:00 |
|
pixeldesu
|
9f33ab5566
|
fixed stuff
|
2014-11-30 14:34:27 +01:00 |
|
pixeldesu
|
2b81ad86db
|
added gravatar support
|
2014-11-30 14:31:38 +01:00 |
|
pixeldesu
|
409cb8aa66
|
added team display to about page
|
2014-11-30 14:21:11 +01:00 |
|
pixeldesu
|
1907583565
|
fix muted link displayability, only limit to answerboxes
|
2014-11-30 14:09:45 +01:00 |
|
pixeldesu
|
98ed4dfe85
|
fix image dimensions
|
2014-11-30 14:08:51 +01:00 |
|
nilsding
|
57c4578533
|
added relationship model
|
2014-11-30 14:06:05 +01:00 |
|
pixeldesu
|
bf4a90b8b5
|
pull?
|
2014-11-30 14:01:36 +01:00 |
|
pixeldesu
|
adce8fa27a
|
maybe this fixes it
|
2014-11-30 13:57:15 +01:00 |
|
pixeldesu
|
e8d7874bef
|
lets try to fix this stuff here
|
2014-11-30 13:52:44 +01:00 |
|
pixeldesu
|
b5b977ab5c
|
what the fuck is badge-danger?
|
2014-11-30 02:06:15 +01:00 |