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
|
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
|
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 |
|
nilsding
|
d25d45cbd4
|
fixed deletion button
|
2014-12-13 15:40:31 +01:00 |
|
nilsding
|
633e133713
|
sharing now works for real.
|
2014-12-13 15:38:16 +01:00 |
|
nilsding
|
013d1d44b7
|
the checkbox should now share to services
|
2014-12-13 15:17:50 +01:00 |
|
pixeldesu
|
461d48556b
|
Merge branch 'master' of git.rrerr.net:justask/justask
|
2014-12-13 00:55:07 +01:00 |
|
pixeldesu
|
aa1686121a
|
add profile header display
|
2014-12-13 00:55:00 +01:00 |
|
pixeldesu
|
6e154bc462
|
added checkbox for Twitter sharing
|
2014-12-13 00:01:54 +01:00 |
|
nilsding
|
3cd5739ce9
|
added link to Sidekiq::Web
|
2014-12-12 23:58:35 +01:00 |
|
nilsding
|
b25c419e52
|
aw yeah
|
2014-12-12 23:53:23 +01:00 |
|
nilsding
|
76c614ea66
|
alright
|
2014-12-12 23:45:49 +01:00 |
|
nilsding
|
5aab94207a
|
answer is now returned in Inbox#answer
|
2014-12-12 23:14:32 +01:00 |
|
nilsding
|
9168d908dd
|
aw yeah
|
2014-12-12 22:37:52 +01:00 |
|
nilsding
|
23fc3009fe
|
bugFuchs
|
2014-12-12 22:35:23 +01:00 |
|
nilsding
|
c91fbe43b1
|
added Services view.
|
2014-12-12 21:54:17 +01:00 |
|
nilsding
|
f24433d84e
|
added Services controller
|
2014-12-12 21:43:09 +01:00 |
|
nilsding
|
6d23ed5dcd
|
added service model
|
2014-12-12 21:42:34 +01:00 |
|
nilsding
|
8743a21371
|
closes Github issue #11
|
2014-12-12 19:05:35 +01:00 |
|
pixeldesu
|
c4bdc8fd3e
|
design updates
|
2014-12-12 19:01:34 +01:00 |
|
nilsding
|
54ec828e5b
|
display_all
|
2014-12-12 18:54:17 +01:00 |
|
nilsding
|
130cbb27ce
|
Set a validation on :display_name
|
2014-12-12 18:52:56 +01:00 |
|
nilsding
|
4d944e1684
|
Karim abused this too much
|
2014-12-12 18:49:34 +01:00 |
|
nilsding
|
d9d23edc6d
|
alright, let's don't.
|
2014-12-12 18:04:34 +01:00 |
|
nilsding
|
6078555c20
|
LET'S MAKE THIS HAPPEN
|
2014-12-12 18:00:34 +01:00 |
|
nilsding
|
b79d4f30ac
|
oy vey
|
2014-12-12 17:54:13 +01:00 |
|
pixeldesu
|
a0f883f062
|
hide left sidebar links on smallest screen size
|
2014-12-12 17:48:19 +01:00 |
|
pixeldesu
|
61f9224302
|
how many navs do we need inside a navbar
|
2014-12-12 17:44:04 +01:00 |
|
pixeldesu
|
7c9df66ae7
|
moved public timeline
|
2014-12-12 17:43:32 +01:00 |
|
pixeldesu
|
38c08970c8
|
Merge branch 'master' of git.rrerr.net:justask/justask
|
2014-12-12 16:50:23 +01:00 |
|
pixeldesu
|
ba7df144d4
|
fix top margin
|
2014-12-12 16:49:15 +01:00 |
|
nilsding
|
ebd0719599
|
foxed about page
|
2014-12-12 16:45:39 +01:00 |
|
pixeldesu
|
3f8fb96975
|
update about page things
|
2014-12-12 16:31:50 +01:00 |
|
nilsding
|
f4ee900ae6
|
slkegjlkd
|
2014-12-11 18:00:24 +01:00 |
|
nilsding
|
40399c8dc1
|
pixel broked it
|
2014-12-11 17:56:52 +01:00 |
|
pixeldesu
|
1d320fd847
|
added navbar toggle animation
|
2014-12-11 15:49:01 +01:00 |
|
nilsding
|
27867a9284
|
added navbar entry for public timeline
|
2014-12-11 06:51:26 +01:00 |
|
nilsding
|
f679bdd659
|
added some panel
|
2014-12-11 06:44:25 +01:00 |
|
nilsding
|
2251a21872
|
added public timeline
|
2014-12-11 06:39:35 +01:00 |
|
pixeldesu
|
0e52a9aef8
|
attempt to fix overlapping comment count
|
2014-12-10 21:16:18 +01:00 |
|
nilsding
|
883bedcbf1
|
C-<RET> for asking questions
|
2014-12-10 20:54:12 +01:00 |
|
nilsding
|
93540e0969
|
added placeholder.
thank you #based quad
|
2014-12-10 20:38:54 +01:00 |
|
nilsding
|
aa28eb18fc
|
added margin to the load more button.
|
2014-12-10 20:37:47 +01:00 |
|
nilsding
|
c8154c1fc2
|
added Piwik tracking
|
2014-12-10 19:54:27 +01:00 |
|
nilsding
|
217683de6c
|
update about page (muh shekels)
|
2014-12-10 19:50:49 +01:00 |
|
pixeldesu
|
9e03ca64e9
|
added gravatar info to settings page
|
2014-12-10 19:38:09 +01:00 |
|
pixeldesu
|
31f520ed4b
|
fix more stuff
|
2014-12-10 19:14:24 +01:00 |
|
pixeldesu
|
2a9db637a0
|
how about no centered text
|
2014-12-10 19:11:06 +01:00 |
|
pixeldesu
|
aa32861f7f
|
new display to generate more questions
|
2014-12-10 19:09:44 +01:00 |
|
nilsding
|
06112b0cce
|
added link to Kontrollzentrum in the navbar for admins
|
2014-12-10 18:23:25 +01:00 |
|
nilsding
|
a4edb4147d
|
generating questions is great
|
2014-12-09 23:37:44 +01:00 |
|
nilsding
|
912ccea445
|
Merge remote-tracking branch 'origin/master'
|
2014-12-09 23:23:28 +01:00 |
|
nilsding
|
9d9713e655
|
this does not belong here
|
2014-12-09 23:22:56 +01:00 |
|
nilsding
|
daab6ce4f5
|
THIS IS SPARTA
|
2014-12-09 23:21:41 +01:00 |
|
pixeldesu
|
766d0e2a2b
|
fix notification icon
|
2014-12-09 23:15:14 +01:00 |
|
pixeldesu
|
ef9579594c
|
added notification test page
|
2014-12-09 23:07:04 +01:00 |
|
pixeldesu
|
f277b249c2
|
added notification controller
|
2014-12-09 22:35:11 +01:00 |
|
pixeldesu
|
bee2404fe3
|
fix equal sign
|
2014-12-09 22:23:51 +01:00 |
|
pixeldesu
|
a9a10dd04d
|
remove pluralize stuff
|
2014-12-09 22:07:45 +01:00 |
|
pixeldesu
|
98b63b45c6
|
splitting scss, pluralizing entries, etc
|
2014-12-09 15:32:29 +01:00 |
|
nilsding
|
e305a67d1e
|
255
|
2014-12-08 23:02:31 +01:00 |
|
nilsding
|
c18ac74700
|
renamed following to friends
|
2014-12-08 19:51:34 +01:00 |
|
nilsding
|
e63e52f585
|
the count is now incremented/decremented correctly on the view followers/friends pages
|
2014-12-08 19:48:12 +01:00 |
|
nilsding
|
f381baa702
|
ZHE FIXXX
|
2014-12-08 17:18:26 +01:00 |
|
nilsding
|
0f2dc34e55
|
why not zoidberg?
|
2014-12-08 17:14:02 +01:00 |
|
nilsding
|
b4408ffbd2
|
!!! (aka. made follower/following links clickable)
|
2014-12-08 17:11:54 +01:00 |
|
nilsding
|
742bba0b12
|
?
|
2014-12-08 17:10:09 +01:00 |
|
nilsding
|
4d5cad0c0d
|
,
|
2014-12-08 17:04:23 +01:00 |
|
nilsding
|
30c8654a27
|
added follower/following pages
|
2014-12-08 17:03:06 +01:00 |
|
nilsding
|
2caf81d08e
|
ayyyy vodka
|
2014-12-08 16:01:27 +01:00 |
|
nilsding
|
2d8305095b
|
make sure the user really wants to delete something…
|
2014-12-08 15:45:15 +01:00 |
|
nilsding
|
c486c293ef
|
restructured javascript files
|
2014-12-08 15:42:34 +01:00 |
|
nilsding
|
72c259bd0d
|
question#content now has a validation.
|
2014-12-08 15:34:37 +01:00 |
|
nilsding
|
293837984e
|
added pagination to User#show
|
2014-12-08 15:23:04 +01:00 |
|
nilsding
|
cc87061fe2
|
Links. (Und rechts)
|
2014-12-08 15:17:26 +01:00 |
|
nilsding
|
bd16bd794d
|
alright this should do.
|
2014-12-08 14:22:11 +01:00 |
|
nilsding
|
6c0e6d1a51
|
hmm...
|
2014-12-08 14:18:16 +01:00 |
|
nilsding
|
c279026ce0
|
added pagination! (at least on the timeline)
|
2014-12-08 14:14:13 +01:00 |
|
nilsding
|
da97b7dcf4
|
show the ask followers modal only for signed in users
|
2014-12-08 13:10:25 +01:00 |
|
nilsding
|
69e55f001e
|
bugFuchs
|
2014-12-08 12:50:02 +01:00 |
|
nilsding
|
7b5454a1bd
|
! (again)
|
2014-12-08 12:34:48 +01:00 |
|
nilsding
|
dce6fc8d74
|
Merge branch 'master' of git.rrerr.net:nilsding/justask
|
2014-12-08 12:19:54 +01:00 |
|
nilsding
|
bda7a9f699
|
some clients doesn't look like they send an user agent
|
2014-12-08 12:11:20 +01:00 |
|
pixeldesu
|
51498d3825
|
fixed navbar display
|
2014-12-07 21:06:57 +01:00 |
|
nilsding
|
afe9b8f743
|
bugFuchs
|
2014-12-07 20:57:10 +01:00 |
|
nilsding
|
7de522a82f
|
added question#show thing and more...
|
2014-12-07 20:51:44 +01:00 |
|
nilsding
|
a9f5ddab65
|
added thing
|
2014-12-07 20:18:53 +01:00 |
|
nilsding
|
58d0efc219
|
implemented "ask your followers"
|
2014-12-07 20:13:45 +01:00 |
|
nilsding
|
c26b081cc0
|
you can now answer a question by hitting ctrl+return
|
2014-12-07 18:33:26 +01:00 |
|
nilsding
|
81b131779b
|
current password now moved to its own modal, it's more visible then.
|
2014-12-07 16:04:05 +01:00 |
|
nilsding
|
3632dbde9f
|
fixed path
|
2014-12-07 15:53:19 +01:00 |
|
pixeldesu
|
01c5577cdd
|
changed display for comments
|
2014-12-07 15:36:08 +01:00 |
|
nilsding
|
bc4e6d4ed2
|
added some counters to sdgjlk
|
2014-12-07 15:11:09 +01:00 |
|
nilsding
|
9f4d9214bd
|
added some counters to user profiles
|
2014-12-07 15:10:05 +01:00 |
|
nilsding
|
8ab5458b1b
|
posting comments is now possible.
|
2014-12-07 15:05:44 +01:00 |
|
nilsding
|
50151453d8
|
added ajax/comment_controller
|
2014-12-07 14:31:20 +01:00 |
|
nilsding
|
2d44eeef60
|
added validation to comment
|
2014-12-07 14:29:47 +01:00 |
|
nilsding
|
8479f308ac
|
!
|
2014-12-07 14:29:35 +01:00 |
|
nilsding
|
a34972379f
|
unregistered users will see the smile_count if at least someone smiled the answer
|
2014-12-07 12:46:25 +01:00 |
|
nilsding
|
a8b8dd31e0
|
Merge branch 'master' of git.rrerr.net:nilsding/justask
|
2014-12-07 11:04:45 +01:00 |
|
nilsding
|
382277adf0
|
iOS web app things
|
2014-12-06 17:08:10 +01:00 |
|
nilsding
|
9f1174f56b
|
fixed smile button
|
2014-12-05 21:55:01 +01:00 |
|
nilsding
|
a2e1e2557b
|
smile count is now in the button itself if the user is signed in
|
2014-12-05 20:21:15 +01:00 |
|
nilsding
|
c276b6aacf
|
added comment text input box thing
|
2014-12-05 20:17:44 +01:00 |
|
nilsding
|
668b032a25
|
the comment button now actually does something!
|
2014-12-05 19:50:21 +01:00 |
|
nilsding
|
d6111d6835
|
added User#comment
|
2014-12-05 14:11:08 +01:00 |
|
nilsding
|
641fa1ddc3
|
added show answer thing
|
2014-12-05 07:02:23 +01:00 |
|
nilsding
|
b80d3c5bbd
|
removed website validation
|
2014-12-01 23:17:16 +01:00 |
|
pixeldesu
|
ac17c09cf7
|
more changes
|
2014-12-01 21:33:51 +01:00 |
|
pixeldesu
|
3c4a240b8a
|
updated profile display
|
2014-12-01 21:11:32 +01:00 |
|
nilsding
|
8b682bd52f
|
added website, bio and location fields to user
|
2014-12-01 20:47:10 +01:00 |
|
pixeldesu
|
ea0bf31ba1
|
security
|
2014-12-01 20:06:26 +01:00 |
|
pixeldesu
|
4a52e791eb
|
Exo
|
2014-12-01 20:03:00 +01:00 |
|
pixeldesu
|
0bb58fefb3
|
word wrapping
|
2014-11-30 23:18:46 +01:00 |
|
pixeldesu
|
562fa112e7
|
css is a bitch
|
2014-11-30 23:12:18 +01:00 |
|
pixeldesu
|
8ee8fabf0d
|
css changes
|
2014-11-30 23:09:33 +01:00 |
|
pixeldesu
|
be438f670f
|
Merge branch 'master' of git.rrerr.net:nilsding/justask
|
2014-11-30 23:08:21 +01:00 |
|
pixeldesu
|
ed307504b0
|
cool profile changes
|
2014-11-30 23:08:11 +01:00 |
|
nilsding
|
c159e3b5bc
|
INDENTATIONS
|
2014-11-30 21:15:51 +01:00 |
|
nilsding
|
631aed196b
|
new partial...
|
2014-11-30 21:14:55 +01:00 |
|
nilsding
|
a102f4506c
|
Merge remote-tracking branch 'origin/master'
|
2014-11-30 21:12:27 +01:00 |
|
nilsding
|
bc77ad0032
|
Gebrechungsschaden
|
2014-11-30 21:12:17 +01:00 |
|
pixeldesu
|
a82ecad4ed
|
change text color
|
2014-11-30 21:09:01 +01:00 |
|
nilsding
|
28df95c089
|
hnn
|
2014-11-30 21:08:00 +01:00 |
|
pixeldesu
|
8313972b3d
|
Merge branch 'master' of git.rrerr.net:nilsding/justask
|
2014-11-30 21:05:22 +01:00 |
|
pixeldesu
|
449cc68958
|
more fixes to timestamp display
|
2014-11-30 21:05:16 +01:00 |
|
nilsding
|
5b1116e129
|
the inbox entries are not new anymore ;_;
|
2014-11-30 21:04:30 +01:00 |
|
pixeldesu
|
484c8d9b65
|
alternate display
|
2014-11-30 21:02:17 +01:00 |
|
pixeldesu
|
ba625247ae
|
remove timestamp from question asked
|
2014-11-30 20:59:21 +01:00 |
|
pixeldesu
|
94f1ac4568
|
panel show me your body
|
2014-11-30 20:58:10 +01:00 |
|
pixeldesu
|
76da9065e2
|
information for inbox
|
2014-11-30 20:55:22 +01:00 |
|
pixeldesu
|
433b0cc3a0
|
more fixes about fixes
|
2014-11-30 20:51:44 +01:00 |
|
pixeldesu
|
5687feeb0a
|
more fixes
|
2014-11-30 20:47:28 +01:00 |
|
pixeldesu
|
e20037a89a
|
timestamp
|
2014-11-30 20:45:21 +01:00 |
|
nilsding
|
f1d93646a2
|
better check 'em thrice
|
2014-11-30 20:37:52 +01:00 |
|
nilsding
|
dccb7f9116
|
better check 'em twice
|
2014-11-30 20:37:10 +01:00 |
|
nilsding
|
f6906d0dde
|
check your timestamp privileges
|
2014-11-30 20:36:26 +01:00 |
|
nilsding
|
97c197f112
|
smiles!!!
|
2014-11-30 20:31:22 +01:00 |
|
nilsding
|
027f2629b1
|
added smile model
|
2014-11-30 19:43:22 +01:00 |
|
nilsding
|
44cea60021
|
added validation for Comment model
|
2014-11-30 19:43:03 +01:00 |
|
pixeldesu
|
3a42ceafaf
|
finally
|
2014-11-30 19:30:06 +01:00 |
|
pixeldesu
|
10b1e31a2f
|
what is a dash?
|
2014-11-30 19:27:28 +01:00 |
|
pixeldesu
|
3c6479f303
|
pluralize
|
2014-11-30 19:25:53 +01:00 |
|
pixeldesu
|
6808b15062
|
fix bug
|
2014-11-30 19:18:30 +01:00 |
|
pixeldesu
|
48f30f50ac
|
add inbox message to index widget
|
2014-11-30 19:13:19 +01:00 |
|
pixeldesu
|
f6d9b1ea71
|
Merge branch 'master' of git.rrerr.net:nilsding/justask
|
2014-11-30 18:42:32 +01:00 |
|
pixeldesu
|
2dffcbec98
|
how about fixing colors
|
2014-11-30 18:27:48 +01:00 |
|
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 |