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

4394 commits

Author SHA1 Message Date
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ß
7fa299b7ad Merge pull request #6959 from cmrd-senya/devise-upgrade 
Upgrade devise to 4.2
 2016-08-11 12:08:42 +02:00
cmrd Senya
4ae26e1ded Upgrade devise to 4.2 2016-08-11 12:25:36 +03: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
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
Steffen van Bergerem
d9746a8461
Escape HTML in mentions box 2016-08-10 17:19:58 +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
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
Benjamin Neff
d3edbfd829 remove pending flag from posts 2016-08-08 19:37:10 +02:00
Benjamin Neff
ecd13fc713 cleanup old attributes from code 2016-08-08 19:37:09 +02:00
Benjamin Neff
7ff18d92fb remove old unused data_conversion fixtures 2016-08-08 19:37:09 +02:00
Benjamin Neff
4a6721af3c cleanup fixtures/public_posts.json 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
Benjamin Neff
89b068e474 write some more tests 2016-08-08 18:56:37 +02:00
Benjamin Neff
1d8ce00bef save signature data on receive 2016-08-08 18:56:37 +02:00
Benjamin Neff
2a6ca1b831 use signature data for federation 2016-08-08 18:56:37 +02: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
ed7fc10043
Clear gon after each rspec test 2016-08-08 17:19:08 +03:00
cmrd Senya
838e5ca432
Use the factory in the publisher_view_spec.js 2016-08-08 17:18:53 +03:00
cmrd Senya
f0bd1f9f06
AspectSelections spec corrections 2016-08-08 17:18:45 +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
Steffen van Bergerem
ba26175421
Fix duplicate activity stream posts 2016-08-07 02:07:05 +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
cmrd Senya
035a483a7a Fix randomly failing profile federation spec 
same as #6913
 2016-07-17 13:02:46 +03: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
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
Benjamin Neff
32cc0951bb bump diaspora_federation 2016-07-15 02:02:55 +02:00
SaiVardhan
274104aac6 issue-6850 Don't include subjects of private messages in email notifications 2016-07-12 16:33:15 +05:30
Jonne Haß
b3a06c1c58 Merge pull request #6913 from svbergerem/fix-randomly-failing-federation-spec 
Fix randomly failing profile federation spec
 2016-07-11 11:23:13 +02:00
Steffen van Bergerem
d6fbde3b7f
Fix randomly failing profile federation spec 2016-07-09 19:22:22 +02:00
Steffen van Bergerem
f8d8089cb6
Add more specs for the admins controller 2016-07-09 12:30:19 +02:00