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
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
Benjamin Neff
2367be3f66
move Federated::Generator to Diaspora::Federated::Generator
2016-06-26 06:21:02 +02:00
Benjamin Neff
709ad6e909
Participation is not relayable anymore
...
only deliver to parent author
2016-06-26 06:21:02 +02:00
Benjamin Neff
c8d43a893d
move Guid module to fields
2016-06-26 06:21:02 +02:00
Benjamin Neff
67688a6022
create module for author association
2016-06-26 06:21:02 +02:00
Benjamin Neff
cf5a72719e
participates root author when receiving a reshare
2016-06-26 06:21:02 +02:00
Benjamin Neff
9fa3cc97d4
deliver message always to all participants
...
message doesn't include Diaspora::Relayable anymore
2016-06-26 06:21:02 +02:00
Benjamin Neff
0f6e0b7288
send the profile to remote persons on start shareing with them
2016-06-26 06:21:02 +02:00
Benjamin Neff
57dbcc0e67
add root author to reshare subscribers
2016-06-26 06:21:02 +02:00
Benjamin Neff
03123f1c4d
remove more unused code and cleanup
2016-06-26 06:21:01 +02:00
Benjamin Neff
2476b74dbe
refactoring delete from services
2016-06-26 06:21:01 +02:00
Benjamin Neff
bb66b973a6
only posts do have reshares
2016-06-26 06:21:01 +02:00
Benjamin Neff
0e6446d05f
create ShareVisibilities with batch import
...
and delete old batch worker and receiver
2016-06-26 06:21:01 +02:00
Benjamin Neff
c8c489eafd
remove post fetcher
2016-06-26 06:21:01 +02:00
Benjamin Neff
51aca4506f
remove HttpMulti and HydraWrapper
2016-06-26 06:21:01 +02:00
Benjamin Neff
ae05d4e928
use Diaspora::Federation::Dispatcher everywhere
2016-06-26 06:21:01 +02:00
Benjamin Neff
21fd9f23da
remove roxml
2016-06-26 06:21:01 +02:00
Benjamin Neff
7893a23927
add resharers and participants to subscribers on public posts
2016-06-26 06:21:01 +02:00
Benjamin Neff
566f4890a2
merge Federated::Shareable to Shareable
...
also drop xml-code for Shareable
2016-06-26 06:21:01 +02:00
Benjamin Neff
7f11beae37
dispatch retractions
2016-06-26 06:21:00 +02:00
Benjamin Neff
65ba573a3b
Contact retraction
2016-06-26 06:21:00 +02:00
Benjamin Neff
89fbcf7c56
federate retractions
2016-06-26 06:21:00 +02:00
Benjamin Neff
86b37466d5
add DeferredRetraction worker
2016-06-26 06:21:00 +02:00
Benjamin Neff
9ce9b4bcd0
deliver profile update with new dispatcher
2016-06-26 06:21:00 +02:00
Benjamin Neff
7184d4334e
remove after_dispatch hook
...
handle photos in StatusMessageCreationService
2016-06-26 06:21:00 +02:00
Benjamin Neff
20dabbd15f
remove user parameter from subscribers method
2016-06-26 06:21:00 +02:00
Benjamin Neff
f9f91a0e9e
create new contact for local receive
2016-06-26 06:21:00 +02:00
Benjamin Neff
596659a78f
first structure of Diaspora::Federation::Dispatcher
2016-06-26 06:21:00 +02:00
Benjamin Neff
83f5662d62
remove NotifyLocalUsers worker
2016-06-26 06:21:00 +02:00
Benjamin Neff
7bb172cefb
remove old Private and Public Receiver
2016-06-26 06:21:00 +02:00
Benjamin Neff
581f8d7226
don't force remove contact on block
...
this creates inconsistent states, if you remove the block in the future
2016-06-26 06:21:00 +02:00
Benjamin Neff
102e2a0834
remove Request class and refactor Connecting
2016-06-26 06:20:59 +02:00
Benjamin Neff
d87756c4b7
move #add_contact_to_aspect from User-model to user_methods.rb
2016-06-26 06:20:59 +02:00
Benjamin Neff
6fbfc2bf96
write receive specs and delete old unused specs
...
also refactored receive methods
2016-06-26 06:20:59 +02:00
Benjamin Neff
59bb46eeb6
handle retractions
2016-06-26 06:20:59 +02:00
Benjamin Neff
58a5a881cf
receive local
...
* Contact: auto-follow-back
* Shareable: create share visibilities
2016-06-26 06:20:59 +02:00
Benjamin Neff
ae96b4bf55
refactor message notifications
...
all visibilities are already in the conversation, so we can send
all notifications at once.
2016-06-26 06:20:59 +02:00
Benjamin Neff
d55be67df1
handle existing guids on receive
2016-06-26 06:20:59 +02:00
Benjamin Neff
4fb34139b0
cleanup notifications and fix tests
2016-06-26 06:20:59 +02:00
Benjamin Neff
ebfb0aa884
create NotificationService: send notifications after receive
2016-06-26 06:20:59 +02:00
Benjamin Neff
97f4b0c2e4
handle ignored author on receive
2016-06-26 06:20:59 +02:00
Benjamin Neff
53e14dd2d6
add ReceiveLocal worker
2016-06-26 06:20:59 +02:00
Benjamin Neff
e9f53265c9
create new receive workers
2016-06-26 06:20:59 +02:00
Benjamin Neff
800fa1786c
fix author join for federation callbacks with Poll
2016-06-26 06:20:58 +02:00
Benjamin Neff
1790efad08
implement :update_pod callback
2016-06-26 06:20:58 +02:00
Benjamin Neff
4408efdff3
fetch public key for unknown person
...
and do some refactorings
2016-06-26 06:20:58 +02:00
Benjamin Neff
7596a49b46
add new send workers
2016-06-26 06:20:58 +02:00
Benjamin Neff
b1d30aa9cc
add more "diaspora to federation entity" methods
...
move it to Diaspora::Federation::Entities and use it in some tests, but most of the tests can be removed later.
2016-06-26 06:20:58 +02:00
Steffen van Bergerem
b1943f1e46
Redesign default.haml and add a podmin welcome page
2016-06-20 02:03:53 +02:00
Jonne Haß
1ef3c1387b
Merge pull request #6872 from denschub/autolink-with-rel-noopener
...
Add rel="noopener noreferrer" to autolinks
2016-06-19 16:21:04 +02:00
Jonne Haß
35a4998707
Merge branch 'stable' into develop
2016-06-19 16:14:13 +02:00
Dennis Schubert
898c3d404f
Throw exception if no templateName gets provided but allow setting templateName to false explicitly
...
closes #6877
2016-06-19 16:14:00 +02:00
Dennis Schubert
652050a87e
Add rel="noopener noreferrer" to autolinks
2016-06-19 13:43:43 +02:00
Dennis Schubert
eb1e1e1263
Merge pull request #6768 from svbergerem/poltergeist
...
Use Poltergeist instead of Selenium
2016-06-19 11:43:50 +02:00
Steffen van Bergerem
629e6382ec
Use Poltergeist instead of Selenium
2016-06-19 01:53:18 +02:00
Dennis Schubert
61fb7410cc
Merge pull request #6844 from cmrd-senya/unique-aspect-visibilities
...
Fix possible duplication of AspectVisibility
2016-06-19 01:49:41 +02:00
Dennis Schubert
49395c0a11
Merge pull request #6812 from cmrd-senya/6811-visibilities-id-overlap
...
Don't include wrong shareable types in scopes
2016-06-19 01:40:01 +02:00
Steffen van Bergerem
657eec29f0
Update status message text after prefilling mentions
2016-06-18 23:29:59 +02:00
Dennis Schubert
520d80cc1a
Merge branch 'stable' into develop
2016-06-09 03:19:35 +02:00
Steffen van Bergerem
a14c61300e
Remove the publisher from the photos page
...
closes #6851
2016-06-09 03:17:52 +02:00
Steffen van Bergerem
8c8368d813
Merge pull request #6848 from cmrd-senya/6841-likes-from-profile
...
Fix like and reshare from the profile page
2016-06-08 23:26:06 +02:00
SansPseudoFix
5bac12d164
6853 fix usernames overflox
2016-06-07 13:02:44 +02:00
cmrd Senya
3b8b04ada8
Fix like and reshare from the profile page
...
Fix class assignment in the mobile view of profile page. Add a
cuke testing the "liking from the profile view" feature.
2016-06-06 19:00:13 +03:00
cmrd Senya
204f58e6a7
Remove repetion of shareable initialization code
2016-05-31 21:16:13 +03:00
cmrd Senya
717554edac
Fix possible duplication of AspectVisibility
...
No uniqueness control on AspectVisibility resulted in possible having
multiple AspectVisibility objects in the DB for the same aspect and
shareable which doesn't make sense. Introduce uniqueness validation
and fix up tests where duplication happened.
2016-05-27 20:22:03 +03:00
Steffen van Bergerem
1de7f8ea9e
Fix message content overflow in conversations
2016-05-13 01:18:16 +02:00
Dennis Schubert
53808847a2
Merge branch 'stable' into develop
2016-05-07 18:52:34 +02:00
Ralin Chimev
1773e3e35d
Do not change notification timestamp when making it read or unread.
...
Marking a notification as unread resets the timeago stamp causing
the times to look wrong. It can be reproduced by marking an old
notification as unread. Using the update_column instead of
update_attribute will not touch the updated_at attribute, and
thus will not affect the updated time ago in the view.
Fixes #6798 .
closes #6821
2016-05-07 18:52:27 +02:00
Dennis Schubert
209cd783c8
Merge pull request #6816 from cmrd-senya/publisher-refactor
...
A minor refactor of the Publisher
2016-05-06 02:23:54 +02:00
Dennis Schubert
230ec02ad7
Merge branch 'stable' into develop
2016-05-06 02:20:38 +02:00
sjain1107
4cd2f1d9c1
Add inviter diaspora-ID to the invite email #6796
...
closes #6817
2016-05-06 02:20:31 +02:00
Steffen van Bergerem
2263abdc82
Merge branch 'stable' into develop
2016-05-05 17:59:51 +02:00
Senya
ce6b1a3c0c
Clear unused regex in mention.rb
...
The REGEX is unused
closes #6810
2016-05-05 17:59:37 +02:00
Ralin Chimev
5dfd242eeb
Fix typo in _flash_messages.scss
...
There is a missing s in „&.alert-success“.
Fixes #6797 .
2016-05-04 17:24:55 +03:00
Steffen van Bergerem
87da8f96d9
Merge pull request #6670 from Flaburgan/fix-horizontal-scrolling-mobile
...
Fix horizontal scrolling on mobile profile
2016-05-04 01:24:56 +02:00
cmrd Senya
ab718dbbc6
A minor refactor of the Publisher
...
There was a minor copy-paste issue with publisher_public and
publisher_explain methods. Fix it and do a little refactoring
of the publisher's code.
2016-04-28 21:45:49 +03:00
Dennis Schubert
e9fb29eba4
Merge pull request #6803 from Flaburgan/5396-fix-error-message-on-mobile-upload
...
Fix error message on mobile image upload, close #5396
2016-04-21 07:25:37 +02:00
Dennis Schubert
2b5f20ef93
Merge pull request #6784 from cmrd-senya/deletion-redirect-fixup
...
Redirect to "/users/sign_in" after AccountDeletion
2016-04-21 07:23:19 +02:00
Dennis Schubert
d6171e53c3
Merge pull request #6778 from Zauberstuhl/facebook_review_changes
...
Changes for my successful facebook reviews
2016-04-21 06:50:57 +02:00
fla
96e0635bff
Fix error message on mobile image upload, close #5396
2016-04-18 20:54:32 +02:00
Flaburgan
52d1084cb1
Fix back to top icon not appearing on webkit browsers
2016-04-13 22:14:39 +02:00
Flaburgan
f2b75af08c
Back to top arrow redesign
2016-04-13 20:11:44 +02:00
Flaburgan
3e95dee58c
Fix back to top icon not appearing on webkit browsers
2016-04-11 11:33:07 +02:00
Steffen van Bergerem
75384d50a7
Improve search and mentions suggestions
2016-04-08 01:23:55 +02:00
cmrd Senya
77bd220e24
Redirect to "/users/sign_in" after AccountDeletion
...
There is no point to redirect to "/stream" after the account deletion
because the user is logged off.
2016-04-07 12:02:46 +03:00
fla
64ed7e9183
Remove bootstrap on mobile photos page
2016-04-03 18:40:50 +02:00
fla
bcf682d8ee
Fix horizontal scrolling on mobile profile
2016-04-03 18:40:50 +02:00
Lukas Matt
b9cf5995b8
Use provider name in translation
2016-03-31 13:18:35 +02:00
Steffen van Bergerem
6941cdc962
Add noscript warning
2016-03-31 13:17:56 +02:00
Steffen van Bergerem
c8a8110cf1
Merge branch 'stable' into develop
2016-03-30 11:13:47 +02:00
Dennis Schubert
fbe77781ff
Use 1004 as our placeholder birth year because 1004 was a leap year. (Well, actually, people in 1004 probably had no idea what a leap year is. Or red tests. Or code.)
2016-03-30 11:12:31 +02:00
