Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-26 00:54:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into new-gui

Browse source 
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 2014-03-06 10:31:39 +01:00
commit 899df1ef8f
33 changed files with 1487 additions and 1313 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/views/layouts/mobile.m.erb
View file

@ -7,6 +7,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="mobile-web-app-capable" content="yes">
<meta name="viewport" content="width=device-width, user-scalable=no">
<%= stylesheet_link_tag "mobile", :media => 'handheld,all' %>
<%= favicon_link_tag 'favicon.ico' %>

2
app/views/todos/all_done.html.erb
View file

@ -21,4 +21,4 @@
<%= render :partial => "todos/todo", :collection => @done, :locals => { :parent_container_type => "completed", :suppress_context => false, :suppress_project => false } %>
<% end -%>
<div class="paginate_footer"><%= will_paginate @done, paginate_options %></div>
<div class="paginate_footer"><%= will_paginate @done, paginate_options %></div>