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
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
Benjamin Neff
d3edbfd829 remove pending flag from posts 2016-08-08 19:37:10 +02:00
Benjamin Neff
83db0a8f3e remove activity_streams, because it was always false ... 2016-08-08 19:37:10 +02:00
Benjamin Neff
ecd13fc713 cleanup old attributes from code 2016-08-08 19:37:09 +02:00
Jonne Haß
32174aa532
Merge pull request #6932 from SuperTux88/relayable-additional-fields 
Save relayable signature data
 2016-08-08 19:28:21 +02:00
SaiVardhan
18dbf02181
[FIX] #6642 Strip Markdown from conversation title 
closes #6642
 2016-08-08 19:23:17 +02:00
Steffen van Bergerem
bf0fec19b3
Fix tag selection margin on getting started page 2016-08-08 19:06:33 +02:00
Steffen van Bergerem
2639a0fd69
Fix size of profile image on getting started page 2016-08-08 19:06:33 +02:00
Steffen van Bergerem
2482dc1869
Fix missing avatar of inviter in getting started view 2016-08-08 19:06:33 +02:00
Benjamin Neff
081d0167b7 add models for signature data 2016-08-08 18:56:37 +02:00
Steffen van Bergerem
5f3e4fc358
Merge pull request #6926 from jhass/timeago_plurals 
Properly support pluralization in timeago strings
 2016-08-08 17:38:30 +02:00
cmrd Senya
e7d8de298b
Client-side aspect dropdown for the people/:guid/contacts page 2016-08-08 17:23:12 +03:00
cmrd Senya
d7fd735ee0
Fix mobile getting_started use wrong person object 2016-08-08 17:22:50 +03:00
cmrd Senya
71ecd7b866
Notifications and search page frontend updates 
Updates introduce usage of client-side aspect dropdown rendering
 2016-08-08 17:22:37 +03:00
cmrd Senya
94ce383498
Introduce NotificationSerializer 
And remove the note_html property from the model.
 2016-08-08 17:22:30 +03:00
cmrd Senya
a3f208c380
Notifications and search page backend updates 
Updates introduce support for preloading contacts to Gon in order
to support client-side rendering of aspect membership dropdown box.
 2016-08-08 17:21:38 +03:00
cmrd Senya
82ac611396
Client-side rendering of aspect dropdown for hovercards 2016-08-08 17:21:30 +03:00
cmrd Senya
923fb8a763
Refactor app.views.AspectMembership 
in order to support adding new aspect to a dropdown without full
page reload
 2016-08-08 17:21:14 +03:00
cmrd Senya
15e0f88758
Rename photos[:count] to photos_count in gon 2016-08-08 17:19:26 +03:00
cmrd Senya
d8687ccb3a
Rename contacts[:count] to contacts_count in gon 2016-08-08 17:19:19 +03:00
cmrd Senya
06352b7809
AspectSelections style fixes 2016-08-08 17:18:37 +03:00
cmrd Senya
d50ab83157
Rename app.collections.Aspect{,Selection}s 2016-08-08 17:18:31 +03:00
cmrd Senya
ac2f161271
Fix views.js corner case 2016-08-08 17:18:20 +03:00
Augier
2e175c4be5 Bump to jQuery 2 2016-08-07 16:14:52 +02:00
Jonne Haß
734f332333
Properly support pluralization in timeago strings 2016-08-01 13:27:30 +02:00
Jonne Haß
f91734028c
Merge pull request #6934 from SuperTux88/fetch-error-handling 
better error message if we webfinger a person with invalid guid
 2016-08-01 13:20:56 +02:00
Jonne Haß
48e5db8235
Stabilize social_relay_presenter_spec.rb 2016-08-01 13:19:07 +02:00
Benjamin Neff
5aa52b36af better error message if we webfinger a person with invalid guid 
this happens if a remote person changed the diaspora-id manually (renamed
domain or something) in their database.
 2016-07-31 23:05:53 +02:00
Sam Davarnia
2a2b604a60 move photo extraction to a class 
style improvements

new line

applied changes

applied changes
 2016-07-18 15:05:44 +03:00
