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

3477 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Dan Rice
1dfdad96fe Add a helper for fixed-width icons 2016-05-15 22:37:03 -04:00
Dan Rice
73a6925054 Remove the navigation_link helper 2016-05-15 22:37:03 -04:00
Dan Rice
836d790f9f Replace search icon with glyph 2016-05-15 22:37:03 -04:00
Dan Rice
14a4da8a71 Add Font Awesome icon support 2016-05-15 22:37:03 -04:00
Dan Rice
2f1d7a62b0 Merge pull request #2008 from dnrce/apply-migration 
Update schema.rb with RemoveProjectHiddenStateFromTodos migration
 2016-05-15 22:36:43 -04:00
Dan Rice
777dc10d49 Update schema.rb with RemoveProjectHiddenStateFromTodos migration 2016-05-15 20:29:25 -04:00
Robin Dickson
f5ae06899f Fix spacing in search results heading 
Based on the style used in the projects index page.

Fixes #2003.
 2016-05-15 18:09:06 +01:00
Matt Rogers
7472488001 Merge pull request #1981 from C-Otto/remove-project_hidden-state 
Remove project hidden state
 2016-04-25 08:29:36 -05:00
Carsten Otto
6805cb801b Add migration script to remove 'project_hidden' 2016-04-16 09:28:11 +02:00
Carsten Otto
ed3bca22a4 Remove 'project_hidden' state 
Compute it using project/context state

Notable change:
todo.hidden? now also returns true if the todo is completed
 2016-04-16 09:27:33 +02:00
Matt Rogers
543f49ed8a Merge pull request #2000 from dnrce/deprecated_password 
Clean up reference to check_for_deprecated_password_hash
 2016-03-09 15:24:25 -06:00
Dan Rice
0843b78d08 Clean up reference to check_for_deprecated_password_hash 
Ref #1733
 2016-02-28 17:58:03 -05:00
Matt Rogers
2172d97964 Merge pull request #1999 from dnrce/datepicker-i18n 
Include datepicker i18n only as needed
 2016-02-18 22:04:48 -06:00
Dan Rice
4b046b98ea Include datepicker i18n only as needed 
* Restore the javascript_tag_for_i18n_datepicker helper (and actually use it)
* Include the datepicker i18n JS in the asset precompilation list
 2016-02-16 22:10:20 -05:00
Matt Rogers
91849c5316 Merge pull request #1995 from dnrce/selenium-scrolling 
Selenium: scroll elements to bottom instead of top
 2016-02-16 09:08:55 -06:00
Matt Rogers
ef0a2ded5b Merge pull request #1996 from dnrce/cucumber-failures 
Address some Cucumber failures
 2016-02-16 09:08:10 -06:00
Matt Rogers
911bd41b2b Merge pull request #1998 from dnrce/symbol-array 
Avoid using %i, which requires Ruby 2.0
 2016-02-16 08:55:05 -06:00
Dan Rice
5974619185 Avoid using %i, which requires Ruby 2.0 2016-02-16 00:33:37 -05:00
Dan Rice
6d1432e832 Selenium: scroll elements to bottom instead of top 
This prevents UI elements from being hidden by the top navbar.
 2016-02-16 00:12:06 -05:00
Dan Rice
24b16ea8dd Fix cucumber drag-and-drop failures 2016-02-16 00:09:49 -05:00
Dan Rice
9419e94a53 Fix cucumber failures related to jQuery UI changes 
Ref #1975
 2016-02-16 00:09:44 -05:00
Matt Rogers
543ed97e2d Merge pull request #1994 from dnrce/ci-lite 
On Travis, restrict Cucumber tests to MySQL builds
 2016-02-15 14:47:34 -06:00