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

1298 commits

Author SHA1 Message Date
Dan Rice
9c083b3175 Switch to official Bootstrap and Font Awesome SASS gems 2014-03-29 16:59:04 -04:00
Reinier Balt
52929bdbcb fix path error in js and update gems 2014-03-28 10:28:20 +01:00
Dan Rice
655d59c1ee Fix incomplete merge in 899df1e 2014-03-27 21:40:59 -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
63af3bbcfa make todo_from_rich_message time zone aware. test was failing. 2014-01-26 15:05:27 +01:00
tim madden
311e63ddd1 Fix recurring todo overlay z-index to be on top of topbar 2014-01-24 16:42:14 -06:00
Reinier Balt
6238029b55 fix regressions 2014-01-11 14:33:14 +01:00
Reinier Balt
3b673f0838 fix some failing cucumber tests 2014-01-09 11:18:33 +01:00
Reinier Balt
def136374c fix regression. Still need to add test to controller tests 2014-01-09 08:05:14 +01:00
Reinier Balt
eb1502d4e0 Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
 2014-01-07 21:01:55 +01:00
Reinier Balt
5dabde222e dry previous commit even further 2014-01-07 20:49:37 +01:00
Reinier Balt
a23587370d remove some duplication in todos_controller 2014-01-07 20:42:19 +01:00
Matt Rogers
16f721aefb Remove an unneeded eval for an instance variable 2014-01-04 12:22:20 -06: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
067db90d58 various small refactorings 2013-09-22 17:34:58 +02:00
Reinier Balt
463f5e922d Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
 2013-09-22 10:30:24 +02:00
Greg Sutcliffe
8a2da01d51 Add Mailgun endpoint for receiving email tasks via Mailgun 2013-09-21 12:43:22 +01:00
Reinier Balt
871e18922b refactor the cli examples in /doc and fix a small bug in todos_controller 2013-09-18 17:45:22 +02:00
Reinier Balt
bbf6cdf702 fix failing cucumber scenario's and update gems 2013-09-18 10:38:20 +02:00
Reinier Balt
62bc47b26b fix regression in recurring todos 2013-09-17 15:40:20 +02:00
Reinier Balt
a31c0a7a5d fix import for csv 2013-09-16 11:37:16 +02:00
Reinier Balt
94114746e7 Merge pull request #209 from iangreenleaf/monthly_recurring_bug 
Fix endlessly repeating monthly recurring todos
 2013-09-15 00:48:40 -07:00
Ian Young
a6c32889ce Bug repeating monthly recurring todos 2013-09-14 18:12:56 -07:00
Ian Young
aff7069c0e Fix bug assigning value from every_x_day input 2013-09-13 23:15:11 -07: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
Reinier Balt
eaa66be698 fix deprecation warnings 2013-09-13 16:44:59 +02:00
Matt Rogers
b343d0a09e Merge pull request #207 from ajanauskas/refactor/session_expire_method 
Refactor session expire method
 2013-09-13 06:16:23 -07:00
Reinier Balt
e2eb31cfcc Merge pull request #206 from mmozuras/refactor_unless_blanks_into_presents 
Refactor unless blanks into presents
 2013-09-13 06:08:16 -07:00
Andrius Janauskas
0150e9f2c3 Refactor session expire method 2013-09-13 16:04:12 +03:00
Reinier Balt
35d0afdfdf Merge pull request #205 from mmozuras/refactor_negative_blanks_into_presents 
Refactor negative blanks into presents
 2013-09-13 05:56:03 -07:00
Mindaugas Mozūras
25e764b21a Refactor "unless blank?" into "if present?" 2013-09-13 15:40:09 +03:00
Mindaugas Mozūras
a97848f0ba Refactor negative blank? into present? 2013-09-13 15:19:25 +03:00
Mindaugas Mozūras
962b4fa5c9 Use respond_to { |format| format.any } to reduce duplication 2013-09-13 14:58:28 +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
4ca6114b76 weekly days were not getting through to the update of a recurring weekly todo 2013-09-05 20:18:14 +02:00
Reinier Balt
3ef55f3b17 Hopfully fix #1434 by updating selectors first. Same fix as #1431 but now for update 
Conflicts:
	app/controllers/recurring_todos_controller.rb
 2013-09-05 20:13:28 +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
b0b39433d5 Merge branch 'master' into new-gui 2013-09-05 12:24:47 +02:00
Reinier Balt
fee1e3b504 fix failing test on timezones and remove debug message 2013-09-05 12:23:26 +02:00
Reinier Balt
cb46a8461e fix show_from not being clear when a todo comes from tickler 2013-09-05 12:21:43 +02:00
Reinier Balt
d7076ca4f9 remove executable modes from these image files 2013-09-05 10:39:06 +02:00