Commit Graph

1828 Commits

Author SHA1 Message Date
Andreas Nedbal 416a12f956 Remove "centre" class 2020-04-27 01:31:43 +02:00
Andreas Nedbal e8a6644998 Refactor frontpage design and styles 2020-04-27 01:18:46 +02:00
Andreas Nedbal 05efd4a42e Refactor jumbotron styles 2020-04-27 00:59:53 +02:00
Andreas Nedbal 5550dd9100 Move variables to style root 2020-04-26 23:55:28 +02:00
Andreas Nedbal 84ee5eec68 Adjust background color of website 2020-04-26 23:54:26 +02:00
Andreas Nedbal dcb314d9a5 Adjust footer link visibilty to work with Bootstrap 4 2020-04-26 23:54:02 +02:00
Georg Gadinger acc394a110
Merge pull request #88 from Retrospring/replace-dead-links
Replace dead links
2020-04-26 23:44:31 +02:00
Georg Gadinger 6a0d9063ba Revert "Prevent the Return key from submitting while composing using an IME"
This reverts commit d13f1cf7b8.
2020-04-26 23:40:02 +02:00
Georg Gadinger dc25b5f0c1 Capitalise organisation name in GitHub urls 2020-04-26 23:18:02 +02:00
Georg Gadinger b2b6419b5d Use HTTPS in links 2020-04-26 23:16:20 +02:00
Georg Gadinger c634d5f03c Update some dead links 2020-04-26 23:12:29 +02:00
Andreas Nedbal 711d6a9f4e WIP: Add initial overrides for Bootstrap 4 styling 2020-04-26 21:48:25 +02:00
Andreas Nedbal 8d9f1d5efb Adjust list_group_item helper for Bootstrap 4 2020-04-26 21:48:02 +02:00
Georg Gadinger aeef50ad78
Merge pull request #86 from Retrospring/cleanup
Minor Cleanup
2020-04-26 20:03:46 +02:00
Andreas Nedbal c124138a4a Fix layout issues in questionbox 2020-04-26 17:30:06 +02:00
Andreas Nedbal 7513ef2b9e Clean up answerbox layout 2020-04-26 17:13:31 +02:00
Andreas Nedbal 0afff3f84d Adjustments and smaller fixes
- Fixed initially selected Discover tabs being empty
- Removed spacing classes from inbox templates
- Fixed feed layout and sidebar display
- Adjust some profile layout nits
2020-04-26 16:25:54 +02:00
Andreas Nedbal 1f678b80c1 Fixed issue rendering privilege item partials 2020-04-26 15:27:19 +02:00
Andreas Nedbal b550e78272 Refactor notifications into partials
All notification type layouts have been:

1) present in both the navigation layout and the notification page
2) in a single file

