Commit graph

16227 commits

Author SHA1 Message Date
Jonne Haß
b9bc20c7ce Backport statistics page to Bootstrap 2 2015-07-24 11:30:34 +02:00
Jonne Haß
c76cf90b62 Readd legacy services to statistics.json 2015-07-24 10:57:37 +02:00
Jonne Haß
d68b3f02bd Expose whether chat is enabled as NodeInfo metadata
related to #6211
2015-07-24 04:16:54 +02:00
Jonne Haß
b7064677ff Collapse StatisticsController into NodeInfoController 2015-07-24 03:51:31 +02:00
Jonne Haß
487b0d90ca Implement NodeInfo 2015-07-24 03:50:02 +02:00
Jonne Haß
2ae8b2f611 Load diaspora.yml overrides for test env 2015-07-24 03:47:46 +02:00
cmrd Senya
e30293b9c1 Enable the jasmine testsuite to work across LAN by setting its Host variable to "0.0.0.0" (instead of default 127.0.0.1) so you could test it with a foreign web browser.
closes #6234
2015-07-23 17:02:52 +02:00
Steffen van Bergerem
aa53763b98 Fix peeping tom on 404 error page
closes #6226
2015-07-22 11:55:24 +02:00
Steffen van Bergerem
f8bbe71f54 Remove correlations
closes #6223
2015-07-22 09:46:52 +02:00
Steffen van Bergerem
c8f482064c Remove rake_helpers 2015-07-22 09:41:53 +02:00
Jonne Haß
1dd76d7c60 Merge branch 'release/0.5.2.0' into stable 2015-07-20 17:48:10 +02:00
Jonne Haß
c0a0f5e076 updated 24 locale files [ci skip] 2015-07-20 17:45:09 +02:00
Jonne Haß
7c233aa216 Drop rails-assets-autosize from Gemfile.lock 2015-07-20 17:42:42 +02:00
Dennis Schubert
53c3ef1d2b Merge branch 'release/0.5.2.0' into stable 2015-07-20 03:52:22 +02:00
Steffen van Bergerem
b707ec9622 Update jasmine-ajax 2015-07-20 03:52:03 +02:00
Steffen van Bergerem
cf4143f4a1 Remove jquery-idletimer 2015-07-20 03:51:03 +02:00
Steffen van Bergerem
aa75572815 Update perfect-scrollbar 2015-07-20 03:44:48 +02:00
Steffen van Bergerem
7a8269ce05 Update jquery-placeholder 2015-07-20 03:42:58 +02:00
Steffen van Bergerem
60e3b0c55f Update highlightjs 2015-07-20 03:39:08 +02:00
Steffen van Bergerem
032e292e82 Update markdown-it 2015-07-20 03:39:08 +02:00
Ivan Korunkov
5ca9ca9844 Default home page: fix wiki link title; GitHub wiki is obsolete, because it has been moved from GitHub to independent resource.
closes #6212
2015-07-20 01:31:22 +02:00
Ivan Korunkov
c98dacdfab Default home page: fix indent level; fix indentation level for configuration message block to make it looks like other blocks. 2015-07-20 01:29:00 +02:00
Jonne Haß
ccf2fad903 Start 0.5.3.0 development cycle 2015-07-20 00:57:24 +02:00
Rich**
48f5aed63e Make default conversation subject translatable and properly capitalize it
closes #6206, closes #6205
2015-07-17 20:20:00 +02:00
JoeBew42
e21dad780d Refactoring tests on photo saved with and without EXIF data
closes #6183
2015-07-16 11:12:12 +02:00
Dennis Schubert
e7a2775cb5 Bump redcarpet 2015-07-16 10:45:32 +02:00
realtin
d0b290ea4d refactor hash indentation and add double quotes
this is the suggested styling according to hound/pronto/rubocop
(#6192)
2015-07-16 03:08:34 +02:00
zaziemo
c5a2334fbe refactor tests to use let
instead of before blocks creating instance variables
pronto checked

#6192
2015-07-16 03:05:21 +02:00
realtin
8823bb01a2 refactor test to use let and better indentation
(#6192)
2015-07-16 03:05:20 +02:00
zaziemo
56e0d3d57d Remove one comment and change hash syntax
#6192
2015-07-16 03:05:20 +02:00
zaziemo
f52260ec68 Delete test because it didn't have an expectation
and dipatch is also called in the following test
#6192
2015-07-16 03:05:20 +02:00
realtin
62b375bb8e refactor test to use let
instead of instance variables
(#6192)
2015-07-16 03:05:20 +02:00
realtin
1503376fa6 refactor test to not use send method
since dispatch method is not private
(#6192)
2015-07-16 03:05:20 +02:00
realtin
880886bbad refactor test to use let instead of instance variables 2015-07-16 03:05:20 +02:00
zaziemo
5fba53a105 refactor even more tests 2015-07-16 03:05:20 +02:00
realtin
3ff33d355f refactor test to use let 2015-07-16 03:05:20 +02:00
zaziemo
e1e8856e8d refactor more specs 2015-07-16 03:05:20 +02:00
zaziemo
e3fe375849 correct indentation and use new hash syntax 2015-07-16 03:05:20 +02:00
zaziemo
fccb5dae23 refactor test: replacing instance variables in before blocks, renaming variables for easier understanding, simplify test set up with less different comments, correct two tests 2015-07-16 03:04:41 +02:00
realtin
a9919fabd1 refactor test to use let and rm unused variables 2015-07-16 03:00:08 +02:00
zaziemo
d86a768590 refactor test using let and subject instead of before 2015-07-16 03:00:08 +02:00
realtin
7f3737b13f refactor test to use let rather then instance variables 2015-07-16 03:00:08 +02:00
zaziemo
abf87889a0 refactor test by using let instead of before block when creating instance variables 2015-07-16 03:00:08 +02:00
Jonne Haß
9b3ff1a416 Use commit_subject for Travis IRC notifications
commit_message has newlines which break the rather naive
IRC client Travis uses
2015-07-15 15:48:41 +02:00
Benjamin Neff
0c8651d703 fix federation-gem for ruby 2.0 2015-07-15 01:33:36 +02:00
Rich
0c3323088d Rephrase 'Enter an email'
One does not simply 'enter an email' (should I enter a random email from my Inbox?), instead one enters ones own email address.

closes #6191
2015-07-14 22:05:34 +03:00
Alex Chvatal
634aa7b09a capitalize Wiki in the links sidebar. closes #6188
closes #6193
2015-07-14 09:58:43 +02:00
Benjamin Neff
e4ca9f01e2 fix jsxc_helper_spec and use new url_to in jsxc_helper
closes #6151
2015-07-13 23:52:13 +02:00
Benjamin Neff
edc3ac6908 write tests for federation callbacks 2015-07-14 05:50:26 +02:00
Benjamin Neff
804784ed3f fix @pod_uri/@pod_url and add url_to to AppConfig 2015-07-14 05:50:26 +02:00