Commit graph

16055 commits

Author SHA1 Message Date
Steffen van Bergerem
032e292e82 Update markdown-it 2015-07-20 03:39:08 +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
Benjamin Neff
8bf54e32ae create temporary fixture tests and remove old tests 2015-07-14 05:50:26 +02:00
Benjamin Neff
f875be8d5b use federation-gem for webfinger/hcard generation
remove old webfinger/hcard generation code

this fixes #5143
2015-07-14 05:50:26 +02:00
realtin
9eadc251ae added post guid to the post_serializer
closes #6185
2015-07-11 00:17:01 +02:00
zaziemo
787c1cfce9 add spec and code to include guid in comment's export
#6115
2015-07-11 00:16:24 +02:00
Benjamin Neff
2df4a1cc5c add logfile-appender in test environment
closes #6175
2015-07-09 09:02:04 +02:00
Dennis Schubert
b5b5f1f028 Revert "Issue #6145: Set a fixed body-height" for global side effects
This reverts commit 990c678cd3.
2015-07-07 02:50:30 +02:00
Haidy777
990c678cd3 Issue #6145: Set a fixed body-height
closes #6169
2015-07-07 02:46:34 +02:00
Benjamin Neff
b0a9a6342f add url_to
closes #6168
2015-07-05 20:46:18 +02:00
Benjamin Neff
97f973b80a fix rubocop warnings in poor_mans_webmock.rb
and remove unused HttpPost mock
2015-07-05 20:44:24 +02:00
Benjamin Neff
f45e053316 remove unused publics_helper
the Subscriber stuff was removed in 2010:
f97218c005
2015-07-05 20:44:24 +02:00
Benjamin Neff
540b8df1b8 don't get url from hcard, is already set from webfinger
prepare for federation refactoring
2015-07-05 20:44:24 +02:00
Benjamin Neff
2294e59ee3 change public_url to atom_url and profile_url 2015-07-05 20:44:24 +02:00
Mohammed Rashid
c652374787 typo in spec [ci skip]
closes #6167
2015-07-05 12:22:23 +02:00
Johan
1e0d81190b updating es-VE locale
closes #6165
2015-07-04 10:48:35 +02:00
cmrd Senya
fe3ff10e07 Add new daily job to clean cache in public/tmp (as suggested in #5946). 2015-07-03 16:34:01 +02:00
theworldbright
d410d2ee76 Fix bug where flash error reappeared #6136
closes #6146
closes #6136
2015-07-03 05:25:22 +02:00
Jonne Haß
6601576149 Merge branch 'master' into stable 2015-07-02 11:11:58 +02:00
Jonne Haß
8624ebb921 bump to 0.5.1.2 2015-07-02 11:09:05 +02:00
Dennis Schubert
e92c8000ba Do not leak private profile fields in JSON format
Signed-off-by: Dennis Schubert <mail@dennis-schubert.de>
2015-07-02 10:07:59 +02:00
Steffen van Bergerem
4cda8675e6 Update markdown-it
closes #6150
2015-06-30 23:30:04 +02:00
Jonne Haß
3dc1eb2bdc Shorter Travis notification for IRC 2015-06-27 20:24:37 +02:00
Jonne Haß
070e785714 bump rails
closes #6140
2015-06-27 04:38:25 +02:00