Commit graph

2454 commits

Author SHA1 Message Date
Reinier Balt
c8d2db6fc3 these belong to last commit 2012-12-23 22:49:48 +01:00
Reinier Balt
e90b24d327 Merge branch 'master' of github.com:TracksApp/tracks 2012-12-23 22:47:31 +01:00
Reinier Balt
bd656ee1c7 fix #1350 by removing admin_email from preferences model and add it as a site option in
site.yml.tmpl. This one needs running migrations
2012-12-23 21:03:37 +01:00
Reinier Balt
d4014a73d3 Merge pull request #132 from mattr-/add-test-coverage
Add test coverage generation using simplecov
2012-12-23 00:35:01 -08:00
Matt Rogers
066c378705 Add test coverage generation using simplecov 2012-12-22 22:56:30 -06:00
Reinier Balt
a32f928fc8 add tag_name to cache invariant 2012-12-16 17:03:23 +01:00
Reinier Balt
5454ba385f fix styling of error messages 2012-12-16 15:20:43 +01:00
Reinier Balt
ed3cbf991c update gems 2012-12-16 14:24:27 +01:00
Reinier Balt
9550b89b25 fix caching of todo where [C] and [P] were not part of the invariant
thus the first generated todo was cached, leading to invalid todo in other views
2012-12-05 16:38:39 +01:00
Reinier Balt
032affb00d Merge pull request #130 from zoombody/bug/1351-note-migration
Reload columns before rendering notes during migration
2012-12-05 00:50:02 -08:00
Dan Rice
c1f1fcb35b Use say() instead of puts() in migrations 2012-12-04 19:04:21 -05:00
Dan Rice
1de6a0c9dc Reload columns before rendering notes during migration
Fixes #1351
2012-12-04 18:44:58 -05:00
Matt Rogers
109da4f213 Merge pull request #128 from zoombody/bug/1366-tab-order
Remove tab-indexes for recurring todo form
2012-12-04 09:15:43 -08:00
Dan Rice
268d37c02d Remove tab-indexes for recurring todo forms
Using the natural tab order makes the Create and Cancel buttons accessible.

Fixes #1371
2012-12-03 16:25:20 -05:00
Reinier Balt
b5d71190b5 Merge pull request #127 from zoombody/bug/1366-tab-order
Fix tab order when creating monthly recurring actions
2012-12-01 01:14:04 -08:00
Reinier Balt
f1006eff51 Merge pull request #126 from zoombody/fixes
Clean up HTML in mobile login
2012-12-01 01:08:21 -08:00
Reinier Balt
923cd70058 Merge pull request #125 from maddentim/fixes-recurring
Eliminating unneeded blank space character from show_date_tag
2012-12-01 01:07:50 -08:00
Reinier Balt
c2d057f1b2 Merge pull request #124 from maddentim/fix-icon-size
Shrink add.png icon to be inline with other icons
2012-12-01 01:07:03 -08:00
Dan Rice
41d8fe5550 Remove duplicate render_flash from mobile login
The flash is already rendered in the layout.

Fixes #1370
2012-11-30 23:27:54 -05:00
Dan Rice
c0056675be Fix tab order when creating monthly recurring actions
Fixes #1366
2012-11-30 23:14:36 -05:00
Dan Rice
f6d251d3a0 Fix stray HTML tags in mobile layout
Fixes #1369
2012-11-30 17:23:03 -05:00
tim madden
281cc51b3a Shrink add.png icon to be inline with other icons
Other icons are 16x16 with add.png is 32x32. This commit scales the
icon down to 16x16.

Closes #1367
2012-11-30 16:09:11 -06:00
tim madden
f7f8b79f5b Eliminating unneeded blank space character from show_date_tag
The space character causes the 'Show in x period' background color to
run into the todo description.

Closes #1368
2012-11-30 16:08:25 -06:00
Reinier Balt
93c6d33729 Merge pull request #122 from zoombody/fixes
Fix redirect to home page after open signup
2012-11-30 00:48:06 -08:00
Dan Rice
c838272622 Fix redirect to home page after open signup
Fixes #1349
2012-11-29 16:27:28 -05:00
Matt Rogers
4d2f25ab20 Refactor the fetching of done todos
Move the get_done_today, get_done_this_week, and get_done_this month
methods into their own class in lib/tracks and use the new class in the
context, project, and todo controllers.

