Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-05 16:58:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3082 commits 35 branches 36 tags 32 MiB
Commit graph

739 commits

Author SHA1 Message Date
Reinier Balt
2f13da8bff fix layout and modal issues 
These were "regressions" after the bootstrap 3 migration
 2014-06-26 13:59:06 +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
Dan Rice
aa8f5b7599 Switch from Assembla to GitHub issues 2014-06-25 13:32:11 -04:00
Dan Rice
622291d98d Purge UserTime from app/* 2014-06-12 21:24:31 -04:00
Dan Rice
4ee8c2e7fd Remove executable bit from files in app/ 2014-06-10 17:50:47 -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
Reinier Balt
595806be87 add parameter to REST api for todos to limit result to active todos. Fixes #1388 2014-05-16 15:33:45 +02:00
Reinier Balt
49a09f36e8 activerecord associations do not act like a collection anymore, so convert to array first 
before using map, collect, etc.
 2014-05-16 14:33:18 +02:00
Reinier Balt
2430fcb906 fix failing tests 
not sure if the to_a fixes to get collections from activerecord is the right way
 2014-05-16 14:33:18 +02:00
Dan Rice
3c2c0fe065 Add mobile calendar view 2014-04-21 12:55:13 -04:00
Dan Rice
03fa8d6091 Move mobile full-site link to footer 
Also remove the Tracks project links from the mobile footer
 2014-04-21 12:55:03 -04:00
Dan Rice
87ede1efce Remove obsolete calendar views under TodosController 2014-04-21 12:22:14 -04:00
Dan Rice
fdd4c267b3 Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
 2014-04-02 13:26:17 -04: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
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
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
maqiv
35d48ea4c4 Added possibility to add tracks as webapp on chrome mobile. 2014-02-17 13:38:49 +01:00
Reinier Balt
3b673f0838 fix some failing cucumber tests 2014-01-09 11:18:33 +01:00
Reinier Balt
eb1502d4e0 Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
 2014-01-07 21:01:55 +01:00
Reinier Balt
8da5e5c220 fix #1446 by adding xml to path for google gadget on integration page 2014-01-02 20:01:05 +01:00
Reinier Balt
77778da0f8 fix #1450 by adding CSRF-token to the mobile forms 2014-01-02 16:45:37 +01:00
Reinier Balt
17dca39d3a update gems and fix i18n and aasm deprecation warnings 2013-12-30 20:52:35 +01:00
Greg Sutcliffe
2f043911c6 Extend RichMessage format to include other data 
Uses new Regex to detect:

 @ context
 ~ project
 > tickler-date
 < due-date
 # tag (repeatable)
 * (starred)
 2013-10-16 21:25:47 +01:00
Reinier Balt
fa537fbeb0 Merge branch 'master' into new-gui 2013-10-02 10:26:32 +02:00
Reinier Balt
d35bc5ad62 Merge pull request #211 from GregSutcliffe/master 
Add integration docs for Mailgun
 2013-09-27 23:07:51 -07:00
Greg Sutcliffe
5e32d6da76 Add integration docs for Mailgun 2013-09-27 21:21:46 +01:00
Reinier Balt
d44538f604 Merge branch 'master' into new-gui 2013-09-25 16:22:47 +02:00
Reinier Balt
9f55a45ec6 refactor search controller 2013-09-25 15:38:51 +02:00
Reinier Balt
463f5e922d Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
 2013-09-22 10:30:24 +02:00
Reinier Balt
bbf6cdf702 fix failing cucumber scenario's and update gems 2013-09-18 10:38:20 +02:00
Reinier Balt
a31c0a7a5d fix import for csv 2013-09-16 11:37:16 +02:00
Reinier Balt
9c86396ef0 Merge branch 'master' into new-gui 
Conflicts:
	app/views/projects/_project_settings.html.erb
	app/views/todos/_todo.html.erb
 2013-09-13 16:52:06 +02:00
Mindaugas Mozūras
25e764b21a Refactor "unless blank?" into "if present?" 2013-09-13 15:40:09 +03:00
Reinier Balt
d3f46c59eb Merge branch 'master' into new-gui 
Conflicts:
	app/views/contexts/show.html.erb
 2013-09-05 20:19:48 +02:00
Reinier Balt
7e59b455f2 fix empty message in context view and handle removing last active todo from context correctly 2013-09-05 17:22:15 +02:00
Reinier Balt
159acac9b6 add forms for new todo and multiple todos to modal 
AJAX is not enabled yet
 2013-08-26 12:08:33 +02:00
Reinier Balt
37f8acb214 fix count in navbar and fix tickler 2013-08-24 22:11:52 +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
2fc3f65368 improve project show page and improve caching 2013-08-08 18:21:56 +02:00
Reinier Balt
c0edd1749c use twitter/typeahead for autocomplete. make go to project|context|tag work and show 
project details in a popover
 2013-08-07 23:31:28 +02:00
Reinier Balt
31386db3df Merge branch 'master' into new-gui 2013-08-05 16:04:40 +02:00
Matt Rogers
6681df9530 Merge pull request #202 from TracksApp/extract-extras-from-user 
Extract time and date concerns from User
 2013-08-01 14:59:17 -07:00
Matt Rogers
96777c2e3a Replace User#time with UserTime#time 2013-07-30 16:21:04 -05:00
Reinier Balt
c63d1db6f2 improve collapsed view on small screen 2013-07-29 12:36:37 +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
d139693632 implement switching grouping 2013-07-29 12:23:52 +02:00
Darren Cato
7e076290b8 first pass at csv import functionality for tracks 2013-07-28 13:28:15 +02:00
Don Cruse
25f80bcf8b Moving label creation to helpers 2013-07-28 13:27:28 +02:00
Reinier Balt
4c4ce911fc Merge pull request #199 from shaded2/csv_import 
Csv import
 2013-07-26 03:04:07 -07:00
Darren Cato
3450c22e97 first pass at csv import functionality for tracks 2013-07-21 13:37:35 -04:00