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

3587 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dan Rice
a6f9be2d84 On Travis, restrict Cucumber tests to MySQL builds 2016-02-14 23:05:43 -05:00
Matt Rogers
fe359cf52e Merge pull request #1986 from TracksApp/no-domain-name-for-relative-to-root 
Don't include a protocol or domain for relative_to_root
 2016-02-09 16:07:56 -06:00
Matt Rogers
6389af4a18 Merge pull request #1983 from C-Otto/fix-chrome-cache-issues 
quick fix
 2016-02-09 16:05:56 -06:00
Matt Rogers
d0c4fee7e4 Don't include a protocol or domain for relative_to_root 
Tracks uses this javascript method in the application layout called
`relative_to_root` to get relative paths for a lot of Javascript
functions. However, it includes the fully qualified protocol and domain
for the tracks site in question. If you have Tracks proxied through SSL
with nginx, then you get a non-secure URL which causes the Javascript to
not work to fetch things like contexts or projects for autocomplete.

Instead of using the `root_url` helper that Rails provides that won't
know about SSL, just use a normal forward slash instead, so that you
still get a path that's relative to the root instead of a URL.
 2016-02-09 15:36:53 -06:00
Carsten Otto
ab5b7af069 quick fix 
fixes #1982
 2016-02-06 00:23:55 +01:00
Matt Rogers
0d2b293bd3 Merge pull request #1802 from jyruzicka/unify-rendering 
Unify rendering into helper
 2016-02-02 16:10:43 -06:00
Jan-Yves Ruzicka
ccf13418f4 Extract rendering to helper method. Shift filename sanitization to controller. 2016-02-02 11:08:12 +00:00
Matt Rogers
7801364662 Merge pull request #1977 from dnrce/pry 
Add pry for debugging
 2016-01-31 18:51:56 -06:00
Dan Rice
bae4b42a6e Add pry for debugging 2016-01-31 11:06:45 -05:00
Matt Rogers
7300e3bf80 Merge pull request #1967 from C-Otto/links-open-in-new-tab 
add target="_blank" for generated links
 2016-01-30 22:12:48 -06:00
Matt Rogers
83622af8c7 Merge pull request #1975 from dnrce/jquery-ui-rails 
Use jquery-ui-rails gem instead of vendored jQuery UI
 2016-01-30 17:34:51 -06:00
Matt Rogers
753e6e6ad5 Merge pull request #1976 from dnrce/selenium-firefox43 
Update selenium-webdriver
 2016-01-30 17:11:59 -06:00
Dan Rice
d2e5df5971 Update selenium-webdriver 2016-01-30 16:28:09 -05:00
Dan Rice
2ea20d1a1e Use jquery-ui-rails gem instead of vendored jQuery UI 2016-01-30 16:12:31 -05:00
Dan Rice
3220177dd3 Merge pull request #1974 from TracksApp/bootstrap-preferences-page 
Update the preferences pages to Bootstrap
 2016-01-30 14:59:20 -05:00
Matt Rogers
7652791451 Update the preferences pages to Bootstrap 2016-01-30 13:49:08 -06:00
Dan Rice
10698d1f94 Merge pull request #1973 from el-Salmon/spanish 
Updated Spanish translation
 2016-01-30 10:57:41 -05:00
Jaime Martín Jiménez
508e0e6e47 Updated Spanish translation 2016-01-30 11:37:41 +01:00
Carsten Otto
3327966af1 add target="_blank" for generated links 
This causes the links to be opened in a new window/tab.
Existing (rendered) notes are not affected by this.

Fixes #1747
 2016-01-27 21:26:27 +01:00
Matt Rogers
d1a9e2746b Merge pull request #1965 from dnrce/2016 
Bump copyright year to 2016
 2016-01-26 20:51:10 -06:00
Dan Rice
3347594828 Merge pull request #1971 from TracksApp/rails-4-1-14-1 
Upgrade to Rails 4.1.14.1
 2016-01-25 21:29:26 -05:00
Matt Rogers
2ef17e24e4 Upgrade to Rails 4.1.14.1 2016-01-25 19:59:45 -06:00
Matt Rogers
0dfcd37a44 Merge pull request #1970 from dnrce/docker 
Add Docker configuration
 2016-01-25 07:41:46 -06:00
Dan Rice
6cd2ae25fe Add Docker configuration 
[ci skip]
 2016-01-24 15:59:34 -05:00
Dan Rice
13d0098b40 Bump copyright year to 2016 
[ci skip]
 2016-01-21 23:36:37 -05:00
Matt Rogers
233b7cc7be Merge pull request #1964 from C-Otto/fix-remember-login 
fix: remember login
 2016-01-21 17:02:45 -06:00
Carsten Otto
461b328402 fix: remember login 
fixes #1963
 2016-01-21 23:45:38 +01:00
Matt Rogers
42ab5e3000 Merge pull request #1951 from C-Otto/show_from_midnight 
when recurring todos always use midnight for "show from"
 2016-01-21 16:13:30 -06:00
Matt Rogers
7d50ee5bdd Merge pull request #1961 from C-Otto/sort-current-projects 
Sort current projects
 2016-01-21 15:59:01 -06:00
Carsten Otto
d2931ea7f0 sort current projects by last_reviewed date 
fixes #1960
 2016-01-21 22:30:48 +01:00
Carsten Otto
33c814e1b9 use local variable where possible 2016-01-17 17:52:28 +01:00
Carsten Otto
a4ef5654e9 explicit loading does not seem to be necessary 2016-01-17 17:51:49 +01:00
Carsten Otto
dc6eed3956 remove instance variable for projects, not necessary 2016-01-17 17:50:04 +01:00
Carsten Otto
94f60ffba4 do not load contexts for review, not necessary 2016-01-17 17:43:31 +01:00
Dan Rice
e5cf1ab604 Merge pull request #1959 from TracksApp/responsive-bootstrap-footer 
Update the footer to be more responsive
 2016-01-14 17:34:19 -05:00
Matt Rogers
d18c6caf34 Remove the legacy footer styles 2016-01-14 14:06:04 -06:00
Matt Rogers
137e36497d Update the footer to be more responsive 
Matches the style of the existing footer and makes the links move to the
next line instead of wrapping if the viewport is too small for all of
the footer to fit on one line.

Also moves the footer over to bootstrap styles
 2016-01-12 21:37:44 -06:00
Matt Rogers
8012f98d6d Merge pull request #1956 from TracksApp/fix-asset-precompilation 
Remove the login stylesheet from precompilation
 2016-01-09 10:07:25 -06:00
Matt Rogers
4917a42b0e Remove the login stylesheet from precompilation 
It's no longer being included on its own anymore.

Fixes #1954
 2016-01-09 10:06:11 -06:00
Matt Rogers
6492b1c3fe Merge pull request #1943 from TracksApp/login-page-redesign 
Redesign the login page
 2015-12-21 11:45:04 -06:00