Commit graph

17604 commits

Author SHA1 Message Date
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
Dennis Schubert
49b71d3042 Merge pull request #6764 from svbergerem/unify-registration-session-form
Unify mobile and desktop registration and session forms
2016-03-22 12:43:51 +01:00
Steffen van Bergerem
832c85d835 Unify mobile and desktop registration and session forms 2016-03-21 20:23:36 +01:00
Jonne Haß
6bec0dbbb9 Merge branch 'stable' into develop 2016-03-21 14:04:33 +01: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
Jonne Haß
6d9123f3ba Merge pull request #6761 from svbergerem/clean-commenting-cukes
Avoid manual commenting in cukes
2016-03-21 13:56:17 +01:00
Jonne Haß
47f6ea4b98 Merge pull request #6762 from svbergerem/fix-notifications-design-regression
Fix notifications page design regressions
2016-03-21 13:48:41 +01:00
Jonne Haß
7c5d6886ba Merge pull request #6729 from theworldbright/6696-api-scope-escalation-fix
#6696 - Fix API scope escalation
2016-03-21 13:45:18 +01:00
Steffen van Bergerem
1d86c8196c Fix notifications page design regressions 2016-03-20 02:25:50 +01:00
Steffen van Bergerem
faf23bf68c Avoid manual commenting in cukes 2016-03-20 01:50:53 +01:00
Dennis Schubert
3bb28ec016 Merge pull request #6757 from svbergerem/fix-mentions-input-box-submitting
Fix publisher overflow on submit
2016-03-18 07:28:36 +01:00
Dennis Schubert
446201b584 Merge branch 'stable' into develop 2016-03-18 07:24:44 +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
Steffen van Bergerem
3210d0d260 Fix publisher overflow on submit 2016-03-18 05:04:22 +01:00
Steffen van Bergerem
b9972b5407 Merge pull request #6746 from SuperTux88/fix-public-stream-specs
fix randomly failing specs for public posts
2016-03-13 01:26:07 +01:00
theworldbright
bb3849e4b1 Fix API privilege scope escalation 2016-03-11 17:18:21 -08:00
Benjamin Neff
80201d452e fix randomly failing specs for public posts 2016-03-09 03:00:47 +01:00
Dennis Schubert
69ac153fe9 Merge pull request #6745 from cmrd-senya/remove_diaspora_handle_shareables
Remove diaspora_handle from shareables
2016-03-08 23:45:16 +01:00
Dennis Schubert
df1c1ab24e Merge pull request #6744 from SuperTux88/refactor-services
Refactor services
2016-03-08 23:35:43 +01:00
Dennis Schubert
aa873199f8 Merge branch 'stable' into develop 2016-03-08 22:56:02 +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