Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-23 17:26:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3513 commits 27 branches 36 tags 33 MiB
Commit graph

3513 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Rogers
74ecfd11d3 Add Ruby 2.3 and 2.4 as CI build targets 
2.3 and 2.4 have been out for some time. We should probably make sure
the project works with them.
 2017-05-20 09:47:47 -05:00
Dan Rice
a8e2978054 Use Firefox 45 ESR for webdriver compatibility (#2079) 2017-03-19 16:46:04 -04:00
Dan Rice
0d99c3df74 Merge pull request #2078 from dnrce/skip-known-failures 
Uncomment but skip tests for known issues
 2017-03-19 16:45:36 -04:00
Dan Rice
b50456d04d Uncomment but skip tests for known issues 2017-03-19 14:13:26 -04:00
Dan Rice
881faa0d02 Merge pull request #2070 from C-Otto/fix-2069 
reorder buttons for recurring todos to make the order uniform
 2017-03-19 14:09:28 -04:00
Carsten Otto
b7bada0791 reorder buttons for recurring todos to make the order uniform 
fixes #2069
 2017-03-18 14:42:34 +01:00
Dan Rice
6fbec08e09 Merge pull request #2067 from C-Otto/rendering_helper_tests 
Move and refactor tests for `rendering_helper`
 2017-03-07 17:34:24 -05:00
Carsten Otto
afb0f03fd3 add tests for open issues 2017-03-07 22:08:12 +01:00
Carsten Otto
c0d20f2e1f move existing tests to rendering_helper_test 2017-03-07 22:08:12 +01:00
Carsten Otto
ccac45b377 fix typo 2017-03-05 13:56:36 +01:00
Dan Rice
b8ab28819c Merge pull request #2064 from C-Otto/master 
add missing space
 2017-02-28 22:00:08 -05:00
Carsten Otto
238b2fd670 add missing space 
bug introduced in c46e5a9e1d

fixes #2063
 2017-02-28 22:16:48 +01:00
Dan Rice
26d0c873c7 Merge pull request #2062 from dnrce/swfobject 
Limit use of SWFObject to the stats page
 2017-02-12 15:43:24 -05:00
Dan Rice
55c5d07aff Limit swf_fu to the stats page 
Fixes #2061
 2017-02-12 15:27:00 -05:00
Dan Rice
7ff34bbea8 Drop vendored SWFObject. Included in swf_fu. 2017-02-12 15:16:05 -05:00
Dan Rice
1d80bed077 Merge pull request #2060 from dnrce/fix-ci-1.9.3 
Hold rubocop back to fix tests on 1.9.3
 2017-02-11 21:10:19 -05:00
Dan Rice
69de2459a9 Hold rubocop back to fix tests on 1.9.3 2017-02-11 20:22:52 -05:00
Dan Rice
1ba829e960 Merge branch '2.3_branch' 2016-10-15 13:13:02 -04:00
Matt Rogers
e01872d515 Merge pull request #2016 from C-Otto/fix-feeds-2.3 
use @not_done_todos for feeds
 2016-08-27 10:12:59 -05:00
Dan Rice
80ec0b6df0 Add RuboCop 
* Exclude bin/ because it's generated code
* Max line length of 120 characters
* Documentation not required
* Prefer double-quoted strings
 2016-08-27 10:09:14 -05:00
Matt Rogers
7a898ecd23 Merge pull request #2039 from TracksApp/graceful-fallback-for-missing-i18n-keys 
Add a fallback to :other for i18n
 2016-08-26 21:24:19 -05:00
Matt Rogers
ddffe8f529 Merge pull request #2040 from TracksApp/eventmachine-for-el-capitan 
Update eventmachine to 1.2.0.1
 2016-08-26 21:24:07 -05:00
Matt Rogers
25339ebc73 Merge pull request #2041 from TracksApp/case-insensitive-tag-searching 
Use Arel to generate case insensitve tag searches
 2016-08-26 21:23:45 -05:00
Matt Rogers
c2296b5b99 Use Arel to generate case insensitve tag searches 2016-08-25 23:10:40 -05:00
Matt Rogers
c6b1151197 Update eventmachine to 1.2.0.1 
Our previous version - `1.0.7` - is not compatible with OS X El Capitan.
Upgrading to the latest version fixed this issue.
 2016-08-20 15:52:42 -05:00
Matt Rogers
0511ea3a3a Add a fallback to :other for i18n 
In most cases, translations don't supply `:few` even though the language
may support the construct. Instead of the app blowing up if the
translation for `:few` doesn't exist, fall back to `:other` instead.
 2016-08-20 14:43:42 -05:00
Matt Rogers
849b530044 Merge pull request #2037 from C-Otto/typo-fix 
fix typo
 2016-07-19 20:38:20 -05:00
Carsten Otto
a2726de78c fix typo 2016-07-19 19:10:15 +02:00
Dan Rice
1754198988 Merge pull request #2027 from dnrce/recurring-todos-title 
Fix navbar link title of "Recurring Todos"
 2016-06-25 21:23:44 -04:00
Dan Rice
30b89267a8 Merge pull request #2014 from dnrce/deprecated_finders 
Remove activerecord-deprecated_finders
 2016-06-25 20:43:19 -04:00
Dan Rice
5a5d293b80 Fix navbar link title of "Recurring Todos" 2016-06-25 20:16:22 -04:00
Dan Rice
185674f3d3 Remove activerecord-deprecated_finders 
Fix #1916
 2016-06-25 20:16:01 -04:00
Dan Rice
16b734a3f8 Merge pull request #2028 from dnrce/wip-features 
Mark a few failing features as WIP until UI redesign is more complete
 2016-06-25 20:15:32 -04:00
Dan Rice
7ee2ba2c9b Mark a few failing features as WIP until UI redesign is more complete 2016-06-25 18:59:31 -04:00
Dan Rice
2c4784cfd2 Merge pull request #2026 from dnrce/require-jquery-ui 
Load jquery-ui-rails CSS via "require" instead of "import"
 2016-06-25 18:58:37 -04:00
Dan Rice
23a22413f5 Load jquery-ui-rails CSS via "require" instead of "import" 
Fixes #2024 and #2025
 2016-06-25 16:55:17 -04:00
Matt Rogers
7748253388 Merge pull request #1910 from dnrce/rails42 
Upgrade to Rails 4.2
 2016-06-14 19:27:18 -05:00
Matt Rogers
c53fdf76b4 Merge pull request #2021 from rbndickson/convert-search-page-to-bootstrap 
Convert search page to bootstrap
 2016-06-07 16:00:03 -05:00
Robin Dickson
67f33b3e39 Remove JS for search input autofocus 
Previously replaced by HTML5 autofocus.
 2016-06-06 16:28:14 +01:00
Robin Dickson
9dc698e775 Convert search page to use bootstrap 2016-06-06 11:23:45 +01:00
Carsten Otto
f18ef64db4 fix time zone issue in test 2016-06-04 00:22:13 +02:00
Carsten Otto
d7aa83b747 add tests for feeds 
and reorganize existing tests
 2016-06-04 00:22:13 +02:00
Dan Rice
d68df9f5ac Merge pull request #2019 from C-Otto/remove-todo-from-code 
remove TODO from code, migrated to #2018
 2016-05-29 20:16:27 -04:00
Carsten Otto
f26f72272b remove TODO from code, migrated to #2018 2016-05-29 23:03:58 +02:00
Carsten Otto
6bc9151400 use @not_done_todos for feeds 
fixes #1726

the name @not_done_todos is wrong and should be replaced in a dedicated fix
 2016-05-29 22:59:42 +02:00
Dan Rice
e7036d6913 Merge branch '2.3_branch' 2016-05-23 21:56:10 -04:00
Dan Rice
58e2b82315 Isolate SITE_CONFIG in tests using minitest-stub-const 2016-05-22 21:59:44 -04:00
Dan Rice
3de582f436 Use rails-dom-testing from source to work around a bug 2016-05-22 21:59:44 -04:00
Dan Rice
3ecf9d6cfc Update protocol whitelist for rails-html-sanitizer 2016-05-22 21:59:44 -04:00
Dan Rice
d42bf5141e Update acts_as_list to fix sanitize_sql_hash_for_conditions deprecation 2016-05-22 21:59:44 -04:00