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

3401 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Matt Rogers
a07567086c Add flash styling of the login page. 2015-12-15 20:02:53 -06:00
Matt Rogers
37c61fa60a Update the login cucumber steps to match the new UI 
Removes the colon for the checkbox label since the position of the
checkbox and the text on the UI has changed.
 2015-12-15 20:02:53 -06:00
Matt Rogers
89506dbeb7 Redesign the login page 
Makes use of both bootstrap and a rendering of the Tracks logo to
provide a bit better experience in term of brand identity as well as
also supporting mobile better.
 2015-12-15 20:02:53 -06:00
Carsten Otto
b788194f8d fix test 2015-12-13 16:12:45 +01:00
Carsten Otto
cd09cce7a4 when recurring todos always use midnight for "show from" 
fixes #1940
 2015-12-13 15:44:40 +01:00
Matt Rogers
3468d1ec13 Merge branch '2.3_branch' 2015-12-08 20:14:33 -06:00
Matt Rogers
c4836672c8 Merge pull request #1909 from C-Otto/tracks-1881 
Activate successors on predecessor destroy
 2015-12-08 20:02:06 -06:00
Matt Rogers
42961e9701 Isolate the links to click within the view menu dropdown 2015-12-02 12:42:30 -06:00
Matteo Giaccone
357c281b9d Add page refresh to fix feature tests 2015-12-02 12:42:18 -06:00
Matteo Giaccone
e60c25f8a2 Port top navigation bar to Bootstrap 2015-12-02 12:42:18 -06:00
Dan Rice
20b040b8b7 Update Nokogiri 2015-12-01 00:02:36 -05:00
Matt Rogers
9389fbef9a Merge pull request #1939 from TracksApp/support-mysql-5.7 
Bump mysql2 to 0.3.20
 2015-11-27 15:21:12 -06:00
Matt Rogers
6a7af342b6 Bump mysql2 to 0.3.20 
Keep it locked at the 0.3.x version due to problems with other apps and
the 0.4.x versions.
 2015-11-18 08:19:54 -06:00
Dan Rice
da7a97b9b5 Merge pull request #1935 from mattr-/simplify-login-system 
Simplify the return values when using basic auth
 2015-11-03 00:15:43 -05:00
Matt Rogers
d9b78c4e1f Simplify the return values when using basic auth 
Returning a hash with explicit keys isn't strictly necessary with the
access methods we're using to get the values for those keys out of the
hash. Return an empty hash instead, simplifying the code.

Also remove the early return statements within the conditional. Those
are also unneeded since this is the last expression that's run in the
method.
 2015-11-02 22:05:29 -06:00
Matt Rogers
fbb62fd36e Merge pull request #1933 from dnrce/projects_url 
Fix link in projects RSS feed
 2015-10-12 21:06:56 -05:00
Dan Rice
0f168b430e Fix link in projects RSS feed 2015-10-11 16:46:21 -04:00
Dan Rice
70e81b7782 Merge pull request #1922 from TracksApp/configurable-static-asset-serving 
Add a configuration setting for serving static assets
 2015-09-03 15:25:04 -04:00
Matt Rogers
faf585b1d4 Add a configuration setting for serving static assets 
This new setting will allow us to control in `site.yml` whether or not
our static assets will be served by Rails or by the app server that is
proxying requests to Rails. This is set to `false` by default so that
the proxying server is responsible for serving the assets.
 2015-09-01 19:21:16 -05:00
Matt Rogers
e71d81e129 Merge pull request #1924 from dnrce/namespace-legacy-css 
Namespace the legacy CSS
 2015-09-01 14:11:44 -05:00
Dan Rice
0ca0317a7f Namespace the legacy CSS 2015-08-30 22:31:03 -04:00
Dan Rice
5f031df2c5 Update uglifier gem 2015-08-30 16:54:53 -04:00
Dan Rice
dbd2aa71b3 Merge branch '2.3_branch' 2015-08-30 11:43:10 -04:00
Dan Rice
465fccff4d Merge pull request #1925 from SuperNascher/usercreate 
Increase the maximum password length
 2015-08-29 22:53:39 -04:00
Nascher
dd6698b8a1 Update the maximum password length 2015-08-29 23:58:02 +00:00
Nascher
4632208699 Increase the maximum password length 2015-08-29 18:36:12 +00:00
Matt Rogers
9a18705f70 Merge pull request #1911 from matjack1/empty-project 
Default project should be empty
 2015-08-25 20:46:45 -05:00
Dan Rice
48c1d7c214 Merge pull request #1920 from TracksApp/incremental-bootstrap-ui 
Add in Bootstrap for UI bits
 2015-08-21 08:52:47 -04:00
Matt Rogers
f62dfac1e4 Lock bootstrap-sass to to 3.3.3 2015-08-20 22:03:44 -05:00
Matt Rogers
dd6b9f0359 Merge pull request #1917 from lrbalt/fix-content-type-attachment 
remove old hack to set content type to application/html
 2015-08-20 11:23:21 -05:00
Matt Rogers
a92824b34d Merge pull request #1918 from lrbalt/fasterer 
speed improvements from fasterer gem
 2015-08-20 09:43:15 -05:00
Matt Rogers
109a82f9e0 Merge pull request #1919 from lrbalt/master 
enable caching of gems on travis
 2015-08-20 09:40:28 -05:00
Reinier Balt
209049b012 enable caching of gems on travis 
as described in http://docs.travis-ci.com/user/caching/
 2015-08-19 15:49:43 +02:00