Commit Graph

250 Commits

Author SHA1 Message Date
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