Steffen van Bergerem
59fb227d95
Merge pull request #6914 from denschub/be-excellent 
Add 'Be excellent to each other!' to the sidebar
 2016-07-17 11:00:16 +02:00
Dennis Schubert
2d8c62fae3
Add 'Be excellent to each other!' to the sidebar 2016-07-17 10:47:08 +02:00
Jonne Haß
8fcb66a425
Merge pull request #6910 from SaiVardhan/Issue#6850_private_message 
[Fix] #6850 Don't include subjects of private message
 2016-07-17 09:32:19 +02:00
Benjamin Neff
d72727f4ac remove unused absence_of_content check 
this didn't do anything
 2016-07-17 01:40:00 +02:00
Benjamin Neff
2cd831f94e also validate remote posts 
all data is included in the federated status_message, so we can validate
on receive. add the photos to the status_message before save.
 2016-07-17 01:40:00 +02:00
Benjamin Neff
df9874b73a remove raw_message 
This was only an alias for "text", and "raw_message" is also not used
for federation anymore, so we can drop it.
 2016-07-17 01:40:00 +02:00
Jonne Haß
8cffc5cfbe
bump rails to 4.2.7 2016-07-15 13:48:09 +02:00
SaiVardhan
274104aac6 issue-6850 Don't include subjects of private messages in email notifications 2016-07-12 16:33:15 +05:30
Steffen van Bergerem
be90b4fef3
Remove unused helper functions 2016-07-09 10:55:59 +02:00
cmrd Senya
026f577bfd
Remove unused methods 2016-07-08 21:30:41 +03:00
Jonne Haß
053f69b67c
Merge pull request #6902 from svbergerem/status-message-filter-mentions 
Filter mentions on status message creation
 2016-07-06 22:27:13 +02:00
aoh0x7DE
d75f795cad Fix issue #6847 (#6905) 
* Fix issue #6847
 2016-07-06 01:57:23 +02:00
Steffen van Bergerem
bef5241512
Remove unused translations from diaspora.yml, add missing ones 2016-07-05 23:34:31 +02:00
Steffen van Bergerem
46cbc6e52a
Filter mentions on status message creation 2016-07-04 10:26:45 +02:00
Steffen van Bergerem
e0226f9322
Raise on missing translations 2016-07-03 20:15:57 +02:00
Steffen van Bergerem
715cb1bb87
Remove unused translations 2016-07-03 18:14:23 +02:00
Steffen van Bergerem
b2d26257d4
Use the correct flash message for new conversations 2016-06-29 21:37:00 +02:00
Benjamin Neff
3bfc4003fb fetch unknown persons to generate url 2016-06-27 14:43:19 +02:00
Jonne Haß
09908a45fb
StatusMessage#raw_message returns empty string for NULL values 
Previously the federation layer has written the empty string to the
database, now it writes nil/no value to it while our code still expects
the empty string in some cases. Restore the old assumption by returning
the empty string, the real raw value by now is available again in
StatusMessage#text for those that need it, such as validations or tests.
 2016-06-27 12:07:11 +02:00
Benjamin Neff
9a3f653c45 fix sender for messages for old pods 
Send a second message to remote recipients with conversation-author
as salmon author if the conversation-author is local.

The first dispatch will fail on old pods. New pods will ignore the
second message, if the guid already exist.
 2016-06-26 14:05:52 +02:00
Benjamin Neff
ab2118ffa5 don't participate own posts 2016-06-26 06:21:03 +02:00
Benjamin Neff
e08306dab4 remove participation parent author check 
the check that the participation parent author is local is now done in
the diaspora_federation gem
 2016-06-26 06:21:03 +02:00
Benjamin Neff
7bdf4921fd use private_class_method with returned symbol of def 2016-06-26 06:21:02 +02:00
Benjamin Neff
bb0d7e46dc add #object_to_receive to Diaspora::Federated::Base 2016-06-26 06:21:02 +02:00
Benjamin Neff
1cf11db634 remove diaspora_handle setter to set author 2016-06-26 06:21:02 +02:00
Benjamin Neff
70f378a1c1 don't participate own posts on creation 2016-06-26 06:21:02 +02:00