Commit graph

8768 commits

Author SHA1 Message Date
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
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
Benjamin Neff
3b1a5c6bdf don't reduce number of invites when registration is open
otherwise the counter goes into negative ;)

also  reset all negative counters
2016-08-13 13:51:02 +02:00
Steffen van Bergerem
da5aef2b75
Fix charcounter position in publisher 2016-08-13 03:21:40 +02:00
Benjamin Neff
e749bbef15 don't reduce number of available invites if there were errors. 2016-08-13 01:47:27 +02:00
Benjamin Neff
2a553940d4 small design fixes for invites 2016-08-13 01:47:27 +02:00
Benjamin Neff
66b7b7e27a Cleanup legacy invitations from code
Fixes #5116
2016-08-13 01:47:27 +02:00
Steffen van Bergerem
16618e1054
Merge pull request #6406 from cmrd-senya/comment-expand-optimization-2
Comments expansion refactoring
2016-08-12 23:46:22 +02:00
augier
5c2e241106 Displaying the markdown editor on publisher 2016-08-12 23:08:41 +02:00
cmrd Senya
8e6df0b1e3
Comments expansion refactoring
If you look at comment expand process with javascript debugger, you
will notice that at first comments get added to existing stream ("add"
event handler of model.comments gets launched because of model.comments.fetch).
Then the comment stream gets empty and then filled by the postRenderTemplate
handler.

This patch removes comments rerendering on the expansion. The fetching process is
changed so that older comments are added to the correct place, so the order
looks nice without rerendering. Thus, unnecessary job of rerendering is avoided.
2016-08-12 22:06:51 +03:00
Jonne Haß
8deef544dc
Merge pull request #6974 from svbergerem/empty-stream
Add 'no posts yet' message to empty streams
2016-08-12 14:11:27 +02:00
Steffen van Bergerem
48b0e3d7d1
Add role='alert' to alerts 2016-08-12 12:58:57 +02:00
Steffen van Bergerem
eae9e01f14
Add 'no posts yet' message to empty streams 2016-08-12 12:55:06 +02:00
Steffen van Bergerem
8a9ce0d6d8
Disable transitions in poltergeist 2016-08-11 19:05:19 +02:00
Jonne Haß
e70ffebc49 Merge pull request #6805 from cmrd-senya/mention-name-fixup
Fix up the meaning of the name parameter in mention
2016-08-11 13:28:02 +02:00
cmrd Senya
d200e92aeb Fix up the meaning of the name parameter in mentions
The desktop frontend now treats the "name" parameter of mention as
a string to display unconditionally. But the Diaspora::Mentionable
renders mentions the different way: "name" is treated as a fallback
string which is rendered only if the person's name is unavailable.
This reflects on the mobile version ATM. This patch makes it behave
the same way as the current desktop version does.
2016-08-11 13:19:48 +03:00
Jonne Haß
500b3197b4 Merge pull request #6964 from svbergerem/remove-inline-notifications-javascript
Remove inline notifications javascript
2016-08-11 10:25:19 +02:00
Jonne Haß
1d2132ebba Merge pull request #6965 from SuperTux88/5847-fix-settings-page
Fix settings page after submit
2016-08-11 02:29:34 +02:00
Steffen van Bergerem
9b4ff768ca
Sort router.js 2016-08-11 02:23:15 +02:00
Steffen van Bergerem
9c46e69b7a
Fix codestyle in router.js 2016-08-11 02:20:35 +02:00
Steffen van Bergerem
fca4a79f80
Remove inline javascript on notifications page 2016-08-11 02:18:28 +02:00
Benjamin Neff
71ed7446c1 Fix user settings style after submit
Fixed:
* wrong url
* broken navigation
* broken design
after saving the user settings

Fixes #5847
2016-08-11 01:58:47 +02:00
Benjamin Neff
be47c6bcd0 remove redirect hack for devise
only expose routes from devise that we actually use
2016-08-11 01:58:47 +02:00
Jonne Haß
bd74eea140
Merge pull request #6962 from svbergerem/fix-mentioning-modal
Fix mentioning model being broken when reopening it
2016-08-11 01:05:39 +02:00