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
|
2169a86615
|
added a count
|
2014-12-21 15:36:57 +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
|
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
|
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
|
7543da2701
|
move profile things into something different
|
2014-12-19 23:33:42 +01:00 |
|
Andreas N
|
bdff6f4110
|
the journey of fixes has finally an end
|
2014-12-19 23:05:45 +01:00 |
|
Andreas N
|
a764632538
|
more fixes and updates
|
2014-12-19 23:03:03 +01:00 |
|
Andreas N
|
c1f0388da4
|
I reached the end of the file, fixing this I finally did it
|
2014-12-19 22:58:06 +01:00 |
|
Andreas N
|
20796654f5
|
more fix
|
2014-12-19 22:57:08 +01:00 |
|
Andreas N
|
f7e35a3977
|
fix stuff
|
2014-12-19 22:56:16 +01:00 |
|
Andreas N
|
e9985ed0aa
|
how about new template
|
2014-12-19 22:52:12 +01:00 |
|
Andreas N
|
75bca2430b
|
added links to pages
|
2014-12-19 22:37:04 +01:00 |
|
Andreas N
|
46c9ccc0ac
|
question page added
|
2014-12-19 22:34:24 +01:00 |
|
Andreas N
|
e483714f44
|
fix headings
|
2014-12-19 22:11:49 +01:00 |
|
Andreas N
|
0f1e0ef3f9
|
fixed missing profile-header
|
2014-12-19 21:49:48 +01:00 |
|
pixeldesu
|
ae27f06df6
|
added tooltips to notification links
|
2014-12-16 16:54:33 +01:00 |
|
pixeldesu
|
c3905791b6
|
move answer link to 'answered by username' section
|
2014-12-16 16:14:42 +01:00 |
|
nilsding
|
a30e6509b5
|
fixed things
|
2014-12-15 07:47:56 +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 |
|
pixeldesu
|
cf78d4758a
|
rounded images
|
2014-12-14 15:44:17 +01:00 |
|
pixeldesu
|
3bcd67d1a4
|
rounded image was missing
|
2014-12-14 15:42:54 +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
|
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 |
|
pixeldesu
|
156d92e946
|
fixed typo...or wrong word
|
2014-12-14 13:52:18 +01:00 |
|
pixeldesu
|
1997d36b2f
|
how about I look into how to change the dropdown first
|
2014-12-13 19:48:31 +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
|
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
|
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
|
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
|
9168d908dd
|
aw yeah
|
2014-12-12 22:37:52 +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 |
|
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
|
4d944e1684
|
Karim abused this too much
|
2014-12-12 18:49:34 +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
|
93540e0969
|
added placeholder.
thank you #based quad
|
2014-12-10 20:38:54 +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
|
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
|
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
|
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
|
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
|
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 |
|
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
|
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
|
a34972379f
|
unregistered users will see the smile_count if at least someone smiled the answer
|
2014-12-07 12:46:25 +01:00 |
|
nilsding
|
382277adf0
|
iOS web app things
|
2014-12-06 17:08:10 +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
|
641fa1ddc3
|
added show answer thing
|
2014-12-05 07:02:23 +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
|
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
|
bc77ad0032
|
Gebrechungsschaden
|
2014-11-30 21:12:17 +01:00 |
|
nilsding
|
28df95c089
|
hnn
|
2014-11-30 21:08:00 +01:00 |
|
pixeldesu
|
449cc68958
|
more fixes to timestamp display
|
2014-11-30 21:05:16 +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 |
|
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 |
|
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
|
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
|
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 |
|
pixeldesu
|
3496cd7f0a
|
hide images if anonymous and links to profiles
|
2014-11-30 14:43: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
|
bf4a90b8b5
|
pull?
|
2014-11-30 14:01:36 +01:00 |
|
pixeldesu
|
e8d7874bef
|
lets try to fix this stuff here
|
2014-11-30 13:52:44 +01:00 |