Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 23:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4073 commits 31 branches 36 tags 32 MiB
Commit graph

4073 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jyri-Petteri Paloposki
ca6382832e Redo the datepicker z-index fix that didn't work because it has been applied only to the div.legacy, but as datepicker is appended to the end of the document it's outside the element. Also making the number a lot bigger to account for a large amount of tasks, which cause higher z-indexes. 
Fixes #2245.
 2020-07-24 17:37:37 +03:00
Jyri-Petteri Paloposki
ccdb78a289
Merge pull request #2436 from TracksApp/help_page 
Add a help page with link to the user manual and other sources
 2020-07-23 22:33:26 +03:00
Jyri-Petteri Paloposki
cf5751cdce Add a help page with link to the user manual and other sources 2020-07-23 22:20:28 +03:00
Jyri-Petteri Paloposki
5be552a71f
Merge pull request #2435 from TracksApp/email_userlist 
Show user email in user list
 2020-07-23 22:19:16 +03:00
Jyri-Petteri Paloposki
0841ddda09 Show user email in user list 2020-07-23 21:58:16 +03:00
Jyri-Petteri Paloposki
75ac171ab8
Merge pull request #2434 from TracksApp/signup_prompt 
Show a signup link under the login form if open signup is enabled
 2020-07-23 21:21:46 +03:00
Jyri-Petteri Paloposki
f86285b7b3 Show a signup link under the login form if open signup is enabled 2020-07-23 20:48:38 +03:00
Jyri-Petteri Paloposki
e0dc5b21ac
Merge pull request #2433 from TracksApp/dependabot/bundler/tolk-4.0.0 
Bump tolk from 3.2.1 to 4.0.0
 2020-07-23 16:10:22 +03:00
