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

1519 commits

Author SHA1 Message Date
Carsten Otto
32a573d60b add in list instead of below 2015-04-16 23:10:49 +02:00
Carsten Otto
164cee695c sort after deleting recurring action 2015-04-16 23:10:49 +02:00
Carsten Otto
e451e2ed5e sort after adding to existing container 2015-04-16 23:10:49 +02:00
Carsten Otto
0469a990c5 sort when activating pending successors of deleted action 2015-04-16 23:10:49 +02:00
Carsten Otto
8fd8158840 sort when a pending successor is activated 2015-04-16 23:10:49 +02:00
Carsten Otto
00bd19b4ff sort when the next instance of a recurring todo is added 2015-04-16 23:10:49 +02:00
Carsten Otto
021d53f359 sort when a pending todo is activated 2015-04-16 23:10:49 +02:00
Carsten Otto
eb7b1e9ab6 sort after editing an action 2015-04-16 23:10:45 +02:00
Carsten Otto
0b00f36c60 sort after creating 2015-04-16 23:10:36 +02:00
Carsten Otto
cc88d24d79 Projects with completed actions may be blocked 
Currently, a project cannot be blocked if at least one completed
action exists. This was introduced in
acab98d4c7,
and I assume this change was not intended
 2015-04-15 20:46:53 +02:00
Carsten Otto
ead021b789 replace element instead nesting another div inside existing div 2015-04-15 20:40:55 +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
eb1012f1f2 typo 2015-04-13 14:38:27 +02:00
Carsten Otto
6017637abc do not activate already completed todos, fix #1778 2015-04-13 14:37:57 +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
cec2e535b2 fix #1754 2015-04-13 14:37:12 +02:00
Carsten Otto
1ed137afa9 Sort by 'show_from' in tickler 2015-04-12 23:24:00 +02:00
Dan Rice
af6fbede45 Merge pull request #1806 from dnrce/clean-image-assets 
Remove unused image assets
 2015-04-12 11:44:14 -04:00
Reinier Balt
5e8ce9f460 Merge pull request #1800 from C-Otto/typos 
Typos
 2015-04-12 17:39:30 +02:00
Reinier Balt
17c5edd7ae Merge pull request #1783 from C-Otto/bug-1778 
do not activate already completed todos, fix #1778
 2015-04-12 17:27:59 +02:00
Dan Rice
be9090d39f Remove unused image assets 2015-04-09 23:06:37 -04:00
Carsten Otto
ca9a4a1f44 typo 2015-04-04 18:10:23 +02:00
Carsten Otto
e1ab067dbb typo 2015-04-04 18:10:18 +02:00
Carsten Otto
2dfe740086 catch exception to show error message in GUI as before 2015-03-25 10:12:56 +01:00
Carsten Otto
0edc263c7e fix #1754 2015-03-24 11:27:36 +01:00
Carsten Otto
cfdafc69e3 do not activate already completed todos, fix #1778 2015-03-24 11:27:17 +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
Matt Rogers
04e3aebabe Use rails helpers for the promote to project menu item 2015-02-18 22:07:42 -06:00
Matt Rogers
8bb92833b5 Use rails helpers for the delete dependency menu item 2015-02-18 22:05:05 -06:00
Matt Rogers
6677af6f8f Use Rails helpers for the delete menu item 
Instead of creating id and routes manually, use the helpers that Rails
provides in order to do this for us.
 2015-02-18 08:24:08 -06:00
Matt Rogers
3bef4daacc Use Rails helpers for the edit button 
Instead of creating id and routes manually, use the helpers that Rails
provides in order to do this for us.
 2015-02-18 08:22:59 -06: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
f81efebd8c Merge pull request #1740 from dnrce/ruby-2.2 
Support Ruby 2.2
 2015-01-03 18:32:03 -05:00
Dan Rice
7f1246f42f Make User.projects.actionize deterministic 
Add project.id to the comparison to ensure consistent order when
counts are identical.
 2015-01-03 18:12:11 -05: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
13f8023ca0 Fix #1724 2015-01-01 18:16:40 -05:00
Matteo Giaccone
0d6e0efcee Fix warnings for Ruby 2.2 update 2015-01-01 13:43:48 -05:00
Matteo Giaccone
2ca90537ae Fix #1724 2014-12-19 21:17:35 +00:00
Matteo Giaccone
bd78ad0670 Move right submit button in mobile new action 2014-12-15 23:21:34 +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