pixeldesu
|
84493a8a74
|
Merge branch 'master' of git.rrerr.net:justask/justask
|
2014-12-14 17:31:08 +01:00 |
|
pixeldesu
|
14040199fe
|
updated TODO
|
2014-12-14 17:31:02 +01:00 |
|
nilsding
|
778c1eaccb
|
bugFuchs
|
2014-12-14 17:21:15 +01:00 |
|
nilsding
|
689c2f852c
|
update TODO
|
2014-12-14 16:15:21 +01:00 |
|
nilsding
|
5da0778131
|
fixed link
|
2014-12-14 15:58:39 +01:00 |
|
nilsding
|
1c01ced3c8
|
fixed link
|
2014-12-14 15:49:44 +01:00 |
|
nilsding
|
da537971d1
|
added item
|
2014-12-14 15:48:19 +01:00 |
|
nilsding
|
519931ee4f
|
fixed denotify
|
2014-12-14 15:48:10 +01:00 |
|
pixeldesu
|
cf78d4758a
|
rounded images
|
2014-12-14 15:44:17 +01:00 |
|
pixeldesu
|
834659fcfd
|
Merge branch 'notifications' of git.rrerr.net:justask/justask into notifications
|
2014-12-14 15:43:00 +01:00 |
|
pixeldesu
|
3bcd67d1a4
|
rounded image was missing
|
2014-12-14 15:42:54 +01:00 |
|
nilsding
|
622af3490c
|
added denotify method
|
2014-12-14 15:42:37 +01:00 |
|
pixeldesu
|
91711b24fe
|
add a bit of margin to smiles section
|
2014-12-14 15:41:08 +01:00 |
|
nilsding
|
3eec44f422
|
Merge remote-tracking branches 'remotes/origin/master' and 'remotes/origin/users-smiled' into notifications
|
2014-12-14 15:29:32 +01:00 |
|
nilsding
|
b0a2072f96
|
made notification tabs work
|
2014-12-14 15:24:59 +01:00 |
|
pixeldesu
|
d963191bd0
|
added smile display to answerbox
|
2014-12-14 15:22:37 +01:00 |
|
nilsding
|
c9d57e235f
|
added route for notifications
|
2014-12-14 15:17:52 +01:00 |
|
nilsding
|
dec91d474d
|
added notification_count
|
2014-12-14 15:15:15 +01:00 |
|
nilsding
|
43474a6c92
|
"commented on your answer"
|
2014-12-14 15:10:23 +01:00 |
|
nilsding
|
154c360e15
|
"smiled your answer"
|
2014-12-14 15:06:10 +01:00 |
|
nilsding
|
c9b5947e6b
|
"followed you"
|
2014-12-14 14:58:29 +01:00 |
|
nilsding
|
c56177cd10
|
we don't need this
|
2014-12-14 14:49:14 +01:00 |
|
nilsding
|
6a914d4394
|
added this thing
|
2014-12-14 14:44:25 +01:00 |
|
nilsding
|
2549d94f31
|
made a few things prettier
|
2014-12-14 14:41:44 +01:00 |
|
nilsding
|
ab9347f053
|
notifications work now!
|
2014-12-14 14:34:51 +01:00 |
|
nilsding
|
6b75a40afa
|
Merge branch 'notifications' of git.rrerr.net:justask/justask into notifications
|
2014-12-14 13:54:59 +01:00 |
|
pixeldesu
|
156d92e946
|
fixed typo...or wrong word
|
2014-12-14 13:52:18 +01:00 |
|
nilsding
|
ec8e813546
|
bugfix
|
2014-12-14 13:31:26 +01:00 |
|
nilsding
|
dd7d4311a4
|
Merge branch 'notifications' of git.rrerr.net:justask/justask into notifications
|
2014-12-14 12:27:45 +01:00 |
|
nilsding
|
ba31db68fe
|
Merge branch 'master' into notifications
|
2014-12-14 12:26:04 +01:00 |
|
nilsding
|
0ebf918d83
|
fixed this thing.
|
2014-12-14 12:19:52 +01:00 |
|
nilsding
|
72f0f577a1
|
case insensitive user names in URLs? why the heck knot!
|
2014-12-14 12:13:05 +01:00 |
|
nilsding
|
82444b8787
|
bugfox!
|
2014-12-14 12:03:57 +01:00 |
|
pixeldesu
|
1997d36b2f
|
how about I look into how to change the dropdown first
|
2014-12-13 19:48:31 +01:00 |
|
nilsding
|
61a7b582e4
|
created notification model
|
2014-12-13 19:30:10 +01:00 |
|
nilsding
|
062d458363
|
added class option to nav_entry
|
2014-12-13 19:28:46 +01:00 |
|
nilsding
|
025507c258
|
Nicolas Cage approves this branch
|
2014-12-13 19:11:27 +01:00 |
|
nilsding
|
1870acdd3a
|
fluid
|
2014-12-13 18:24:50 +01:00 |
|
nilsding
|
e1d250cadd
|
change wording
|
2014-12-13 18:20:25 +01:00 |
|
pixeldesu
|
1156548ef6
|
fix button opacity
|
2014-12-13 18:12:24 +01:00 |
|
pixeldesu
|
6706203ac1
|
more fixes
|
2014-12-13 18:10:57 +01:00 |
|
pixeldesu
|
103103764b
|
how about this thing
|
2014-12-13 18:04:52 +01:00 |
|
nilsding
|
de69e84e5a
|
Haml::SyntaxError
|
2014-12-13 18:03:27 +01:00 |
|
pixeldesu
|
3173d70aac
|
added new frontpage design
|
2014-12-13 17:52:58 +01:00 |
|
nilsding
|
309fa939aa
|
no more thread.new
|
2014-12-13 16:46:27 +01:00 |
|
nilsding
|
0a23494962
|
updated procfile
|
2014-12-13 16:44:33 +01:00 |
|
nilsding
|
2df59727be
|
added a few directories in ./tmp
|
2014-12-13 16:42:00 +01:00 |
|
nilsding
|
935acb7335
|
added layouts/messages to setting views
|
2014-12-13 16:03:18 +01:00 |
|
nilsding
|
a2dae7c5d4
|
checked state is best state
|
2014-12-13 15:49:19 +01:00 |
|
nilsding
|
82277847b9
|
Merge branch 'omniauth'
|
2014-12-13 15:40:50 +01:00 |