Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-31 14:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3195 commits 35 branches 36 tags 32 MiB
Commit graph

3195 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Rice
1dc21daef2 Merge pull request #1817 from C-Otto/fix-typo 
Fix typo
 2015-04-12 17:53:28 -04:00
Carsten Otto
58fc98887e Fix typo 2015-04-12 23:10:48 +02:00
Dan Rice
db62ebd074 Update Gemfile.lock 
Wasn't updated properly in 5718eac5c
 2015-04-12 11:53:35 -04:00
Dan Rice
4d0b55355e Update SQLite support status in install docs 
SQLite is fully supported as of #1766.
 2015-04-12 11:48:34 -04: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
Reinier Balt
dc6653daea Merge pull request #1777 from C-Otto/circular-dependencies 
fix #1754
 2015-04-12 17:21:52 +02:00
Reinier Balt
2a9469f672 Merge pull request #1766 from dnrce/test-multiple-dbs 
CI test on both MySQL and SQLite
 2015-04-12 17:19:09 +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
1609546aa1 typo 2015-03-25 10:12:06 +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
Dan Rice
5718eac5c3 Bump Rails to 4.1.10 2015-03-23 23:30:31 -04:00
Dan Rice
a51cfca9d6 Update copyright year 2015-03-23 23:25:58 -04:00
Dan Rice
c8ce5f03ed Merge pull request #1769 from dnrce/thin 
Use Thin instead of WEBrick
 2015-03-14 14:25:12 -04:00
Dan Rice
ce7f1a62c6 Use Thin instead of WEBrick 2015-03-13 00:25:58 -04:00
Dan Rice
08443e1faf Merge pull request #1774 from dnrce/remove_cache_digests 
Remove cache_digests gem
 2015-03-13 00:24:41 -04:00
Dan Rice
85603a2e79 Merge branch '2.3_branch' 2015-03-08 20:51:18 -04:00
Dan Rice
9423cf4d14 Revert to stock config.ru 
Fixes #1772
 2015-03-08 20:50:27 -04:00
Dan Rice
2af9e4981b Remove cache_digests gem 
cache_digests was the precursor to the native "Russian doll caching" built into Rails 4
 2015-03-08 20:08:34 -04:00
Matt Rogers
620bcd136e Merge pull request #1767 from dnrce/therubyracer-gem-group 
Place therubyracer in a gem group
 2015-02-24 22:04:34 -06:00
Dan Rice
f4925dd806 Place therubyracer in a gem group 2015-02-24 21:29:10 -05:00
Dan Rice
3d6239638f Merge pull request #1765 from GregSutcliffe/master 
Update install doc to use db groups
 2015-02-24 21:08:17 -05:00
Greg Sutcliffe
cfd677313d Update install doc to use db groups 2015-02-24 20:14:00 +00:00
Dan Rice
4405015384 CI test on both MySQL and SQLite 2015-02-22 18:19:48 -05:00
Matteo Giaccone
d7fbcb10c4 Fix #1722 2015-02-22 17:04:46 -05:00
Dan Rice
0f336c4e2f Merge pull request #1743 from matjack1/fix-1722 
Fix #1722
 2015-02-22 16:44:51 -05:00
Matteo Giaccone
ed9063bffa Fix #1722 2015-02-22 18:54:24 +00:00
Dan Rice
ef33ce5bbc Merge pull request #1764 from GregSutcliffe/master 
Add db bundler groups so they can be excluded with --without
 2015-02-21 14:59:58 -05:00
Greg Sutcliffe
663559f158 Add db bundler groups so they can be excluded with --without 2015-02-21 18:39:22 +00:00
Dan Rice
382cd58cd4 Merge pull request #1763 from TracksApp/use-rails-helpers 
Use the Rails helpers in more places
 2015-02-18 23:36:03 -05: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
Dan Rice
e39177b82d Merge pull request #1758 from C-Otto/repeating-recurring 
repeating -> recurring, repeat -> recurrence
 2015-02-10 10:58:06 -05:00
Carsten Otto
dfe8735c0d rename repeating -> recurring, repeat -> recurrence 2015-02-10 16:25:27 +01:00
Dan Rice
ab02d09830 Merge pull request #1759 from C-Otto/occurrence 
occurence -> occurrence
 2015-02-10 10:06:39 -05:00
Carsten Otto
d480569629 occurence -> occurrence 2015-02-10 15:49:13 +01:00
Dan Rice
d1cd4b68eb Merge pull request #1757 from C-Otto/typos 
Fix typos and an error message description
 2015-02-10 09:23:14 -05:00
Carsten Otto
bef79d135a fix test error message 2015-02-09 23:24:19 +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
Dan Rice
31217762a0 Merge pull request #1744 from matjack1/remove-applescript 
Remove applescript integration. Closes #1723
 2015-01-02 21:06:06 -05:00