FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,260 Commits 1 Branch 0 Tags 15 MiB
Commit Graph

998 Commits

Author SHA1 Message Date
Andreas N 40a5689a4b cool new navbar colours 2015-01-13 21:53:47 +01:00
Andreas N c1e6945bff cool new navbar colours 2015-01-13 21:27:39 +01:00
nilsding 14eb6b035b Revert "got rid of nprogress" 
This reverts commit 3574993746.
 2015-01-13 19:49:43 +01:00
Andreas N 3316ccb7bc fix indentation 2015-01-13 19:06:26 +01:00
Andreas N e0871a661b fix sharing settings 2015-01-13 19:04:27 +01:00
Andreas N 1ed216df25 update sharing settings 2015-01-13 18:59:58 +01:00
nilsding a05d763b75 selecting the group from the ask followers modal works now. 2015-01-13 15:45:32 +01:00
nilsding 9b0b2df18e added %select to the ask followers modal 2015-01-13 14:50:28 +01:00
nilsding a8ed21942e added group_timelines 2015-01-13 13:23:12 +01:00
nilsding eaa4096af5 Merge branch 'master' into groups 
Conflicts:
	db/schema.rb
 2015-01-13 07:05:11 +01:00
nilsding 65e514c55d added sharing to Tumblr 2015-01-13 00:12:48 +01:00
nilsding 1bb369aa7d implemented basic functionality of YE OLDE BANHAMMER! 2015-01-12 22:44:13 +01:00
nilsding 3574993746 got rid of nprogress 2015-01-12 15:53:14 +01:00
nilsding 38e5550241 strip blank spaces 2015-01-12 13:08:10 +01:00
nilsding 9de917fb23 closes GitHub issue #57 2015-01-12 13:00:00 +01:00
nilsding 011150ba17 added a lock icon 2015-01-12 07:08:06 +01:00
nilsding f93624fa2c added groups route thing 2015-01-12 06:57:43 +01:00
nilsding d1a6c512c4 finally corrected that model thing. 2015-01-12 06:41:44 +01:00
nilsding 5e26d72d91 finally commited the stuff I wrote 4 hours ago 2015-01-10 23:29:04 +01:00
nilsding bc826f07fe moved Piwik code to its own file 2015-01-10 18:53:25 +01:00
Andreas N 01ac598c20 android sure has weird preferences 2015-01-10 13:58:19 +01:00
Andreas N 460f5c377d more tries to fix 2015-01-10 13:56:39 +01:00
Andreas N 7937bff707 let's see if we can fix this 2015-01-10 13:50:08 +01:00
Andreas N 1a9df6da6c added new favicons 2015-01-10 13:43:02 +01:00
Andreas N bbfba492ae change the line height for answers 2015-01-09 22:03:58 +01:00
Andreas N e2564f4d37 pretty much the worst issue I ever caused 2015-01-09 21:59:26 +01:00
Andreas N 16cb29852f fix shit 2015-01-09 21:57:30 +01:00
Andreas N 77259d8cef Merge remote-tracking branch 'origin/master' 2015-01-09 21:54:18 +01:00
Andreas N 273624f679 updated answerbox design 2015-01-09 21:52:09 +01:00
Andreas N 3e88abe36d updated answerbox design 2015-01-09 21:44:41 +01:00
nilsding 6fcbee55c4 added forbidden user names (including case insensitivity!) 2015-01-09 14:12:52 +01:00
nilsding 081a9ee4a8 vittu 2015-01-08 22:54:10 +01:00
nilsding 03ac252dca fixed fuckup 2015-01-08 22:53:29 +01:00
Andreas N 7882ccbc03 how about design update 2015-01-08 22:50:59 +01:00
nilsding d97763eda0 Revert "Le Funny Emoji Meme Face x--DD" 
This reverts commit 5118ba9761.
 2015-01-08 22:34:50 +01:00
