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

4286 commits

Author SHA1 Message Date
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
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
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
a3ed9da210 changes for new federation-gem version 2016-03-30 09:45:46 +02:00
cmrd Senya
0f04414a4f Fix usage of hard-coded pod URI in rspec testsuite 2016-03-22 15:06:30 +03: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ß
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
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
Steffen van Bergerem
3210d0d260 Fix publisher overflow on submit 2016-03-18 05:04:22 +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
d5560430ce Merge pull request #6740 from svbergerem/refactor-cukes 
Refactor invitations and public stream cukes
 2016-03-07 18:47:52 +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
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
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
e4f8023b91 Add rspec test for public stream 2016-03-05 21:07:00 +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
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
Benjamin Neff
acb91c79d2 improve pod connection check 
* use port for check
* respect entries in /etc/hosts
* test /.well-known/host-meta
* don't allow redirects to other domains
 2016-03-05 02:57:11 +01:00
Benjamin Neff
b1a6516474 add migration for pods-table 
* add port to pods
* remove url from person and link people with pod-table
 2016-03-05 00:12:54 +01:00
Steffen van Bergerem
f556a5210e Refactor js search views 2016-03-04 22:55:39 +01:00
Benjamin Neff
f913128967 don't add public shareables to aspect_visibilities 2016-03-04 20:13:52 +01:00
Steffen van Bergerem
bf17205c17 Fix some publisher.scss scss-lint errors 2016-03-04 18:02:22 +01:00
Steffen van Bergerem
f948120ba6 Refactor keycodes 2016-03-04 18:02:22 +01:00
Augier
e34960392c Code simplifications and typo 2016-03-04 18:02:22 +01:00
Augier
8f021be20b Do not instanciate publisher if not publisher element is present 2016-03-04 18:02:22 +01:00
augier
b1d60d7c9a Jasmine tests 2016-03-04 18:02:22 +01:00
augier
f1e8c57c26 CSS guidestyle 2016-03-04 18:02:22 +01:00
Benjamin Neff
7011f2961d Revert "Back out #6723 due to Postgres breakage" 
This reverts commit 84cfbd22fc.
 2016-03-04 14:01:31 +01:00
Dennis Schubert
84cfbd22fc Back out #6723 due to Postgres breakage 
This reverts commit 832a56134b, reversing
changes made to 75c3e6068c.
 2016-03-04 13:33:32 +01:00
Benjamin Neff
e3d1f0fd16 fix order with two posts with the same timestamp for all streams 2016-03-03 21:43:11 +01:00
Benjamin Neff
7583568be8 update queries for new ShareVisibility 
Also:
* remove ShareablesFromPerson evil-query
* improve multi-stream and aspect-stream queries
* fix logging for recieve
* don't add last 100 public posts to users streams after sharing
* delete share visibility when shareable is deleted
 2016-03-03 21:43:11 +01:00
Benjamin Neff
14d45861cb remove old migration spec, because it tries to downgrade later migrations 2016-03-03 21:43:11 +01:00
Dennis Schubert
75c3e6068c Merge branch 'stable' into develop 2016-03-03 17:58:05 +01:00
Steffen van Bergerem
b98af83c9d Sort tag search result by name 
closes #6734
 2016-03-03 17:57:58 +01:00
Dennis Schubert
7c88fb7936 Merge pull request #6586 from cmrd-senya/drop-signatures 
Remove parent author signature for relayables from the DB
 2016-03-03 17:39:28 +01:00
Jonne Haß
b0d983e85c Merge branch 'stable' into develop 2016-02-26 11:27:29 +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
51eb3a79fc Merge pull request #6718 from svbergerem/fix-contacts-page-notification-count 
Fix notification count change on contacts page
 2016-02-25 09:26:34 +01:00
Steffen van Bergerem
dafafcd680 Fix notification count change on contacts page 2016-02-24 23:56:01 +01:00
Dennis Schubert
a967fe1f48 Merge pull request #6708 from svbergerem/pending-person-stream-spec 
Activate "Stream::Person returns the most recent posts" spec
 2016-02-23 06:36:09 +01:00
Steffen van Bergerem
b808ac08ef Activate "Stream::Person returns the most recent posts" spec 2016-02-21 11:31:40 +01:00
Dennis Schubert
535057aca4 Merge branch 'stable' into develop 2016-02-21 04:26:25 +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
Dennis Schubert
3d3e82f7f0 Merge branch 'stable' into develop 2016-02-21 04:20:19 +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
Steffen van Bergerem
f8f05371e0 Merge pull request #6394 from AugierLe42e/mobile-js-refactor 
Mobile JS refactor
 2016-02-15 22:22:35 +01:00
