Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-16 04:08:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2804 commits 31 branches 36 tags 33 MiB
Commit graph

2804 commits

This branch
This branch
All branches
Author SHA1 Message Date
Reinier Balt
d670839460 Merge branch 'master' into new-gui 2013-07-13 23:19:42 +02:00
Reinier Balt
a201ecf737 Merge pull request #187 from TracksApp/https-gemfile 
Use HTTPS URIs for git repos
 2013-07-09 08:07:53 -07:00
Matt Rogers
8e4154e24a Use HTTPS URIs for git repos 2013-07-09 09:56:52 -05:00
Reinier Balt
c7aa8ca597 add submenu to todos 2013-07-06 13:20:58 +02:00
Reinier Balt
c5884a3f3c Merge branch 'master' into new-gui 2013-07-05 17:03:36 +02:00
Reinier Balt
9f4cec3117 Fix #1433 by adding login and print stylesheets to asset pipeline 2013-07-05 17:03:01 +02:00
Reinier Balt
9522a611cd Merge pull request #186 from rnck/mylocalisation 
updated german locale de.yml
 2013-07-03 06:52:05 -07:00
Heiko Reincke
3ccefa4e06 updated german locale de.yml 2013-07-03 08:45:27 +02:00
Reinier Balt
db29b84f69 add keyboard shortcuts and make todos selectable useing j and k 2013-07-01 15:56:54 +02:00
Reinier Balt
b725b7b137 clean up menu bar 2013-06-28 09:46:21 +02:00
Reinier Balt
8e0013d0df add shortcuts, help dialog and start on add-action dialog 2013-06-27 22:47:34 +02:00
Reinier Balt
972210326a change look of todo 2013-06-27 22:47:11 +02:00
Reinier Balt
b79efb3f31 Merge branch 'master' into new-gui 2013-06-25 16:51:05 +02:00
Reinier Balt
e03514886c update gemfile for rails4 final release 2013-06-25 16:50:07 +02:00
Reinier Balt
ab0006dc34 initial port of context-show view 2013-06-22 16:04:17 +02:00
Reinier Balt
7da6c6cad4 add navigation to application layout 2013-06-22 13:48:06 +02:00
Reinier Balt
4770857d76 Merge branch 'rails4' into new-gui 2013-06-21 10:20:49 +02:00
Reinier Balt
d64f6e003e Merge branch 'master' into rails4 
Conflicts:
	Gemfile.lock
 2013-06-21 10:20:36 +02:00
Reinier Balt
b6dc330ab0 migrate login page 2013-06-21 10:18:02 +02:00
Reinier Balt
40eb14fc1a remove niftycorners and superfish 2013-06-21 09:23:39 +02:00
Reinier Balt
a380799d74 remove old assets and archive layout files 2013-06-21 09:02:25 +02:00
Reinier Balt
680872aafc install bootstrap 2013-06-21 08:53:35 +02:00
Reinier Balt
9bb3702d78 install mousetrap 2013-06-21 08:52:19 +02:00
Reinier Balt
40704b3e98 add bootstrap and mousetrap 2013-06-21 08:52:06 +02:00
Reinier Balt
f4908f2b7b fix cache invariant for grouped todos in context and project view 2013-06-19 17:47:51 +02:00
Reinier Balt
1ae6e13f1d update gems 2013-06-19 16:50:02 +02:00
Reinier Balt
64d3e802f2 fix #1406. fix #1431. set recurring_period first before setting other attributes 2013-06-19 16:42:35 +02:00
Reinier Balt
2daffef683 fix failing tests 2013-06-17 10:06:38 +02:00
Reinier Balt
20b4b626fe update for rails4rc2 2013-06-17 09:32:46 +02:00
Reinier Balt
4a485558e2 Merge branch 'master' into rails4 
Conflicts:
	Gemfile.lock
	config/routes.rb
 2013-06-17 09:25:02 +02:00
Reinier Balt
56b884055f fix #1270. if start-from fits the recurrence pattern, the first todo should use the start-from date 
this is use-case 2 mentioned in the ticket.
 2013-06-11 23:38:30 +02:00
Reinier Balt
3a2af7caf2 update CHANGELOG [ci skip] 2013-06-11 16:30:32 +02:00
Reinier Balt
be1a9528d5 move the two toggle links in top-right to view menu 2013-06-11 16:13:46 +02:00
Reinier Balt
7084c11263 fix failing tests 2013-06-11 15:36:27 +02:00
Reinier Balt
07de6a8358 fix expiration test. it was missing a rendering 2013-06-11 15:24:20 +02:00
Reinier Balt
0a57a68a87 Project and context view can now be grouped by context and project (using view menu) 2013-06-11 11:12:21 +02:00
Reinier Balt
591e20c9f1 update gems 2013-06-11 11:11:40 +02:00
Reinier Balt
9c56416dcb Merge pull request #184 from mattr-/cucumber-login-backdoor 
Move the expire_session route
 2013-06-10 21:52:25 -07:00
Matt Rogers
931791edfd Move the expire_session route 
It's now in the cucumber login helper.
 2013-06-10 14:30:12 -05:00
Reinier Balt
0a10a2050b Merge pull request #183 from mattr-/cucumber-login-backdoor 
Add login backdoor to speed up the cucumber test suite
 2013-06-09 21:49:00 -07:00
Reinier Balt
0e8552ac4e fix #1273. Used the wording suggested in this ticket. 2013-06-05 16:58:52 +02:00
Reinier Balt
b6bf21987d add new rvm dotfiles to gitignore 2013-06-05 16:30:03 +02:00
Matt Rogers & Katrina Owen
2c5aff3b36 Add login backdoor to speed up the cucumber test suite 2013-06-04 19:39:06 -05:00
Reinier Balt
651e45d389 merge i18n keys to better support fr locale and update en, fr and nl locale for the change 
es was updated by tolk, but no changes in content
 2013-06-04 11:47:47 +02:00
Reinier Balt
b6e110c917 fix #1422. Changing default tags of a project is now remembered 
when not updating the whole page
 2013-06-04 10:50:42 +02:00
Reinier Balt
ee9951403e fix #1419 for master too: do not show new todo that was added with show_from set 2013-06-04 10:31:29 +02:00
Heraldo Esquiche
f8300de7df Update es.yml 
manually merged with 2.3devel
 2013-06-04 10:19:36 +02:00
Reinier Balt
a8af880647 fix #1417. We now handle unblocking a todo that is part of a hidden project or context 2013-06-04 10:07:02 +02:00
Reinier Balt
2921746409 fix manual merge error 2013-06-03 15:21:19 +02:00
Reinier Balt
02d4afb724 fix #1429 by correctly handling tags with dots 
This was a very old regression. This used to work before the rails 3.2 upgrade... Added tests
to prevent future unnoticed breakage
 2013-06-03 15:20:13 +02:00