Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-31 14:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2989 commits 35 branches 36 tags 32 MiB
Commit graph

2989 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
b543f530e8 add recent schema.rb 2014-03-04 17:08:22 +01:00
Reinier Balt
6077af3ed0 update gems including rails 2014-03-02 14:20:21 +01:00
Reinier Balt
39c52e03b4 fix failing tests 
the date in fixtures is not set by timecop. That doesn't help here
 2014-02-23 14:03:57 +01:00
Reinier Balt
a14686d1e2 Merge pull request #215 from maqiv/master 
Added possibility to add tracks as webapp on chrome mobile.
 2014-02-17 13:47:15 +01:00
maqiv
35d48ea4c4 Added possibility to add tracks as webapp on chrome mobile. 2014-02-17 13:38:49 +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
Dan Rice
a54f958f0d Fix a typo in the upgrade doc 2014-02-04 23:45:08 -05:00
Reinier Balt
1649d95374 update gemfile again and fix failing test 2014-01-31 17:44:54 +01:00
Reinier Balt
d14dc9a00c update Gemfile 2014-01-27 20:06:32 +01:00
Reinier Balt
b15d195c45 fix test regressions. should run all tests before committing :-) 2014-01-26 15:10:36 +01:00
Reinier Balt
63af3bbcfa make todo_from_rich_message time zone aware. test was failing. 2014-01-26 15:05:27 +01:00
Matt Rogers
76b0ec024a Merge pull request #214 from maddentim/fixes-recurring 
Fix #1451 recurring todo overlay z-index to be on top of topbar
 2014-01-24 19:50:24 -08: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
908149ea61 some features that were wip-ed because of cucumber issues seem to pass 2014-01-08 22:04:40 +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
Matt Rogers
3591911d7d Remove trailing whitespace 2014-01-04 12:22:20 -06:00
Reinier Balt
50dcbe92e0 force travis to use recent bundler to support ruby 2.1 2014-01-03 14:49:25 +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
008d3d4c3d fix mysql error on old migration. prevented ci from running 2014-01-02 19:41:02 +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
468274c5d1 fix tests for ruby 2.1 and add 2.1 to ci test matrix 2013-12-31 16:11:32 +01:00
Reinier Balt
17dca39d3a update gems and fix i18n and aasm deprecation warnings 2013-12-30 20:52:35 +01:00
Matt Rogers
b1c306b09e Fix the repo location in the install documentation 2013-11-05 19:24:39 -06:00
Reinier Balt
872ab50f83 Merge pull request #212 from GregSutcliffe/master 
Extend Email subject format with new fields
 2013-10-16 23:40:34 -07: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
Matt Rogers
1441d53808 Compare against an array instead of joining them into a string 
No need to create a string out of them to get a good comparison
 2013-10-15 20:03:01 -05:00
Matt Rogers
9fd4b845de Don't depend on the environment in the test 2013-10-15 20:02:52 -05:00
Matt Rogers
bae4b2a5b7 Require 'timecop' explicitly 
This works around a problem with bundler's autorequires when not using
a standard Rails environment.
 2013-10-15 20:02:52 -05: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
edb2ad7077 add missing tests for todo 2013-09-25 16:22:06 +02:00
Reinier Balt
9f55a45ec6 refactor search controller 2013-09-25 15:38:51 +02:00
Reinier Balt
11bc4294a8 add tests for done_todos 2013-09-25 15:08:25 +02:00
Reinier Balt
23d92411d3 avoid name clash 2013-09-25 13:40:30 +02:00
Reinier Balt
406eb47db7 move coverage to ci rake task 2013-09-24 09:48:21 +02:00