Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-23 18:50: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
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
Matt Rogers
63711edba8 Don't run the cucumber features as part of the ci task. 
They take too long to run.
 2012-10-09 12:47:53 -05:00
Matt Rogers
17f2648bf9 fix the migration task name for the ci task 2012-10-09 12:36:03 -05:00
Matt Rogers
e1bae5a2de run the database migration as part of the ci build 2012-10-09 12:29:06 -05:00
Matt Rogers
e569cd081a create a copy of database.yml on Travis 2012-10-09 12:24:25 -05:00
Matt Rogers
f81905cbb5 Use mysql for all databases in the template file 
Sqlite is not in the Gemfile so it makes no sense to have it in the
database.yml.tmpl file.
 2012-10-09 12:22:07 -05:00
Matt Rogers
b36f36190c create a copy of site.yml on Travis 2012-10-09 12:08:39 -05:00
Matt Rogers
fc8ad0f7b8 set up Travis CI for Tracks 2012-10-09 11:53:46 -05:00
Matt Rogers
1aa1908a98 Merge pull request #112 from zoombody/postgres 
Don't sort todos when counting them
 2012-10-07 21:02:06 -07:00
Reinier Balt
a46fee6b91 Merge pull request #113 from dD0T/mobileredir 
Mobile task creation redirected to non-mobile results page.

thanks!
 2012-10-06 00:37:13 -07:00
Stefan Hacker
a7014e9716 Mobile task creation redirected to non-mobile results page. 2012-10-05 17:55:13 +02:00
Dan Rice
5b6cbf566a Don't sort todos when counting them 
Grouping isn't as lax in PostgreSQL as it is in MySQL or SQLite. All
sort fields also need to be in the GROUP BY, or be aggregated. The order
isn't relevant when counting, so simply don't order in that case.

Fix #1336
 2012-10-04 10:43:22 -04:00
Matt Rogers
33c3c578f6 Fix up the links in the footer. 
The link to the forum is gone. The email link points to the new google
groups mailing list. The contribute link points to
http://getontracks.org/development

Fixes #1340
 2012-10-03 23:12:40 -05:00
Reinier Balt
8c1a180da9 Merge pull request #111 from zoombody/dropdown-css-fix 
improve text alignment in todo actions menu
 2012-10-02 01:18:59 -07:00
Dan Rice
7ce214720d improve text alignment in todo actions menu 2012-10-01 21:56:08 -04:00
Reinier Balt
e846de6a32 Merge pull request #110 from zoombody/favicon 
make favicon background transparent
 2012-09-29 23:53:13 -07:00
Matt Rogers
a8fa2962c9 Merge pull request #109 from zoombody/css-fix 
fix #1334 wrong navbar link colors
 2012-09-29 20:21:02 -07:00
Matt Rogers
c1118b298c Merge pull request #108 from zoombody/rollover 
convert rollovers to pure CSS with sprites
 2012-09-29 20:19:46 -07:00