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

3499 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dan Rice
a789a0296b Reorder HTML tag attributes to fix failing tests 2016-05-22 21:59:44 -04:00
Dan Rice
689db4c9c3 Update assert_select for Nokogiri compatibility 
assert_select has been moved into the rails-dom-testing gem and is now
based on Nokogiri.

* Remove assert_tag and assert_xml_select
* Quote CSS attribute selector values
* Use decoded versions of HTML in assert_select. Nokogiri decodes
  elements prior to matching.
* Add a test helper for entities such as ` ` for which it's
  difficult or confusing to include the decoded version directly in the
  assertion.
* Assert directly on Atom feeds' XML namespace because it isn't
  selectable as an attribute
 2016-05-22 21:59:44 -04:00
Dan Rice
d7d86446c0 Upgrade to Rails 4.2 
* Update boilerplate with `bin/rake rails:upgrade`
* Use test instead of test:all rake task
* Change stylesheet extensions from .css.scss to .scss
* Update docs to use localhost instead of 0.0.0.0 because Rails 4.2
  no longer listens on all addresses by default.
 2016-05-22 21:58:52 -04:00
Dan Rice
86bcc4d6c6 Update Tolk to 1.9.3 
Support Rails 4.2
 2016-05-21 19:52:04 -04:00
Matt Rogers
6230280d69 Merge pull request #2012 from TracksApp/revert-1986-no-domain-name-for-relative-to-root 
Revert "Don't include a protocol or domain for relative_to_root"
 2016-05-20 22:52:15 -05:00
Matt Rogers
fa7f49e399 Revert "Don't include a protocol or domain for relative_to_root" 2016-05-20 22:50:17 -05:00
Matt Rogers
ce453e7e1a Merge pull request #2010 from dnrce/fix-recurring-todo-dialogs 
Fix recurring todo dialogs
 2016-05-20 22:49:06 -05:00
Matt Rogers
3eaa54a190 Merge pull request #2006 from rbndickson/fix-search-results-heading 
Fix spacing in search results heading
 2016-05-20 22:47:35 -05:00
Dan Rice
091697fe1e Fix recurring todo edit form formatting 
Fixes #1938
 2016-05-18 17:02:15 -04:00
Dan Rice
1227eaa84c Move the recurring todo dialog below the navbar 
Fixes #2007
 2016-05-17 22:50:32 -04:00
Matt Rogers
018d901b4d Merge pull request #1993 from dnrce/nav-redesign 
Update the navbar design
 2016-05-17 20:17:35 -05:00
Mateusz Konieczny
23dc2421bf Update "Hosted Tracks" URL in README (#2009) 
[ci skip]
 2016-05-16 13:04:24 -04:00
Dan Rice
4ad65ea079 Only show the date on large displays 2016-05-15 22:37:03 -04:00
Dan Rice
5173f94993 Condense "Admin", "Help", and "Logout" into a single "Options" menu 2016-05-15 22:37:03 -04:00