mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-27 01:24:07 +01:00
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
This commit is contained in:
Reinier Balt
commit
899df1ef8f
33 changed files with 1487 additions and 1313 deletions
148
Gemfile.lock
148
Gemfile.lock
|
|
@ -1,8 +1,12 @@
|
|||
GIT
|
||||
remote: https://github.com/cucumber/aruba
|
||||
<<<<<<< HEAD
|
||||
revision: 7afbc5c0cbae9c9a946d70c4c2735ccb86e00f08
|
||||
=======
|
||||
revision: 99d8e6a5992af17b014783e775409bc3fd422273
|
||||
>>>>>>> master
|
||||
specs:
|
||||
aruba (0.5.3)
|
||||
aruba (0.5.4)
|
||||
childprocess (>= 0.3.6)
|
||||
cucumber (>= 1.1.1)
|
||||
rspec-expectations (>= 2.7.0)
|
||||
|
|
@ -13,21 +17,42 @@ GIT
|
|||
specs:
|
||||
actionpack-xml_parser (1.0.1)
|
||||
actionpack (>= 4.0.0, < 5)
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
GIT
|
||||
remote: https://github.com/tolk/tolk
|
||||
revision: da2888c181493027a68f04ba7e2b9060883cc464
|
||||
specs:
|
||||
tolk (1.4.00)
|
||||
safe_yaml (~> 0.8)
|
||||
will_paginate
|
||||
>>>>>>> master
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
RedCloth (4.2.9)
|
||||
<<<<<<< HEAD
|
||||
aasm (3.0.25)
|
||||
actionmailer (4.0.2)
|
||||
actionpack (= 4.0.2)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
=======
|
||||
aasm (3.1.1)
|
||||
actionmailer (4.0.3)
|
||||
actionpack (= 4.0.3)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (4.0.3)
|
||||
activesupport (= 4.0.3)
|
||||
>>>>>>> master
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
<<<<<<< HEAD
|
||||
activemodel (4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
builder (~> 3.1.0)
|
||||
|
|
@ -38,18 +63,38 @@ GEM
|
|||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.3)
|
||||
activesupport (4.0.2)
|
||||
=======
|
||||
activemodel (4.0.3)
|
||||
activesupport (= 4.0.3)
|
||||
builder (~> 3.1.0)
|
||||
activerecord (4.0.3)
|
||||
activemodel (= 4.0.3)
|
||||
activerecord-deprecated_finders (~> 1.0.2)
|
||||
activesupport (= 4.0.3)
|
||||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.3)
|
||||
activesupport (4.0.3)
|
||||
>>>>>>> master
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
acts_as_list (0.3.0)
|
||||
acts_as_list (0.4.0)
|
||||
activerecord (>= 3.0)
|
||||
<<<<<<< HEAD
|
||||
arel (4.0.1)
|
||||
atomic (1.1.14)
|
||||
bcrypt-ruby (3.0.1)
|
||||
builder (3.1.4)
|
||||
bullet (4.7.1)
|
||||
=======
|
||||
arel (4.0.2)
|
||||
atomic (1.1.15)
|
||||
bcrypt-ruby (3.0.1)
|
||||
builder (3.1.4)
|
||||
bullet (4.8.0)
|
||||
>>>>>>> master
|
||||
activesupport
|
||||
uniform_notifier (>= 1.4.0)
|
||||
cache_digests (0.3.1)
|
||||
|
|
@ -61,9 +106,13 @@ GEM
|
|||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
xpath (~> 2.0)
|
||||
childprocess (0.3.9)
|
||||
childprocess (0.5.1)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
<<<<<<< HEAD
|
||||
codeclimate-test-reporter (0.2.0)
|
||||
=======
|
||||
codeclimate-test-reporter (0.3.0)
|
||||
>>>>>>> master
|
||||
simplecov (>= 0.7.1, < 1.0.0)
|
||||
coffee-rails (4.0.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
|
|
@ -71,9 +120,14 @@ GEM
|
|||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
<<<<<<< HEAD
|
||||
coffee-script-source (1.6.3)
|
||||
commonjs (0.2.7)
|
||||
cucumber (1.3.10)
|
||||
=======
|
||||
coffee-script-source (1.7.0)
|
||||
cucumber (1.3.11)
|
||||
>>>>>>> master
|
||||
builder (>= 2.1.2)
|
||||
diff-lcs (>= 1.1.3)
|
||||
gherkin (~> 2.12)
|
||||
|
|
@ -86,6 +140,7 @@ GEM
|
|||
rails (>= 3.0.0)
|
||||
database_cleaner (1.2.0)
|
||||
diff-lcs (1.2.5)
|
||||
<<<<<<< HEAD
|
||||
docile (1.1.1)
|
||||
erubis (2.7.0)
|
||||
execjs (2.0.2)
|
||||
|
|
@ -93,13 +148,24 @@ GEM
|
|||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.3.0)
|
||||
factory_girl (~> 4.3.0)
|
||||
=======
|
||||
docile (1.1.3)
|
||||
erubis (2.7.0)
|
||||
execjs (2.0.2)
|
||||
factory_girl (4.4.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.4.1)
|
||||
factory_girl (~> 4.4.0)
|
||||
>>>>>>> master
|
||||
railties (>= 3.0.0)
|
||||
ffi (1.9.3)
|
||||
gherkin (2.12.2)
|
||||
multi_json (~> 1.3)
|
||||
highline (1.6.21)
|
||||
hike (1.2.3)
|
||||
htmlentities (4.3.1)
|
||||
i18n (0.6.9)
|
||||
<<<<<<< HEAD
|
||||
jquery-rails (3.0.4)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
|
|
@ -109,16 +175,27 @@ GEM
|
|||
less-rails (2.4.2)
|
||||
actionpack (>= 3.1)
|
||||
less (~> 2.4.0)
|
||||
=======
|
||||
jquery-rails (3.1.0)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.1)
|
||||
>>>>>>> master
|
||||
libv8 (3.16.14.3)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
<<<<<<< HEAD
|
||||
metaclass (0.0.1)
|
||||
=======
|
||||
metaclass (0.0.4)
|
||||
>>>>>>> master
|
||||
mime-types (1.25.1)
|
||||
mini_portile (0.5.2)
|
||||
minitest (4.7.5)
|
||||
mocha (0.14.0)
|
||||
mocha (1.0.0)
|
||||
metaclass (~> 0.0.1)
|
||||
<<<<<<< HEAD
|
||||
mousetrap-rails (1.4.6)
|
||||
multi_json (1.8.2)
|
||||
multi_test (0.0.3)
|
||||
|
|
@ -126,6 +203,14 @@ GEM
|
|||
nokogiri (1.6.1)
|
||||
mini_portile (~> 0.5.0)
|
||||
polyglot (0.3.3)
|
||||
=======
|
||||
multi_json (1.8.4)
|
||||
multi_test (0.0.3)
|
||||
mysql2 (0.3.15)
|
||||
nokogiri (1.6.1)
|
||||
mini_portile (~> 0.5.0)
|
||||
polyglot (0.3.4)
|
||||
>>>>>>> master
|
||||
protected_attributes (1.0.5)
|
||||
activemodel (>= 4.0.1, < 5.0)
|
||||
rack (1.5.2)
|
||||
|
|
@ -133,6 +218,7 @@ GEM
|
|||
rack (>= 1.1.3)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
<<<<<<< HEAD
|
||||
rails (4.0.2)
|
||||
actionmailer (= 4.0.2)
|
||||
actionpack (= 4.0.2)
|
||||
|
|
@ -146,23 +232,51 @@ GEM
|
|||
railties (4.0.2)
|
||||
actionpack (= 4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
=======
|
||||
rails (4.0.3)
|
||||
actionmailer (= 4.0.3)
|
||||
actionpack (= 4.0.3)
|
||||
activerecord (= 4.0.3)
|
||||
activesupport (= 4.0.3)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.3)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
rails_autolink (1.1.5)
|
||||
rails (> 3.1)
|
||||
railties (4.0.3)
|
||||
actionpack (= 4.0.3)
|
||||
activesupport (= 4.0.3)
|
||||
>>>>>>> master
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.1.1)
|
||||
ref (1.0.5)
|
||||
<<<<<<< HEAD
|
||||
rspec-expectations (2.14.4)
|
||||
=======
|
||||
rspec-expectations (2.14.5)
|
||||
>>>>>>> master
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rubyzip (1.1.0)
|
||||
safe_yaml (0.9.7)
|
||||
sanitize (2.0.6)
|
||||
sanitize (2.1.0)
|
||||
nokogiri (>= 1.4.4)
|
||||
<<<<<<< HEAD
|
||||
sass (3.2.13)
|
||||
=======
|
||||
sass (3.2.14)
|
||||
>>>>>>> master
|
||||
sass-rails (4.0.1)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (>= 3.1.10)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
<<<<<<< HEAD
|
||||
selenium-webdriver (2.39.0)
|
||||
childprocess (>= 0.2.5)
|
||||
=======
|
||||
selenium-webdriver (2.40.0)
|
||||
childprocess (>= 0.5.0)
|
||||
>>>>>>> master
|
||||
multi_json (~> 1.0)
|
||||
rubyzip (~> 1.0)
|
||||
websocket (~> 1.0.4)
|
||||
|
|
@ -171,7 +285,11 @@ GEM
|
|||
multi_json
|
||||
simplecov-html (~> 0.8.0)
|
||||
simplecov-html (0.8.0)
|
||||
<<<<<<< HEAD
|
||||
sprockets (2.10.1)
|
||||
=======
|
||||
sprockets (2.11.0)
|
||||
>>>>>>> master
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
|
|
@ -180,18 +298,19 @@ GEM
|
|||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
sqlite3 (1.3.8)
|
||||
sqlite3 (1.3.9)
|
||||
swf_fu (2.0.4)
|
||||
coffee-script
|
||||
rails (>= 3.1)
|
||||
therubyracer (0.12.0)
|
||||
therubyracer (0.12.1)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
thor (0.18.1)
|
||||
thread_safe (0.1.3)
|
||||
atomic
|
||||
thread_safe (0.2.0)
|
||||
atomic (>= 1.1.7, < 2)
|
||||
tilt (1.4.1)
|
||||
timecop (0.6.3)
|
||||
<<<<<<< HEAD
|
||||
tolk (1.4.00)
|
||||
protected_attributes
|
||||
safe_yaml (~> 0.8)
|
||||
|
|
@ -206,6 +325,11 @@ GEM
|
|||
execjs
|
||||
rails (>= 3.1)
|
||||
railties (>= 3.1)
|
||||
=======
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
>>>>>>> master
|
||||
tzinfo (0.3.38)
|
||||
uglifier (2.4.0)
|
||||
execjs (>= 0.3.0)
|
||||
|
|
@ -237,6 +361,7 @@ DEPENDENCIES
|
|||
cucumber-rails
|
||||
database_cleaner
|
||||
factory_girl_rails
|
||||
highline
|
||||
htmlentities
|
||||
jquery-rails
|
||||
json
|
||||
|
|
@ -244,6 +369,7 @@ DEPENDENCIES
|
|||
mocha
|
||||
mousetrap-rails
|
||||
mysql2
|
||||
protected_attributes
|
||||
rack-mini-profiler
|
||||
rails (~> 4.0.0)
|
||||
rails_autolink
|
||||
|
|
@ -256,9 +382,13 @@ DEPENDENCIES
|
|||
swf_fu
|
||||
therubyracer
|
||||
timecop (~> 0.6.2)
|
||||
<<<<<<< HEAD
|
||||
tolk
|
||||
turbolinks
|
||||
twitter-bootstrap-rails
|
||||
=======
|
||||
tolk!
|
||||
>>>>>>> master
|
||||
uglifier (>= 1.3.0)
|
||||
will_paginate-bootstrap
|
||||
yard
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue