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
Steffen van Bergerem
11f6ed2b9a
Fix community spotlight styles
2016-08-10 23:13:18 +02:00
Steffen van Bergerem
e152dc6549
Get rid of inline javascript on contacts page
2016-08-10 23:13:18 +02:00
Steffen van Bergerem
d60862c3c6
Fix mentioning model being broken when reopening it
2016-08-10 23:09:49 +02:00
Steffen van Bergerem
d9746a8461
Escape HTML in mentions box
2016-08-10 17:19:58 +02:00
Benjamin Neff
86e75a02bb
fix privacy settings form submit
2016-08-10 13:16:59 +02:00
Benjamin Neff
37837b3f73
fix style on registration-page after errors
2016-08-10 13:16:59 +02:00
Jonne Haß
edd568007d
Merge pull request #6954 from svbergerem/refactor-osm-in-spv
...
Refactor locations in the SPV
2016-08-10 12:10:17 +02:00
Jonne Haß
90abad0152
Merge pull request #6950 from cmrd-senya/consolidate-queues
...
Consolidate queues
2016-08-10 11:46:09 +02:00
Steffen van Bergerem
a591ae781a
Refactor tileLayer creation
2016-08-10 11:30:48 +02:00
Steffen van Bergerem
3fb7b420eb
Always show expanded map in SPV
2016-08-10 11:30:48 +02:00
Jason Robinson
78299c9e2f
Consolidate amount of sidekiq queues from 13 to 5
...
Sidekiq documentation says 'Sidekiq is not designed to work well with dozens of queues.'. Having the amount of queues we have at the moment brings no anyway.
Closes #5571
2016-08-10 08:51:22 +00:00
Steffen van Bergerem
0bc5ec4bb4
Make customsearch filter async results for typeahead.js
2016-08-10 00:41:07 +02:00
Steffen van Bergerem
cefffc6082
Move contacts search to contacts#index
2016-08-09 19:20:40 +02:00
Steffen van Bergerem
9f28b935b9
Drop contacts.json
2016-08-09 19:20:40 +02:00
Steffen van Bergerem
f1e9c99866
Add contacts search
2016-08-09 19:20:40 +02:00
Steffen van Bergerem
73ce521bb3
Modify search to include contacts
2016-08-09 15:12:44 +02:00
Steffen van Bergerem
79117d1a46
Merge pull request #6944 from AugierLe42e/bump-jquery-2
...
Bump to jQuery 2
2016-08-09 13:00:39 +02:00
Steffen van Bergerem
9cbc7b6050
Refactor photo css
2016-08-09 10:20:34 +02:00
Steffen van Bergerem
09aff30648
Fix hovercards on profile edit page
2016-08-09 01:14:24 +02:00
Steffen van Bergerem
020f8c51b4
Fix other user's profile photos stream
2016-08-09 00:33:12 +02:00
Steffen van Bergerem
dc236b8b9d
Merge pull request #6838 from Flaburgan/masonry-photo
...
Set fixed height of tile in photos stream, fix #6809
2016-08-08 23:46:23 +02:00
Flaburgan
eac051ffaa
Set fixed height of tile in photos stream, fix #6809
2016-08-08 23:28:19 +02:00
Jonne Haß
ca2dd532af
Merge pull request #6940 from SuperTux88/cleanup-posts-table
...
Cleanup posts table
2016-08-08 20:53:24 +02:00
Jonne Haß
e738f40d8f
Merge pull request #6947 from svbergerem/fix-inviter-avatar
...
Various frontend fixes for the getting started page
2016-08-08 20:10:52 +02:00
