Commit Graph

271 Commits

Author SHA1 Message Date
Andreas N 5369f34bab Merge remote-tracking branch 'remotes/origin/inbox-options' 2015-01-30 20:27:11 +01:00
Andreas N 5ce2368310 Merge branch 'inbox-options' 2015-01-30 20:22:48 +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
nilsding ca7789750a made NProgress loading bar brighter (GitHub issue #73) 2015-01-27 17:53:05 +01:00
Andreas N 8ff92dca15 Merge remote-tracking branch 'origin/master' 2015-01-26 18:41:37 +01:00
Andreas N 32956319d4 changed question-text line height 2015-01-26 18:41:16 +01:00
nilsding 4e49258463 removed annoying margin, ready to merge [ci skip] 2015-01-26 18:08:03 +01:00
nilsding f7e71d3d67 how about this selector? 2015-01-26 18:04:17 +01:00
Andreas N 174ea6b774 changed display of notification badge 2015-01-26 17:55:18 +01:00
Andreas N 45e08651af fixed some more stuff 2015-01-26 17:33:40 +01:00
Andreas N da9c15d43c basic stuff added 2015-01-26 17:16:32 +01:00
Andreas N 370169c35a update and fix mobile design 2015-01-26 15:51:18 +01:00
Andreas N 40eb19d387 updated colours thingy 2015-01-25 20:48:14 +01:00
nilsding 0d639fd6ec added blogger badge 2015-01-25 20:30:09 +01:00
nilsding 05334e3bd0 added some specs 2015-01-18 14:15:21 +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
Andreas N 2ddb39e530 added top padding 2015-01-17 18:36:46 +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 0bf59a0bb0 fixed that damn tab link border thing 2015-01-17 16:26:46 +01:00
nilsding 5fd5af9f47 Merge branch 'master' into groups 2015-01-17 15:51:52 +01:00
nilsding 53cb527c7f put that damn tooltip in the callback function. 2015-01-15 17:47:54 +01:00
Andreas N b99fe56038 update design to be condensed 2015-01-14 19:57:11 +01:00
Andreas N 053a2d695c I think this is causing some problems with the design 2015-01-14 19:30:48 +01:00
Andreas N 1497f97395 attempt to center input 2015-01-14 15:44:27 +01:00
nilsding d7350838ba Merge branch 'master' into groups 2015-01-13 23:13:38 +01:00
nilsding 5f3feaa4e6 MAXIMUM SASS™ 2015-01-13 22:55:45 +01:00
Andreas N 1b0b505ec9 another try 2015-01-13 22:37:02 +01:00
Andreas N 1c40721688 hopefully 2015-01-13 22:34:48 +01:00
Andreas N 9e1de238da please 2015-01-13 22:32:23 +01:00
Andreas N 20f01094b5 stupid overrides 2015-01-13 22:15:18 +01:00
Andreas N bb7cb3ded0 change the primary color to purple 2015-01-13 22:10:45 +01:00
Andreas N e834a1ae29 change the primary color to purple 2015-01-13 22:03:43 +01:00
nilsding 3d34f916c9 Merge branch 'master' into navbar-color
Conflicts:
	app/assets/stylesheets/application.css.scss
2015-01-13 21:56:00 +01:00
nilsding 0ee58e0d20 it doesn't make much sense changing the variables after loading bootstrap 2015-01-13 21:54:56 +01:00
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
nilsding a05d763b75 selecting the group from the ask followers modal works now. 2015-01-13 15:45:32 +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 bc826f07fe moved Piwik code to its own file 2015-01-10 18:53:25 +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 3e88abe36d updated answerbox design 2015-01-09 21:44:41 +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 26c21e6a27 fixed being unable to use cmd+enter on macs 2015-01-07 00:52:19 +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 4b114b0cab fixed badge size 2015-01-06 15:35:16 +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
Andreas N 11cd8b59f8 fix broken labels 2015-01-05 00:50:27 +01:00
nilsding cdfe5564d6 made C-RET work again 2015-01-03 22:36:51 +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 f53ca1b449 the new answer is now shown 2015-01-03 19:14:26 +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
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