Commit graph

1320 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
0839765e7b smaal refactoring and improvement of date handling in test 2014-03-31 11:22:23 +02:00
Reinier Balt
ed039d4c4a small refactorings and add some tests 2014-03-31 11:09:00 +02:00
Reinier Balt
3cb18cd875 move tests from recurring_todo_test to respective repeat_pattern_tests 2014-03-31 09:43:39 +02:00
Reinier Balt
0c153ef28c improve test of daily repeat pattern 2014-03-31 09:43:39 +02:00
Reinier Balt
b84adfc172 move recurrence text helpers into patterns. move next_date calculation into
respective models
2014-03-31 09:43:39 +02:00
Reinier Balt
d8507bf8b7 move as_text helpers to respective pattern 2014-03-31 09:43:39 +02:00
Reinier Balt
cbdbb792a5 add basis tests for patterns and remove doubles from recurring_todo_test.rb 2014-03-31 09:43:39 +02: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
5de96d7eda add some more tests 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
59a29c664a move form specific accessors out of model 2014-03-31 09:43:39 +02:00
Reinier Balt
bad91e8d10 make validations a bit more dry 2014-03-31 09:43:39 +02:00
Reinier Balt
29b815e998 move model validation into pattern classes and link from recurring_todo model 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
8e13059df1 Further improve time comparison in Project model 2014-03-30 21:49:12 -04:00
Dan Rice
ece69b8540 Use Date class to assist with date math in Project model
Fixes an intermittent failure in ProjectTest#test_age_in_days
2014-03-30 17:26:31 -04:00
Dan Rice
42e2da8653 First-pass conversion of layouts and icons to BS3/FA
Rough around the edges.
2014-03-29 16:59:18 -04:00
Dan Rice
9c083b3175 Switch to official Bootstrap and Font Awesome SASS gems 2014-03-29 16:59:04 -04:00
Reinier Balt
52929bdbcb fix path error in js and update gems 2014-03-28 10:28:20 +01: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
maqiv
35d48ea4c4 Added possibility to add tracks as webapp on chrome mobile. 2014-02-17 13:38:49 +01:00
Reinier Balt
63af3bbcfa make todo_from_rich_message time zone aware. test was failing. 2014-01-26 15:05:27 +01:00
tim madden
311e63ddd1 Fix recurring todo overlay z-index to be on top of topbar 2014-01-24 16:42:14 -06:00
Reinier Balt
6238029b55 fix regressions 2014-01-11 14:33:14 +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
8da5e5c220 fix #1446 by adding xml to path for google gadget on integration page 2014-01-02 20:01:05 +01:00
Reinier Balt
77778da0f8 fix #1450 by adding CSRF-token to the mobile forms 2014-01-02 16:45:37 +01:00
Reinier Balt
17dca39d3a update gems and fix i18n and aasm deprecation warnings 2013-12-30 20:52:35 +01:00
Greg Sutcliffe
2f043911c6 Extend RichMessage format to include other data
Uses new Regex to detect:

 @ context
 ~ project
 > tickler-date
 < due-date
 # tag (repeatable)
 * (starred)
2013-10-16 21:25:47 +01:00
Reinier Balt
fa537fbeb0 Merge branch 'master' into new-gui 2013-10-02 10:26:32 +02:00
Reinier Balt
d35bc5ad62 Merge pull request #211 from GregSutcliffe/master
Add integration docs for Mailgun
2013-09-27 23:07:51 -07:00
Greg Sutcliffe
5e32d6da76 Add integration docs for Mailgun 2013-09-27 21:21:46 +01: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
067db90d58 various small refactorings 2013-09-22 17:34:58 +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