Commit graph

725 commits

Author SHA1 Message Date
Dan Rice
7781281243 Merge pull request #1801 from C-Otto/tracks-440
replace 'None' project by empty string
2015-05-14 21:25:28 -04:00
Carsten Otto
be8be4c558 replaceWith instead of html 2015-05-14 14:02:35 +02:00
Carsten Otto
a29009d3da replace 'None' project by empty string, fix #440 2015-05-10 14:08:20 +02:00
Carsten Otto
e1ab067dbb typo 2015-04-04 18:10:18 +02:00
Carsten Otto
d480569629 occurence -> occurrence 2015-02-10 15:49:13 +01:00
Dan Rice
70191af76b Merge branch '2.3_branch' into master 2015-01-02 21:25:34 -05:00
Matteo Giaccone
177971a70e Remove applescript integration. Closes #1723 2015-01-02 21:12:32 +00:00
Matteo Giaccone
bd78ad0670 Move right submit button in mobile new action 2014-12-15 23:21:34 +00:00
Matt Rogers
8d24f5105a Add a Sidebar class to represent the side bar
Start using it throughout the rest of the app instead of the various
instance variables
2014-11-11 19:55:00 -06:00
Reinier Balt
166387f0be Statistics for longest running projects now includes completed and hidden projects. fixes #1725 2014-11-05 17:09:59 +01:00
Reinier Balt
2883d1b7f4 Statistics for longest running projects now includes completed and hidden projects. fixes #1725 2014-11-05 17:07:21 +01:00
Xavi Vila
140942b01f added 'es' locale to data/index 2014-09-13 17:07:57 +02:00
Dan Rice
79587541d6 Use www.getontracks.org as canonical website URL
[ci skip]
2014-08-31 13:14:15 -04:00
Matt Rogers
aa41e20e46 Remove trailing whitespace and tabs 2014-08-14 21:05:05 -05:00
Reinier Balt
6191cce4c7 small refactorings of generated javascripts 2014-08-13 15:33:32 +02:00
Reinier Balt
8a3cb66e49 fix regression and refactor todos/update.js a bit 2014-08-13 15:33:32 +02:00
Reinier Balt
4cdbd9a451 move js genreated for ajax calls into their own object to prevent name clashes
I only modified the js that is most likely to be used in cocurrent calls. This because we
start the development of Tracks 3 that will change all js.
2014-08-13 15:33:32 +02:00
Reinier Balt
f0871738e9 put the javascript to handle marking todos complete in its own object with unique name
this should prevent concurrent running ajax calls to mess up the ui
2014-08-13 15:33:32 +02:00
Dan Rice
1e4f7c9f30 Update CSRF helper usage
Renamed back in Rails 3.1.0
2014-07-07 21:38:49 -04:00
Reinier Balt
5ed2de3ab0 remove custom solution to visually show that you are running in development
environment and replace with rack-dev-mark gem
2014-06-26 10:05:22 +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
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
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
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
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
9f55a45ec6 refactor search controller 2013-09-25 15:38:51 +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
Mindaugas Mozūras
25e764b21a Refactor "unless blank?" into "if present?" 2013-09-13 15:40:09 +03: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
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
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
Don Cruse
845ac14176 Moving label creation to helpers 2013-07-19 00:14:52 -05:00
Don Cruse
70f633c150 Shifting more instance variables to the controller
Also removing some instance variables that were never invoked in the
views. This sets up a future refactoring of the method of comptuting
rolling averages, which differs between the two types of "last year"
views being refactored.
2013-07-18 21:01:39 -05:00