Dan Rice
|
fdd4c267b3
|
Merge branch 'master' into new-gui
Conflicts:
Gemfile.lock
|
2014-04-02 13:26:17 -04:00 |
|
Dan Rice
|
3c737ea294
|
Update to latest Tolk which doesn't depend on protected_attributes
Fixes #1455
|
2014-04-02 13:13:44 -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
|
a9fa955c33
|
move daily test to daily pattern test
|
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 |
|
Reinier Balt
|
8c90dd8f48
|
Merge pull request #217 from zoombody/crypted_pws
Add rake task to check for deprecated password hashes
|
2014-03-30 22:42:09 +02:00 |
|
Dan Rice
|
1a593d9796
|
Add rake task to check for deprecated password hashes
|
2014-03-30 15:02:41 -04:00 |
|
Dan Rice
|
64fddeaf7a
|
Rename the tracks rakefile to match the namespace
|
2014-03-30 14:41:37 -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
|
185e967a58
|
update gemfile after merge
|
2014-03-06 10:33:05 +01: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
|
b543f530e8
|
add recent schema.rb
|
2014-03-04 17:08:22 +01:00 |
|
Reinier Balt
|
6077af3ed0
|
update gems including rails
|
2014-03-02 14:20:21 +01:00 |
|
Reinier Balt
|
39c52e03b4
|
fix failing tests
the date in fixtures is not set by timecop. That doesn't help here
|
2014-02-23 14:03:57 +01:00 |
|
Reinier Balt
|
a14686d1e2
|
Merge pull request #215 from maqiv/master
Added possibility to add tracks as webapp on chrome mobile.
|
2014-02-17 13:47:15 +01:00 |
|
maqiv
|
35d48ea4c4
|
Added possibility to add tracks as webapp on chrome mobile.
|
2014-02-17 13:38:49 +01:00 |
|
Reinier Balt
|
a67f88bcfa
|
restore reset_password rake task
|
2014-02-09 14:56:05 +01:00 |
|
Reinier Balt
|
e0336f578e
|
update Tolk to github master for rails 4 support. It currently needs protected_attributes
gem.
|
2014-02-09 14:39:36 +01:00 |
|
Dan Rice
|
a54f958f0d
|
Fix a typo in the upgrade doc
|
2014-02-04 23:45:08 -05:00 |
|
Reinier Balt
|
1649d95374
|
update gemfile again and fix failing test
|
2014-01-31 17:44:54 +01:00 |
|
Reinier Balt
|
d14dc9a00c
|
update Gemfile
|
2014-01-27 20:06:32 +01:00 |
|
Reinier Balt
|
b15d195c45
|
fix test regressions. should run all tests before committing :-)
|
2014-01-26 15:10:36 +01:00 |
|
Reinier Balt
|
63af3bbcfa
|
make todo_from_rich_message time zone aware. test was failing.
|
2014-01-26 15:05:27 +01:00 |
|
Matt Rogers
|
76b0ec024a
|
Merge pull request #214 from maddentim/fixes-recurring
Fix #1451 recurring todo overlay z-index to be on top of topbar
|
2014-01-24 19:50:24 -08: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
|
908149ea61
|
some features that were wip-ed because of cucumber issues seem to pass
|
2014-01-08 22:04:40 +01:00 |
|