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
3756 commits 31 branches 36 tags 32 MiB
Commit graph

3756 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jyri-Petteri Paloposki
f873a93eb3 #1153: Convert rest of the stats to use ChartJS 2019-05-19 13:04:33 +03:00
Jyri-Petteri Paloposki
dec82fd26c #1153: Change to using Chart.js with a basic RoR library instead of Chartkick because Chartkick doesn't support combo charts. 2019-05-17 22:49:21 +03:00
Jyri-Petteri Paloposki
c9cae9421a #1153: Few of the graphs converted to use Chartkick 2019-05-17 22:49:21 +03:00
Matt Rogers
b1fbc7202e
Merge pull request #2229 from srbaker/move-mini-profiler-to-bottom-left 
Move the profiler to the bottom left.
 2019-05-15 14:55:28 -05:00
Steven R. Baker
74517944de Rack::MiniProfile doesn't exist in test environment. 2019-05-15 20:44:49 +02:00
Steven R. Baker
33ec5886cc Move the profiler to the bottom left. 
It's far less in the way here. It's also hide-able with Alt-P (if you
don't have a textbox focused.)
 2019-05-13 21:50:49 +02:00
Matt Rogers
c4fbec045b
Merge pull request #2224 from srbaker/add-version-spec-to-migrations 
Add Rails version to the migrations.
 2019-05-13 13:18:35 -05:00
Matt Rogers
ec760961f9
Merge pull request #2227 from srbaker/fix-invalid-locale-data 
Single quotes don't need to be escaped here.
 2019-05-13 13:10:15 -05:00
Steven R. Baker
b07f1ef78a Single quotes don't need to be escaped here. 
This was preventing the app from loading, weirdly.
 2019-05-13 19:57:16 +02:00
Matt Rogers
2d3ce5bf42
Merge pull request #2225 from srbaker/upgrade-sanitize 
Upgrade sanitize.
 2019-05-13 12:18:20 -05:00
Steven R. Baker
1461a3a10c The actual link should be URI escaped, not HTML escaped. 2019-05-13 18:59:39 +02:00
Steven R. Baker
e84d82e5c8 Upgrade sanitize. 2019-05-13 18:58:59 +02:00
Steven R. Baker
6fb6cac89c Add Rails version to the migrations. 2019-05-13 18:42:57 +02:00
Matt Rogers
820f5b5f8f
Merge pull request #2223 from srbaker/optionally-skip-docker 
Don't use docker if the file `.skip-docker` exists in project.
 2019-05-13 09:03:42 -05:00
Steven R. Baker
7648e7ebf3 Don't use docker if the file .skip-docker exists in project. 2019-05-13 15:55:59 +02:00
Matt Rogers
8bf0627d41
Merge pull request #2210 from ZeiP/bug/2032_api_filters 
#2032: Use context and project filters in API also when not requestin…
 2019-05-12 13:52:19 -05:00
Matt Rogers
cb7be6d564
Merge pull request #2206 from TracksApp/focus-new-action-field 
Remove the autofocus from the search fields
 2019-05-12 13:40:32 -05:00
Matt Rogers
19168f262d
Merge pull request #2211 from TracksApp/prefer-find-by-over-detect 
Prefer find_by over detect
 2019-05-06 08:43:51 -05:00
Matt Rogers
1956c59cb5
Merge pull request #2213 from ZeiP/feature/2203_token_basic_auth 
#2203: Try to use basic password also as a token when accessing a tok…
 2019-05-06 08:08:50 -05:00
dependabot[bot]
b0f80d7607
Merge pull request #2215 from TracksApp/dependabot/bundler/sqlite3-1.4.1 2019-05-06 13:06:03 +00:00
dependabot[bot]
94a59d2f75
Merge pull request #2214 from TracksApp/dependabot/bundler/bullet-6.0.0 2019-05-06 13:05:42 +00:00
dependabot[bot]
ca7c1ff40c
Bump sqlite3 from 1.4.0 to 1.4.1 
Bumps [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases)
- [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/master/CHANGELOG.rdoc)
- [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v1.4.0...v1.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-06 05:56:12 +00:00
dependabot[bot]
814e0370d5
Bump bullet from 5.9.0 to 6.0.0 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.9.0 to 6.0.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.9.0...6.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-06 05:55:42 +00:00
Matt Rogers
d180acb88a
Merge pull request #2212 from TracksApp/exists-instead-of-empty 
Prefer !exists? over empty?
 2019-05-04 20:56:53 -05:00
Matt Rogers
11b9081064
Use !exists? instead of empty? 
`exists?` issues a better SQL query than `empty?`
 2019-05-04 15:16:36 -05:00
Jyri-Petteri Paloposki
3186683cd0 #2203: Try to use basic password also as a token when accessing a token-enabled endpoint 2019-05-04 23:13:28 +03:00
Matt Rogers
996395cc80
Merge pull request #2207 from TracksApp/exists-instead-of-count 
Use exists? instead of count > 0
 2019-05-04 14:54:21 -05:00
Matt Rogers
596096b8d5
Prefer find_by over detect 
Uses a better SQL query to pull a single object vs. pulling a full set
and then iterating over it.
 2019-05-04 14:51:22 -05:00
Matt Rogers
2c627be0cc
Merge pull request #2208 from ZeiP/feature/2203_api_token 
#2203: Allow using REST API with token
 2019-05-04 14:49:24 -05:00
Jyri-Petteri Paloposki
8c5edd2dcf #2032: Use context and project filters in API also when not requesting only done items 2019-05-04 22:47:39 +03:00
Matt Rogers
c6a4f8a656
Merge pull request #2209 from ZeiP/bug/2034_done_api_route 
#2034: Change the REST API documentation to point to the existing don…
 2019-05-04 14:47:30 -05:00
Jyri-Petteri Paloposki
78ef3141c6 #2203: Change the test testing API token access to test for ok instead of forbidden 2019-05-04 20:58:53 +03:00
Jyri-Petteri Paloposki
16ca18e4f5 #2034: Change the REST API documentation to point to the existing done tasks API 2019-05-04 20:35:38 +03:00
Jyri-Petteri Paloposki
d3ba80c84e #2203: Allow using REST API with token 2019-05-04 20:31:32 +03:00
Matt Rogers
a7d8b3c950
Use exists? instead of count > 0 2019-05-04 10:32:15 -05:00
dependabot[bot]
ec59f10af8
Merge pull request #2193 from TracksApp/dependabot/bundler/rails-5.2.3 2019-05-04 15:31:59 +00:00
Matt Rogers
2cdbcfef25
Merge pull request #2198 from TracksApp/dependabot/bundler/rspec-expectations-3.8.3 
Bump rspec-expectations from 3.7.0 to 3.8.3
 2019-05-04 10:31:01 -05:00
Matt Rogers
f08d596a4e
Remove the autofocus from the search fields 2019-05-04 10:17:43 -05:00
Matt Rogers
fcbb38e803
Merge pull request #2205 from ZeiP/bug/2036_nil-classes 
#2036: Change empty XML responses to have the correct base element
 2019-05-04 09:58:04 -05:00
Matt Rogers
9c3d5f008f
Merge pull request #2204 from ZeiP/bug/2035_hiddenxml 
#2035: Fix /hidden.xml by adding the route which was removed in commi…
 2019-05-04 09:57:19 -05:00
Jyri-Petteri Paloposki
b9a80a385e #2036: Change empty XML responses to have the correct base element 2019-05-03 11:47:05 +03:00
Jyri-Petteri Paloposki
aa7bcd2239 #2035: Fix /hidden.xml by adding the route which was removed in commit a83c8b3f92. 2019-05-02 16:50:41 +03:00
dependabot[bot]
fe0c0b4370
Bump rails from 5.2.2.1 to 5.2.3 
Bumps [rails](https://github.com/rails/rails) from 5.2.2.1 to 5.2.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.2.1...v5.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 18:29:51 +00:00
dependabot[bot]
addc3b5513
Merge pull request #2199 from TracksApp/dependabot/bundler/nokogiri-1.10.3 2019-04-22 18:28:07 +00:00
dependabot[bot]
a17cd7f060
[Security] Bump nokogiri from 1.10.1 to 1.10.3 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.1 to 1.10.3. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.1...v1.10.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 18:11:19 +00:00
dependabot[bot]
360c553521
Bump rspec-expectations from 3.7.0 to 3.8.3 
Bumps [rspec-expectations](https://github.com/rspec/rspec-expectations) from 3.7.0 to 3.8.3.
- [Release notes](https://github.com/rspec/rspec-expectations/releases)
- [Changelog](https://github.com/rspec/rspec-expectations/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-expectations/compare/v3.7.0...v3.8.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-22 05:54:58 +00:00
Matt Rogers
8b909ba00d
Merge pull request #2184 from TracksApp/dependabot/bundler/sqlite3-1.4.0 
Bump sqlite3 from 1.3.13 to 1.4.0
 2019-04-15 08:40:33 -05:00
Matt Rogers
9b0a88214c
Merge pull request #2162 from matjack1/docker-fixes 
Fix Docker setup
 2019-04-14 13:54:51 -05:00
Matt Rogers
434c379d0c
Merge pull request #2188 from TracksApp/dependabot/bundler/puma-3.12.1 
Bump puma from 3.12.0 to 3.12.1
 2019-04-14 13:50:38 -05:00
Matt Rogers
94878702d3
Merge pull request #2183 from TracksApp/dependabot/bundler/will_paginate-3.1.7 
Bump will_paginate from 3.1.6 to 3.1.7
 2019-04-14 13:50:24 -05:00