Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-15 21:55:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3082 commits 27 branches 36 tags 33 MiB
Commit graph

106 commits

Author SHA1 Message Date
Reinier Balt
29acdc5a9d Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/tracks.css.scss
	app/views/layouts/application.html.erb
 2014-06-26 10:56:22 +02:00
Reinier Balt
59291f305f Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/helpers/todos_helper.rb
	app/views/shared/_footer.html.erb
 2014-06-26 10:46:20 +02:00
Reinier Balt
6012c49fa2 move rack-dev-mark gem to development group 2014-06-26 10:14:00 +02:00
Reinier Balt
5ed2de3ab0 remove custom solution to visually show that you are running in development 
environment and replace with rack-dev-mark gem
 2014-06-26 10:05:22 +02:00
Dan Rice
64bd5b99c5 Raise pinned bcrypt version 2014-06-24 23:07:03 -04:00
Dan Rice
e0779a0b07 Use bcrypt gem instead of obsolete bcrypt-ruby 2014-06-02 20:52:59 -04:00
Dan Rice
fd24dc83b1 Use aruba and actionpack-xml_parser from rubygems 
The released versions have caught up with Tracks' needs,
so it's no longer necessary to fetch them from source.
 2014-05-16 18:18:49 -04:00
Dan Rice
d0cec167a8 Replace Timecop with new ActiveSupport helpers 2014-05-16 13:25:22 -04:00
Dan Rice
7d7e47deff Add Spring and spring-aware binstubs 
Also remove /script, which is no longer used in Rails 4
 2014-05-16 12:21:40 -04:00
Dan Rice
ede9636c6d Pin Rails to 4.1.x, not 4.x 2014-05-16 10:21:57 -04:00
Reinier Balt
beac5bffb0 update to rails 4.1 2014-05-16 14:33:18 +02:00
Dan Rice
4a3d5a74e6 Require only stdlib for password reset rake task 2014-05-15 22:41:37 -04:00
Dan Rice
6d468e229e Use latest Tolk release, which supports Rails 4 2014-05-02 11:26:21 -04:00
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
Dan Rice
9c083b3175 Switch to official Bootstrap and Font Awesome SASS gems 2014-03-29 16:59:04 -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
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
Reinier Balt
6238029b55 fix regressions 2014-01-11 14:33:14 +01:00
Matt Rogers
3591911d7d Remove trailing whitespace 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
bba86e51d7 re-add simplecov by request 2013-09-23 16:49:59 +02:00
Reinier Balt
07a3962d7d remove simplecov since we now have coverage reporting on Code Climate 2013-09-22 19:29:30 +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
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
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
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
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
40704b3e98 add bootstrap and mousetrap 2013-06-21 08:52:06 +02:00
Reinier Balt
2daffef683 fix failing tests 2013-06-17 10:06:38 +02:00
Reinier Balt
20b4b626fe update for rails4rc2 2013-06-17 09:32:46 +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
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