nilsding 5118ba9761 Le Funny Emoji Meme Face x--DD 2015-01-08 22:28:56 +01:00
nilsding c2811e65ce fixed indentation 2015-01-08 18:23:03 +01:00
nilsding 181a6b72b0 pagination for notifications 2015-01-08 18:22:27 +01:00
nilsding 6b28c35d4a the pointy face should work again???? 2015-01-08 18:10:20 +01:00
nilsding ce7f896e0c added Group model 2015-01-08 13:16:13 +01:00
Andreas N 52791b737b added link to FAQ page 2015-01-07 22:06:21 +01:00
Andreas N 4a8eee158d fixed faq page 2015-01-07 21:57:46 +01:00
Andreas N 546bc67bba fixed faq page 2015-01-07 21:52:56 +01:00
Andreas N 6ca96aaa71 fixed faq page 2015-01-07 21:50:44 +01:00
Andreas N 0d4a271299 Merge branch 'master' of git.rrerr.net:justask/justask 2015-01-07 21:37:22 +01:00
Andreas N 4161002da0 added faq page 2015-01-07 21:30:52 +01:00
ix 054ece5aed its not a button ok 2015-01-07 19:59:42 +01:00
ix 66734193b0 pressing ctrl/meta + m toggles the question box 2015-01-07 19:58:43 +01:00
ix d8f964bda2 added en language to layout (for screenreaders) 2015-01-07 16:02:02 +01:00
nilsding ddfba921c9 removed %p tag 2015-01-07 13:59:04 +01:00
nilsding a8d533cef7 markdown for comments and in the bio 2015-01-07 07:02:07 +01:00
ix 90cff830a2 Merge branch 'master' of git.rrerr.net:justask/justask 2015-01-07 00:52:41 +01:00
ix 26c21e6a27 fixed being unable to use cmd+enter on macs 2015-01-07 00:52:19 +01:00
nilsding 0916628c43 added link to bug tracker 2015-01-07 00:36:09 +01:00
ix f76603a071 manual merge?? 2015-01-06 18:59:52 +01:00
ix 221025fef7 fixed tooltip loading on loading more questions/answers 2015-01-06 18:56:43 +01:00
Andreas N 1b4eb15152 tooltips for smiles 2015-01-06 17:33:02 +01:00
Andreas N 4b114b0cab fixed badge size 2015-01-06 15:35:16 +01:00
Andreas N 7b37676be2 Merge remote-tracking branch 'origin/master' 2015-01-06 15:32:25 +01:00
Andreas N 0d784aee47 finish implementing new badge design 2015-01-06 15:32:14 +01:00
Andreas N 17afe26171 added new profile badge display 2015-01-06 15:26:24 +01:00
nilsding 3567ba6190 numbers 2015-01-05 10:16:00 +01:00
Andreas N 11cd8b59f8 fix broken labels 2015-01-05 00:50:27 +01:00
Andreas N fcf7d430eb updated about page even more 2015-01-05 00:32:58 +01:00
Andreas N e1563da2f3 updated about page 2015-01-05 00:10:35 +01:00
Andreas N 124d588b39 added kyr to team display 2015-01-05 00:02:13 +01:00
nilsding 9e0abc342a redirect to login page 2015-01-03 22:48:59 +01:00
nilsding 59b431513b made privacy_allow_stranger_answers work 2015-01-03 22:37:10 +01:00
nilsding cdfe5564d6 made C-RET work again 2015-01-03 22:36:51 +01:00
nilsding 997430f909 opting-out of the public timeline works now 2015-01-03 22:30:40 +01:00
nilsding 09b6a6bc10 made that stuff work 2015-01-03 22:27:14 +01:00
nilsding 175e113af1 an error is now raised if the user does not want to receive anonymous questions 2015-01-03 22:06:23 +01:00
nilsding bc94a729a6 users now can enable/disable some privacy settings 2015-01-03 21:58:56 +01:00
nilsding fd4e66bb75 Merge branch 'master' into privacy 2015-01-03 20:28:20 +01:00
nilsding f1c0bc5a4c Merge branch 'sweetalert' 2015-01-03 19:54:42 +01:00
Andreas N 30189ae6b8 fixed overlay z-index 2015-01-03 19:53:22 +01:00
nilsding 7d9a0b720d even more fixes 2015-01-03 19:49:47 +01:00
nilsding 0485be8eb9 report user also now has sweetalert 2015-01-03 19:45:14 +01:00
nilsding d183a79493 fixed sweetalert for use with Turbolinks, changed wording 2015-01-03 19:43:51 +01:00
nilsding 81becddbd5 added pagination to answers 2015-01-03 19:24:51 +01:00
nilsding f53ca1b449 the new answer is now shown 2015-01-03 19:14:26 +01:00
nilsding 9dc98a3e4e users may not not answer their own question 2015-01-03 19:08:09 +01:00
nilsding aec3e1c800 if a question was answered, all occurrences of it in the inbox are now gone 2015-01-03 19:02:56 +01:00
nilsding 72140be316 moved answer thing to the bottom 2015-01-03 19:02:06 +01:00
Andreas N e22dd08f75 Merge remote-tracking branch 'origin/master' 2015-01-03 18:57:39 +01:00
Andreas N a259c19ef0 how about some updated design for this 2015-01-03 18:57:30 +01:00
nilsding 88b71d8f31 added render of the answerbox to the response 2015-01-03 18:56:06 +01:00
nilsding e37907f948 removed unnecessary puts 2015-01-03 18:42:24 +01:00
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 496ff61a65 added User#answered? 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
nilsding c4c6cb62d8 removed redundant line 2015-01-03 18:13:18 +01:00
nilsding 8aee9bd69e added User#answer, moved some code from inbox.rb to answer.rb 2015-01-03 18:09:56 +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 82924cfbec fix profile size indifference 2015-01-03 15:23:43 +01:00
Andreas N ca222f86c8 fix profile-text margin 2015-01-03 04:32:26 +01:00
Andreas N a09cb9431f revert 'fixed button layout on mobile devices' 2015-01-03 04:29:43 +01:00
Andreas N 0881f4a999 fixed button layout on mobile devices 2015-01-03 04:25:25 +01:00
Andreas N efee32a024 Merge remote-tracking branch 'origin/master' 2015-01-03 04:22:22 +01:00
Andreas N d06802fd41 fixed button layout on mobile devices 2015-01-03 04:22:10 +01:00
nilsding 98af66be63 Merge remote-tracking branch 'origin/master' 2015-01-03 04:01:52 +01:00
nilsding ddae3c6278 crapkit sucks 2015-01-03 04:01:42 +01:00
Andreas N c871f63f8a brighter gray 2015-01-03 04:01:25 +01:00
nilsding 85c32346b0 Merge branch 'master' of 10.2.0.1:justask/justask 2015-01-03 03:56:22 +01:00
Andreas N 639fa43a5a fix indentation 2015-01-03 03:56:14 +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
nilsding 9869a46fef Revert "attempt fix for #39" 
This reverts commit 16f319a0a6.
 2015-01-03 03:50:54 +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 16f319a0a6 attempt fix for #39 2015-01-03 03:12:01 +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 00250ddcab fix this shit, take 2 2015-01-03 00:33:10 +01:00
