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

17428 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dennis Schubert
6270e22226 Start hotfix 0.5.7.1 2016-03-08 22:25:21 +01:00
Dennis Schubert
d5560430ce Merge pull request #6740 from svbergerem/refactor-cukes 
Refactor invitations and public stream cukes
 2016-03-07 18:47:52 +01:00
Dennis Schubert
485f7c5263 Merge pull request #6742 from svbergerem/fix-tooltips-in-media 
Fix tooltips inside of .media elements
 2016-03-07 18:47:15 +01:00
Dennis Schubert
f2105d2fce Merge pull request #6741 from svbergerem/fix-typeahead-nonlatin-suggestions 
Fix typeahead suggestions with nonlatin chars
 2016-03-07 18:45:16 +01:00
cmrd Senya
2986aa8b24 Remove diaspora_handle from shareables 
We can determine diaspora_handle from a relation with people for the
shareables (posts, photos). So we don't need to store diaspora_handle in
the DB. Also remove tmp_old_id from photos which is not refenrenced anywhere.
 2016-03-07 18:47:21 +03:00
Steffen van Bergerem
11b659864f Fix typeahead suggestions with nonlatin chars 2016-03-07 14:54:45 +01:00
Benjamin Neff
0c8588eec8 PostService: create find! 
* find returns nil if nothing found
* find! raises errors if not found or not visible
 2016-03-07 05:52:54 +01:00
Benjamin Neff
e6b72b526f remove "not public" error page 
this is not used anymore:
* not logged in users are redirected to the login page
* logged in users see the normal 404 page
 2016-03-07 05:52:54 +01:00
Benjamin Neff
017842cc01 don't update updated_at date when read the notifications. 
updated_at is displayed in the frontend and should only be updated when
another notification_actor gets added

Also improved the sql-queries: update directly and not select first and
update then.
 2016-03-07 05:52:54 +01:00
Benjamin Neff
d94eae0d45 refactoring PostService 
* move presenters back to controllers, this is view-logic
* use PostService in CommentService
* remove iframe route, this is not used anymore
* id/guid limit at 16 chars, hex(8) is 16 chars long
 2016-03-07 05:52:54 +01:00
Benjamin Neff
d872c64369 write specs for CommentService 2016-03-07 05:52:54 +01:00
Benjamin Neff
b398b115bc refactoring CommentService 2016-03-07 05:52:54 +01:00
Benjamin Neff
b67b7cf8c6 write specs for StatusMessageCreationService 2016-03-07 05:52:54 +01:00
Benjamin Neff
5a46da47c3 refactoring StatusMessageCreationService 
* move parameter normalization back to controller, because this is
  frontend-specific.
* if the StatusMessage is public, save also public photos
 2016-03-07 00:00:27 +01:00
Jonne Haß
bc72851ef9 Merge pull request #6743 from SuperTux88/fix-pod-migration 
fix pod table migration if someone deleted a user (owner) manually
 2016-03-06 23:57:12 +01:00
Benjamin Neff
10af3a8b11 fix pod table migration if someone deleted a user (owner) manually 2016-03-06 23:55:28 +01:00
Steffen van Bergerem
665015859a Fix tooltips inside of .media elements 2016-03-06 00:42:29 +01:00
Steffen van Bergerem
e4f8023b91 Add rspec test for public stream 2016-03-05 21:07:00 +01:00
Steffen van Bergerem
79d53f2f59 Refactor invitation cukes 2016-03-05 20:33:22 +01:00
Dennis Schubert
e90f72ff37 Merge pull request #6739 from svbergerem/convert-cukes-to-rspec 
[WIP] Convert some cukes to rspec
 2016-03-05 13:41:39 +01:00
Steffen van Bergerem
9d591c6433 Move some multi stream and person stream cukes to rspec 2016-03-05 11:18:55 +01:00
Steffen van Bergerem
6e6a5c1e29 Move multiple participations test to rspec 2016-03-05 11:18:55 +01:00
Steffen van Bergerem
6ef4345dae Remove activity stream sorting cuke 
already tested in spec/lib/evil_query_spec.rb
 2016-03-05 11:18:49 +01:00
Jonne Haß
39ae5e741e Merge pull request #6732 from SuperTux88/cleanup-aspect_visibilities 
Cleanup aspect visibilities
 2016-03-05 11:05:55 +01:00
Dennis Schubert
91d636b9f6 Merge pull request #6727 from SuperTux88/improve-pod-check 
Improve pod check
 2016-03-05 06:03:20 +01:00
Dennis Schubert
cc5a3997d2 Merge pull request #6728 from svbergerem/mentions-typeahead 
Rewrite mentions input using typeahead.js
 2016-03-05 04:55:38 +01:00