Commit graph

3788 commits

Author SHA1 Message Date
Jyri-Petteri Paloposki
6ad1e2cf93
Merge pull request #2231 from ZeiP/bug/1153_stats
Change the Flash charts to Charts.js
2019-05-29 19:33:57 +03:00
Jyri-Petteri Paloposki
2bda716ceb
Merge pull request #2076 from C-Otto/fix-2048
also update project name in multiple-actions mode
2019-05-23 01:10:35 +03:00
Jyri-Petteri Paloposki
beec6dbb77 Remove the test that was made in the old testing framework 2019-05-23 00:38:18 +03:00
Jyri-Petteri Paloposki
dad7fdf006
Merge pull request #2055 from scriptythekid/master
make drag&drop todos from/to contexts work again  - fix #2054
2019-05-22 22:46:51 +03:00
Jyri-Petteri Paloposki
ef567c0952
Merge pull request #2237 from ZeiP/bug/context_change_hidden_fails
Fixed bug causing context change to hidden returning a server error
2019-05-22 19:32:00 +03:00
Jyri-Petteri Paloposki
0df6f19726 Fixed bug causing context change to hidden returning a server error 2019-05-22 16:09:46 +03:00
Jyri-Petteri Paloposki
dc0ca7239a
Merge branch 'master' into bug/1153_stats 2019-05-22 01:48:37 +03:00
Jyri-Petteri Paloposki
359f615bf7 Remove unnecessary string manipulation 2019-05-22 01:31:26 +03:00
Jyri-Petteri Paloposki
1e0f1bd611 Change context element IDs to use underscore instead of just the c prefix 2019-05-22 01:28:50 +03:00
Jyri-Petteri Paloposki
5962fe808b
Merge pull request #2233 from ZeiP/bug/1929_broken_feed_missing_tag
#1929: Fix the actions query breaking when querying actions with a no…
2019-05-22 00:49:42 +03:00
Jyri-Petteri Paloposki
43523d8191 Test the RSS feed of starred, active todos 2019-05-22 00:40:58 +03:00
Jyri-Petteri Paloposki
644cf0d9e7 Fix the syntax 2019-05-21 22:33:21 +03:00
Jyri-Petteri Paloposki
7fc1f1bf9f
Update app/models/todos/undone_todos_query.rb
Co-Authored-By: Matt Rogers <mattr-@github.com>
2019-05-21 22:28:37 +03:00
dependabot[bot]
788dc2d095
Merge pull request #2232 from TracksApp/dependabot/bundler/selenium-webdriver-3.142.3 2019-05-21 13:39:58 +00:00
Jyri-Petteri Paloposki
a86a59b68e Removing unnecessary Gems 2019-05-21 16:05:33 +03:00
Jyri-Petteri Paloposki
d784b1a5eb #1929: Fix the actions query breaking when querying actions with a non-existent tag 2019-05-21 15:17:50 +03:00
dependabot[bot]
fc9f8eddd2
Bump selenium-webdriver from 2.53.4 to 3.142.3
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 2.53.4 to 3.142.3.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-21 06:04:42 +00:00
dependabot[bot]
ebfa39d5a1
Merge pull request #2226 from TracksApp/dependabot/bundler/rubocop-0.69.0 2019-05-20 15:00:57 +00:00
Jyri-Petteri Paloposki
ccb5e1e2f1 Remove the decomissioned chart view from the selection display listing 2019-05-20 01:39:39 +03:00
Jyri-Petteri Paloposki
088346ecb0 One more decomissioned test file away 2019-05-20 01:21:55 +03:00
Jyri-Petteri Paloposki
80aad1b4f2 #1153: Remove unnecessary type change and test for stats chart templates and endpoints which were removed 2019-05-20 01:12:25 +03:00
Jyri-Petteri Paloposki
458d46da9e #1153: Remove debug output 2019-05-19 18:46:02 +03:00
Jyri-Petteri Paloposki
313e6ee106 #1153: Remove resolved TODO comment 2019-05-19 18:42:56 +03:00
Jyri-Petteri Paloposki
b7320a1de8 #1153: Perhaps the final deletion of the old Flash charts code 2019-05-19 18:40:23 +03:00
Jyri-Petteri Paloposki
61ed4c33f3 #1153: Remove the last of Flash charts 2019-05-19 18:31:04 +03:00
Jyri-Petteri Paloposki
b040dfce51 #1153: Final checks against the old code, fixed the last mistakes 2019-05-19 17:39:38 +03:00
Jyri-Petteri Paloposki
f9370a9a4a #1153: Fix whitespace issues caused by Vim misconfiguration 2019-05-19 16:51:26 +03:00
Jyri-Petteri Paloposki
0b326e17d8 #1153: Use translations properly, add missing labels, fix bugs and add links to charts 2019-05-19 16:40:00 +03:00
Jyri-Petteri Paloposki
0a106aac5e #1153: Remove unnecessary Flash-stats related templates 2019-05-19 13:26:09 +03:00
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
dependabot[bot]
0ac71ea635
Bump rubocop from 0.65.0 to 0.69.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.65.0 to 0.69.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.65.0...v0.69.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-13 17:19:50 +00: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