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

586 commits

Author SHA1 Message Date
Dan Rice
fdd4c267b3 Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
 2014-04-02 13:26:17 -04:00
Reinier Balt
a7807a4b66 dry form_helper using meta programming. 
not sure if this improves readability, but codeclimate should be happier...
 2014-03-31 09:43:39 +02:00
Reinier Balt
b23338eaa2 fix updating of recurring todo and create a form helper for filling the recurring todo edit 
form
 2014-03-31 09:43:39 +02:00
Reinier Balt
776a046465 move mapping of form attributes to model attributes from pattern to builder to make 
pattern independent of form
 2014-03-31 09:43:39 +02:00
Reinier Balt
1f36c27af8 small cleanups 2014-03-31 09:43:39 +02:00
Reinier Balt
c2c67f1640 use new model to handle updating of recurring todos 2014-03-31 09:43:39 +02:00
Reinier Balt
00af159be7 remove unused code and refactor builder to remove duplication 2014-03-31 09:43:39 +02:00
Reinier Balt
78c07d52b7 Start major refactoring of recurring_todos. Started with creating new recurring todos. 
All current and new tests pass
 2014-03-31 09:43:39 +02:00
Dan Rice
655d59c1ee Fix incomplete merge in 899df1e 2014-03-27 21:40:59 -04:00
Reinier Balt
899df1ef8f Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/tracks.css.scss
	app/controllers/todos_controller.rb
	app/services/rich_message_extractor.rb
	app/services/todo_from_rich_message.rb
	app/views/todos/all_done.html.erb
	config/initializers/rack-mini-profiler.rb
	test/models/rich_message_extractor_test.rb
	test/models/todo_from_rich_message_test.rb
 2014-03-06 10:31:39 +01:00
Reinier Balt
3b673f0838 fix some failing cucumber tests 2014-01-09 11:18:33 +01:00
Reinier Balt
def136374c fix regression. Still need to add test to controller tests 2014-01-09 08:05:14 +01:00
Reinier Balt
eb1502d4e0 Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
 2014-01-07 21:01:55 +01:00
Reinier Balt
5dabde222e dry previous commit even further 2014-01-07 20:49:37 +01:00
Reinier Balt
a23587370d remove some duplication in todos_controller 2014-01-07 20:42:19 +01:00
Matt Rogers
16f721aefb Remove an unneeded eval for an instance variable 2014-01-04 12:22:20 -06:00
Reinier Balt
d44538f604 Merge branch 'master' into new-gui 2013-09-25 16:22:47 +02:00
Reinier Balt
9f55a45ec6 refactor search controller 2013-09-25 15:38:51 +02:00
Reinier Balt
463f5e922d Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
 2013-09-22 10:30:24 +02:00
Greg Sutcliffe
8a2da01d51 Add Mailgun endpoint for receiving email tasks via Mailgun 2013-09-21 12:43:22 +01:00
Reinier Balt
871e18922b refactor the cli examples in /doc and fix a small bug in todos_controller 2013-09-18 17:45:22 +02:00
Reinier Balt
bbf6cdf702 fix failing cucumber scenario's and update gems 2013-09-18 10:38:20 +02:00
Reinier Balt
a31c0a7a5d fix import for csv 2013-09-16 11:37:16 +02:00
Reinier Balt
9c86396ef0 Merge branch 'master' into new-gui 
Conflicts:
	app/views/projects/_project_settings.html.erb
	app/views/todos/_todo.html.erb
 2013-09-13 16:52:06 +02:00
Reinier Balt
eaa66be698 fix deprecation warnings 2013-09-13 16:44:59 +02:00
Matt Rogers
b343d0a09e Merge pull request #207 from ajanauskas/refactor/session_expire_method 
Refactor session expire method
 2013-09-13 06:16:23 -07:00
Reinier Balt
e2eb31cfcc Merge pull request #206 from mmozuras/refactor_unless_blanks_into_presents 
Refactor unless blanks into presents
 2013-09-13 06:08:16 -07:00
Andrius Janauskas
0150e9f2c3 Refactor session expire method 2013-09-13 16:04:12 +03:00
Reinier Balt
35d0afdfdf Merge pull request #205 from mmozuras/refactor_negative_blanks_into_presents 
Refactor negative blanks into presents
 2013-09-13 05:56:03 -07:00
Mindaugas Mozūras
25e764b21a Refactor "unless blank?" into "if present?" 2013-09-13 15:40:09 +03:00
Mindaugas Mozūras
a97848f0ba Refactor negative blank? into present? 2013-09-13 15:19:25 +03:00
Mindaugas Mozūras
962b4fa5c9 Use respond_to { |format| format.any } to reduce duplication 2013-09-13 14:58:28 +03:00
Reinier Balt
d3f46c59eb Merge branch 'master' into new-gui 
Conflicts:
	app/views/contexts/show.html.erb
 2013-09-05 20:19:48 +02:00
Reinier Balt
4ca6114b76 weekly days were not getting through to the update of a recurring weekly todo 2013-09-05 20:18:14 +02:00
Reinier Balt
3ef55f3b17 Hopfully fix #1434 by updating selectors first. Same fix as #1431 but now for update 
Conflicts:
	app/controllers/recurring_todos_controller.rb
 2013-09-05 20:13:28 +02:00
Reinier Balt
37f8acb214 fix count in navbar and fix tickler 2013-08-24 22:11:52 +02:00
Reinier Balt
2fc3f65368 improve project show page and improve caching 2013-08-08 18:21:56 +02:00
Reinier Balt
c0edd1749c use twitter/typeahead for autocomplete. make go to project|context|tag work and show 
project details in a popover
 2013-08-07 23:31:28 +02:00
Reinier Balt
41ff0e20ae Merge branch 'master' into new-gui 2013-07-29 12:37:20 +02:00
Reinier Balt
7605ec404f move will_paginate on all_todos pages to will_paginate-bootstrap gem to get the bootstrap 
styling for free. Adds caching to todos/done page too
 2013-07-29 12:25:13 +02:00
Don Cruse
8ed20b35f2 Fixing bug #1442 
This bug was caused when the chart encountered data outside of its
visible range (i.e., the upper bound of the array size). A test was
added that inserts some data from 2 years and 16 months in the past.
The test failed on the old version, throwing exactly the error in bug
report #1442.

The fix is to check whether or not the value is within the array range
before sending the "+=" operator. With this change, the test passes.
 2013-07-28 19:00:51 -05:00
Darren Cato
c9c1569de0 i18n changes 2013-07-28 13:28:15 +02:00
Matt Bridges
84795cdead Pull apart the LoginController#login action 
Begin pulling apart the different paths through the login action to
better understand how the action responds given different state.
 2013-07-28 13:28:15 +02:00
Darren Cato
bf99e8046a typos and style tweaks 2013-07-28 13:28:15 +02:00
Darren Cato
7e076290b8 first pass at csv import functionality for tracks 2013-07-28 13:28:15 +02:00
Don Cruse
25f80bcf8b Moving label creation to helpers 2013-07-28 13:27:28 +02:00
Don Cruse
3babc05a2d Moving time labels to separate methods 2013-07-28 13:27:28 +02:00
Don Cruse
98a9acf741 Simplufying interpolation method 2013-07-28 13:27:28 +02:00
Don Cruse
1b7613f61b Tweak to running averages 2013-07-28 13:27:27 +02:00
Don Cruse
180a6cddf9 Removing a single-line method 2013-07-28 13:27:27 +02:00