nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16483 commits 4 branches 0 tags 121 MiB
Commit graph

16483 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dennis Schubert
7e9da88601
Bump devise-token_authenticatable 2016-05-12 12:11:44 +02:00
Dennis Schubert
2b45ba67c6
Bump database_cleaner 2016-05-12 12:09:24 +02:00
Dennis Schubert
4c06540f22
Bump carrierwave 2016-05-12 12:09:24 +02:00
Dennis Schubert
b72fd03a31
Bump autoprefixer-rails 2016-05-12 12:06:36 +02:00
Dennis Schubert
02ea344636
Bump activerecord-import 2016-05-12 12:04:43 +02:00
Dennis Schubert
f725349f18
Bump active_model_serializers 2016-05-12 12:04:43 +02:00
Dennis Schubert
f95ccdf979
Bump rails 2016-05-12 12:04:43 +02:00
Dennis Schubert
6bc1419cbe Prepere 0.5.10.0 cycle 2016-05-09 00:59:58 +02:00
Ralin Chimev
1773e3e35d Do not change notification timestamp when making it read or unread. 
Marking a notification as unread resets the timeago stamp causing
the times to look wrong. It can be reproduced by marking an old
notification as unread. Using the update_column instead of
update_attribute will not touch the updated_at attribute, and
thus will not affect the updated time ago in the view.

Fixes #6798.

closes #6821
 2016-05-07 18:52:27 +02:00
sjain1107
4cd2f1d9c1 Add inviter diaspora-ID to the invite email #6796 
closes #6817
 2016-05-06 02:20:31 +02:00
Senya
ce6b1a3c0c Clear unused regex in mention.rb 
The REGEX is unused

closes #6810
 2016-05-05 17:59:37 +02:00
Jonne Haß
8fe11d7da7
Workaround https://github.com/travis-ci/travis-ci/issues/329 by 
encrypting the channel setting

Courtesy of https://github.com/mozilla/build-tools/commit/c13a297
 2016-04-27 11:55:05 +02:00
Steffen van Bergerem
61d27c3391 Add Changelog for #6782 [ci skip] 2016-04-13 22:17:56 +02:00
Flaburgan
52d1084cb1 Fix back to top icon not appearing on webkit browsers 2016-04-13 22:14:39 +02:00
Dennis Schubert
dc4604bcd9 Merge branch 'master' into stable 2016-04-04 03:11:49 +02:00
Dennis Schubert
ec6ad16d94 Merge branch 'release/0.5.8.0' 2016-04-04 03:10:13 +02:00
Dennis Schubert
eba9e8f829 Prepare 0.5.9.0 cycle 
[ci skip]
 2016-03-30 16:52:00 +02:00
Lukas Matt
a3ac1e3072 account_deletions get stuck while selecting participations 
Following query takes over 20 minutes and fills up the database:
SELECT * FROM participations WHERE author_id = XXXXX

On servers with a huge participations-table this is a serious
performance issue which is easily fixed by the author_id index

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2016-03-30 16:20:55 +02:00
Dennis Schubert
4617629098 Add spec for PeopleHelper#birthday_format 
closes #6738
 2016-03-30 11:13:35 +02:00
Dennis Schubert
fbe77781ff Use 1004 as our placeholder birth year because 1004 was a leap year. (Well, actually, people in 1004 probably had no idea what a leap year is. Or red tests. Or code.) 2016-03-30 11:12:31 +02:00
Benjamin Neff
69f08a4a7e add fetch callbacks 2016-03-30 10:01:54 +02:00
Benjamin Neff
625eedf05d add "diaspora to federation entity" methods for posts 2016-03-30 09:45:46 +02:00
Benjamin Neff
a3ed9da210 changes for new federation-gem version 2016-03-30 09:45:46 +02:00
Benjamin Neff
c4ad63d106 bump diaspora_federation 
and bump typhoeus
 2016-03-30 09:45:46 +02:00