Augier
28c509baeb Add jasmine specs for mobile view 2016-02-15 12:14:35 +01:00
Steffen van Bergerem
89f21e87f8 Remove unused code 2016-02-14 02:48:51 +01:00
Dennis Schubert
677bddc3d3 Merge branch 'stable' into develop 2016-02-09 12:42:26 +01:00
Steffen van Bergerem
ac5a7746e2 Remove contacts_title method and translations 
closes #6687
 2016-02-09 12:42:21 +01:00
Steffen van Bergerem
6efde34bb8 Remove stream faces 2016-02-08 17:42:36 +01:00
Steffen van Bergerem
482cbe7fcc Add reason for post report to email sent to admins 2016-02-07 17:58:03 +01:00
Dennis Schubert
26e37c46bd Merge branch 'svbergerem-textarea-autosize' into develop 2016-02-07 05:39:49 +01:00
Steffen van Bergerem
936460e874 Merge branch 'stable' into develop 2016-02-06 15:40:16 +01:00
Dennis Schubert
87ef4446e1 Remove uma.jpg and wolf.jpg 
closes #6673
 2016-02-06 15:39:38 +01:00
Steffen van Bergerem
3f72b231d4 Enable autosize for all textareas 2016-02-06 15:10:32 +01:00
Steffen van Bergerem
0c05b474c5 Merge pull request #6509 from AugierLe42e/fix-mobile-comment 
Refactor mobile comment section
 2016-02-05 11:30:04 +01:00
Augier
a5198e9a01 Fix no reaction case 2016-02-03 16:06:24 +01:00
Jonne Haß
32bda8fe20 Merge branch 'stable' into develop 2016-01-28 18:47:18 +01:00
Faldrian
8e3816e64e let mention-regex only match usable strings 
closes #6658
 2016-01-28 18:47:13 +01:00
fla
1e27b509f9 Add number of votes on poll answers 2016-01-24 14:31:06 +01:00
Dennis Schubert
515cda7658 Merge branch 'stable' into develop 2016-01-24 07:15:04 +01:00
Benjamin Neff
44ab0df02b fix suppress_annoying_errors 
closes #6653
 2016-01-24 07:14:58 +01:00
Steffen van Bergerem
a52c8a2f55 Tell user that the author might ignore them when commenting/liking failed 2016-01-21 21:02:39 +01:00
Steffen van Bergerem
6fce81fc99 Merge branch 'stable' into develop 2016-01-20 21:37:30 +01:00
tamatsyk
960e651764 internationalize controller rescue_from text 
Fix typos

change forbitten to forbidden

fix styling issue and copypaste

improve code style for aspec_memberships_controller.rb with rubocop

fix styling issues

aligned elements of hash literals

fix typo

fix locale name and styling of its usage

fix failing tests

closes #6554
 2016-01-20 21:37:02 +01:00
augier
054971c7de Big refactor on mobile comments 2016-01-15 15:54:34 +01:00
Jonne Haß
baeff22451 Merge pull request #6095 from AugierLe42e/openid 
OpenID Connect
 2016-01-06 12:30:15 +01:00
Dennis Schubert
40e780abcf Merge branch 'stable' into develop 2016-01-06 00:49:15 +01:00
Benjamin Neff
812510b44a refactoring tests again 
closes #6595
 2016-01-06 00:47:55 +01:00
cmrd Senya
b6c7f004e4 Further receive tests development 2016-01-06 00:47:42 +01:00
cmrd Senya
e54f87b7a6 Add rspec persistance file 2016-01-06 00:46:14 +01:00
theworldbright
b09ee87912 Update json-jwt legacy methods 2016-01-04 17:01:41 +09:00
theworldbright
58aef5658b Fix remaining remarks 2016-01-04 17:01:40 +09:00
theworldbright
773a5a67d9 Add default kid to ID token 2016-01-04 16:49:58 +09:00
theworldbright
ed1dc256a8 Fix handling of error message in authorization controller 2016-01-04 16:49:58 +09:00
theworldbright
10938404e9 Fix HTTP request test mocks 2016-01-04 16:49:57 +09:00
augier
73c1f0bc70 Fix pronto remarks 2016-01-04 16:49:57 +09:00
theworldbright
c6bec2f2dc Return error to RP instead of user for prompt=none 2016-01-04 16:49:57 +09:00
theworldbright
9fc8c63cae Fix hash styles for stub_request 2016-01-04 16:49:57 +09:00
theworldbright
f1b394de0f Fix remaining remarks 2016-01-04 16:49:57 +09:00
theworldbright
2f8c391ac6 Fix pronto and travis errors 2016-01-04 16:49:57 +09:00
theworldbright
0fbcb71255 Add support for request_uri and claims 2016-01-04 16:49:56 +09:00