Commit graph

3253 commits

Author SHA1 Message Date
Carsten Otto
0b6bc291e0 there is no form on the project list page
no need to update anything
2015-06-15 10:31:44 +02:00
Carsten Otto
ff27f769e9 swap expected/actual 2015-06-15 09:47:49 +02:00
Carsten Otto
e5294f070f improve grammar in test 2015-06-15 09:47:49 +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
Dan Rice
d06b857676 Merge pull request #1884 from C-Otto/circular-dependencies
(2.3) Circular dependencies
2015-06-14 18:13:54 -04:00
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
Carsten Otto
04fdf8c620 add test for #1804 and #1836 2015-05-22 23:03:12 +02:00
Carsten Otto
0adad47857 re-add action in correct container if context is changed
fixes #1804
2015-05-22 23:02:47 +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
e7495e32b7 remove redundant code 2015-05-22 23:02:32 +02:00
Carsten Otto
131053fc1f cleanup test 2015-05-22 23:02:32 +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
73bb53e1e5 Still show action if it could not be added as predecessor
If it is added as a predecessor, other code takes care to hide the action.
For a very short time, barely noticeable, the action is shown moving back
to its original position.

See pull request #1777
2015-05-22 20:51:27 +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
82ac4e22b0 fix syntax 2015-05-14 15:51:49 +02: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