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

842 Commits

Author SHA1 Message Date
Yuki 94433f4484 trim the fat 2015-05-08 21:37:09 +05:30
Yuki 9633511859 Some fixes (whoops used current_user instead of user) 2015-05-08 21:34:58 +05:30
Yuki 975909f197 remove unused file 2015-05-08 21:24:03 +05:30
Yuki 2e6ffdaab7 basic implementation 2015-05-08 21:14:16 +05:30
Yuki b2a57da4b2 Merge with master 2015-05-08 18:58:50 +05:30
pixeldesu 61fdaf6742 = != - 2015-05-06 02:07:12 +02:00
Georg G. 9b39491d88 Merge pull request #18 from skiprope/temp-bans 
Support for ban reasons and ban times.
 2015-05-05 16:54:23 +02:00
Yuki 65c852585d notification tab for comment smiles 2015-05-05 02:40:54 +05:30
nilsding 97b27248c2 added CommentSmile to 'Smiles' in the stats section in about page 2015-05-04 16:43:48 +02:00
Yuki 513c41619c Thanks, Mac (remove .DS_Store) 2015-05-04 07:41:53 +05:30
Yuki 2204227273 Feature-comment-smiles complete (fix Retrospring/bugs#42) 2015-05-04 07:09:47 +05:30
Yuki 9d14321cd1 Fix Retrospring/bugs#41 2015-04-30 05:17:55 +05:30
Yuki 982531ab55 don't echo everything omg i need to take pills to make me less stupid or something 2015-04-28 17:39:43 +05:30
Yuki 9688b7ee48 Merge stable 2015-04-28 10:22:54 +05:30
Yuki d012423b29 Fix for Retrospring/bugs#41 2015-04-28 07:55:46 +05:30
pixeldesu bd3564d6f3 center question on question page 2015-04-27 19:36:02 +02:00
Yuki 76ac8e1a9d Fix Retrospring/bugs#36 2015-04-27 06:51:29 +05:30
pixeldesu db474773bd update moderation tab display 2015-04-26 13:28:04 +02:00
pixeldesu 13d67b51f0 redirect to root instead of users question site 2015-04-26 13:19:04 +02:00
pixeldesu aac84c623f fix invisible border on question panel 2015-04-26 13:15:03 +02:00
Yuki ee29e1f28f Reporting and Deleting logic 2015-04-26 07:06:25 +05:30
pixeldesu e2f06167dc fix styling and schema 2015-04-26 02:46:37 +02:00
pixeldesu c8ba89dd1e change question display and add report placeholder 2015-04-26 02:18:57 +02:00
Yuki ba9262145d Show 'View reported User' in addition to the other buttons if reason.target.user is present 2015-04-26 03:23:22 +05:30
Yuki 4ad9916c7e Rename 'delete answer' to 'return to inbox' for clarity 2015-04-24 04:22:52 +05:30
Yuki 0bb3895ce8 Small fixes 2015-04-24 00:51:58 +05:30
Yuki f4b5289d3a Actually fixes Retrospring/bugs#25 2015-04-23 07:03:21 +05:30
Yuki 5764c36b32 DateTime.now -> DateTime.current 2015-04-23 06:48:17 +05:30
Yuki 1184410275 Forbid admins getting banned 2015-04-23 06:39:23 +05:30
Yuki be04d3528c Support for ban reasons and ban times. Fixes Retrospring/bugs#26 and Retrospring/bugs#25 2015-04-23 06:26:29 +05:30
Georg G. e306d36b10 Merge pull request #15 from skiprope/report-reason 
Add support for report reasons (fixes Retrospring/bugs#7)
 2015-04-22 18:25:29 +02:00
Georg G 667bb155c9 fixes Retrospring/bugs#23 2015-04-22 18:19:20 +02:00
Yuki b9bf0b04b6 Add support for report reasons 2015-04-22 08:29:10 +05:30
Georg G ef4fd30cd9 closes Retrospring/bugs#17 2015-04-22 00:33:55 +02:00
pixeldesu 305de8bf7b fix typo 2015-04-21 17:41:45 +02:00
Georg G 1db856c0fe fixed dropdown text for comments 2015-04-21 15:46:43 +02:00
Yuki 8eeae22c43 Don't resubscribe if a user unsubscribes and comments again 2015-04-21 17:52:32 +05:30
Yuki ecffd07344 Support for post subscriptions 2015-04-21 06:42:11 +05:30
Georg G aed2597de0 fixed grammar 2015-04-20 21:14:59 +02:00
Georg G aef20ee485 formatting 2015-04-20 21:14:05 +02:00
Howl aec96e5e4f Add link to bugs tracker and change a bit some stuff 2015-04-20 19:02:19 +02:00
Georg G b6499ddd42 UNCAPS!!!!!!!!!!! 2015-04-19 22:38:10 +02:00
Georg G d669d66d4a formatting 2015-04-19 22:36:50 +02:00
Georg G 7b637fd81b added contributors to about section 2015-04-19 22:31:14 +02:00
Georg G c9b7e71290 added contributor badge to user profile view 2015-04-19 22:25:21 +02:00
Georg G ced880fe34 made contributor badge changable via web interface 2015-04-19 22:25:04 +02:00
Georg G 55b2a98450 fixed notification badge fuckup 2015-04-19 17:07:35 +02:00
pixeldesu 4e185bbaa7 change Bootswatch theme, general theme changes, list group helper 2015-04-19 16:49:53 +02:00
Georg G. a9a12fa7d9 Merge pull request #2 from TheHowl/padding-on-links-section 
fix horrible link section without padding in about page
 2015-04-19 00:26:41 +02:00
Yuki e2bfc26c75 Markdown preview through AJAX (/ajax/preview) 2015-04-19 03:47:13 +05:30
Howl 1032363b5a fix horrible link section in about page 2015-04-18 23:45:52 +02:00
pixeldesu e1d20db3e0 update faq and about 2015-04-18 22:06:36 +02:00
Georg G 71a7effa29 changed faq entry 2015-04-18 22:01:00 +02:00
pixeldesu d46a6ecb38 update about page 2015-04-18 21:21:45 +02:00
pixeldesu 723d72c587 update about page 2015-04-18 21:11:18 +02:00
pixeldesu 865bbbd6b9 add Github link to footer 2015-04-18 21:08:20 +02:00
nilsding 434e1a21bc removed shutdown message 2015-04-02 01:31:09 +02:00
nilsding 47cbbed719 made admin listing changeable in justask.yml 2015-04-02 01:28:42 +02:00
nilsding adee82bdf1 le instant troll mode activated 2015-03-27 23:10:57 +01:00
pixeldesu 09b30506fd add deletion message to index 2015-03-27 13:25:50 +01:00
pixeldesu fbb494f3ea add deletion message to index 2015-03-27 13:24:09 +01:00
pixeldesu 644b1b1316 add deletion message to index 2015-03-27 13:21:46 +01:00
pixeldesu 6e913fbfeb Merge branch 'master' of git.rrerr.net:justask/justask 2015-03-27 13:17:29 +01:00
pixeldesu 5d3cd6ee75 add deletion message to index 2015-03-27 13:17:16 +01:00
nilsding 1773ff0b33 remove myself from about page 2015-03-18 21:26:42 +01:00
nilsding 487de37477 fix jihad issue #86 2015-02-28 17:29:10 +01:00
Andreas N da7b684513 add links to privacy policy and terms of service in footer 2015-02-20 01:23:48 +01:00
Andreas N af598f585a added link to blog in the footer 2015-02-20 01:12:24 +01:00
Andreas N 66cc15971e more date tooltips 2015-02-20 00:40:41 +01:00
Andreas N a3bfa41baa add date tooltips to relative dates 2015-02-20 00:18:43 +01:00
Andreas N a451cab3e9 show answer link in all cases 2015-02-18 00:07:38 +01:00
Andreas N c61b9ddf50 fix #83 2015-02-17 23:57:34 +01:00
Andreas N d87d18ae9d change effective date 2015-02-16 19:23:58 +01:00
Andreas N c50531c988 Merge remote-tracking branch 'remotes/origin/texts' into develop 2015-02-16 18:59:59 +01:00
Andreas N 8f9472a611 update privacy policy 2015-02-16 16:32:29 +01:00
Georg G d5fcec4d7d hide that "Load more" button if you delete all questions 2015-02-12 22:15:01 +01:00
Georg G 66c5e46a78 this happens all the time 2015-02-12 22:10:50 +01:00
Georg G cb606f942a fixed pagination for real 2015-02-12 22:09:11 +01:00
Andreas N e3bc0d6300 add inbox pagination 2015-02-12 21:59:46 +01:00
Andreas N 9aabccdddc add links to profile 2015-02-12 18:10:16 +01:00
Andreas N f58ec9f2a6 another try to fix 2015-02-12 17:50:13 +01:00
Andreas N f2678cac0f applied to wrong item 2015-02-12 17:23:46 +01:00
Andreas N 42dd275b2f more optimizations to mobile display 2015-02-12 17:22:40 +01:00
Andreas N 2e75649b71 optimization to mobile display 2015-02-12 17:08:22 +01:00
Andreas N 4e7c0ec819 trying to fix this³ 2015-02-12 16:59:54 +01:00
Andreas N 136b4dbba5 trying to fix this² 2015-02-12 16:57:51 +01:00
Andreas N 89ea02e7af the navbar is kinda broken 2015-02-12 16:51:04 +01:00
Andreas N 1ef032e69e some more changes 2015-02-12 16:48:14 +01:00
Andreas N 55a4278c34 copycat failures 2015-02-12 16:39:28 +01:00
Andreas N 0dfbac0bda update profile dropdown, first draft 2015-02-12 16:37:07 +01:00
Andreas N cb13903493 update moderator display 2015-02-12 15:57:05 +01:00
Andreas N 5e9d455a2f typo 2015-02-10 22:08:00 +01:00
Andreas N c6864133d4 update terms/policy a bit 2015-02-10 21:36:37 +01:00
Andreas N 87cfff8809 try to fix buggy tooltip 2015-02-09 19:58:58 +01:00
Andreas N ddbb7e63c8 remove small size for asking button 2015-02-09 17:39:34 +01:00
Andreas N 7e12a1c77a update notification display 2015-02-09 16:48:31 +01:00
Andreas N 6ac227fd31 hide entire list item, not just the button 2015-02-09 16:43:48 +01:00
Andreas N 192c0a0931 update ask button in navbar 2015-02-09 16:43:05 +01:00
Andreas N 3c6221eb1e indentation got fucked up here 2015-02-08 02:54:57 +01:00
Andreas N 8550760772 add inbox sidebar 2015-02-08 00:59:07 +01:00
Andreas N 46d8769b92 remove padding on even more pages 2015-02-05 15:20:41 +01:00
Andreas N cde8d8a30f remove padding on specific rows on mobile devices 2015-02-05 15:17:15 +01:00
Andreas N 66607a1eae update modal 2015-02-03 18:22:01 +01:00
Andreas N 26cd72ba2e update modal 2015-02-03 18:10:14 +01:00
Georg G 06cc52ffc5 made these checkboxes work 2015-02-03 17:48:30 +01:00
Georg G 96f4a9433f moderation javascripts now only get loaded if the current_user is a moderator or above 2015-02-03 17:31:04 +01:00
Georg G 17f1c8f091 added user privileges modal 2015-02-03 17:13:50 +01:00
Andreas N d09b8554d3 update placeholders 2015-02-01 20:07:52 +01:00
Andreas N cff278793e update timeline design 2015-01-31 16:20:07 +01:00
Andreas N 9cb21d2458 add moderation navbar navbar 2015-01-31 00:49:31 +01:00
Andreas N 030e6ac6a6 add notification navbar 2015-01-31 00:47:28 +01:00
nilsding 393b92e001 … [ci skip] 2015-01-30 22:55:29 +01:00
Andreas N bca0344792 remove margin from navbar 2015-01-30 22:53:44 +01:00
nilsding bde9f39573 fixed mobile navbar thing [ci skip] 2015-01-30 22:52:05 +01:00
Andreas N 1c6533bb74 change text 2015-01-30 22:48:38 +01:00
Andreas N cac03fa31e change fixed to static 2015-01-30 22:48:24 +01:00
Andreas N 99c7aa8f86 add mobile navigation for lists and timelines 2015-01-30 22:46:44 +01:00
Andreas N caa6a06ab0 small visual improvement 2015-01-30 20:34:28 +01:00
Andreas N b3d81e18ab fix this shit 2015-01-30 20:32:10 +01:00
nilsding a7fbc5b366 fixed inbox entries and toggle button 2015-01-28 06:49:17 +01:00
Andreas N 9c2b0951bf add coffescript to expand options 2015-01-27 18:25:20 +01:00
Andreas N ddbff78926 add panel-footer to inbox panel 2015-01-27 18:13:24 +01:00
nilsding 13bdbaa430 centred the "New notifications will appear here" text and also fixed class for notifications entry on navbar 2015-01-26 17:53:23 +01:00
nilsding c8b02bbf50 actually add some code here 2015-01-26 17:50:45 +01:00
Andreas N 2a0d80b755 basic stuff fixed 2015-01-26 17:21:40 +01:00
Andreas N da9c15d43c basic stuff added 2015-01-26 17:16:32 +01:00
Andreas N e9c7c5120b hotfix 2015-01-26 15:57:07 +01:00
Andreas N 370169c35a update and fix mobile design 2015-01-26 15:51:18 +01:00
Andreas N 1a3c491e45 remove fa-spin from blogger badge 2015-01-25 20:50:42 +01:00
nilsding 0d639fd6ec added blogger badge 2015-01-25 20:30:09 +01:00
Andreas N fa2220dd00 added Filippus to admins 2015-01-19 17:39:19 +01:00
Andreas N 5b67ac7f0a added template css file 2015-01-18 00:23:55 +01:00
Andreas N 3edfbb42a1 add design stuff for header display 2015-01-18 00:16:06 +01:00
Andreas N c60e345d7b removed kyr from admins 2015-01-17 21:35:52 +01:00
Andreas N 26605dd66f more fixes for member listing for groups 2015-01-17 19:15:06 +01:00
Andreas N f714e8d0e2 fix member listing for groups 2015-01-17 19:13:31 +01:00
Andreas N 0b2c1b86c8 added member listing for groups 2015-01-17 19:13:09 +01:00
nilsding 927ec9678f deleting groups works now! finally!!! 2015-01-17 18:57:23 +01:00
Andreas N 745f600f60 added delete button 2015-01-17 18:42:56 +01:00
nilsding a0d0731a6b creating groups works now. 2015-01-17 18:24:36 +01:00
nilsding dd6af3f651 adding and removing users to/from groups works now 2015-01-17 17:50:25 +01:00
nilsding 5fd5af9f47 Merge branch 'master' into groups 2015-01-17 15:51:52 +01:00
Andreas N fa3020e36d i honestly don't know whats wrong here 2015-01-17 12:45:02 +01:00
Andreas N c36c3e6472 fixed faq 2015-01-17 12:41:59 +01:00
Andreas N 599a88c34a updated faq 2015-01-17 12:39:31 +01:00
Andreas N 991ad1f838 added agree statement to sign in page 2015-01-17 12:34:51 +01:00
Andreas N 6871733249 update terms of service 2015-01-17 09:21:49 +01:00
Andreas N d5b14f0654 update effective date 2015-01-17 09:13:56 +01:00
Andreas N 74e74dedef added terms of service 2015-01-16 23:16:28 +01:00
Andreas N 28e72b3adc added panel-body 2015-01-16 22:45:00 +01:00
Andreas N d593e0edd4 added privacy policy 2015-01-16 22:43:56 +01:00
Andreas N 75ae141759 added privacy policy 2015-01-16 22:36:39 +01:00
Andreas N 597c54aa93 remove empty header 2015-01-15 16:18:35 +01:00
Andreas N e90d9777b2 update about page with cool header 2015-01-15 16:04:59 +01:00
Andreas N 0e052ee1be added tab navigation 2015-01-14 20:14:58 +01:00
Andreas N b99fe56038 update design to be condensed 2015-01-14 19:57:11 +01:00
Andreas N 0ad2bc9ca2 fix indentation 2015-01-14 19:37:51 +01:00
Andreas N c557192b61 wrapping list-group in panel, just for design stuff 2015-01-14 16:29:53 +01:00
Andreas N 1497f97395 attempt to center input 2015-01-14 15:44:27 +01:00
Andreas N 050d94e8d7 update group membership modal 2015-01-14 15:35:53 +01:00
Andreas N 42534982d6 move icons 2015-01-14 14:20:04 +01:00
Andreas N 03eb5ad738 Merge remote-tracking branch 'origin/master' 2015-01-14 14:17:33 +01:00
Andreas N 3fe879768f updated sharing section 2015-01-14 14:17:24 +01:00
nilsding 642be7996d added Fontawesome icon 2015-01-14 07:32:43 +01:00
nilsding c99fe89235 added group memberships modal 2015-01-14 07:07:40 +01:00
nilsding d7350838ba Merge branch 'master' into groups 2015-01-13 23:13:38 +01:00
Andreas N f350f2806a change theme-color 2015-01-13 22:57:50 +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 1bb369aa7d implemented basic functionality of YE OLDE BANHAMMER! 2015-01-12 22:44:13 +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 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 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 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
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 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
nilsding 0916628c43 added link to bug tracker 2015-01-07 00:36:09 +01:00
Andreas N 1b4eb15152 tooltips for smiles 2015-01-06 17:33:02 +01:00
Andreas N 0d784aee47 finish implementing new badge design 2015-01-06 15:32:14 +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 59b431513b made privacy_allow_stranger_answers work 2015-01-03 22:37:10 +01:00
nilsding 09b6a6bc10 made that stuff work 2015-01-03 22:27:14 +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 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 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 f4d63ae4e3 users now can answer other people's questions 2015-01-03 18:41:10 +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
Andreas N 82924cfbec fix profile size indifference 2015-01-03 15:23:43 +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 ddae3c6278 crapkit sucks 2015-01-03 04:01:42 +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
nilsding 9869a46fef Revert "attempt fix for #39" 
This reverts commit 16f319a0a6.
 2015-01-03 03:50:54 +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 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 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 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 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 daa8eefff6 temp fix 2014-12-29 22:01:54 +01:00
nilsding fa16612ba8 made the new cropper work 2014-12-29 16:29:46 +01:00
nilsding f7cb3478be :medium everywhere 2014-12-29 14:57:16 +01:00
nilsding b61a631f15 added hidden fields 2014-12-29 14:50:25 +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 678e03deed uploading profile pictures works now 2014-12-29 11:21:43 +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 7d55141a1a added deleted column to reports 2014-12-28 21:34:36 +01:00
nilsding b3f165b12b reporting and deleting comments works now 2014-12-28 21:14:01 +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 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 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
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
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
nilsding 642d88da07 , 2014-12-27 15:56:34 +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