Commit Graph

991 Commits

Author SHA1 Message Date
Dominik M. Kwiatek 7cac93ad4e Add hCaptcha 2020-05-27 20:07:39 +01:00
Georg Gadinger d906be9da2 Change "Lists" intro text 2020-05-25 20:16:30 +02:00
Georg Gadinger b58883e004 Remove "ask a group" feature 2020-05-25 18:34:43 +02:00
Georg Gadinger 61816aec5f Remove unnecessary class 2020-05-25 18:10:28 +02:00
Georg Gadinger ea0685136e Rename Groups to Lists
haha regexp go brrr

special thanks to @seatsea for helping me out with the French locales
2020-05-25 18:04:54 +02:00
Dominik M. Kwiatek 9fa099024f Fix linter errors 2020-05-17 21:09:09 +01:00
Dominik M. Kwiatek d4f8e03d28 Cropping in the background
With database fields, sadly.
2020-05-17 20:39:10 +01:00
Georg Gadinger 49bc29b31a fix some mistakes in some views 2020-05-17 18:15:18 +02:00
Andreas Nedbal 1b555e284d Fix lint violation on announcements partial 2020-05-11 19:40:45 +02:00
Andreas Nedbal 66b2afc976 Turn single-word strings into symbols 2020-05-11 19:40:45 +02:00
Andreas Nedbal 7639c20f64 Fix lints in app/views/announcement 2020-05-11 19:40:44 +02:00
Andreas Nedbal 60b892e74e Fix display_all being not defined 2020-05-11 19:40:44 +02:00
Andreas Nedbal 7b63efed6f Fix lints in app/views/answerbox 2020-05-11 19:40:44 +02:00
Andreas Nedbal ed6528c948 Fix lints in app/views/application 2020-05-11 19:40:44 +02:00
Andreas Nedbal c585fe3760 Fix lints in app/views/devise 2020-05-11 19:40:44 +02:00
Andreas Nedbal 30331f4bfc Fix lints in app/views/discover 2020-05-11 19:40:44 +02:00
Andreas Nedbal a290cad72d Fix lints in app/views/group 2020-05-11 19:40:44 +02:00
Andreas Nedbal 3a335798fe Fix lints in app/views/inbox 2020-05-11 19:40:43 +02:00
Andreas Nedbal 7243fa11d4 Remove superfluous .html from layout 2020-05-11 19:40:43 +02:00
Andreas Nedbal 2686017ad8 Fix lints in app/views/layouts 2020-05-11 19:40:43 +02:00
Andreas Nedbal 7414471d41 Fix lints in app/views/modal 2020-05-11 19:40:43 +02:00
Andreas Nedbal 13878070fd Remove superfluous .html from moderation views 2020-05-11 19:40:43 +02:00
Andreas Nedbal 3c1d007c5e Fix lints in app/views/moderation 2020-05-11 19:40:43 +02:00
Andreas Nedbal 730b6156ce Fix lints in app/views/navigation 2020-05-11 19:40:43 +02:00
Andreas Nedbal d27ef3aae5 Fix lints in app/views/notifications 2020-05-11 19:38:07 +02:00
Andreas Nedbal 2d4726c297 Fix lints in app/views/public 2020-05-11 19:38:07 +02:00
Andreas Nedbal 7f17a2995e Fix lints in app/views/question 2020-05-11 19:38:07 +02:00
Andreas Nedbal eed08b811c Fix lints in app/views/services 2020-05-11 19:38:07 +02:00
Andreas Nedbal c21a3d0f73 Fix lints in app/views/settings 2020-05-11 19:38:07 +02:00
Andreas Nedbal fe70717510 Fix lints in app/views/shared 2020-05-11 19:38:07 +02:00
Andreas Nedbal a3117861c8 Fix lints in app/views/tabs 2020-05-11 19:38:07 +02:00
Andreas Nedbal e08f9dafab Fix lints in app/views/user 2020-05-11 19:38:06 +02:00
Andreas Nedbal caa6b27684 Fix lints in app/views/static 2020-05-11 19:38:06 +02:00
Andreas Nedbal 4474d9895c Fix notification menu clipping out of view 2020-05-11 15:19:40 +02:00
Andreas Nedbal 937f24839d Fix profile links on new inbox entries being not visible 2020-05-09 11:41:24 +02:00
Andreas Nedbal 0db1de9552 Fix question page dropdowns using old Bootstrap layout 2020-05-09 05:39:01 +02:00
Andreas Nedbal c9866e87bf Merge branch 'master' of github.com:Retrospring/retrospring 2020-05-09 05:03:54 +02:00
Andreas Nedbal 6798dcd090 Fix question dropdown using old Bootstrap layout 2020-05-09 05:03:25 +02:00
Georg Gadinger 0d28152f3e Fix items being inserted after "Load More" button 2020-05-09 04:51:14 +02:00
Georg Gadinger 9b4c8027b8 Fix pagination for ajax views 2020-05-09 04:39:09 +02:00
Andreas Nedbal adf5968ad0 Fix some layout issues on question pages 2020-05-09 04:10:40 +02:00
Andreas Nedbal 4ae8b7ed81 Remove timepicker from ban modal 2020-05-09 03:21:25 +02:00
Andreas Nedbal 936969d72a Fix ban dialog functionality 2020-05-09 03:09:12 +02:00
Andreas Nedbal 322cfceeab Merge branch 'feature/bootstrap' of github.com:Retrospring/retrospring into feature/bootstrap 2020-05-09 02:46:03 +02:00
Andreas Nedbal ba2e82d7ec Fix moderation userbox layout 2020-05-09 02:45:47 +02:00
Georg Gadinger ae8e0b651a Fix Question#show view when user is nil 2020-05-09 02:43:43 +02:00
Georg Gadinger 3ae83d8d02 Unbreak the "Your Data" page when some timestamps are not set 2020-05-09 02:18:23 +02:00
Georg Gadinger 65f152b762 Move user theme to the end of the body --> turbolinks has turbo links again 2020-05-09 02:08:31 +02:00
Andreas Nedbal e44be8fa0e Use large bell icon for notifications page 2020-05-09 00:50:46 +02:00
Andreas Nedbal eec9637aef Add spacing to inbox user avatars 2020-05-09 00:13:53 +02:00
Andreas Nedbal c76f839ea7 Fixed announcement JavaScript functionality 2020-05-07 20:36:14 +02:00
Andreas Nedbal 8a8c2667de Adjust theme settings page layout
- Moved color section to come right after General
- Adjusted buttons for light/dark preview to not trigger form submit
2020-05-07 20:28:20 +02:00
Andreas Nedbal 6e51294eca Adjust announcement index page design 2020-05-07 19:49:39 +02:00
Andreas Nedbal 5d63d0ba27 Update announcement styling and adjust announcement views 2020-05-07 19:30:13 +02:00
Andreas Nedbal 1cc49cf03c Adjust warning-text default theme value 2020-05-07 19:28:26 +02:00
Andreas Nedbal 633f69c163 Fix about page icon styles 2020-05-07 15:09:55 +02:00
Andreas Nedbal d607a8790b Fix styling of new inbox entries 2020-05-07 15:01:35 +02:00
Andreas Nedbal 787ec882c4 Fix answerbox text layout on mobile 2020-05-07 03:46:44 +02:00
Andreas Nedbal 207769d164 Fix layout of profile header in profile settings 2020-05-07 02:30:50 +02:00
Andreas Nedbal 12955cc663 Fix design of user and questionboxes 2020-05-07 02:12:44 +02:00
Andreas Nedbal b443aff964 Fix moderation comment layout 2020-05-06 22:54:36 +02:00
Andreas Nedbal e4561862e5 Adjust frontpage text to match master version 2020-05-06 22:22:16 +02:00
Andreas Nedbal 83f51b6422 Add new styling for Devise views 2020-05-06 21:56:10 +02:00
Andreas Nedbal 6c54f8b79f Adjust image spacing in profile settings 2020-05-06 21:29:06 +02:00
Andreas Nedbal 65e66003ee Fix theme deletion not working 2020-05-06 18:51:06 +02:00
Andreas Nedbal 859d2825d1 Remove mention of shutdown from export page 2020-05-06 14:23:11 +02:00
Andreas Nedbal 689dd3880f Adjust texts in tabs/feed template 2020-05-06 13:56:09 +02:00
Andreas Nedbal c142920c6c Adjust answerbox layout on mobile 2020-05-05 05:04:54 +02:00
Andreas Nedbal 22ae1f6655 Adjust navigation layout on main feed pages 2020-05-05 04:31:15 +02:00
Andreas Nedbal aa25e8199f Remove old theme styling file 2020-05-05 03:27:56 +02:00
Andreas Nedbal 83cebe4d9b Fix theme preview not applying
This happens because the generated "preview style tag" is added before the main style one. This change makes sure the theme is rendered right after the application style
2020-05-05 02:03:49 +02:00
Andreas Nedbal 880429f5f9 Add new fields for themes
- In the settings view
- In the model validation
- In the controller parameter permissions
- In the CoffeeScript/Ruby helpers
2020-05-05 02:02:16 +02:00
Andreas Nedbal fe357eaa07 Update layout of the theme settings page 2020-05-04 15:37:13 +02:00
Andreas Nedbal 02cc1c418d WIP: Initial implementation of CSS variable based theming 2020-05-03 17:28:41 +02:00
Andreas Nedbal 9b38b1d736 Refactor comment styles and layout 2020-05-02 21:23:04 +02:00
Andreas Nedbal 85d97b0c71 Rename changed classes across templates 2020-05-02 20:35:48 +02:00
Andreas Nedbal b508eb3f21 Refactor and adjust answerbox styles 2020-05-02 20:35:28 +02:00
Andreas Nedbal 2a8a80e859 Refactor locale panel styles 2020-05-02 18:29:04 +02:00
Andreas Nedbal 28c21dcc3d Refactor smile user list styles 2020-05-02 18:12:55 +02:00
Andreas Nedbal 1e2259fe40 Rename j2-page class to container--main 2020-05-02 17:37:19 +02:00
Andreas Nedbal 185b5a65c8 Refactor notification styling and layout 2020-05-01 21:57:14 +02:00
Andreas Nedbal e8b003fde4 Refactor entry styling and adjust layouts where used 2020-05-01 19:29:05 +02:00
Andreas Nedbal 932c611dab Fix userbox layout on frontpage 2020-05-01 18:55:18 +02:00
Andreas Nedbal 86744a3da4 Refactor userbox styling and layout 2020-05-01 18:38:29 +02:00
Andreas Nedbal 7bd7b91ea4 Refactor and redesign user profile section 2020-04-30 20:35:22 +02:00
Andreas Nedbal 3f0d84a4ad Re-add answer/show template 2020-04-30 20:33:05 +02:00
Andreas Nedbal d61fa91f0d Refactor question styles
- Created styles in component/question
- Removed old styles from scss/panel
- Moved question partial to question controller resource, as it is only used there, not shared
2020-04-30 00:44:43 +02:00
Andreas Nedbal c4c0c44eec Remove old navbar styles and refactor navigation
- Create components/buttons for btn-fab element
- Create components/avatars for defined avatar size classes and behaviour
2020-04-29 18:15:52 +02:00
Andreas Nedbal cc5489c357 Remove group styles and adjust group modal layout 2020-04-29 15:26:50 +02:00
Andreas Nedbal 56bef6a4aa Remove unnecessary styles for "data" page 2020-04-29 14:49:24 +02:00
Andreas Nedbal 45b11bddfd Merge branch 'master' into feature/bootstrap 2020-04-29 02:49:07 +02:00
Georg Gadinger 66527a8c9c views/ajax: delete 2020-04-28 20:39:17 +02:00
Georg Gadinger e07d069c73 Refactor Ajax::*Controllers
Also removed the unused `Ajax::QuestionController#preview` method and
route
2020-04-28 20:28:00 +02:00
Andreas Nedbal d53abd307d Remove no-header classes from profile page 2020-04-28 19:33:54 +02:00
Andreas Nedbal 650751e875 Adjust profile statistics layout
- Instead of being in the sidebar, they are now present as a tabbed navigation
- The questionbox is now present on any layout
2020-04-28 15:03:51 +02:00
Andreas Nedbal 56b63d60b7 Add "navbar-themed" class to use CSS variables in navigation 2020-04-27 18:39:01 +02:00
Andreas Nedbal e9e0a222b0 Merge branch 'master' into feature/bootstrap 2020-04-27 02:11:54 +02:00
Andreas Nedbal 40df3a59d8 Remove "discover" class 2020-04-27 01:55:31 +02:00
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 dcb314d9a5 Adjust footer link visibilty to work with Bootstrap 4 2020-04-26 23:54: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
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 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 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 9ee5811243 Remove piwik 2020-04-25 16:22:09 +02: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
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 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
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
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