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

3237 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Rice
70cd38460b Merge pull request #1890 from graaff/sanitize-version 
Provide minimum version for sanitize gem.
 2015-06-14 17:17:41 -04:00
Hans de Graaff
2d4be328c3 Provide minimum version for sanitize gem. 
The sanitize code in Tracks uses merge to copy Sanitize configurations,
but this was only introduced in version 3.0.0.
 2015-05-25 11:10:58 +02:00
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
Dan Rice
6f03b2256b Merge pull request #1864 from C-Otto/tracks-1841 
replaceWith instead of html
 2015-05-14 21:23:21 -04:00
Dan Rice
3227d17b8e Merge pull request #1858 from C-Otto/tracks-1856 
Add missing translation
 2015-05-14 20:50:53 -04:00
Carsten Otto
be8be4c558 replaceWith instead of html 2015-05-14 14:02:35 +02:00
Carsten Otto
ea3e1cafe8 no space after "TRACKS::" (cf. en.yml) 2015-05-14 12:54:11 +02:00
Carsten Otto
5c07585ad4 add missing translation for en+de 2015-05-13 23:54:49 +02:00
Carsten Otto
a29009d3da replace 'None' project by empty string, fix #440 2015-05-10 14:08:20 +02:00
Dan Rice
660238d2cf Merge pull request #1807 from dnrce/border-radius 
Use standard CSS for rounded corners
 2015-05-03 12:39:17 -04:00
Dan Rice
e6761731d1 Use standard CSS for rounded corners 
Remove Nifty Corners and prefixed CSS rules.
Browser support of CSS3 border-radius is excellent by now.
 2015-05-02 23:56:15 -04:00
Dan Rice
d7944c2464 Merge pull request #1824 from dnrce/remove-should 
Convert a .should expectation to expect()
 2015-04-15 14:07:22 -04:00
Dan Rice
7d7c3550f8 Convert a .should expectation to expect() 2015-04-15 09:58:30 -04:00
Dan Rice
be18133e08 Merge branch '2.3_branch' 2015-04-14 23:29:30 -04: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
Carsten Otto
700305055f Add step definitions to create deferred actions 2015-04-13 16:25:34 +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
23a36ca22d Merge pull request #1816 from C-Otto/cucumber-fix 
Fix cucumber test: select first menu
 2015-04-13 16:21:17 +02:00
Reinier Balt
22f0a2e587 Merge pull request #1815 from C-Otto/cucumber-version 
Update cucumber version
 2015-04-13 16:20:54 +02:00
Reinier Balt
82cabf8aee Merge pull request #1814 from C-Otto/tracks-1448 
retain tags from action when transforming into project
 2015-04-13 16:19:55 +02:00
Reinier Balt
319d4b00cd fix failing tests with use of localtime 2015-04-13 15:57:57 +02:00
Reinier Balt
403cc1015e fix a few more timezone issues with the use 
of localtime
 2015-04-13 15:52:54 +02:00
Reinier Balt
c129b8a06f fix a few more timezone issues with the use 
of localtime
 2015-04-13 15:48:20 +02:00
Reinier Balt
37485013a0 discard time in these tests since they are 
irrelevant here
 2015-04-13 15:43:32 +02:00
Reinier Balt
c7c923a317 discard time in these tests since they are 
irrelevant here
 2015-04-13 15:42:35 +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
f3c36e6e04 Fix typo 2015-04-13 14:39:05 +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
12ee2ed5e3 typo 2015-04-13 14:38:09 +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
Dan Rice
1dc21daef2 Merge pull request #1817 from C-Otto/fix-typo 
Fix typo
 2015-04-12 17:53:28 -04:00
Carsten Otto
1ed137afa9 Sort by 'show_from' in tickler 2015-04-12 23:24:00 +02:00
Carsten Otto
bf8b118ebf Add step definitions to create deferred actions 2015-04-12 23:24:00 +02:00
Carsten Otto
58fc98887e Fix typo 2015-04-12 23:10:48 +02:00
Carsten Otto
a23011c88b select first menu 
in 'Scenario: Deleting a todo will remove it from the calendar'
there may be two menus if the test is run on the last day of
the month
 2015-04-12 22:11:22 +02:00
Carsten Otto
675f1224b4 use newer version to fix problems with firefox 35+ 
selenium-webdriver older than 2.45 does not work with firefox 35 and newer
 2015-04-12 22:09:56 +02:00
Carsten Otto
65fe3ad202 remove outdated comment 
The comment is outdated in the sense that the limitation to versions lower
than 2.14 was dropped three years ago (ca7d81d). In other words, tracks
used newer versions for quite a while now, so this comment does not make
sense anymore.
 2015-04-12 22:03:46 +02:00
Carsten Otto
229c515e71 retain tags from action when transforming into project 2015-04-12 21:57:23 +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