This commit addresses both issues and creates partials for all notfication types.
2020-04-26 15:26:55 +02:00
Andreas Nedbal 4917ce46d3 Fix "nav-item" assigning class in nav_entry helper 2020-04-26 14:30:23 +02:00
Andreas Nedbal 1885343900 Clean up main navigation
- Move main navigation into views/navigation
- Split guest navigation into seperate file
- Move main navigation partials into subfolder
- Further adjustments for Bootstrap 4 compatibility
2020-04-26 14:29:23 +02:00
Karina Kwiatek 926631eca3 Remove more left-over references to role fields 2020-04-25 22:23:37 +01:00
Karina Kwiatek f42cc6aed9 Remove all other references to removed roles 2020-04-25 21:20:02 +01:00
Karina Kwiatek 9d933c933e Remove unused (removed) roles from Your Data / Export 2020-04-25 21:14:26 +01:00
Karina Kwiatek 71e62dddcf Remove unused roles from privileges modal 2020-04-25 21:06:36 +01:00
Karina Kwiatek 10a9ca5577 Fix bad replace; update schema.rb 2020-04-25 21:01:46 +01:00
Andreas Nedbal 18d4fad00e Move notification navigation to new location 2020-04-25 20:27:56 +02:00
Andreas Nedbal aeedee8b2f Move moderation navigation to new location 2020-04-25 20:20:00 +02:00
Andreas Nedbal 2fb1966c5b Move feed navigation to new location 2020-04-25 20:11:33 +02:00
Andreas Nedbal e56e65cf40 Further adjustments to inbox layout
- Fixed base styling of cards due to layout differences between panels of Bootstrap 3
- Removed duplicate rendering of sidebar
2020-04-25 19:45:53 +02:00
Andreas Nedbal e15cedd56c Adjust tab classes to Bootstrap 4 2020-04-25 19:02:39 +02:00
Andreas Nedbal a9812f5800 Clean up feed layouts 2020-04-25 18:23:02 +02:00
Andreas Nedbal 2a074227ac Clean up inbox layouts 2020-04-25 18:10:48 +02:00
Andreas Nedbal baf5ba698d Clean up moderation layout 2020-04-25 18:05:35 +02:00
Andreas Nedbal ae4c68a10b Use layout inheritance by convention 2020-04-25 17:54:52 +02:00
Andreas Nedbal 19e7ed557e Remove .html.haml prefix from modal files 2020-04-25 17:52:24 +02:00
Andreas Nedbal 245c6493d3 Clean up notifications layout 2020-04-25 17:51:00 +02:00
Andreas Nedbal 6e22e84081 Clean up user profile layouts 2020-04-25 17:21:39 +02:00
Andreas Nedbal c870b00f65 Clean up user setting layouts 2020-04-25 17:04:23 +02:00
Andreas Nedbal ea77168b50 Port application layout to use parent_layout 2020-04-25 17:03:59 +02:00
Andreas Nedbal 8b8a5a1e72 Add parent_layout helper 2020-04-25 17:02:59 +02:00
Andreas Nedbal 9ee5811243 Remove piwik 2020-04-25 16:22:09 +02:00
Dominik M. Kwiatek 9f992d398f
Fix exception being thrown upon attempting to ban a user (#82) 2020-04-25 14:51:28 +01:00
Karina Kwiatek d13f1cf7b8 Prevent the Return key from submitting while composing using an IME
Based on the following article by Michael Stum:
https://www.stum.de/2016/06/24/handling-ime-events-in-javascript/
2020-04-25 14:35:04 +01:00
Andreas Nedbal 96309eb8ba Move all modals into shared views/modal directory 2020-04-25 15:16:45 +02:00
Andreas Nedbal 3885c24825 Properly align navbar when not signed in 2020-04-25 14:29:52 +02:00
Andreas Nedbal 7767eeae9f Merge branch 'master' into feature/bootstrap 2020-04-25 13:14:01 +02:00
Georg Gadinger 445d9ebe2a Fix user questions page 2020-04-23 03:31:07 +02:00
Dominik M. Kwiatek a8c335899d
Use email field for password reset (#77)
Fixes unsubmmittable password reset form
2020-04-22 19:22:16 +01:00
Karina Kwiatek 3aa2e5899c Remove JoJoke 2020-04-22 15:51:45 +01:00
Karina Kwiatek 47fde17560 Remove deprecated gravatar_url method 2020-04-20 23:18:14 +01:00
Georg Gadinger 101b3b68d3 Use cursored pagination, remove WillPaginate 2020-04-20 23:13:24 +02:00
Dominik M. Kwiatek 516bc48aa0
Merge pull request #70 from Retrospring/feature/announcements
Implement Announcements
2020-04-19 23:10:47 +01:00
Andreas Nedbal 2dbc6eff01 Adjust navbar styling 2020-04-20 00:04:01 +02:00
Andreas Nedbal 3994917ce9 Adjust notification navigation to Bootstrap 4 2020-04-19 23:42:37 +02:00
Andreas Nedbal 0c3dee30ae Add row to notification list 2020-04-19 23:34:09 +02:00
Andreas Nedbal b5a833e917 Remove superfluous card-default class 2020-04-19 23:31:24 +02:00
Georg Gadinger 477ec3e9c9 Do not allow creation of groups with empty names 2020-04-19 23:28:50 +02:00
Karina Kwiatek 4889071f95 Add JS for dismissing announcements 2020-04-19 22:27:50 +01:00
Andreas Nedbal 21fceccf2f Adjust modal layouts to Bootstrap 4 2020-04-19 23:26:29 +02:00
Andreas Nedbal efd2ff4db0 Convert visibility classes to Bootstrap 4 2020-04-19 23:14:05 +02:00
Andreas Nedbal fa14859a6a Adjust dropdowns to Bootstrap 4 layout 2020-04-19 23:13:39 +02:00
Andreas Nedbal 213eb1d11f Add row classes to fix grid layouts 2020-04-19 23:12:23 +02:00
Andreas Nedbal 33cd5b57a3 Convert panel classes to card classes 2020-04-19 23:11:14 +02:00
Andreas Nedbal 2b39888679 Adjust base navigations Bootstrap 4 2020-04-19 23:03:34 +02:00
Karina Kwiatek 80c6a4272a Fix indentation in new.html.haml 2020-04-19 21:58:08 +01:00
Karina Kwiatek 391f4a28ed Merge branch 'master' into feature/announcements
# Conflicts:
#	db/schema.rb
2020-04-19 21:52:58 +01:00
Karina Kwiatek a505e7ee71 Ensure we're logged in as an admin when using the AnnouncementController 2020-04-19 21:45:07 +01:00
Karina Kwiatek b6d6c1fded Add announcements to the top of the application template 2020-04-19 21:38:21 +01:00
Georg Gadinger 946bb3ae9d Use Rolify for admin and moderator roles 2020-04-19 22:35:58 +02:00
Karina Kwiatek 473f2cdcc5 Show announcement validation errors on the frontend 2020-04-19 21:26:55 +01:00
Karina Kwiatek 2ecc746e23 Implement validation for announcements 2020-04-19 21:11:22 +01:00
Karina Kwiatek 6187cb0b6c Add the ability to edit announcements 2020-04-19 20:58:57 +01:00
Karina Kwiatek f14a168bce Implement deletion of announcements 2020-04-19 20:50:33 +01:00
Karina Kwiatek e3b89f7346 Implement creation of announcements 2020-04-19 20:34:48 +01:00
Karina Kwiatek 8a632a09cd Create Announcement model & controller 2020-04-19 20:12:22 +01:00
Andreas Nedbal 7f74e844f5 Replace Bootstrap 3 with Bootstrap 4 2020-04-19 21:08:58 +02:00
Georg Gadinger 6999695ff8 Cleanup 2020-04-19 19:49:47 +02:00
Georg Gadinger 8b129bbbf4 Fix moderation panel. 2020-04-19 18:33:20 +02:00
Georg Gadinger 311c7ac6c0 Remove Rollbar 2020-04-19 17:20:07 +02:00
Georg Gadinger d680185b0b Remove twemoji 2020-04-19 17:03:53 +02:00
Georg Gadinger 76f4ec35e2 get rid of "Fixnum is deprecated" warning 2020-04-19 14:39:59 +02:00
Georg Gadinger 6f6ac3cc7d Merge remote-tracking branch 'origin/master' into rails5 2020-04-19 14:32:47 +02:00
Georg Gadinger 9fa8ef1501 enable 'Discover' page for mods 2020-04-19 13:55:13 +02:00
Karina Kwiatek a19402af41 Upgrade to Rails 5.2 2020-04-19 00:45:50 +01:00
Georg Gadinger 323f9d91ac Fix NoMethodError on the data page 2020-04-19 01:19:25 +02:00
Georg Gadinger 3e7497a144 Upgrade to Rails 5 2020-04-19 00:59:22 +02:00
Georg Gadinger b926820d90 javascripts: "fix" (un)smile update bug 2020-04-18 23:44:59 +02:00
Georg Gadinger d47991f379 Fixes for devise 4.x 2019-03-29 22:37:10 +01:00
Georg Gadinger a5d689e76c Do not allow spam users to be created 2018-07-27 20:27:40 +02:00
Georg Gadinger 66400c87dd Merge remote-tracking branch 'github/master' 2018-05-20 14:18:02 +02:00
liv c0ace7cec4
remove dead bug tracker link 2018-05-15 17:37:13 +02:00
Tina 106b9fd71f twitter.com/retrospringnet -> retrospring 2018-04-29 21:22:16 +02:00
Tina eec1065c83
twitter.com/retrospringnet -> retrospring 2018-04-12 05:40:46 +02:00
Andreas N 7a16113295 adjust tweet length to new twitter limit 2018-04-11 21:26:58 +02:00
Georg Gadinger 1922094f11 Fix translations again argh 2017-04-02 09:07:59 +02:00
Georg Gadinger 4424cb64cd Fix JS translations 2017-04-02 09:04:49 +02:00
Georg Gadinger f8e494094f Evil hack on production for frontend translations 2017-04-01 01:13:16 +02:00
Georg Gadinger 73b18af6ff Notify errors to Rollbar 2017-03-31 23:17:36 +02:00
Georg Gadinger 771821356f fix sweetalert 2017-03-31 22:49:38 +02:00
Georg Gadinger 28cc6b5938 Certain features can now be enabled/disabled from config 2017-03-31 22:21:38 +02:00
Georg Gadinger 10d16466fd fuck 2017-03-31 15:13:52 +02:00
Georg Gadinger 9766ede53c Hotfix to not break discover page 2017-03-31 15:11:38 +02:00
Georg Gadinger 3424cc47c9 Hotfix lmao 2017-03-31 15:04:58 +02:00
Georg Gadinger b8701e7626 Make user_screen_name helper use kwargs, add link_only arg 2017-03-30 19:17:25 +02:00
pixeldesu f7d06135ef don't include unnecessary theme files on user profiles 2017-03-29 15:49:27 -07:00
pixeldesu 8d4d2ffce1 apply changes to groups page, adjust heading for header 2017-03-29 15:29:07 -07:00
pixeldesu 598fce6f83 add header classes to profile pages 2017-03-29 15:20:37 -07:00
pixeldesu f345f8628f add header to other profile sections 2017-03-29 15:18:11 -07:00
pixeldesu b153a04b54 remove visible traces of team members 2017-03-29 14:52:26 -07:00
pixeldesu 6787c0539f limit header size 2017-03-29 14:35:23 -07:00
Georg G 39c79287e2 ing hell 2016-01-05 21:50:21 +01:00
Georg G 78b34ef6f9 c and k 2016-01-05 21:48:30 +01:00
Georg G 2ad1c4294d u 2016-01-05 21:38:36 +01:00
Georg G 2d20aa8dae f 2016-01-05 21:35:10 +01:00
Georg G 573fd89887 added export tab 2016-01-05 21:29:53 +01:00
Georg G b034986e43 update text 2016-01-05 21:11:14 +01:00
Georg G 615d7152d2 fuck logic 2016-01-05 21:06:52 +01:00
Georg G 0deb4c4ccc added export view/controller/routes 2016-01-05 20:54:38 +01:00
Georg G bf64a59649 added User#can_export? 2016-01-05 20:54:13 +01:00
Georg G a13d2443bd added ExportWorker 2016-01-05 20:54:00 +01:00
funerally b10ca0d736 Fixed twitter link
Fixed broken twitter link on about page.
2015-10-03 00:00:44 -04:00
pixeldesu b0ca8a6219 Fix wording 2015-09-20 15:32:41 +02:00
pixeldesu 08644306fc Update frontpage styling and content 2015-09-20 15:16:24 +02:00
Yuki e510a6e8b4 Do you feel it, Mr. Krabs? 2015-09-18 18:09:26 +09:00
Yuki c107cb19cb LEEDLE LEEDLE LEEE 2015-09-18 18:08:08 +09:00
Yuki 64ba41d9a6 Fix reports 2015-09-18 18:02:16 +09:00
pixeldesu 9bb512e8fe fix underlining style for notification header links 2015-09-17 00:26:00 +02:00
pixeldesu 927d6632c1 make the notification center smaller and shorten content 2015-09-16 23:59:47 +02:00
pixeldesu 24f7ff98ec Fix comment notifications and markdownify content 2015-09-16 22:46:33 +02:00
pixeldesu ede3ad1b92 Update notification design and behaviour
- Add display of content that was replied to/with
- Instead of marking notifications new, only show new items and hide seen entries
- Add a 'New Notifications' page and set it as default
- Add proper display if there are no new notifications
- Adjust theme to fit new changes
2015-09-16 22:18:40 +02:00
Yuki 8cbd85a89c the copy paste is strong 2015-09-01 18:48:56 +05:30
Yuki 4b891b3f70 Fix dangerous send exploit 2015-09-01 18:44:50 +05:30
Yuki 5d3d3a68e7 Fix remote code execution exploit 2015-09-01 18:44:31 +05:30
pixeldesu 419b578956 fix missing coloring of question panel 2015-09-01 07:45:40 +02:00
pixeldesu a9ad31b285 move check if user is logged in out of template 2015-08-28 16:36:49 +02:00
pixeldesu 8c5badf0b8 fix Retrospring/bugs#95 2015-08-28 16:29:02 +02:00
Yuki bbb1e001e2 swippty swooty comin for that .panel-success > .panel-heading .media * { color: #deadbeef !important } 2015-08-27 05:57:16 +05:30
Yuki 9b7a014121 Panel my panel no default (season 2) 2015-08-27 05:39:10 +05:30
Yuki 71caf3cce5 Several changes to theming, solving a bunch of bugs 2015-08-27 05:30:26 +05:30
pixeldesu 683ce43294 implement pgHero 2015-08-26 21:37:29 +02:00
pixeldesu 107bbb3aeb add entry-subtext styling 2015-08-26 04:14:03 +02:00
pixeldesu d3a7bca68f another occurence of nav tabs instead of list-groups 2015-08-26 01:45:03 +02:00
pixeldesu 764a36e4be %ul.nav -> .list-group 2015-08-25 23:46:49 +02:00
Yuki 010d0a327e i'm about to give up 2015-08-26 02:26:47 +05:30
Yuki a7c3acea76 ISHYGDDT 2015-08-26 02:14:14 +05:30
Yuki cc8e2448eb probably shouldn't do this 2015-08-26 01:44:17 +05:30
Yuki 9daa8a7ab3 T -> t 2015-08-26 01:43:08 +05:30
Yuki cd6c746e4d paperclip is dead to me 2015-08-26 01:41:30 +05:30
Yuki ad8506ee5f fix css content type 2015-08-26 01:24:07 +05:30
Yuki c2da575955 invalid is invalid 2015-08-26 01:20:17 +05:30
Yuki 370d66105f wildcard content 2015-08-26 01:14:36 +05:30
Yuki 1ad2a60c5d => death 2015-08-26 01:06:51 +05:30
Yuki 741bee22a0 text/css 2015-08-26 01:05:56 +05:30
Yuki 18d4cf116f -- 2015-08-26 01:04:40 +05:30
Yuki c5ad288da4 S3 headers 2015-08-26 01:04:29 +05:30
Yuki d6610829f8 Badumdum 2015-08-26 01:03:57 +05:30
Yuki 2e0a00e461 Braces 2015-08-26 00:50:18 +05:30
Yuki 7c68b2a167 PRODUCTION V DEVELOPMENT, ROUND 3 FIGHT 2015-08-26 00:45:08 +05:30
Yuki 6642408b61 Fix show foreign themes bug 2015-08-26 00:35:36 +05:30
pixeldesu 675ba646ea Merge remote-tracking branch 'origin/feature-themes' 2015-08-25 20:55:42 +02:00
Yuki 4b646b7e80 Drop ERB loop 2015-08-26 00:07:55 +05:30
Yuki 54167416f5 Fix ask all button color 2015-08-26 00:02:20 +05:30
Yuki 906692e78f Theming is finished
Previews, settings pane and presets!
2015-08-25 23:57:06 +05:30
Yuki 1912fc3766 Model goop
also made the theme selection logic for user profiles and current user, and the saving logic
2015-08-25 13:56:36 +05:30
Yuki e42f81193b Finalize theme file 2015-08-25 10:48:01 +05:30
Yuki 0bfbbbc856 Theme Progress
New notifications
notifications page
tabs
pills/lists
badges
panel badges
2015-08-25 10:19:25 +05:30
Yuki e7e28efcab Theme Progress
Link color
Notification dropdown text fix
Dropdown select color
Panels
Modals
Buttons, Labels and Alerts
nprogress
fix and rename __THEME_CSS_CACHE to __THEME_CSS_CACHE_V1
2015-08-25 01:26:59 +05:30
Yuki 5f8dc8a24f Cache CSS if in production 2015-07-29 22:29:52 +05:30
Yuki 47344a5774 ThemeHelper.render_theme_with_context 2015-07-29 22:24:33 +05:30
Yuki aec452cbd1 CSS -> SCSS 2015-07-29 22:01:34 +05:30
pixeldesu 9f8c43f8a4 fix #39, copypasta issue 2015-07-29 17:11:20 +02:00
Yuki 3444fcc93e rework some theme code, particlefield now adapts color 2015-07-29 20:38:07 +05:30
Yuki 9ef71a84e9 Merge branch 'master' of github.com:Retrospring/retrospring into feature-themes 2015-07-29 19:52:14 +05:30
Yuki 9734e5463e Merge pull request #33 from colons/master
Do not declare mobile app capability
2015-07-28 04:33:56 +05:30
Yuki 97ad1285fe don't break loops 2015-07-27 13:16:26 +05:30
Yuki c846b963a4 more fixes 2015-07-27 13:12:00 +05:30
Yuki bde8b64977 error -> info (maybe .warn?) 2015-07-27 12:48:10 +05:30
Yuki 26a517a650 Fixes, workers now output to sidekiq, not rails 2015-07-27 12:42:12 +05:30
Yuki 92bbfef2df Moved ask all + ask group to worker, validates user_id for ask person now 2015-07-27 12:29:56 +05:30
Yuki 21f2467f45 Fix question pagination 2015-07-25 23:18:27 +05:30
Yuki 12b2ec8a3b Turbolinks stop removing the god damn spreadsheet you twat 2015-07-24 22:44:16 +05:30
Yuki 54b051a7e7 Temp. layout for testing 2015-07-24 22:42:14 +05:30
pixeldesu 6ea04faf4f update show_follow JS to address changes 2015-07-24 17:14:42 +02:00
pixeldesu 6f65f8c9f4 Merge branch 'feature-userbox-header' 2015-07-24 17:10:28 +02:00
pixeldesu 5ce5d69e4a remove the TODO from the userbox 2015-07-24 17:09:17 +02:00
pixeldesu 1a9660bc05 update userbox style with headers 2015-07-24 17:04:46 +02:00
Iain Dawson 92ffb71c3b Do not declare mobile app capability. 2015-07-24 08:15:44 +01:00
Yuki 3b0646644a Replace @users with Hash 2015-07-24 01:14:20 +05:30
Yuki 2aef9bd71f Support for Ruby 2.0.0 2015-07-24 01:13:39 +05:30
Yuki 5c2168b9af The copy paste is strong 2015-07-23 23:23:51 +05:30
Yuki deb6d12108 Moderation Priority + IP 2015-07-23 23:21:13 +05:30
Yuki 5c86833601 Fix emails 2015-07-23 12:12:36 +05:30
Yuki 38d1c21118 Someone wanted even paddings, here you go. also made the support more wide. 2015-07-23 11:50:21 +05:30
pixeldesu 5366c3c748 add fake mail validation 2015-07-21 22:44:14 +02:00
Yuki 54e27896f4 Add missing ='s to text templates 2015-07-21 23:57:59 +05:30
Yuki eb85f38220 Fix text, add more templates 2015-07-21 23:50:54 +05:30
Yuki 362292716f Mail templating, hopefully 2015-07-21 23:43:14 +05:30
pixeldesu aabbd9fb8c add :confirmable to users + migration / letter_opener for local email confirmations 2015-07-21 17:55:28 +02:00
pixeldesu 36d6cd5816 remove strict case requirement 2015-07-17 22:46:05 +02:00
pixeldesu 19d6ccd855 change logic for deletion when no user or no question is found 2015-07-17 22:31:10 +02:00
pixeldesu 0044430fa6 fix indentation 2015-07-17 21:59:16 +02:00
pixeldesu 68526bfc4e removing unnecessary return values 2015-07-17 21:48:33 +02:00
pixeldesu e1d38ebb89 removing more logic from templates + simpler coffeescript 2015-07-17 21:45:45 +02:00
pixeldesu 8232aa2a21 fix flashes staying on the page 2015-07-17 21:34:53 +02:00
pixeldesu a122106d82 fix manual deletion not decreasing ib-count 2015-07-17 21:25:32 +02:00
pixeldesu 84f80c824e fix broken pagination and wrong question count for deletion 2015-07-17 20:54:11 +02:00
pixeldesu e9ae442431 add ability to show/search questions from specific users 2015-07-17 20:29:19 +02:00
pixeldesu 3a5dcbcd3b Move account deletion to Sidekiq worker, fixes #11 2015-07-15 01:44:35 +02:00
pixeldesu d2c59c047d remove line of code that determines C as language for this file 2015-07-06 18:38:52 +02:00
Yuki af71f1ef34 Some adjustmenets to locale logic, add 'jp.language: 日本語', regenerate schema 2015-07-04 13:01:46 +05:30
pixeldesu ca41890ada replaced big avatar image on main timeline page 2015-06-28 01:36:58 +02:00
Robin B. 00b9ec8192 scroll down the fucking page 2015-06-21 17:18:30 +02:00
Andreas N. 6c0428398c Merge pull request #45 from Retrospring/locale
Locale Flags
2015-06-21 13:29:39 +02:00
Yuki 208184fe4a Merge pull request #33 from colons/padding-for-create
Merge PR #33
2015-06-21 12:42:31 +05:30
Yuki 409c82b5ed Flag switcher 2015-06-21 12:33:29 +05:30
pixeldesu aab109dd42 add sign in count to data page 2015-06-21 04:35:27 +02:00
pixeldesu c600b0562a copycat mistakes 2015-06-20 21:15:38 +02:00
pixeldesu f76e997708 empty != blank 2015-06-20 21:09:30 +02:00
pixeldesu 58e80919df add data page 2015-06-20 20:38:07 +02:00
pixeldesu c1faf41305 added translator badge to profiles 2015-06-19 14:46:23 +02:00
pixeldesu 1daa44f5bf fixes Retrospring/bugs#82 2015-06-17 12:07:51 +02:00
Yuki f65bfa9e75 Twitter Emoji 2015-06-13 20:23:11 +05:30
Yuki 43825a0951 Rename locale cookie 2015-06-11 07:36:33 +05:30
Yuki c358c34043 HAHA EVERYONE GOT FRENCH BECAUSE I USED A DEPENDENCY, SERVES ME RIGHT 2015-06-10 01:06:47 +05:30
Georg G 53fe52b3b6 fixed wrong style on timestamps in answerbox 2015-06-09 18:24:27 +02:00
Yuki b60823abe2 minor fixes 2015-06-09 21:35:35 +05:30
Yuki e5ecea8414 Fix third-person notifications showing the wrong user 2015-06-09 21:19:29 +05:30
Yuki 649b1cda3b Fix Retrospring/bugs#77 2015-06-09 17:57:49 +05:30
Yuki 428bd99a63 Fix another issue 2015-06-09 09:36:09 +05:30
Yuki 607574cfce don't need this function 2015-06-09 08:56:10 +05:30
Yuki 339ddf5204 I woke up 2 minutes ago 2015-06-09 08:54:17 +05:30
Yuki d2511dea42 Fix retrospring/bugs#76 2015-06-09 08:51:58 +05:30
pixeldesu 0aeab3b7f7 fix merge conflict 2015-06-08 22:17:14 +02:00
pixeldesu 8109cb8e2d this time it's really final 2015-06-08 22:06:39 +02:00
pixeldesu 341372d874 finalize 2015-06-08 21:51:46 +02:00
pixeldesu 73147c414a fix discover merge conflict 2015-06-08 21:24:02 +02:00
pixeldesu a8fd3624b6 localize even more final stuff 2015-06-08 21:11:35 +02:00
Yuki 3afaf3222d Yes and No translated into true and false??? this fixes it 2015-06-09 00:31:37 +05:30
pixeldesu d28f64adf1 localize placeholders 2015-06-08 20:48:23 +02:00
pixeldesu d13cdb27dc localize javascript 2015-06-08 20:35:16 +02:00
Yuki d3aec1faea uncomment require i18n/translations 2015-06-08 20:20:59 +05:30
Yuki 055830626e Set up i18n-js and show usage to pixel 2015-06-08 20:19:47 +05:30
pixeldesu 7c5f9b082a add missing profile setting locales 2015-06-08 16:05:20 +02:00
pixeldesu 488d582afa add i18n-js and localize javascript (not implemented yet) 2015-06-08 16:01:16 +02:00
pixeldesu 3a4ff794de add some missing locales 2015-06-07 23:52:03 +02:00
pixeldesu 984abbe738 git localize flashes 2015-06-07 19:03:57 +02:00
pixeldesu e6e1d03187 localized ajax controllers 2015-06-07 18:24:01 +02:00
pixeldesu cd2685a179 localized moderation, sidebar, userbox, etc. 2015-06-07 16:24:41 +02:00
pixeldesu f011fddc9d instead of capitalizing the string in the template, just capitalize the locale 2015-06-07 15:34:22 +02:00
pixeldesu 97f0594d13 another attempt to fix test 2015-06-07 15:27:34 +02:00
pixeldesu 4c7ae9ea70 whoops, copypasta mistake here 2015-06-07 15:25:39 +02:00
pixeldesu e006dfde53 localize user profile, settings, modals 2015-06-07 15:10:17 +02:00
Yuki ce2323d675 fix tests 2015-06-07 06:27:21 +05:30
Yuki f564ef724e line 51 of _notification.html.haml line 57 of _notifications.html.haml 2015-06-07 06:13:18 +05:30
pixeldesu b8c0032986 localize notifications (except comments) 2015-06-07 01:28:10 +02:00
pixeldesu 45ec9ebdff Merge remote-tracking branch 'origin/locale' into locale 2015-06-07 00:24:50 +02:00
pixeldesu 75d4d5a07f localize inbox 2015-06-07 00:24:27 +02:00
Iain Dawson 96e367852b Move the north-of-768px styles up one pixel.
Prevents the site looking totally broken at exactly 768px wide.
2015-06-06 16:57:17 +01:00
Iain Dawson 1aa4cf6ebb Make room for the create button
Fixes an issue where content on the bottom of the page would be impossible to click on narrow devices.
2015-06-06 16:53:18 +01:00
Yuki d11b16dad6 Possibly fix /ajax/preview 2015-06-06 05:57:15 +05:30
pixeldesu 1796283ace change tab titles 2015-06-01 15:39:23 +02:00
Yuki b907029673 and apparently browser variety is a good thing 2015-05-30 06:38:49 +05:30
Yuki 76be03be66 Fix header parallax (assigned a variable called 'top' which is read only, caused issues with firefox and blink/webkit browsers IDK why it worked in local test envs, but this should fix it) 2015-05-28 06:51:26 +05:30
Georg G b1ad14caf0 swapped || order 2015-05-27 16:18:08 +02:00
Yuki 2e89758c37 few JS fixes and header parallax (closes #53) 2015-05-27 11:11:38 +05:30
Yuki d79fcc68bc Merge branch 'optimize-js' of github.com:Retrospring/retrospring into profile-headers 2015-05-27 11:09:36 +05:30
Yuki a560efe1c0 badumm tiss 2015-05-27 08:10:11 +05:30
pixeldesu 7a0be2519a localize question_header and questionbox 2015-05-27 04:31:28 +02:00
pixeldesu 16ec60aa19 localize question 2015-05-27 04:13:13 +02:00
pixeldesu 75a7b393b9 Merge remote-tracking branch 'origin/locale' into locale 2015-05-27 03:54:04 +02:00
pixeldesu 7905fe8372 localize actions 2015-05-27 03:53:53 +02:00
Yuki 50e1186e79 Accept-Language header support 2015-05-27 07:06:18 +05:30
Yuki 52890707c5 less logic in views 2015-05-27 06:51:06 +05:30
Yuki 74bbbdf4ca FILTHY 2015-05-27 06:41:21 +05:30
pixeldesu 9c83972105 localized answerbox (trigger warning: horrible code) 2015-05-27 02:58:03 +02:00
pixeldesu ab0b428e03 implemented translations into front, about and discover 2015-05-26 21:15:18 +02:00
Yuki c6028f8dee [skip ci] fix comments 2015-05-26 09:01:06 +05:30
Yuki 69a1bb32f4 Basic locale check 2015-05-26 08:56:40 +05:30
pixeldesu b687b27563 use service-docs instead of text in templates 2015-05-26 01:35:04 +02:00
Yuki cd904ae1bc Fix FAQ 2015-05-26 04:56:58 +05:30
Georg G. c72448349a Merge pull request #31 from Retrospring/markdown-io
Allow loading markdown files from FS
2015-05-24 17:38:48 +02:00
Yuki 67f11828dd Fix CAT-2015-0001 2015-05-24 19:38:07 +05:30
Yuki 9d93bbf9b1 Allow loading markdown files from FS 2015-05-24 18:18:54 +05:30
pixeldesu 49dea9095a move Group modal toggle to navbar on desktop 2015-05-24 03:58:15 +02:00
pixeldesu 8753af3b48 completely redesign About page 2015-05-19 17:48:02 +02:00
Yuki 7a5b1cf1de Merge branch 'master' of github.com:Retrospring/retrospring into optimize-js 2015-05-18 14:36:46 +05:30
pixeldesu 4400779d00 add Most Comments and Most Answered to Discover 2015-05-18 00:57:47 +02:00
pixeldesu 6b08e6fed5 tooltips for comment timestamps [ci skip] 2015-05-17 05:52:49 +02:00
pixeldesu bbb3b806a5 Merge remote-tracking branch 'origin/master' 2015-05-17 05:36:50 +02:00
pixeldesu ab6983001e timestamps for comments and CSS fixes 2015-05-17 05:36:23 +02:00
Yuki 9e3a6e2171 Mobile-friendly profile info box 2015-05-16 04:09:33 +05:30
Georg G. 64a7450b28 Merge pull request #29 from Retrospring/feature-discover
Only show new users that have asked at least 1 question (Discover)
2015-05-15 12:14:40 +02:00
Yuki 6c48e47f2c Only show people that have asked at least 1 question (Discover) 2015-05-15 10:25:26 +05:30
Yuki db75f3dd36 Answers show question content, not answer content (makes more sense) 2015-05-15 06:46:02 +05:30
Georg G f359f32380 removed period 2015-05-14 13:15:31 +02:00
Georg G 3e72243639 change wording on discover page 2015-05-14 13:14:42 +02:00
pixeldesu c7cecba025 fix type being not set for question pages 2015-05-14 02:39:30 +02:00
pixeldesu d3e78b8cb7 update Discover page title 2015-05-14 00:48:26 +02:00
pixeldesu 773b2917cb Merge branch 'feature-discover' 2015-05-14 00:47:23 +02:00
pixeldesu 023fe26e81 finish up Discover page 2015-05-14 00:45:01 +02:00
Yuki 6c5f97f3da Case-sensitivity fix. 2015-05-14 03:40:34 +05:30
Yuki bf68586a80 The copy and paste is strong 2015-05-14 03:37:09 +05:30
Yuki 47c574f404 Temp. fix for text not being a readable color due to the purple background being gone 2015-05-14 03:35:12 +05:30
Yuki 2e1cb4d273 Made titles functional, because functional programming is the future 2015-05-14 03:32:19 +05:30
pixeldesu 86b5e9933e add basic functionality 2015-05-13 23:55:10 +02:00
pixeldesu 5c13dda585 add tab navigation 2015-05-13 22:29:37 +02:00
Georg G 140e5bf51e added some querying magic :neckbeard: 2015-05-13 21:58:00 +02:00
pixeldesu 23583fab99 add header and page title to discover page 2015-05-13 21:20:20 +02:00
pixeldesu 961ebfd266 add routes and empty index for discover 2015-05-13 20:56:51 +02:00
Georg G c9a268ebdf added empty DiscoverController 2015-05-13 20:39:04 +02:00
pixeldesu c27c99b18f add particles to about and faq, update frontpage 2015-05-13 16:14:30 +02:00
pixeldesu e01ac8dcf6 added Particleground to frontpage 2015-05-12 23:53:42 +02:00
Yuki 0ba88942de Fix question headers overflowing into the answers 2015-05-13 00:18:06 +05:30
Yuki 580e645403 Fix ban.js throwing errors 2015-05-11 12:31:48 +05:30
Yuki 7d2f1b1594 Non-blocking image load 2015-05-11 11:28:24 +05:30
pixeldesu 884dab5988 update panel styles, fixes Retrospring/bugs#51 2015-05-11 06:17:12 +02:00
pixeldesu d08692340c add pagetitles 2015-05-10 19:48:47 +02:00
pixeldesu 3d5bb16a8f update Terms of Service, adding Code of Conduct 2015-05-10 13:39:18 +02:00
Yuki 94e2dbc5ad Only allow JPG, PNG and GIF for profile pictures, and only allow JPG and PNG for profile headers 2015-05-10 10:08:06 +05:30
Georg G 91be970cb9 fixed profile headers 2015-05-10 02:57:18 +02:00
Andreas N. 0145b36510 Merge pull request #22 from Retrospring/profile-headers
Profile headers
2015-05-10 02:22:30 +02:00
Yuki 05ca42c819 Fix Retrospring/bugs#49 2015-05-09 05:01:31 +05:30
Yuki fa51961341 prevent double binding controls 2015-05-08 21:50:57 +05:30
Yuki b71466535d Fix zooming when cropping header 2015-05-08 21:44:54 +05:30
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 e20ce9999e cleanup 2015-05-08 21:19:37 +05:30
Yuki 843845c05a fix scroll issue w/ headers 2015-05-08 21:16:07 +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
pixeldesu 42b41a268b fix not shown ban reason 2015-05-05 18:09:26 +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
Yuki 8b88827a00 Fix retrospring/bugs#43 2015-05-05 02:36:57 +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 ab35c2740c monkey patch buggy underlines in smile modal 2015-05-04 07:14:30 +05:30
Yuki 2204227273 Feature-comment-smiles complete (fix Retrospring/bugs#42) 2015-05-04 07:09:47 +05:30
Yuki 1c80c70dd9 Derp x2 (Retrospring/bugs#41) 2015-04-30 05:52:24 +05:30
Yuki 832dc1c1e4 Report.user_id is dependent on :destroy-- no need to iterate over it again 2015-04-30 05:42:17 +05:30
Yuki 563293be44 Derp (Caused Retrospring/bugs#41) 2015-04-30 05:34:43 +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 1233e108e4 Further fix retrospring/bugs#41 2015-04-28 14:16:02 +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
pixeldesu f0ef693361 move panel styles in panel file + fix question panel 2015-04-26 13:05:47 +02:00
Yuki 5792b59fc7 fix issue described in https://twitter.com/mochizune/status/592271577871417344 2015-04-26 15:51:47 +05:30
Yuki ac14fefb3c Check privilege 2015-04-26 07:09:51 +05:30
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
Georg G. e4118c0013 Merge pull request #20 from skiprope/ans-delete-ux
Rename 'delete answer' to 'return to inbox' for clarity
2015-04-24 06:29:31 +02:00
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 4d5d7fdcc1 Bootstrap-datetimepicker 2015-04-24 00:37:39 +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 407595c12b Missing return statement 2015-04-23 06:31:48 +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
Yuki cc16afe49b Users get notified by anonymous questions they asked. Fixes Retrospring/bugs#21 2015-04-23 02:07:50 +05:30
Georg G c8747fea44 replaced the id with the actual type 2015-04-22 18:29:12 +02:00
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
Georg G. a1a0781cc9 Merge pull request #14 from skiprope/issue-16
Implements additions of and fixes retrospring/bugs#16
2015-04-22 07:33:24 +02:00
Yuki b9bf0b04b6 Add support for report reasons 2015-04-22 08:29:10 +05:30
Yuki ef0330eae9 navbar mobile consistency 2015-04-22 07:12:12 +05:30
Georg G ef4fd30cd9 closes Retrospring/bugs#17 2015-04-22 00:33:55 +02:00
Yuki 1625ad6236 No need to work on the first-child, work on the li directly 2015-04-22 03:55:11 +05:30
Yuki 1600cdf295 Implements additions of and fixes retrospring/bugs#16 2015-04-22 03:52:18 +05:30
pixeldesu 305de8bf7b fix typo 2015-04-21 17:41:45 +02:00
Georg G 6be70374c8 fixes Retrospring/bugs#5 2015-04-21 16:53:59 +02:00
Georg G 1db856c0fe fixed dropdown text for comments 2015-04-21 15:46:43 +02:00
Yuki 33800c9d2a BUGFIX Fixes inability to manually subscribe to new questions because there is no subscription record BUGFIX 2015-04-21 18:32:27 +05:30
Yuki 8eeae22c43 Don't resubscribe if a user unsubscribes and comments again 2015-04-21 17:52:32 +05:30
Yuki 1c485b20e9 Subscribe asker to the answer 2015-04-21 06:58:35 +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 141db2e521 Merge branch 'master' of github.com:Retrospring/retrospring 2015-04-19 00:43:04 +02:00
Georg G 399bdf21ee include MarkdownHelper 2015-04-19 00:42:58 +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
Yuki 87a68768c3 Don't tag people in questions with twitter 2015-04-19 02:45:47 +05:30
Georg G c917f5f59d removed support 2015-04-18 22:12:58 +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 860df7ebf2 Merge branch 'develop' 2015-03-18 21:26:52 +01:00
nilsding 1773ff0b33 remove myself from about page 2015-03-18 21:26:42 +01:00
pixeldesu 642b3e5710 HTTPS 2015-03-03 20:15:43 +01:00
pixeldesu 40c3690c12 change default font to Lato 2015-03-03 19:58:22 +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 9bffdec2a5 fix growl notification positioning, this time for real 2015-02-17 00:56:12 +01:00
Andreas N 6c4f5c11df fix growl notification positioning 2015-02-17 00:53:09 +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
Georg G 4a8ea35ead Merge branch 'navbar-profile-redesign' 2015-02-12 20:22:34 +01:00
Andreas N 2a854c1cda update paddings 2015-02-12 18:14:23 +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
nilsding 5c2d75ece9 now marking multiple "smiled" and "commented" notifications as read at once 2015-02-12 17:49:05 +01:00
Andreas N c033f1f4b2 media queries for min and max size 2015-02-12 17:48:19 +01:00
Andreas N 0f8940435d impoooortant 2015-02-12 17:46:19 +01:00
Andreas N 910c1a81d6 I heard you like importants in media queries so I put an important in your media query 2015-02-12 17:44:07 +01:00
Andreas N 06d2af92ce another way to fix this 2015-02-12 17:25:46 +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 f46ebe5a30 doing the worst things to css since its existence 2015-02-12 17:11:21 +01:00
Andreas N 2e75649b71 optimization to mobile display 2015-02-12 17:08:22 +01:00
Andreas N 8a83db4291 can we remove the important here? 2015-02-12 17:02:14 +01:00
Andreas N b9874ff423 more centered alignment for single usernames 2015-02-12 17:01:50 +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 8e9a893c79 trying to fix this 2015-02-12 16:54:48 +01:00
Andreas N ed3490c40c whoops 2015-02-12 16:52:08 +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 1c0a70165a Merge remote-tracking branch 'origin/master' 2015-02-12 15:57:21 +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
nilsding e51b525fd5 use :created_at for order 2015-02-10 07:04:49 +01:00
nilsding 31d8e68725 automatically mark notifications as read 2015-02-10 06:53:50 +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 a509b34524 Merge remote-tracking branch 'origin/master' 2015-02-03 14:57:44 +01:00
Andreas N 3bf92f43f0 remove support from validator 2015-02-03 14:55:36 +01:00
nilsding 8882360e4b added 'search' to the list of forbidden user names [ci skip] 2015-02-02 16:10:01 +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
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 0bf46a888f added a new Markdown renderer (TwitteredMarkdown) which will be used for sharing to Twitter 2015-01-29 16:45:58 +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 ca7789750a made NProgress loading bar brighter (GitHub issue #73) 2015-01-27 17:53:05 +01:00
nilsding b26ec1dd0b fixed question generator not working if privacy_allow_anonymous_questions is false (GitHub issue #71) 2015-01-27 17:51:39 +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
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 45e08651af fixed some more stuff 2015-01-26 17:33:40 +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
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
Andreas N fa2220dd00 added Filippus to admins 2015-01-19 17:39:19 +01:00
nilsding 05334e3bd0 added some specs 2015-01-18 14:15:21 +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
nilsding 44b4e8721a alright 2015-01-17 19:53:34 +01:00
nilsding 4a8005b195 closes issue #64 2015-01-17 19:49:11 +01:00
Andreas N 1f73b3e3fa Merge remote-tracking branch 'origin/groups' into groups 2015-01-17 19:15:15 +01:00
Andreas N 26605dd66f more fixes for member listing for groups 2015-01-17 19:15:06 +01:00
nilsding 2ffd514bf1 forgot the @ 2015-01-17 19:14:18 +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 1c26af4c8c @group now holds the current group 2015-01-17 19:07:31 +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
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 ac6c7a5c79 Merge remote-tracking branch 'origin/master' 2015-01-17 12:39:41 +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 ec62fea665 updated screen name validator 2015-01-16 23:31:02 +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
nilsding 53cb527c7f put that damn tooltip in the callback function. 2015-01-15 17:47:54 +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 053a2d695c I think this is causing some problems with the design 2015-01-14 19:30:48 +01:00
nilsding 3ba2b785d4 added maximum length for group name 2015-01-14 17:48:21 +01:00
nilsding e5b753681c Merge branch 'master' into groups 2015-01-14 17:38:47 +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 0c97ae60d4 finally got rid of that .each 2015-01-14 07:50:27 +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 f907c4b5a8 returning 404 if group was not found 2015-01-13 23:21:16 +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
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
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