Commit graph

17650 commits

Author SHA1 Message Date
Steffen van Bergerem
d98574a351
Change 'Sign up' to 'Create account' 2016-06-20 23:27:38 +02:00
Dennis Schubert
68086fbf0b Merge branch 'stable' into develop 2016-06-20 05:24:49 +02:00
Dennis Schubert
962af9e2dd Start 0.5.11.0 cycle 2016-06-20 05:23:32 +02:00
Dennis Schubert
f1f7c41eda Remove unused Changelog headlines for 0.5.10.0
[ci skip]
2016-06-20 05:22:37 +02:00
Dennis Schubert
fb25718839 Merge pull request #6268 from svbergerem/redesign-default-haml
Redesign default.haml
2016-06-20 05:17:42 +02:00
Steffen van Bergerem
b1943f1e46
Redesign default.haml and add a podmin welcome page 2016-06-20 02:03:53 +02:00
Jonne Haß
03f6420ffd
Merge branch 'stable' into develop 2016-06-19 19:46:26 +02:00
Steffen van Bergerem
0d1d490e43
Update Contributor Covenant to v1.4.0
closes #6878
2016-06-19 19:46:19 +02:00
Jonne Haß
11d99d48b6
Merge branch 'stable' into develop 2016-06-19 18:08:46 +02:00
Jonne Haß
8ba0cb0c16
Revert "Fix flaky mentioning cukes"
This reverts commit 1811028835.
2016-06-19 18:05:46 +02:00
Jonne Haß
1ef3c1387b
Merge pull request #6872 from denschub/autolink-with-rel-noopener
Add rel="noopener noreferrer" to autolinks
2016-06-19 16:21:04 +02:00
Jonne Haß
0f8806c5f2
Merge branch 'stable' into develop 2016-06-19 16:20:37 +02:00
Steffen van Bergerem
1811028835
Fix flaky mentioning cukes
closes #6876
2016-06-19 16:20:02 +02:00
Jonne Haß
35a4998707
Merge branch 'stable' into develop 2016-06-19 16:14:13 +02:00
Dennis Schubert
898c3d404f
Throw exception if no templateName gets provided but allow setting templateName to false explicitly
closes #6877
2016-06-19 16:14:00 +02:00
Dennis Schubert
652050a87e Add rel="noopener noreferrer" to autolinks 2016-06-19 13:43:43 +02:00
Dennis Schubert
13684216f2 Download PhantomJS over http
since Travis' wget has no clue what SNI is
who needs security anyway, right?
2016-06-19 13:42:04 +02:00
Dennis Schubert
192699f051 Download phantomjs from our own mirrir
the Amazon S3 connection at Travis seems to be a bit flaky...
2016-06-19 12:41:29 +02:00
Jonne Haß
2cab7f02eb
Merge branch 'stable' into develop 2016-06-19 11:56:58 +02:00
Dennis Schubert
3ae3bfe520
Don't require guard-* gems 2016-06-19 11:53:02 +02:00
Dennis Schubert
eb1e1e1263 Merge pull request #6768 from svbergerem/poltergeist
Use Poltergeist instead of Selenium
2016-06-19 11:43:50 +02:00
Dennis Schubert
2b1942a9b3
Remove deprecated guard-cucumber arguments 2016-06-19 11:38:12 +02:00
Dennis Schubert
e0f31fb350
Remove jshint guard config 2016-06-19 11:38:12 +02:00
Dennis Schubert
76369f33c5
Remove pry-debundle 2016-06-19 11:38:12 +02:00
Dennis Schubert
d41711a383
Merge branch 'stable' into develop 2016-06-19 05:38:59 +02:00
Dennis Schubert
7fb6ffbb4d
Don't require guard-rspec
since it causes an ugly warning in the console!
2016-06-19 05:37:41 +02:00
Steffen van Bergerem
629e6382ec
Use Poltergeist instead of Selenium 2016-06-19 01:53:18 +02:00
Dennis Schubert
61fb7410cc
Merge pull request #6844 from cmrd-senya/unique-aspect-visibilities
Fix possible duplication of AspectVisibility
2016-06-19 01:49:41 +02:00
Dennis Schubert
49395c0a11
Merge pull request #6812 from cmrd-senya/6811-visibilities-id-overlap
Don't include wrong shareable types in scopes
2016-06-19 01:40:01 +02:00
Dennis Schubert
f1e296cc52 Merge pull request #6870 from svbergerem/update-status-message-text-prefill-mention
Update status message text after prefilling mentions
2016-06-19 01:03:26 +02:00
Dennis Schubert
2e2671120c Merge pull request #6869 from SuperTux88/fix-changelog_url-spec
fix spec for ApplicationHelper#changelog_url
2016-06-19 01:02:27 +02:00
Steffen van Bergerem
657eec29f0 Update status message text after prefilling mentions 2016-06-18 23:29:59 +02:00
Benjamin Neff
30ea6ef72f fix spec for ApplicationHelper#changelog_url 2016-06-18 23:12:29 +02:00
Dennis Schubert
c357d229ed Merge pull request #6868 from svbergerem/eslint-drop-max-nested-callbacks
Eslint drop max nested callbacks and add "=" marker to spaced comment
2016-06-18 10:45:57 +02:00
Steffen van Bergerem
c1734fd800 Add = marker to spaced comment eslint rule 2016-06-18 10:34:28 +02:00
Steffen van Bergerem
41b49341e2 Drop max-nested-callbacks from eslint config 2016-06-18 10:29:09 +02:00
Dennis Schubert
f9e0469183
Use a forked version of eslintrb for now
fixes #6866
upstream https://github.com/zendesk/eslintrb/pull/7
2016-06-17 07:32:31 +02:00
Dennis Schubert
0db7252630
Merge pull request #6863 from SuperTux88/remove-REDISTOGO_URL-deprecation
remove REDISTOGO_URL deprecation
2016-06-16 02:52:54 +02:00
Dennis Schubert
673740b93c
Merge pull request #6860 from svbergerem/eslint
Use eslint instead of jshint
2016-06-16 02:50:27 +02:00
Steffen van Bergerem
8ba1618fb5
Bump terminal-table 2016-06-16 02:41:48 +02:00
Steffen van Bergerem
cec7fcd964
Bump hamlit 2016-06-16 02:39:45 +02:00
Steffen van Bergerem
02bd6c3c3e
Bump eye 2016-06-16 02:39:37 +02:00
Dennis Schubert
45063bf08d
Merge branch 'stable' into develop 2016-06-16 02:39:20 +02:00
Steffen van Bergerem
0d9fe532e7
Bump ruby-progressbar 2016-06-16 02:34:05 +02:00
Steffen van Bergerem
7defbf93a8
Bump parser 2016-06-16 02:34:04 +02:00
Steffen van Bergerem
5e9b32cc00
Bump mime-types 2016-06-16 02:34:04 +02:00
Steffen van Bergerem
5f340484a0
Bump font-awesome-rails 2016-06-16 02:34:04 +02:00
Steffen van Bergerem
156f9dfd25
Bump fog-core 2016-06-16 02:34:04 +02:00
Steffen van Bergerem
d397568f98
Bump cucumber 2016-06-16 02:34:04 +02:00
Steffen van Bergerem
0fb2f8cd70
Bump ast 2016-06-16 02:34:04 +02:00