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 |
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
|
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 |
pixeldesu
|
78812f58f9
|
even more changes
|
2014-11-30 00:31:23 +01:00 |
pixeldesu
|
6a722af2f7
|
more changes to answerbox
|
2014-11-30 00:23:11 +01:00 |
pixeldesu
|
ed1d43be01
|
more changes
|
2014-11-30 00:10:23 +01:00 |
pixeldesu
|
b3e26a6fd2
|
admin status changes
|
2014-11-30 00:06:47 +01:00 |
pixeldesu
|
36ac06ec6e
|
more style fixes on profiles
|
2014-11-29 23:40:57 +01:00 |
pixeldesu
|
cdf6b9ba06
|
Merge branch 'master' of git.rrerr.net:nilsding/justask
|
2014-11-29 23:29:42 +01:00 |
pixeldesu
|
057ebe08af
|
more changes to answerbox
|
2014-11-29 23:29:34 +01:00 |
nilsding
|
5d88368c00
|
Kauf dir was denn das macht Spaß kauf einfach Irgendwas™
|
2014-11-29 23:26:55 +01:00 |
pixeldesu
|
fa313dc2c1
|
equals
|
2014-11-29 23:21:31 +01:00 |
pixeldesu
|
6c04d1d24d
|
answerbox update things
|
2014-11-29 23:18:52 +01:00 |
pixeldesu
|
bc254bc60d
|
changed profile display a bit
|
2014-11-29 22:56:38 +01:00 |
nilsding
|
685b0efe83
|
added motivation header
|
2014-11-29 22:34:11 +01:00 |
nilsding
|
178a01d2f1
|
added admin badge
|
2014-11-28 22:41:29 +01:00 |
nilsding
|
5608148550
|
changed nprogress colour
|
2014-11-28 21:41:32 +01:00 |
nilsding
|
9728561a93
|
bugfix
|
2014-11-28 21:39:38 +01:00 |
nilsding
|
5b013314ed
|
added rails-assets-growl for notifications
|
2014-11-28 21:35:44 +01:00 |
nilsding
|
6f03b75f00
|
fixed privileged? method
|
2014-11-28 21:18:20 +01:00 |
nilsding
|
965d7b701e
|
fixed font size
|
2014-11-28 21:17:50 +01:00 |
nilsding
|
70aec0b86e
|
back to bootswatch.
|
2014-11-28 20:23:17 +01:00 |
nilsding
|
9cc35f90f3
|
fixed delete button not showing up FOR REAL
|
2014-11-28 19:25:18 +01:00 |
nilsding
|
dc83151e65
|
fixed delete button not showing up
|
2014-11-28 19:23:54 +01:00 |
nilsding
|
eed67aeaa2
|
if an admin deletes an answer it will not show up in the users' inbox again
|
2014-11-28 14:09:12 +01:00 |
nilsding
|
6fb97c9ecc
|
moved privileged? method from answer_controller to application_controller
|
2014-11-27 11:51:05 +01:00 |
nilsding
|
3994bdeb02
|
JS
|
2014-11-27 11:50:41 +01:00 |
nilsding
|
4476e54ca5
|
added answerbox
|
2014-11-27 11:50:29 +01:00 |
nilsding
|
e128686297
|
added privileged? helper
|
2014-11-27 11:50:10 +01:00 |
nilsding
|
8dff4462cf
|
added (ajax) answer controller
|
2014-11-26 17:05:46 +01:00 |
nilsding
|
976cdef4d7
|
changed nprogress colour
|
2014-11-26 13:34:23 +01:00 |
nilsding
|
b0b19dd3e2
|
added shared links to devise views
|
2014-11-25 13:58:20 +01:00 |
nilsding
|
e0c63e3099
|
changed about texts a bit
|
2014-11-24 18:11:44 +01:00 |
nilsding
|
6c5cd4f116
|
added footer thing to show page
|
2014-11-24 17:52:58 +01:00 |
nilsding
|
4701b8a37e
|
added links to the bottom of some pages
|
2014-11-17 13:19:59 +01:00 |
nilsding
|
493bfe881c
|
added links to the bottom of some pages
|
2014-11-17 13:19:08 +01:00 |
nilsding
|
5fa2611297
|
about pages?? why (k)not
|
2014-11-17 13:02:11 +01:00 |
pixeldesu
|
6cb23c818e
|
ROW ROW FIGHT THE POWER
|
2014-11-13 20:02:41 +01:00 |
pixeldesu
|
56d7273af6
|
Merge branch 'master' of git.rrerr.net:nilsding/justask
|
2014-11-13 19:37:20 +01:00 |
pixeldesu
|
9a3e6bb51b
|
ALL YOUR META TAGS ARE BELONG TO US
|
2014-11-13 19:37:11 +01:00 |
nilsding
|
5bb879ae7c
|
fixed fuckup
|
2014-11-13 19:27:24 +01:00 |
nilsding
|
4ea3b99ff3
|
removed unnecessary puts
|
2014-11-13 19:23:32 +01:00 |
pixeldesu
|
f98e534c12
|
ALL YOUR FORM-CONTROL ARE BELONG TO US
|
2014-11-13 19:20:18 +01:00 |
nilsding
|
e39f82882b
|
link
|
2014-11-13 13:02:47 +01:00 |
nilsding
|
8ae0fc6c22
|
the display name is now shown on the profile if it's set
|
2014-11-13 12:52:08 +01:00 |