Andreas N e6eff218b5 fix this shit 2015-01-03 00:32:07 +01:00
Andreas N aa6c892eb3 added supporter display 2015-01-03 00:24:06 +01:00
nilsding 74ece9d971 added privacy setting routes 
this took me longer than it should have taken
 2015-01-02 21:34:56 +01:00
Andreas N dd21ce344b fixed button, or attempt fix 2015-01-02 17:40:34 +01:00
Andreas N 65445954c8 moved button on different sizes to navbar or right side 2015-01-02 17:27:44 +01:00
Andreas N 97086a8a9a add privacy tab 2015-01-02 01:09:04 +01:00
Andreas N 57f469e429 you can report yourself anymore in comments 2015-01-02 00:41:26 +01:00
Andreas N ed9c7e945d you can report yourself anymore 2015-01-02 00:38:59 +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 dc558902f4 Merge remote-tracking branch 'origin/master' 2015-01-01 19:10:41 +01:00
Andreas N d5b538461e added moderator display to about page 2015-01-01 19:10:31 +01:00
nilsding f6e405c2e9 url: HTTPS! 2015-01-01 18:55:17 +01:00
nilsding 5c0fd6838f hmm? 2015-01-01 18:45:15 +01:00
nilsding 4a49b7fc27 ffffff 2015-01-01 18:19:02 +01:00
nilsding b76a78bdfb also this 2015-01-01 18:17:40 +01:00
nilsding e9ab8deb85 :async 2015-01-01 18:17:34 +01:00
nilsding 149868c097 this should do. 2015-01-01 18:08:16 +01:00
nilsding 5df705cdaa argh 2015-01-01 17:59:24 +01:00
nilsding dee2ba253e fix this shit 2015-01-01 17:54:16 +01:00
nilsding 77b92b0b23 changed a few Devise views 2015-01-01 17:50:25 +01:00
nilsding ed6e91c33f changed about avatar 2015-01-01 17:21:39 +01:00
Andreas N ba0e39e99b Merge remote-tracking branch 'origin/master' 2015-01-01 17:09:30 +01:00
Andreas N 96704c06da updated bugtracker link in about page 2015-01-01 17:09:15 +01:00
nilsding 1d3848424d changed regex for matching user mentions 2014-12-31 16:02:34 +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 daa8eefff6 temp fix 2014-12-29 22:01:54 +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 f7cb3478be :medium everywhere 2014-12-29 14:57:16 +01:00
nilsding e7a0d77fd4 changed flash thing 2014-12-29 14:54:32 +01:00
nilsding 3e033cc102 permit more params! 2014-12-29 14:52:06 +01:00
nilsding 7aa954e212 added cropper processor 2014-12-29 14:51:52 +01:00
nilsding b61a631f15 added hidden fields 2014-12-29 14:50:25 +01:00
nilsding 4adc6eec09 ugh 2014-12-29 14:49:57 +01:00
nilsding bba9fb8354 removed gravatar warning 2014-12-29 13:56:23 +01:00
nilsding 5071e3ffe8 added JCrop to view 2014-12-29 13:52:19 +01:00
nilsding 7074a1edf7 mark gravatar-url as deprecated 2014-12-29 12:56:41 +01:00
nilsding b378a03afa added delayed_paperclip 2014-12-29 11:58:01 +01:00
nilsding 678e03deed uploading profile pictures works now 2014-12-29 11:21:43 +01:00
nilsding 501f039e7f gravatar_url returns the users' profile_picture 2014-12-29 10:18:38 +01:00
nilsding cf3933271a added profile_picture to users 2014-12-29 10:18:12 +01:00
nilsding f6ceafb710 added jquery.Jcrop 2014-12-29 09:39:47 +01:00
Andreas N 70ac565e6b added following information thingy 2014-12-29 02:32:44 +01:00
nilsding 65e90e1c64 reporting users works as well. 2014-12-29 01:47:04 +01:00
nilsding 27558f83c4 made tabs work 2014-12-29 01:25:48 +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 3f3591c6e7 removed hardcoded occurrences of "justask" 2014-12-28 22:39:10 +01:00
nilsding 49c371302c unique smiles only! 2014-12-28 22:15:25 +01:00
nilsding 40f54fd19a more before_destroy and after_create 2014-12-28 21:58:35 +01:00
nilsding bb3e431393 added associations for this 2014-12-28 21:47:51 +01:00
nilsding 2c29dd9a18 even more after_create and before_destroy 2014-12-28 21:46:57 +01:00
nilsding 7d157cde8f dependent: :destroy 2014-12-28 21:42:21 +01:00
nilsding 9c9c4fdc5d after_create and before_destroy 2014-12-28 21:40:33 +01:00
nilsding fec91eeb5b before_destroy 2014-12-28 21:34:42 +01:00
nilsding 7d55141a1a added deleted column to reports 2014-12-28 21:34:36 +01:00
nilsding b6c0b1864a moved some code 2014-12-28 21:20:07 +01:00
nilsding 6d81b4a24b FUCK this!!!!! 2014-12-28 21:14:10 +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
Andreas N f158acff3f added delete button to moderationbox 2014-12-28 20:13:45 +01:00
nilsding 7bfa5132dd added link to the reported object 2014-12-28 20:05:30 +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 ce280fffa1 reporting things via ajax works now 2014-12-28 19:55:50 +01:00
nilsding 3f24542410 added git info for development rails env 2014-12-28 19:45:49 +01:00
nilsding 774cf8df99 h 2014-12-28 19:32:08 +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
nilsding 5829d4f1ef removed unnecessary p tag 2014-12-28 19:11:36 +01:00
nilsding 0e4d744478 added Markdown to answers 2014-12-28 19:06:49 +01:00
nilsding d79394640e fixed GitHub issue #25 2014-12-28 00:34:56 +01:00
nilsding 3046a5e4b3 fixed tweet not tweeting 2014-12-27 21:03:18 +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
nilsding 35e956e692 dropdown is now left 2014-12-27 18:14:31 +01:00
Andreas N 33694d3820 hiding block-button for now 2014-12-27 18:12:50 +01:00
Andreas N d0000f0754 block-sized action button 2014-12-27 18:10:04 +01:00
Andreas N 8a6d661216 added actions for user profile 2014-12-27 18:07:25 +01:00
nilsding a487ed7f69 update! raises an exception while update does not. 2014-12-27 17:37:54 +01:00
nilsding e789fb7e68 finally made that worker work. 2014-12-27 17:33:49 +01:00
Andreas N 2e048d9472 add text for no comments 2014-12-27 16:38:07 +01:00
nilsding cd289a32c4 removed report comment thing 2014-12-27 16:18:02 +01:00
nilsding e75284dba0 added some view logic 2014-12-27 16:14:57 +01:00
Andreas N 84806a8001 copy-pasted comment section for moderation 2014-12-27 16:09:04 +01:00
Andreas N 56441a4967 more fix. 2014-12-27 16:03:09 +01:00
Andreas N 70f629582e Merge remote-tracking branch 'origin/moderation' into moderation 2014-12-27 15:59:30 +01:00
Andreas N 3c2467092b fixing other stuff I broke with this fix. 2014-12-27 15:59:09 +01:00
nilsding 642d88da07 , 2014-12-27 15:56:34 +01:00
nilsding 2df18c6dd7 Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:56:12 +01:00
Andreas N be30f9c7e5 PLEASE WORK 2014-12-27 15:56:01 +01:00
nilsding 6a1bc6e867 Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:54:36 +01:00
Andreas N 7a9949c85c PLEASE 2014-12-27 15:54:26 +01:00
nilsding 1a131d8c47 Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:50:59 +01:00
Andreas N edeff57293 Fixxed! 2014-12-27 15:50:36 +01:00
nilsding 5c5edbab13 Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:40:07 +01:00
Andreas N be44301874 I hope this finally fixes it ;_; 2014-12-27 15:39:45 +01:00
nilsding 27aa704511 Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:38:16 +01:00
Andreas N 018a377c24 finally 2014-12-27 15:38:06 +01:00
nilsding f1298a416f Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:31:44 +01:00
Andreas N 9522bfa8f0 I should probably put that in the right file 2014-12-27 15:31:34 +01:00
nilsding 8a23ce0cf3 Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:28:10 +01:00
nilsding 4e81467163 hhhh 2014-12-27 15:28:01 +01:00
Andreas N 2e2c2dac58 trying to fix dropdowns 2014-12-27 15:27:39 +01:00
Andreas N 1700bfb0f5 update comment design again 2014-12-27 15:22:30 +01:00
Andreas N f8d8c13fb9 update comment design 2014-12-27 15:15:35 +01:00
Andreas N c7c10b43b9 Merge branch 'moderation' of git.rrerr.net:justask/justask into moderation 2014-12-27 15:13:05 +01:00
Andreas N 395d1691f8 update comment design 2014-12-27 15:12:57 +01:00
nilsding 260d5cddd7 updated delete button 2014-12-27 14:59:48 +01:00
nilsding b625144993 added moderation models 2014-12-27 14:35:09 +01:00
Andreas N a5c8405b9a attempt to fix this shit 2014-12-27 03:01:52 +01:00
nilsding 1a43ae0054 UND NACH RECHTS, RECHTS, RECHTS, IMMER NACH RRRECHTS 2014-12-27 02:34:01 +01:00
Andreas N 2c8cd5bc3e fix broken dropdown 2014-12-27 02:29:57 +01:00
Andreas N bdd3cd5afc Added button for report/delete actions 2014-12-27 02:26:51 +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
nilsding e570f40a36 WRYYYYYYYYYYYYYYYYYY 2014-12-27 01:45:24 +01:00
nilsding 88e9d7599d dragons 2014-12-27 01:22:13 +01:00
nilsding 9fe8be1db8 Merge branch 'master' of git.rrerr.net:justask/justask 
Conflicts:
	app/views/shared/_answerbox.html.haml
 2014-12-27 00:40:02 +01:00
