Andreas N
|
92af469aa4
|
Merge branch 'master' into moderation
|
2014-12-27 02:12:32 +01:00 |
|
nilsding
|
64d50ad9b4
|
fox'd
|
2014-12-27 01:55:09 +01:00 |
|
nilsding
|
a37cd95f46
|
Merge branch 'master' into notifications-tooltips
|
2014-12-27 01:46:34 +01:00 |
|
nilsding
|
e570f40a36
|
WRYYYYYYYYYYYYYYYYYY
|
2014-12-27 01:45:24 +01:00 |
|
nilsding
|
88e9d7599d
|
dragons
|
2014-12-27 01:22:13 +01:00 |
|
nilsding
|
9fe8be1db8
|
Merge branch 'master' of git.rrerr.net:justask/justask
Conflicts:
app/views/shared/_answerbox.html.haml
|
2014-12-27 00:40:02 +01:00 |
|
nilsding
|
c817f32b18
|
j
|
2014-12-27 00:39:03 +01:00 |
|
Andreas N
|
20c173442d
|
remove that button
|
2014-12-27 00:37:42 +01:00 |
|
Andreas N
|
4961a44d59
|
add collapsed view for single answerbox
|
2014-12-27 00:33:45 +01:00 |
|
nilsding
|
d31bfa6d8b
|
added a few placeholders
|
2014-12-27 00:19:55 +01:00 |
|
pixeldesu
|
32ace00f84
|
forgot the extra profile pages
|
2014-12-26 15:32:53 +01:00 |
|
nilsding
|
cb003ce36d
|
added link to moderation panel in navbar
|
2014-12-26 14:09:07 +01:00 |
|
pixeldesu
|
40dc6a140d
|
fix margin if content is empty
|
2014-12-26 13:48:20 +01:00 |
|
pixeldesu
|
e900b794d3
|
increased sidebar size on profile
|
2014-12-26 13:45:29 +01:00 |
|
nilsding
|
9e918fa3dc
|
added moderator to users
|
2014-12-26 13:34:01 +01:00 |
|
pixeldesu
|
f403a0a2f8
|
added tabs, moderation box view and comment display
|
2014-12-25 23:47:11 +01:00 |
|
pixeldesu
|
32623ec2f2
|
added basic mod page
|
2014-12-25 23:14:45 +01:00 |
|
pixeldesu
|
2107ec6270
|
init moderation controller
|
2014-12-25 23:00:33 +01:00 |
|
nilsding
|
b927b3bc87
|
orrrr
|
2014-12-25 15:16:57 +01:00 |
|
nilsding
|
4e2cfd5188
|
???
|
2014-12-25 15:16:10 +01:00 |
|
nilsding
|
de1ef57a8a
|
dose that work
|
2014-12-25 15:13:52 +01:00 |
|
Andreas N
|
9440eafbe8
|
Merge branch 'master' of git.rrerr.net:justask/justask
|
2014-12-25 14:27:24 +01:00 |
|
Andreas N
|
4f777968e5
|
readded links to questions on user profile
|
2014-12-25 14:26:35 +01:00 |
|
Andreas N
|
a09c01cc44
|
fixed text display for anon questionbox
|
2014-12-25 14:22:49 +01:00 |
|
nilsding
|
22838ebfda
|
Meymeys
|
2014-12-21 23:10:26 +01:00 |
|
Andreas N
|
7429aca044
|
remove br
|
2014-12-21 23:09:16 +01:00 |
|
nilsding
|
98e9fe098f
|
Meymeys
|
2014-12-21 23:07:56 +01:00 |
|
Andreas N
|
40b0097149
|
more fix
|
2014-12-21 23:07:01 +01:00 |
|
Andreas N
|
6201b7043b
|
how to stupid fix
|
2014-12-21 23:05:53 +01:00 |
|
nilsding
|
b01e1791d4
|
Merge remote-tracking branch 'origin/inbox'
|
2014-12-21 23:04:43 +01:00 |
|
Andreas N
|
23af34494e
|
add share on Twitter button
|
2014-12-21 23:01:21 +01:00 |
|
nilsding
|
2aea87d305
|
Meymeys
|
2014-12-21 22:41:14 +01:00 |
|
nilsding
|
b45b273f50
|
I TAKE A LOOK AT MY ENORMOUS MEMES
|
2014-12-21 22:29:52 +01:00 |
|
nilsding
|
e8f4c2662a
|
goddamnit Karim
|
2014-12-21 16:40:10 +01:00 |
|
nilsding
|
2169a86615
|
added a count
|
2014-12-21 15:36:57 +01:00 |
|
nilsding
|
aa9bd028db
|
Merge remote-tracking branch 'origin/inbox'
|
2014-12-21 15:33:03 +01:00 |
|
nilsding
|
0ddb1a609c
|
the 404 page is shown again if an user was not found
|
2014-12-21 15:32:49 +01:00 |
|
nilsding
|
dc0b105b46
|
added .panel-title
|
2014-12-21 14:28:33 +01:00 |
|
nilsding
|
7a18790241
|
added disable attribute if there are no questions in the inbox
|
2014-12-21 14:11:35 +01:00 |
|
nilsding
|
1ba34c59d0
|
added "delete all questions" button thing
|
2014-12-21 13:41:57 +01:00 |
|
Andreas N
|
55f1680c18
|
hide delete inbox for now
|
2014-12-20 16:15:59 +01:00 |
|
Andreas N
|
000fa09a5e
|
restructure inbox design
|
2014-12-20 14:37:14 +01:00 |
|
Andreas N
|
ba9b6d1e12
|
add link to question/answer in question display
|
2014-12-20 02:14:27 +01:00 |
|
Andreas N
|
00f1c6ac1a
|
attempt fix
|
2014-12-20 02:04:35 +01:00 |
|
Andreas N
|
5aa6248cb1
|
icon bar animation shows up when you have new notifications
|
2014-12-20 01:37:05 +01:00 |
|
Andreas N
|
368949a031
|
fix design stuff
|
2014-12-20 00:03:07 +01:00 |
|
Andreas N
|
cc3dcdddd5
|
more view fixes
|
2014-12-19 23:41:15 +01:00 |
|
Andreas N
|
5d19a975f3
|
indentation is my best friend
|
2014-12-19 23:38:09 +01:00 |
|
Andreas N
|
b074abad4d
|
fuck panel-body
|
2014-12-19 23:35:54 +01:00 |
|
Andreas N
|
b9e1432889
|
Merge branch 'master' of git.rrerr.net:justask/justask
|
2014-12-19 23:33:50 +01:00 |