Commit graph

600 commits

Author SHA1 Message Date
Carsten Otto
2039ae05db document code
This helps solving the TODO mentioned a few lines above
2015-06-15 09:46:47 +02:00
Dan Rice
8dd4970b0c Merge branch '2.3_branch' 2015-06-14 18:20:08 -04:00
Dan Rice
ebec4f089d Merge pull request #1875 from C-Otto/tracks-1836
(2.3) Provide data needed for partial views
2015-06-14 18:15:59 -04:00
Carsten Otto
4ce7c6bcd4 Provide data needed for partial views
The partials for context and project need to compute the
context's/project's id, which is done based on @context/@project.
Provide this data.

Fixes #1836
2015-05-22 23:02:41 +02:00
Carsten Otto
bba13194fd show dependency validation errors in action edit form 2015-05-22 20:51:27 +02:00
Carsten Otto
fd8f4e2b32 Fix syntax 2015-05-22 20:51:27 +02:00
Carsten Otto
82ac4e22b0 fix syntax 2015-05-14 15:51:49 +02:00
Carsten Otto
a29009d3da replace 'None' project by empty string, fix #440 2015-05-10 14:08:20 +02:00
Dan Rice
1dbef179a7 Revert breaking commits
This reverts the following commits:
319d4b00cd
403cc1015e
37485013a0
d08ffb3806
2015-04-14 23:28:18 -04:00
Dan Rice
556c68c2e6 Revert breaking commits
This reverts the following commits:
c129b8a06f
c7c923a317
006c135a64
2015-04-14 22:26:07 -04:00
Carsten Otto
aa14a8e802 Sort by 'show_from' in tickler 2015-04-13 16:25:44 +02:00
Reinier Balt
55e28d90a9 Merge pull request #1805 from C-Otto/tracks-1727
Sort deferred actions by "show from" in tickler, #1727
2015-04-13 16:24:17 +02:00
Reinier Balt
d08ffb3806 do not compare at_midnight in different timezones.
Use localtime to make sure both dates are in the
same timezone
2015-04-13 15:35:09 +02:00
Reinier Balt
006c135a64 do not compare at_midnight in different timezones.
Use localtime to make sure both dates are in the
same timezone
2015-04-13 15:33:22 +02:00
Carsten Otto
502543f348 typo 2015-04-13 14:38:37 +02:00
Carsten Otto
32b48df78f catch exception to show error message in GUI as before 2015-04-13 14:37:25 +02:00
Carsten Otto
1ed137afa9 Sort by 'show_from' in tickler 2015-04-12 23:24:00 +02:00
Reinier Balt
5e8ce9f460 Merge pull request #1800 from C-Otto/typos
Typos
2015-04-12 17:39:30 +02:00
Carsten Otto
ca9a4a1f44 typo 2015-04-04 18:10:23 +02:00
Carsten Otto
2dfe740086 catch exception to show error message in GUI as before 2015-03-25 10:12:56 +01:00
Matteo Giaccone
d7fbcb10c4 Fix #1722 2015-02-22 17:04:46 -05:00
Matteo Giaccone
ed9063bffa Fix #1722 2015-02-22 18:54:24 +00:00
Carsten Otto
dfe8735c0d rename repeating -> recurring, repeat -> recurrence 2015-02-10 16:25:27 +01:00
Carsten Otto
d480569629 occurence -> occurrence 2015-02-10 15:49:13 +01:00
Carsten Otto
705f307bfb fix typos 2015-02-09 23:24:19 +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
Dan Rice
b9f3b9685f Merge pull request #1733 from dnrce/password-hashing
Remove support for deprecated password hashing algorithm
2014-12-14 14:35:32 -05:00
Dan Rice
ea0d40060a Remove support for deprecated password-hashing algorithm
* Remove all methods implementing and checking for the old algorithm
* Document a pre-upgrade step to check for remaining obsolete passwords
* Remove config.salt
2014-11-15 10:28:29 -05: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
Dan Rice
0cd8a1a3ee Allow CloudMailin to skip CSRF verification 2014-09-08 01:31:28 -04:00
Dan Rice
45232cd2dd Fix CloudMailin signature digest calculation
Adopt current (deprecated) code from
http://docs.cloudmailin.com/receiving_email/securing_your_email_url_target/

Fixes #1402
2014-09-08 00:55:46 -04:00
Matt Rogers
aa41e20e46 Remove trailing whitespace and tabs 2014-08-14 21:05:05 -05:00
Reinier Balt
bafd55cf09 refactor due date tag on todo for mobile and non-mobile view 2014-07-17 13:56:08 +02:00
Dan Rice
9125355313 Sync boilerplate with Rails 4.1.4 2014-07-07 21:25:24 -04:00
Dan Rice
9b92306252 Return a valid RecurringTodo after creation error
Fixes #1463
2014-06-19 01:17:15 -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
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
Reinier Balt
128da07fc2 remove Digest deprecation warning 2014-05-16 14:33:18 +02:00
Dan Rice
3c2c0fe065 Add mobile calendar view 2014-04-21 12:55:13 -04:00
Reinier Balt
a7807a4b66 dry form_helper using meta programming.
not sure if this improves readability, but codeclimate should be happier...
2014-03-31 09:43:39 +02: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
Reinier Balt
776a046465 move mapping of form attributes to model attributes from pattern to builder to make
pattern independent of form
2014-03-31 09:43:39 +02:00
Reinier Balt
1f36c27af8 small cleanups 2014-03-31 09:43:39 +02:00
Reinier Balt
c2c67f1640 use new model to handle updating of recurring todos 2014-03-31 09:43:39 +02:00
Reinier Balt
00af159be7 remove unused code and refactor builder to remove duplication 2014-03-31 09:43:39 +02:00
Reinier Balt
78c07d52b7 Start major refactoring of recurring_todos. Started with creating new recurring todos.
All current and new tests pass
2014-03-31 09:43:39 +02: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
5dabde222e dry previous commit even further 2014-01-07 20:49:37 +01:00