Benjamin Neff
d97448e552 remove ChromeFrame 
Google Chrome Frame was a plugin for Internet Explorer, but is no longer
supported. And it was included with http and not https which triggered a
warning on most pods.

Also set the minimum version to 9 to support #6557

closes #6751
 2016-03-21 14:04:24 +01:00
Benjamin Neff
6ea8cd546e don't change AppConfig.environment.url in jsxc_helper_spec 
closes #6748
 2016-03-18 07:24:40 +01:00
Benjamin Neff
67fbd02ae0 use AppConfig.url_to for generated urls for oembed 
_url doesn't with generate https if the pod uses https
 2016-03-18 07:24:25 +01:00
Dennis Schubert
4cb4ee0b5a Merge branch 'master' into stable 2016-03-08 22:55:51 +01:00
Dennis Schubert
9a8cecd89c Merge branch 'hotfix/0.5.7.1' 2016-03-08 22:53:49 +01:00
Dennis Schubert
352d732a37 Disable fetching of root posts for relayables 
since that could allow fetching spoofed/altered posts
thanks @supertux88
 2016-03-08 22:41:26 +01:00
Dennis Schubert
6270e22226 Start hotfix 0.5.7.1 2016-03-08 22:25:21 +01:00
Dennis Schubert
92fcbfbede Bump mysql2 2016-03-04 15:00:33 +01:00
Dennis Schubert
e00cbf62ae Bump js_image_paths 2016-03-04 14:53:02 +01:00
Dennis Schubert
558094409b Bump js-routes 2016-03-04 14:53:02 +01:00
Dennis Schubert
5eba267db2 Bump autoprefixer-rails 2016-03-04 14:53:02 +01:00
Dennis Schubert
9af3e957f6 Bump rails 2016-03-04 14:50:07 +01:00
Steffen van Bergerem
b98af83c9d Sort tag search result by name 
closes #6734
 2016-03-03 17:57:58 +01:00
Steffen van Bergerem
98d76af318 Remove empty test file, move i18n spec 
closes #6720
 2016-02-26 11:27:17 +01:00
Dennis Schubert
9f2e5b1868 Only mark unread notifications as read otherwise, the UPDATE statement would update all the notifications... 
closes #6711
 2016-02-23 09:38:34 +01:00
Steffen van Bergerem
0392549702 Add footer on conversations page 
closes #6710
 2016-02-23 06:35:15 +01:00
Dennis Schubert
fbabc541ae updated 111 locale files [ci skip] 2016-02-22 11:26:04 +01:00
Dennis Schubert
523197e779 Merge branch 'master' into stable 2016-02-22 05:00:12 +01:00
Dennis Schubert
56ebcc7600 Remove version number padding 
[ci skip]
 2016-02-22 04:58:36 +01:00
Dennis Schubert
6713995ebc Merge branch 'master' into stable 2016-02-22 04:53:46 +01:00
Dennis Schubert
81ced55fed Merge branch 'release/0.5.7.0' 2016-02-22 04:53:06 +01:00
Steffen van Bergerem
374679c093 Add rspec test for reset_authentication_token without current_user 
closes #6707
 2016-02-21 04:26:12 +01:00
Marien Fressinaud
27a8e0fbca Test if user is nil in #reset_authentication_token 
Actually it redirects to stream page and says that user is already logged in.

Fix https://github.com/diaspora/diaspora/issues/6326
 2016-02-21 04:24:50 +01:00
Steffen van Bergerem
02b330de70 Add jasmine test for aspect name form on contacts page 
closes #6706
 2016-02-21 04:19:33 +01:00
Saritha
7fe7287928 Fix for Empty input field when editing aspect name Fix #6548 2016-02-21 04:18:07 +01:00
Steffen van Bergerem
9eb0dddb1a Speed up asset serving in development 
closes #6702
 2016-02-16 11:19:04 +01:00