nilsding c817f32b18 j 2014-12-27 00:39:03 +01:00
Andreas N 20c173442d remove that button 2014-12-27 00:37:42 +01:00
Andreas N 4961a44d59 add collapsed view for single answerbox 2014-12-27 00:33:45 +01:00
nilsding d31bfa6d8b added a few placeholders 2014-12-27 00:19:55 +01:00
pixeldesu 32ace00f84 forgot the extra profile pages 2014-12-26 15:32:53 +01:00
nilsding cb003ce36d added link to moderation panel in navbar 2014-12-26 14:09:07 +01:00
pixeldesu 40dc6a140d fix margin if content is empty 2014-12-26 13:48:20 +01:00
pixeldesu e900b794d3 increased sidebar size on profile 2014-12-26 13:45:29 +01:00
nilsding 9e918fa3dc added moderator to users 2014-12-26 13:34:01 +01:00
pixeldesu f403a0a2f8 added tabs, moderation box view and comment display 2014-12-25 23:47:11 +01:00
pixeldesu 32623ec2f2 added basic mod page 2014-12-25 23:14:45 +01:00
pixeldesu 2107ec6270 init moderation controller 2014-12-25 23:00:33 +01:00
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 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 aa9bd028db Merge remote-tracking branch 'origin/inbox' 2014-12-21 15:33:03 +01:00
nilsding 0ddb1a609c the 404 page is shown again if an user was not found 2014-12-21 15:32:49 +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 00f1c6ac1a attempt fix 2014-12-20 02:04:35 +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 cc3dcdddd5 more view fixes 2014-12-19 23:41:15 +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 b9e1432889 Merge branch 'master' of git.rrerr.net:justask/justask 2014-12-19 23:33:50 +01:00
Andreas N 7543da2701 move profile things into something different 2014-12-19 23:33:42 +01:00
nilsding aa3f118332 fixed anonymous questions being shown 2014-12-19 23:12:19 +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
nilsding fc5dc30751 asdf 2014-12-16 17:32:23 +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 2251f21664 bio has now validation 2014-12-16 12:48:40 +01:00
nilsding 6471e3baa5 fixed answers not being deleted 2014-12-15 19:19:26 +01:00
nilsding a30e6509b5 fixed things 2014-12-15 07:47:56 +01:00
nilsding c0c279e6d8 closes GitHub issue #16 2014-12-14 21:35:24 +01:00
nilsding a961764a56 closes github issue #15 2014-12-14 17:32:31 +01:00
nilsding 778c1eaccb bugFuchs 2014-12-14 17:21:15 +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
nilsding 519931ee4f fixed denotify 2014-12-14 15:48:10 +01:00
pixeldesu cf78d4758a rounded images 2014-12-14 15:44:17 +01:00
pixeldesu 834659fcfd Merge branch 'notifications' of git.rrerr.net:justask/justask into notifications 2014-12-14 15:43:00 +01:00
pixeldesu 3bcd67d1a4 rounded image was missing 2014-12-14 15:42:54 +01:00
nilsding 622af3490c added denotify method 2014-12-14 15:42:37 +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 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