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

17477 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Dennis Schubert
eba9e8f829 Prepare 0.5.9.0 cycle 
[ci skip]
 2016-03-30 16:52:00 +02:00
Dennis Schubert
0ea2767b3f Merge branch 'stable' into develop 2016-03-30 16:21:52 +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
Steffen van Bergerem
c8a8110cf1 Merge branch 'stable' into develop 2016-03-30 11:13:47 +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
Lukas Matt
267d91bf66 Changes for a successful facebook review 
I had two facebook reviews in the past days
Removing the display type and adding a explicit
'Share to' provider tag did the trick

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2016-03-30 10:36:28 +02:00
Dennis Schubert
d854cc185a Merge pull request #6771 from Zauberstuhl/add_author_id_index_to_participations 
account_deletions get stuck while selecting participations
 2016-03-30 10:22:54 +02:00
Dennis Schubert
e95c742aa1 Merge branch 'stable' into develop 2016-03-30 10:18:09 +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
Lukas Matt
16275ec926 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-27 14:16:03 +02:00
Steffen van Bergerem
0cbb1233aa Fix conversations participants design regression 2016-03-23 01:47:30 +01:00
Steffen van Bergerem
be05f454e4 Merge pull request #6535 from Flaburgan/stream-modification 
Design of stream pages
 2016-03-23 01:28:55 +01:00
Flaburgan
847fdb0de9 split left column 2016-03-22 17:01:44 +01:00
cmrd Senya
0f04414a4f Fix usage of hard-coded pod URI in rspec testsuite 2016-03-22 15:06:30 +03:00
Flaburgan
5ff085afff Fix tests 2016-03-22 13:00:51 +01:00
fla
a10601f9a9 collapse left navbar sections 2016-03-22 13:00:51 +01:00
fla
70140259ba Max-width for the whole content 2016-03-22 13:00:51 +01:00
fla
d0d3df05eb Fix original white theme 2016-03-22 13:00:51 +01:00
Flaburgan
3c2bc54061 Fix getting started help 
Add temp max-width to the streams

Back to white bg for left menu

Fix invitation code selection

fix pronto errors
 2016-03-22 13:00:51 +01:00
fla
76f74ebc0b remove dark gray left column on tag page 2016-03-22 13:00:51 +01:00
fla
5f446330e2 collapse the sidebars to the side of the screen even on big screens 
Drop right side bar, move content to left side bar

Move user avatar and name from the left nav bar to the left of the publisher
 2016-03-22 13:00:50 +01:00