This removes the complexity from the application controller, silos it
off, and slightly reduces the complexity of the other controllers so
that they don't have to duplicate as much code.

The tradeoff here is that the code that was moved out into its own class
was also duplicated in the todos controller due to a different use case
that I didn't see before. This is still an improvement however and so
I'm ok with going back and tackling the extra complexity added to
TodoController at a later date.
2012-11-27 23:07:46 -06:00
Matt Rogers
2393d6d371 Don't load cucumber automatically on Bundler initialization 2012-11-27 23:07:45 -06:00
Matt Rogers
f69c56ec31 Merge pull request #121 from zoombody/fixes
Disable loading of the full environment during assets:precompile
2012-11-27 12:22:16 -08:00
Dan Rice
9e8893cfac Disable loading of the full environment during assets:precompile
Fixes #1338
2012-11-27 14:19:45 -05:00
Reinier Balt
f228067e0b Merge pull request #120 from maddentim/fixes
Creating new todo link for context headers in mobile interface
2012-11-26 10:56:16 -08:00
Tim Madden
8cef2b41c1 Creating new todo link for context headers 2012-11-26 10:14:55 -06:00
Reinier Balt
58246a1359 Merge pull request #119 from zoombody/fixes
Render collapse/expand buttons using CSS instead of JS
2012-11-15 00:08:15 -08:00
Dan Rice
bdbb1dd29d Render collapse/expand buttons using CSS instead of JS
Fix #1354
Also clean up some dependent JS unused since c64e1bc
2012-11-14 22:01:43 -05:00
Reinier Balt
416a8699d5 Merge pull request #118 from zoombody/i18n
Revert corrupt translations
2012-11-04 08:09:59 -08:00
Dan Rice
eea380951f Revert corrupt translations
Fixes #1339
2012-11-03 16:20:25 -04:00
Matt Rogers
84fc7f9ece Merge pull request #117 from zoombody/fixes
Miscellaneous minor fixes
2012-10-26 15:02:48 -07:00
Dan Rice
504d03f989 Fix wrong page title when adding a user
Title still says "admin user" even though subsequent users are not admins.
Add a new string to correct this.
2012-10-26 17:19:40 -04:00
Dan Rice
beaa069340 Cleanup footer links
Minor fixes as a follow-up to #1340
* Assembla is HTTPS-only
* Mailing list is members-only, so link to the group instead and call it
  "mailing list" instead of "email"
* getontracks.org's canonical URL has no www
* Make the same changes to the mobile footer
* The forum is no longer referenced, so purge from translations
2012-10-26 17:04:56 -04:00
Matt Rogers
678cd5ca01 Merge pull request #116 from zoombody/mobile-checkboxes
Render task-complete checkbox for mobile
2012-10-25 18:54:36 -07:00
Dan Rice
53074136d3 Replace hard-coded footer link to mobile site 2012-10-25 21:52:09 -04:00
Dan Rice
ff4d639142 Fix visible HTML tags in mobile flash 2012-10-25 21:24:04 -04:00
Dan Rice
8c56444f96 Render task-complete checkbox for mobile
Fixes #1346
2012-10-25 21:15:35 -04:00
Reinier Balt
dd5d8b21a7 Merge pull request #115 from maddentim/fixes
Fixes
2012-10-24 14:06:02 -07:00
tim madden
92cfeb4188 adding home link to mobile footer to fill it out 2012-10-23 11:11:00 -05:00
tim madden
6d3a6611c8 adding links to footers to go between mobile and full site 2012-10-23 11:10:59 -05:00
tim madden
c46122bb34 Changing mobile layout so that links always show so link fill across 2012-10-23 11:10:59 -05:00
Tim Madden
25ea467c5e restoring route of /m instead of just /mobile 2012-10-23 11:10:59 -05:00
Reinier Balt
fc46624b0a Merge pull request #114 from mattr-/upgrade-jquery-ui
update to jQuery UI 1.9.0
2012-10-23 04:52:11 -07:00
Matt Rogers
3aabadf353 update to jQuery UI 1.9.0 2012-10-15 20:31:06 -05:00
Matt Rogers
d3255f551d Don't run CI on 1.8.7.
factory_girl requires 1.9.3
[ci skip]
2012-10-09 12:55:35 -05:00