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

17602 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
db1dfbf698 Merge pull request #6829 from Zauberstuhl/bump_diaspora-prosody-config 
bump diaspora-prosody-config to v0.0.5
 2016-05-12 03:52:02 +02:00
Lukas Matt
1c5c4f10af
bump diaspora-prosody-config to v0.0.5 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2016-05-12 00:59:07 +02:00
Dennis Schubert
1fc60a9f82 Merge branch 'stable' into develop 2016-05-09 01:00:42 +02:00
Dennis Schubert
6bc1419cbe Prepere 0.5.10.0 cycle 2016-05-09 00:59:58 +02:00
Dennis Schubert
53808847a2 Merge branch 'stable' into develop 2016-05-07 18:52:34 +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
Dennis Schubert
209cd783c8 Merge pull request #6816 from cmrd-senya/publisher-refactor 
A minor refactor of the Publisher
 2016-05-06 02:23:54 +02:00
Dennis Schubert
230ec02ad7 Merge branch 'stable' into develop 2016-05-06 02:20:38 +02:00
sjain1107
4cd2f1d9c1 Add inviter diaspora-ID to the invite email #6796 
closes #6817
 2016-05-06 02:20:31 +02:00
Dennis Schubert
2131e3425a Merge pull request #6792 from Zauberstuhl/unicorn_killer 
Move unicorn_killer to Gemfile
 2016-05-06 02:13:07 +02:00
Dennis Schubert
fc97b654ab Merge pull request #6779 from Zauberstuhl/prosody_integration 
Configuration wrapper for Prosody
 2016-05-06 02:03:48 +02:00
Steffen van Bergerem
2263abdc82 Merge branch 'stable' into develop 2016-05-05 17:59:51 +02:00
Senya
ce6b1a3c0c Clear unused regex in mention.rb 
The REGEX is unused

closes #6810
 2016-05-05 17:59:37 +02:00
Steffen van Bergerem
05d632dcf2 Merge pull request #6820 from ralinchimev/fix-typo-in-scss 
Fix typo in _flash_messages.scss
 2016-05-05 17:55:50 +02:00
Ralin Chimev
5dfd242eeb Fix typo in _flash_messages.scss 
There is a missing s in „&.alert-success“.

Fixes #6797.
 2016-05-04 17:24:55 +03:00
Steffen van Bergerem
87da8f96d9 Merge pull request #6670 from Flaburgan/fix-horizontal-scrolling-mobile 
Fix horizontal scrolling on mobile profile
 2016-05-04 01:24:56 +02:00
cmrd Senya
ab718dbbc6
A minor refactor of the Publisher 
There was a minor copy-paste issue with publisher_public and
publisher_explain methods. Fix it and do a little refactoring
of the publisher's code.
 2016-04-28 21:45:49 +03:00
Jonne Haß
32fdec4493
Merge branch 'stable' into develop 2016-04-27 11:56:12 +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
Lukas Matt
c10c31b52b Adjust links and description in diaspora config 2016-04-25 15:30:28 +02:00
Lukas Matt
f0d5ff12a2 Diaspora configuration wrapper for Prosody 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2016-04-25 15:30:28 +02:00
Dennis Schubert
7dbd94b326 Merge pull request #6804 from cmrd-senya/patch-1 
the special case is not required anymore
 2016-04-21 07:26:08 +02:00
Dennis Schubert
e9fb29eba4 Merge pull request #6803 from Flaburgan/5396-fix-error-message-on-mobile-upload 
Fix error message on mobile image upload, close #5396
 2016-04-21 07:25:37 +02:00
Dennis Schubert
2b5f20ef93 Merge pull request #6784 from cmrd-senya/deletion-redirect-fixup 
Redirect to "/users/sign_in" after AccountDeletion
 2016-04-21 07:23:19 +02:00
Dennis Schubert
d6171e53c3 Merge pull request #6778 from Zauberstuhl/facebook_review_changes 
Changes for my successful facebook reviews
 2016-04-21 06:50:57 +02:00
Senya
0c177aaddf the special case is not required anymore 
fix #5678
 2016-04-19 08:28:47 +03:00
fla
96e0635bff Fix error message on mobile image upload, close #5396 2016-04-18 20:54:32 +02:00
Steffen van Bergerem
b0e608aa38 Merge branch 'stable' into develop 2016-04-13 22:18:52 +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
Steffen van Bergerem
413652fbf6 Add Changelog for #6782 [ci skip] 2016-04-13 21:39:39 +02:00
Steffen van Bergerem
b9f5328d47 Merge pull request #6782 from Flaburgan/redesign-back-to-top 
Fix back to top not appearing on Webkit browsers + redesign
 2016-04-13 21:15:35 +02:00
Flaburgan
f2b75af08c Back to top arrow redesign 2016-04-13 20:11:44 +02:00
Lukas Matt
56c7af940d
Move unicorn_killer to Gemfile 2016-04-13 14:41:02 +02:00
Flaburgan
3e95dee58c Fix back to top icon not appearing on webkit browsers 2016-04-11 11:33:07 +02:00
Dennis Schubert
f073a96b19 Merge pull request #6788 from svbergerem/improve-search-suggestions 
Improve search and mentions suggestions
 2016-04-08 08:19:07 +02:00
Steffen van Bergerem
75384d50a7 Improve search and mentions suggestions 2016-04-08 01:23:55 +02:00
cmrd Senya
77bd220e24
Redirect to "/users/sign_in" after AccountDeletion 
There is no point to redirect to "/stream" after the account deletion
because the user is logged off.
 2016-04-07 12:02:46 +03:00
Dennis Schubert
a414fb2381 Merge pull request #6747 from cmrd-senya/rspec-fixup 
Fix usage of hard-coded pod URI in rspec testsuite
 2016-04-05 17:52:50 +02:00
Dennis Schubert
be2ec6f391 Merge branch 'stable' into develop 2016-04-04 03:12:02 +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
fla
64ed7e9183 Remove bootstrap on mobile photos page 2016-04-03 18:40:50 +02:00
fla
bcf682d8ee Fix horizontal scrolling on mobile profile 2016-04-03 18:40:50 +02:00
Dennis Schubert
1122dca5b8 Merge pull request #6777 from svbergerem/noscript 
Add noscript warning
 2016-03-31 22:11:07 +02:00
Lukas Matt
b9cf5995b8 Use provider name in translation 2016-03-31 13:18:35 +02:00
Steffen van Bergerem
6941cdc962 Add noscript warning 2016-03-31 13:17:56 +02:00
Dennis Schubert
7fc8f7de9b Merge branch 'stable' into develop 
[ci skip]
 2016-03-30 16:52:49 +02:00