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

8790 commits

Author SHA1 Message Date
Steffen van Bergerem
9a2cb1517a
Set participations client side when changing post interactions 
closes #7040
 2016-09-04 03:17:48 +02:00
Steffen van Bergerem
02742a4a8f
Use post controls view for single post moderation 2016-09-04 03:16:24 +02:00
Steffen van Bergerem
8faedd574d
Move post controls to a separate view 2016-09-04 03:16:24 +02:00
Steffen van Bergerem
68045cec8c
Remove unused feedback actions view 2016-09-04 03:16:24 +02:00
Steffen van Bergerem
ffdd5a14ac
Remove deleted comments when loading more comments 
closes #7045
 2016-09-04 03:15:35 +02:00
Steffen van Bergerem
e3e9510e6a
Refactor appending comments to the comment stream 2016-09-04 03:14:17 +02:00
Steffen van Bergerem
ce7d008e09
Set grammatical gender in tags controller 2016-09-04 03:02:27 +02:00
Steffen van Bergerem
08794bc47b
Remove user_photo method from users controller 
closes #7049
 2016-09-04 03:01:51 +02:00
Benjamin Neff
5017bd9541
rewrite notifier template with haml 
closes #7054
 2016-09-04 01:44:15 +02:00
Benjamin Neff
b0611ce270
remove logo from mails 2016-09-04 01:43:24 +02:00
Benjamin Neff
364502a134
bring back sender avatar 2016-09-04 01:43:24 +02:00
Benjamin Neff
575748169e
remove text color from notification mails 2016-09-04 01:43:24 +02:00
lislis
bc64bca9df
update the bug link in the sidebar to the report bug wiki page 2016-09-01 21:34:44 +02:00
Steffen van Bergerem
5b5e3e2c29
Display images inline in profile bio 2016-08-23 01:52:27 +02:00
Steffen van Bergerem
7f0ffb8b0a
Fix invitation link on people search page 2016-08-23 01:52:25 +02:00
Dennis Schubert
ae2cecefae
Merge pull request #7018 from SuperTux88/fix-reshare-metadata 
Fix regressions from #6998
 2016-08-22 02:29:44 +02:00
Benjamin Neff
4b020b8d61 Fix regressions from #6998 
* fixed old reshares of reshares
* fixed deleted root of a reshare
 2016-08-22 00:43:43 +02:00
Benjamin Neff
b3013c8152 bump diaspora_federation 2016-08-22 00:21:25 +02:00
Dennis Schubert
3be0d52bc9
Merge pull request #7016 from svbergerem/fix-7015 
Fix misplaced publisher prefill on tags page
 2016-08-21 14:27:16 +02:00
Dennis Schubert
93037098ce
Merge pull request #7014 from svbergerem/remove-stream-title 
Remove stream title from main stream
 2016-08-21 14:27:04 +02:00
Dennis Schubert
c4485a72af
Merge pull request #7013 from svbergerem/fix-header-badges-small-screens 
Move notifications and conversations links in collapsed header on small devices
 2016-08-21 14:26:54 +02:00
