Commit Graph

1783 Commits

Author SHA1 Message Date
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
Dominik M. Kwiatek d09cf5e979
Merge pull request #83 from Retrospring/fix/ime-handling 2020-04-25 14:51:10 +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
Andreas Nedbal 1aec0f95a4 Add configurable asset caching for Docker on Windows environments 2020-04-25 13:02:20 +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 fc5c4dd00a Optimise image assets
Saved 64 KB out of 799 KB. 33.5% per file on average (up to 87.9%)
2020-04-22 15:21:37 +01:00
Georg Gadinger 0c0a5c106c
Merge pull request #73 from Retrospring/better-pagination
Use cursored pagination, remove WillPaginate
2020-04-21 20:01:07 +02: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 c292f51957
Set up GitHub Actions (#72)
* Add GitHub Actions config

* Add extra dependencies and use environment variable for DB config

Moved the env vars up to outside of the postgres service so this might not work

* Pass environment variables for Postgres credentials to Postgres container

* Pass service ports to application

Have a suspicion that Redis one won't work as justask.yml is probably not using ERB

* Add database.yml.postgres with port

* Cache gems; pass Redis URL as env var

* Add host to DB config

* Pass DB credentials for db:setup

* Use 127.0.0.1 instead of localhost to force TCP; Use bundler config without instead of --without

* I can't read 🗑

* 🤔

* 💻🔨 I have no idea what I'm doing…

* Testing env defined outside steps

* Move templated vars down

* Add build badge
2020-04-20 21:02:48 +01: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
Karina Kwiatek 6e605758a6 Minor cleanup in AnnouncementController 2020-04-19 22:59:57 +01:00
Karina Kwiatek 16ade832ca Address @nilsding's review changes 2020-04-19 22:58:47 +01:00
Georg Gadinger 3acde78388
Merge pull request #69 (nice!) from Retrospring/bugfix/empty-group-names
Do not allow creation of groups with empty names
2020-04-19 23:55:37 +02:00
Andreas Nedbal 3994917ce9 Adjust notification navigation to Bootstrap 4 2020-04-19 23:42:37 +02:00
Karina Kwiatek c4164a8f34 Add AnnouncementController tests 2020-04-19 22:40:06 +01:00
Karina Kwiatek 864d5844dc Add Announcement tests 2020-04-19 22:38:01 +01: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 e731d76d52 Update admin/announcements routes to use has_role? 2020-04-19 21:54:40 +01:00
Karina Kwiatek 391f4a28ed Merge branch 'master' into feature/announcements
# Conflicts:
#	db/schema.rb
2020-04-19 21:52:58 +01:00
Georg Gadinger da25be15b1
Merge pull request #67 from Retrospring/use-real-roles
Use Rolify for admin and moderator roles
2020-04-19 22:50:44 +02: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
Georg Gadinger a0c9641994 Remove useless specs 2020-04-19 22:31:43 +02:00
Karina Kwiatek 473f2cdcc5 Show announcement validation errors on the frontend 2020-04-19 21:26:55 +01:00