Commit graph

94 commits

Author SHA1 Message Date
Reinier Balt
eb1502d4e0 Merge branch 'master' into new-gui
Conflicts:
	Gemfile.lock
2014-01-07 21:01:55 +01:00
Reinier Balt
d44538f604 Merge branch 'master' into new-gui 2013-09-25 16:22:47 +02:00
Reinier Balt
bba86e51d7 re-add simplecov by request 2013-09-23 16:49:59 +02:00
Reinier Balt
492de244d2 update gemfile.lock 2013-09-22 10:31:22 +02:00
Reinier Balt
463f5e922d Merge branch 'master' into new-gui
Conflicts:
	Gemfile.lock
2013-09-22 10:30:24 +02:00
Reinier Balt
daef1c440b improve integration test of cli scripts 2013-09-20 21:18:33 +02:00
Reinier Balt
bbf6cdf702 fix failing cucumber scenario's and update gems 2013-09-18 10:38:20 +02:00
Reinier Balt
76902e95c0 Get test coverage reporting on codeclimate 2013-09-16 09:40:41 +02:00
Reinier Balt
031f9fe967 * Add details popover to action.
* Hide tags and overdue date on phones
* Depend on released twitter-bootstrap-rails instead of their master tree
2013-08-09 22:49:57 +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
Reinier Balt
dbe8060bec Merge branch 'master' into new-gui
Conflicts:
	Gemfile.lock
2013-07-28 13:37:45 +02:00
Reinier Balt
58e0393efa add json as dependency 2013-07-28 13:36:47 +02:00
Reinier Balt
f32547136b Merge branch 'master' into new-gui
Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
2013-07-28 13:35:34 +02:00
Reinier Balt
8690dc1fcb update gems 2013-07-28 13:34:48 +02:00
Reinier Balt
92eb88a68d update gems 2013-07-28 13:29:22 +02:00
Matt Rogers
a89e26bc97 Update the version specifier for timecop 2013-07-28 13:28:42 +02:00
Matt Rogers
e7c6142684 Update the version specifier for timecop 2013-07-24 12:35:11 -05:00
Matt Rogers
c9d7fd1124 Use the proper version of timecop 2013-07-22 22:27:04 -05:00
Reinier Balt
79fdd5d625 implement go to project with autocomplete 2013-07-20 23:21:24 +02:00
Reinier Balt
d670839460 Merge branch 'master' into new-gui 2013-07-13 23:19:42 +02:00
Matt Rogers
8e4154e24a Use HTTPS URIs for git repos 2013-07-09 09:56:52 -05:00
Reinier Balt
db29b84f69 add keyboard shortcuts and make todos selectable useing j and k 2013-07-01 15:56:54 +02:00
Reinier Balt
972210326a change look of todo 2013-06-27 22:47:11 +02:00
Reinier Balt
b79efb3f31 Merge branch 'master' into new-gui 2013-06-25 16:51:05 +02:00
Reinier Balt
e03514886c update gemfile for rails4 final release 2013-06-25 16:50:07 +02:00
Reinier Balt
ab0006dc34 initial port of context-show view 2013-06-22 16:04:17 +02:00
Reinier Balt
4770857d76 Merge branch 'rails4' into new-gui 2013-06-21 10:20:49 +02:00
Reinier Balt
d64f6e003e Merge branch 'master' into rails4
Conflicts:
	Gemfile.lock
2013-06-21 10:20:36 +02:00
Reinier Balt
40704b3e98 add bootstrap and mousetrap 2013-06-21 08:52:06 +02:00
Reinier Balt
1ae6e13f1d update gems 2013-06-19 16:50:02 +02:00
Reinier Balt
20b4b626fe update for rails4rc2 2013-06-17 09:32:46 +02:00
Reinier Balt
4a485558e2 Merge branch 'master' into rails4
Conflicts:
	Gemfile.lock
	config/routes.rb
2013-06-17 09:25:02 +02:00
Reinier Balt
591e20c9f1 update gems 2013-06-11 11:11:40 +02:00
Reinier Balt
671f64b419 move to strong_parameters of rails4. 2013-05-27 12:44:31 +02:00
Reinier Balt
049296fd33 update bundle and remove unneeded gem 2013-05-25 23:17:39 +02:00
Reinier Balt
7465ecce26 Start using actionpack-xml_parser as a gem
XML param parsing was removed from rails 4. We may need to look into dropping support 
for xml api perhaps in favor of a good json api
2013-05-13 15:36:33 +02:00
Reinier Balt
65859807ea update configs for rails 4 2013-05-11 23:12:20 +02:00
Reinier Balt
5ed69fc1a2 update gems and fix failures from new aasm
I'm not sure the test failures caused by reload not working are caused by the new aasm, 
perhaps the thread isolation is causing that...
2013-04-29 11:53:32 +02:00
Reinier Balt
783d4dd774 update cucumber, capybara and mini-profiler
let capybara find hidden elements (2.0 behavior)
2013-04-11 10:52:32 +02:00
Reinier Balt
904ad9e8f0 update to latest gems 2013-04-08 19:50:50 +02:00
Dan Rice
9a2a1f7419 Update therubyracer/libv8 to fix #1387 2013-03-23 10:02:15 -04:00
Dan Rice
11c5f988db Update Rails to 3.2.13 2013-03-18 14:16:04 -04:00
Dan Rice
dc311221f1 Render notes using RedCloth without formatize
Removes the outdated bluecloth dependency
2013-03-13 17:03:58 +02:00
Matt Rogers
7c5028f227 add the mocha stubbing and mocking library 2013-03-03 13:56:18 -06:00
Reinier Balt
4aa5933946 return aruba to Gemfile and fix aruba scenarios 2013-03-02 11:36:46 +01:00
Reinier Balt
402b078c02 update gems 2013-02-23 15:16:03 +01:00
Reinier Balt
1b0d08bbb5 fix timing issues on failing scenarios. Fix deprecated jquery functions and update jqueryui
Signed-off-by: Reinier Balt <lrbalt@gmail.com>
2013-02-15 22:27:39 +01:00
Dan Rice
98fbbccdcb Update Rails to 3.2.12 (security fix) 2013-02-11 19:24:52 -05:00
Dan Rice
4d3ba2a012 Remove Mongrel and other Ruby-1.8-specific development gems 2013-02-07 20:14:23 -05:00
Dan Rice
a8c810e262 Switch to mainline cache_digests gem
lrbalt's 1.8.7-compatible fork is no longer necessary to use.
2013-01-25 20:21:06 -05:00