Steffen van Bergerem
3179b492f7
Fix misplaced publisher prefill on tags page 2016-08-21 14:22:41 +02:00
Steffen van Bergerem
fa06eba840
Remove stream title from main stream 2016-08-21 13:26:58 +02:00
Steffen van Bergerem
4b801a0ba9
Move notifications and conversations links in collapsed header on small devices 2016-08-21 12:56:16 +02:00
Steffen van Bergerem
002a7ff984
Fix stream shortcuts on small screens 2016-08-21 10:31:24 +02:00
Benjamin Neff
c6427c4ec0 don't add the root author to the subscribers if the root post was deleted 2016-08-18 23:34:58 +02:00
Denis Hovart
bcace2def2 6840 : meta tags update (#6998) 
* Adds a new metadata helper and methods to PostPresenter to have metas on post pages.

* Adds tests to post controller to check correctness of metas

* Add methods to PersonPresenter to have metas on profile pages

* Correct meta data helper test

* Update PersonPresenter, add test to PeopleController

* Creates TagPresenter. Display tag metas on tag index page

* Updata meta data helper spec

* Not displaying bio as the description meta on profile page for now. Privacy concerns to be cleared.

* Set meta info as hashes in presenters

* Move original hardcoded metas info to config/defaults.yml

* metas_tags include by default the general metas, update views

* Update code style, clean views

* Renames TagPresenter StreamTagPresenter, updates TagController spec

* Add a default_metas entry to diaspora.yml.example

* Align metas hash in presenters, refactor meta data helper

* Use bio as description meta if user has a public profile

* Rename StreamTagPresenter to TagStreamPresenter
 2016-08-18 21:52:39 +02:00
Jonne Haß
148e85558a
Merge pull request #7001 from svbergerem/fix-conversation-recipient-suggestions 
Fix conversations autoSuggest showing non-mutual contacts
 2016-08-18 13:36:27 +02:00
Steffen van Bergerem
7b5ac656a7
Fix conversations autoSuggest showing non-mutual contacts 2016-08-18 13:02:14 +02:00
Jonne Haß
e3a95d7d71 Merge pull request #6995 from SuperTux88/fix-mention-fetching 
only create mentions after creating statusmessages
 2016-08-18 12:00:11 +02:00
Jonne Haß
c74a7041f1 Merge pull request #7000 from svbergerem/router-trailing-slash 
Fix backbone router for URLs with trailing slashes
 2016-08-18 11:59:20 +02:00
Steffen van Bergerem
0a1a7b167f
Merge pull request #6983 from AugierLe42e/fix-mobile-photo-page-avatar 
Fixes the avatar on mobile multiphoto page
 2016-08-18 11:22:29 +02:00
Steffen van Bergerem
18683f9ca8
Fix backbone router for URLs with trailing slashes 2016-08-18 10:57:59 +02:00
Augier
8a3f0778f5 Fixes the avatar display on mobile the photo page 2016-08-18 10:52:31 +02:00
Steffen van Bergerem
34e3fb2e14
Merge pull request #6991 from cmrd-senya/dropdown-regression 
Fix aspect dropdown when person is being fetched
 2016-08-18 10:07:35 +02:00
Steffen van Bergerem
21887675a6
Use Bootstrap pagination on people search page 2016-08-18 01:54:43 +02:00
Steffen van Bergerem
993f3d5ab0
Refactor contacts page using pagination 2016-08-18 01:54:43 +02:00
Benjamin Neff
fb318373c7 only create mentions after creating statusmessages 2016-08-17 02:26:58 +02:00
cmrd Senya
6fba0e498e
Use diaspora_id validation from the federation gem 
DRY
 2016-08-16 12:08:06 +03:00
Steffen van Bergerem
e5c5490932
Merge pull request #6981 from AugierLe42e/fix-6979 
Fixes #6979
 2016-08-15 23:00:16 +02:00
cmrd Senya
4b3f36e92a
Fix aspect dropdown when person is being fetched 
fix #6989
 2016-08-15 23:43:24 +03:00
Benjamin Neff
23541546e9 Allow hovercards of remote people when not logged in 
In #6603 hovercards were activated for logged out users, but they only
worked for local people. Hovercards on remote-people are important to
get the diaspora-id to search the person on the local pod, if you don't
know who it is.
 2016-08-15 01:33:26 +02:00
Jonne Haß
200486b6f1
Merge pull request #6984 from SuperTux88/6294-ignore-notifications 
Don't create notifications from ignored people
 2016-08-14 18:28:13 +02:00
Benjamin Neff
0d338b6f79 don't create notifications if the notification-actor is ignored 
Also move "shareable hidden"-logic to AlsoCommented, because it is the
only one that needs it. And write some specs for mentioned and started
sharing notifications.

Fixes #6294
 2016-08-14 17:03:49 +02:00
Augier
c5618591c3 Fixes #6979 2016-08-14 11:04:11 +02:00
Steffen van Bergerem
9f8482174b
Display markdown images inline 2016-08-14 08:18:48 +02:00
Benjamin Neff
f4459488e5 allow other people to share with a user who ignores them 
otherwise we have data-inconsistency if the user stops ignoring the
person.
 2016-08-14 01:08:26 +02:00
cmrd Senya
9546fddb9e
[API] don't store ID tokens in DB 
fix #6857
 2016-08-13 20:09:43 +03:00
Jonne Haß
b2fa3357eb
Merge pull request #6976 from SuperTux88/cleanup-invitations 
Cleanup invitations
 2016-08-13 14:16:41 +02:00
Benjamin Neff
bc6c8a0598 disable registration with invite-code when invitations are closed 
also display message if the user has no invitations left and refactored
InvitationsController spec and remove unused message parameter
 2016-08-13 13:51:28 +02:00