Commit Graph

206 Commits

Author SHA1 Message Date
nilsding f4d63ae4e3 users now can answer other people's questions 2015-01-03 18:41:10 +01:00
Andreas N f5a469bafa fix alert text for destroying answers 2015-01-03 18:40:56 +01:00
nilsding 7be7de11cd moved answering code from inbox_controller.rb to answer_controller.rb 2015-01-03 18:40:39 +01:00
Andreas N 9d3b8cced4 replaced alerts with sweetAlert 2015-01-03 17:36:55 +01:00
Andreas N ac9738d058 added sweetalert scripts 2015-01-03 16:54:10 +01:00
Andreas N c6e7170e7b added sweetalert styles 2015-01-03 16:51:57 +01:00
Andreas N ca222f86c8 fix profile-text margin 2015-01-03 04:32:26 +01:00
Andreas N c871f63f8a brighter gray 2015-01-03 04:01:25 +01:00
Andreas N 1c7b064dbd removed this shit 2015-01-03 03:54:30 +01:00
Andreas N 6bf1c6bb01 changed background color 2015-01-03 03:52:50 +01:00
Andreas N 15605682b2 fix 2015-01-03 03:47:48 +01:00
Andreas N 34a5b56555 added follow button to dim view 2015-01-03 03:43:32 +01:00
Andreas N c71061c5a3 even more design updates 2015-01-03 02:14:49 +01:00
Andreas N c74f4086eb even more design updates 2015-01-03 02:13:53 +01:00
Andreas N dfb879899a even more design updates 2015-01-03 02:08:09 +01:00
Andreas N e25b05297f even more design updatess 2015-01-03 02:00:54 +01:00
Andreas N 6ab87a5431 add cool new profile panel design 2015-01-03 01:58:27 +01:00
Andreas N 75fb90c9e5 add cool new profile panel design 2015-01-03 01:49:56 +01:00
Andreas N aa6c892eb3 added supporter display 2015-01-03 00:24:06 +01:00
Andreas N 26f21f8e97 fixed #37 2015-01-02 00:28:19 +01:00
Andreas N 806d83fc0c updated css 2015-01-01 19:45:34 +01:00
Andreas N d5b538461e added moderator display to about page 2015-01-01 19:10:31 +01:00
nilsding 7d504778b0 "Delete all" button is now disabled properly and the ibCount is now incremented by 1 (closes GitHub issues #34 and #27) 2014-12-30 16:20:47 +01:00
nilsding 8998b84027 updateVars is now called when the image finished loading 2014-12-29 17:22:43 +01:00
nilsding 338fa5bdb2 divide by scale 2014-12-29 16:39:27 +01:00
nilsding fa16612ba8 made the new cropper work 2014-12-29 16:29:46 +01:00
nilsding 26363c4742 added jquery.guillotine 2014-12-29 15:47:10 +01:00
nilsding 4adc6eec09 ugh 2014-12-29 14:49:57 +01:00
nilsding 5071e3ffe8 added JCrop to view 2014-12-29 13:52:19 +01:00
nilsding f6ceafb710 added jquery.Jcrop 2014-12-29 09:39:47 +01:00
nilsding 65e90e1c64 reporting users works as well. 2014-12-29 01:47:04 +01:00
nilsding 34a2f3cd6b deleting comments works now 2014-12-29 01:05:30 +01:00
nilsding a0c0d68e43 posting moderation comments works now 2014-12-29 00:50:14 +01:00
nilsding b7b5ee960e deleting reports works now 2014-12-29 00:21:06 +01:00
nilsding 486d5d18f2 this fucker finally works how I want it to 2014-12-28 23:57:07 +01:00
nilsding 7a0b3f4af7 added votes for reports 2014-12-28 23:26:16 +01:00
nilsding b3f165b12b reporting and deleting comments works now 2014-12-28 21:14:01 +01:00
nilsding 27afd18d25 fixed follow button 2014-12-28 20:22:37 +01:00
nilsding 6864faee03 reporting answers works now 2014-12-28 19:56:37 +01:00
nilsding 9fe827b537 removed .button calls for destroy 2014-12-28 19:56:13 +01:00
nilsding 90fe42e643 Merge remote-tracking branch 'origin/master' into moderation
Conflicts:
	app/models/user.rb
2014-12-28 19:29:01 +01:00
Andreas N 4bb65be9e5 css changes 2014-12-27 19:26:35 +01:00
Andreas N 6b3552526c css changes 2014-12-27 19:24:46 +01:00
Andreas N f236e7b709 css changes 2014-12-27 19:22:27 +01:00
Andreas N 05002b8d10 added floating ask your followers button 2014-12-27 19:18:55 +01:00
Andreas N 56441a4967 more fix. 2014-12-27 16:03:09 +01:00
Andreas N 3c2467092b fixing other stuff I broke with this fix. 2014-12-27 15:59:09 +01:00
Andreas N be30f9c7e5 PLEASE WORK 2014-12-27 15:56:01 +01:00
Andreas N 7a9949c85c PLEASE 2014-12-27 15:54:26 +01:00
Andreas N edeff57293 Fixxed! 2014-12-27 15:50:36 +01:00
nilsding 260d5cddd7 updated delete button 2014-12-27 14:59:48 +01:00
Andreas N a5c8405b9a attempt to fix this shit 2014-12-27 03:01:52 +01:00
Andreas N 92af469aa4 Merge branch 'master' into moderation 2014-12-27 02:12:32 +01:00
nilsding 64d50ad9b4 fox'd 2014-12-27 01:55:09 +01:00
nilsding a37cd95f46 Merge branch 'master' into notifications-tooltips 2014-12-27 01:46:34 +01:00
pixeldesu 40dc6a140d fix margin if content is empty 2014-12-26 13:48:20 +01:00
nilsding 9e918fa3dc added moderator to users 2014-12-26 13:34:01 +01:00
nilsding 2aea87d305 Meymeys 2014-12-21 22:41:14 +01:00
nilsding b45b273f50 I TAKE A LOOK AT MY ENORMOUS MEMES 2014-12-21 22:29:52 +01:00
nilsding e8f4c2662a goddamnit Karim 2014-12-21 16:40:10 +01:00
nilsding 2169a86615 added a count 2014-12-21 15:36:57 +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 000fa09a5e restructure inbox design 2014-12-20 14:37:14 +01:00
Andreas N 00f1c6ac1a attempt fix 2014-12-20 02:04:35 +01:00
Andreas N cc3dcdddd5 more view fixes 2014-12-19 23:41:15 +01:00
Andreas N 7543da2701 move profile things into something different 2014-12-19 23:33:42 +01:00
Andreas N e9985ed0aa how about new template 2014-12-19 22:52:12 +01:00
Andreas N e483714f44 fix headings 2014-12-19 22:11:49 +01:00
nilsding fc5dc30751 asdf 2014-12-16 17:32:23 +01:00
nilsding a30e6509b5 fixed things 2014-12-15 07:47:56 +01:00
pixeldesu 91711b24fe add a bit of margin to smiles section 2014-12-14 15:41:08 +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 3173d70aac added new frontpage design 2014-12-13 17:52:58 +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 013d1d44b7 the checkbox should now share to services 2014-12-13 15:17:50 +01:00
pixeldesu aa1686121a add profile header display 2014-12-13 00:55:00 +01:00
nilsding 8743a21371 closes Github issue #11 2014-12-12 19:05:35 +01:00
pixeldesu ba7df144d4 fix top margin 2014-12-12 16:49:15 +01:00
pixeldesu 1d320fd847 added navbar toggle animation 2014-12-11 15:49:01 +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 aa28eb18fc added margin to the load more button. 2014-12-10 20:37:47 +01:00
nilsding a4edb4147d generating questions is great 2014-12-09 23:37:44 +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 98b63b45c6 splitting scss, pluralizing entries, etc 2014-12-09 15:32:29 +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 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 c279026ce0 added pagination! (at least on the timeline) 2014-12-08 14:14:13 +01:00
nilsding 69e55f001e bugFuchs 2014-12-08 12:50:02 +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
pixeldesu 01c5577cdd changed display for comments 2014-12-07 15:36:08 +01:00
nilsding 8ab5458b1b posting comments is now possible. 2014-12-07 15:05:44 +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