Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-25 03:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3373 commits 32 branches 36 tags 32 MiB
Commit graph

620 commits

Author SHA1 Message Date
Dan Rice
dbd2aa71b3 Merge branch '2.3_branch' 2015-08-30 11:43:10 -04:00
Matt Rogers
dd6b9f0359 Merge pull request #1917 from lrbalt/fix-content-type-attachment 
remove old hack to set content type to application/html
 2015-08-20 11:23:21 -05:00
Reinier Balt
5092b388fe Fasterer: Parallel assignment is slower 
Parallel assignment is slower than sequential assignment.
Only got the low hanging fruit. There are some functions that
have multiple return values. Fixing this needs more refactoring.
 2015-08-19 15:12:52 +02:00
Reinier Balt
9f81e1a5c3 fasterer: Use attr_reader for reading ivars. 2015-08-19 14:52:13 +02:00
Reinier Balt
0d224a5fe9 fasterer: hash#fetch with block is faster 
hash#fetch with block is faster than hash#fetch with
second parameter
 2015-08-19 14:49:52 +02:00
Reinier Balt
ddd9c07d3b Fasterer: Use &:symbol is faster 
Calling argumentless methods within blocks is slower than using
symbol to proc.
 2015-08-19 14:48:31 +02:00
Reinier Balt
f7f10b8a61 remove old hack to set content type to application/html 
This prevents attachments to be seen as something different than
html content. For example, message/rfc822 for email was being
replaced by application/html causing wrong application to be
started on the client.
 2015-08-19 14:27:26 +02:00
Carsten Otto
1fa6a182c1 remove context if name is not set in update form 
fixes #1839
 2015-08-09 13:42:29 +02:00
Matt Rogers
bb934b6474 Remove the Google Gadget Integration 
Google has discontinued the "Add any gadget by URL" Labs feature. Remove
the feature from the application.
 2015-08-07 21:31:00 -04:00
Matt Rogers
486204c1d7 Merge pull request #1888 from C-Otto/tracks-1882 
navigate back to note's project after deletion
 2015-08-07 21:05:21 -04:00
Matt Rogers
bca2440ca0 Merge pull request #1857 from C-Otto/tracks-1852 
Show meaningful numbers in badge for completed projects and recurring actions
 2015-08-07 21:01:32 -04:00
Matt Rogers
f393afb69f Merge branch '2.3_branch' 
This brings the master branch up to date with the 2.3 release branch
 2015-08-07 20:27:14 -04:00
Matt Rogers
258528460d Merge pull request #1873 from C-Otto/default-context-choice-2.3 
(2.3) in tag view, do not use more-or-less random context for the form
 2015-08-07 20:02:01 -04:00
Matt Rogers
1c0a70df75 Merge pull request #1903 from lrbalt/fix-test-errors 
Fix failing tests for non-UTC timezones
 2015-08-07 19:50:58 -04:00
Reinier Balt
f2c6c2d3af show attachment in view and make it downloadable 2015-08-05 16:05:56 +02:00
Reinier Balt
e58379e81f This fixes failing tests when the timezone is different than utc 
There were several problems:
* Time.now returns the systems time, not the users time
* fixtures do not translate dates from timezone to utc, but stores the
  date verbatim
* calling a controller will set the timezone to the preference of the
  current_user. So it could be changed while you do not realize this. I
  fixed the failing test, but problems could be elsewhere
 2015-08-05 11:50:33 +02:00
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
65a2a727fb navigate back to note's project after deletion 
fixes #1882
 2015-05-23 22:39:32 +02: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
dd21e7466c in tag view, do not use more-or-less random context for the form 
See #1834 for a discussion
 2015-05-14 15:38:37 +02:00
Carsten Otto
5ffaf98c7b show 0-0 instead of 1-0 if no project/action exists 
limit maximum to actual number of projects/actions
 2015-05-14 12:53:24 +02:00
Carsten Otto
296b8135a1 make code of completed projects and completed recurring actions more similar 2015-05-13 23:46:35 +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