Commit graph

3269 commits

Author SHA1 Message Date
Matt Rogers
f234fbd4e8 Improve the buttons on the mobile interface
Add some padding so that they're larger and easier to hit with a finger
2015-07-24 22:28:22 -05:00
Dan Rice
6bcae280c3 Update jquery-rails
Address CVE-2015-1840
2015-06-20 12:32:06 -04:00
Dan Rice
577fa0b501 Merge pull request #1883 from suraia/favicon
Increase favicon size to 32x32 pixels
2015-06-19 12:04:59 -04:00
Michael Kuhn
1608faaf28 Add 32x32 favicon
It is based on apple-touch-icon.png and looks much better on HiDPI displays.
2015-06-19 17:38:45 +02:00
Dan Rice
c7359a3ec2 Merge branch '2.3_branch' 2015-06-17 20:48:11 -04:00
Dan Rice
4070f4e03a Version 2.3.0 2015-06-17 20:43:05 -04:00
Dan Rice
0dae5ccde0 Merge branch '2.3_branch' 2015-06-17 10:27:10 -04:00
Dan Rice
4c9685bb8b Merge pull request #1893 from dnrce/rails-4.1.11
Update Rails to 4.1.11
2015-06-17 10:22:27 -04:00
Dan Rice
da8f9828e0 Merge branch '2.3_branch' 2015-06-16 22:59:41 -04:00
Dan Rice
9c744bc452 Intelligently link to the latest release
[ci skip]
2015-06-16 22:54:30 -04:00
Dan Rice
f8b868d12b Update Rails to 4.1.11
Resolves #1877
2015-06-16 20:49:19 -04:00
Dan Rice
2c36e22a18 Merge pull request #1819 from C-Otto/cleanup
Cleanup
2015-06-16 20:47:44 -04:00
Dan Rice
b70e92738e Merge branch '2.3_branch' 2015-06-16 20:44:57 -04:00
Carsten Otto
67ced62096 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-06-16 20:44:26 -04:00
Dan Rice
5bf60bb0e6 Merge pull request #1808 from C-Otto/blocked_projects
Projects with completed actions may be blocked
2015-06-16 20:44:17 -04:00
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
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
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