dependabot[bot]
c19ccbaeee
Bump tolk from 3.2.1 to 4.0.0 
Bumps [tolk](https://github.com/tolk/tolk) from 3.2.1 to 4.0.0.
- [Release notes](https://github.com/tolk/tolk/releases)
- [Changelog](https://github.com/tolk/tolk/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tolk/tolk/compare/v3.2.1...v4.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-23 05:59:09 +00:00
Jyri-Petteri Paloposki
f61fc09eda
Merge pull request #2432 from TracksApp/dependabot/bundler/bcrypt-3.1.15 
Bump bcrypt from 3.1.13 to 3.1.15
 2020-07-22 13:50:30 +03:00
dependabot[bot]
5c5dfec30d
Bump bcrypt from 3.1.13 to 3.1.15 
Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from 3.1.13 to 3.1.15.
- [Release notes](https://github.com/codahale/bcrypt-ruby/releases)
- [Changelog](https://github.com/codahale/bcrypt-ruby/blob/master/CHANGELOG)
- [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.13...v3.1.15)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-22 06:22:31 +00:00
Jyri-Petteri Paloposki
0c503a7600
Merge pull request #2431 from TracksApp/user_email_address 
User email address
 2020-07-20 21:03:17 +03:00
Jyri-Petteri Paloposki
84429bdb8e Fixed the last test 2020-07-20 20:54:50 +03:00
Jyri-Petteri Paloposki
149dbe7e27 More fixed tests 2020-07-20 20:25:35 +03:00
Jyri-Petteri Paloposki
efee4976b0 Make email address voluntary in preferences; update tests to handle the added email field better 2020-07-20 20:08:18 +03:00
Jyri-Petteri Paloposki
f9f7e6b9ea Updated schema 2020-07-20 19:38:15 +03:00
Jyri-Petteri Paloposki
7560206d96 Fix the footer on login and signup pages 2020-07-20 19:11:16 +03:00
Jyri-Petteri Paloposki
dbaa9a85cb Add a field for user email address 2020-07-20 18:41:10 +03:00
Jyri-Petteri Paloposki
0ff46f63dc
Merge pull request #2430 from TracksApp/login_form_styles 
Signup form styles
 2020-07-20 18:38:55 +03:00
Jyri-Petteri Paloposki
5a3727dc5f Add functionality for requiring TOS approval on signup 2020-07-20 18:16:15 +03:00
Jyri-Petteri Paloposki
2781395405 Use the login form styles for the signup form too 2020-07-20 17:24:16 +03:00
Jyri-Petteri Paloposki
8054f866bb
Merge pull request #2429 from TracksApp/dependabot/bundler/solargraph-0.39.12 
Bump solargraph from 0.39.11 to 0.39.12
 2020-07-20 10:55:34 +03:00
dependabot[bot]
a5942dc1b5
Bump solargraph from 0.39.11 to 0.39.12 
Bumps [solargraph](https://github.com/castwide/solargraph) from 0.39.11 to 0.39.12.
- [Release notes](https://github.com/castwide/solargraph/releases)
- [Commits](https://github.com/castwide/solargraph/compare/v0.39.11...v0.39.12)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-20 06:19:17 +00:00
Jyri-Petteri Paloposki
41c36ee453
Merge pull request #2428 from TracksApp/docker_fixes 
Hopefully the final fixes based on fresh installs with both Docker in…
 2020-07-20 01:06:22 +03:00
Jyri-Petteri Paloposki
4dd52e591d Hopefully the final fixes based on fresh installs with both Docker install methods 2020-07-20 00:58:45 +03:00
Jyri-Petteri Paloposki
bec0884bac Fix installation doc formatting 2020-07-19 23:23:15 +03:00
Jyri-Petteri Paloposki
41902cbeeb
Merge pull request #2427 from TracksApp/scripts_and_docs 
Add Docker documentation to the installation docs; update and create …
 2020-07-19 23:19:36 +03:00
Jyri-Petteri Paloposki
3bdbd7bcf5 Add mention of the .use-docker file. 2020-07-19 23:19:00 +03:00
Jyri-Petteri Paloposki
d145640ead Add Docker documentation to the installation docs; update and create the ”Scripts To Rule Them All” scripts for easy use of the Docker Composer environment. 
Fixes #2425.
 2020-07-19 23:06:26 +03:00
Jyri-Petteri Paloposki
b57a62b72d
Merge pull request #2424 from TracksApp/docker-fix 
Better Docker config: Use entrypoint to setup the environment, run in…
 2020-07-19 22:14:55 +03:00
Jyri-Petteri Paloposki
5bb723329b Few more settings in order for the CI test automation 2020-07-19 22:04:45 +03:00
Jyri-Petteri Paloposki
b2ede09fe6 Remove unnecessary debug output 2020-07-19 21:50:35 +03:00
Jyri-Petteri Paloposki
869bf2a9fd Mount the mandatory config files separately in docker-compose, since it's including the whole /app from host and therefore the copies made in Dockerfile aren't available. 2020-07-19 21:44:43 +03:00
Jyri-Petteri Paloposki
85e104006c Handle empty database password properly, don't try to run docker-compose inside the container 2020-07-19 21:30:24 +03:00
Jyri-Petteri Paloposki
53c7c94306 A few more fixes in hope of fixing the Docker Compose 2020-07-19 18:07:23 +03:00
Jyri-Petteri Paloposki
2e40879123 Fix the Docker Compose configuration and remove the database config from VCS 
Fixes #2248.
 2020-07-19 17:36:06 +03:00
Jyri-Petteri Paloposki
4d65a8f761 Overhaul the environment system in bin/ to make the defaults easier to understand. Update the installation instructions. 
Fixes #2170, #2372, #2329, #2368
 2020-07-19 17:20:35 +03:00
Jyri-Petteri Paloposki
3f22c8a036 Better Docker config: Use entrypoint to setup the environment, run in production mode by default, defaults for all config values 2020-07-19 16:12:57 +03:00
Jyri-Petteri Paloposki
67012821e6
Merge pull request #2391 from TracksApp/dependabot/bundler/rack-mini-profiler-2.0.2 
Bump rack-mini-profiler from 2.0.1 to 2.0.2
 2020-07-17 21:40:34 +03:00
Jyri-Petteri Paloposki
68bf0124bf
Merge pull request #2422 from TracksApp/aasm4 
Update aasm to v4.
 2020-07-17 21:36:40 +03:00
Jyri-Petteri Paloposki
183dd48781 Update aasm to v4. 2020-07-17 21:28:42 +03:00
dependabot-preview[bot]
65e9093d7c
Bump rack-mini-profiler from 2.0.1 to 2.0.2 
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.0.1...v2.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-07-17 18:14:39 +00:00
Jyri-Petteri Paloposki
cb6ec75753
Merge pull request #2419 from TracksApp/dependabot/bundler/jquery-rails-4.4.0 
Bump jquery-rails from 4.3.5 to 4.4.0
 2020-07-17 20:41:35 +03:00
Jyri-Petteri Paloposki
6344a75a5b
Merge pull request #2420 from TracksApp/dependabot/bundler/rails-controller-testing-1.0.5 
Bump rails-controller-testing from 1.0.4 to 1.0.5
 2020-07-17 20:40:37 +03:00
Jyri-Petteri Paloposki
db496084f8
Merge pull request #2421 from TracksApp/docker-fix 
Run migration before starting Docker server; update README a bit
 2020-07-17 16:09:17 +03:00
Jyri-Petteri Paloposki
8118b588d8 Run migration before starting Docker server; update README a bit 2020-07-17 16:00:22 +03:00
dependabot[bot]
6f16479119
Bump rails-controller-testing from 1.0.4 to 1.0.5 
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/rails/rails-controller-testing/releases)
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.4...v1.0.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-17 09:57:02 +00:00
dependabot[bot]
70e1679784
Bump jquery-rails from 4.3.5 to 4.4.0 
Bumps [jquery-rails](https://github.com/rails/jquery-rails) from 4.3.5 to 4.4.0.
- [Release notes](https://github.com/rails/jquery-rails/releases)
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/jquery-rails/compare/v4.3.5...v4.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-17 09:56:35 +00:00
Jyri-Petteri Paloposki
5bb3a772fa
Create dependabot.yml 2020-07-17 12:53:39 +03:00
Jyri-Petteri Paloposki
466a4821db
Merge pull request #2415 from TracksApp/docker-fix 
Better Docker integration
 2020-07-17 00:38:54 +03:00