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
Lukas Matt
267d91bf66
Changes for a successful facebook review
...
I had two facebook reviews in the past days
Removing the display type and adding a explicit
'Share to' provider tag did the trick
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2016-03-30 10:36:28 +02:00
Steffen van Bergerem
0cbb1233aa
Fix conversations participants design regression
2016-03-23 01:47:30 +01:00
Flaburgan
847fdb0de9
split left column
2016-03-22 17:01:44 +01:00
Flaburgan
5ff085afff
Fix tests
2016-03-22 13:00:51 +01:00
fla
a10601f9a9
collapse left navbar sections
2016-03-22 13:00:51 +01:00
fla
70140259ba
Max-width for the whole content
2016-03-22 13:00:51 +01:00
fla
d0d3df05eb
Fix original white theme
2016-03-22 13:00:51 +01:00
Flaburgan
3c2bc54061
Fix getting started help
...
Add temp max-width to the streams
Back to white bg for left menu
Fix invitation code selection
fix pronto errors
2016-03-22 13:00:51 +01:00
fla
76f74ebc0b
remove dark gray left column on tag page
2016-03-22 13:00:51 +01:00
fla
5f446330e2
collapse the sidebars to the side of the screen even on big screens
...
Drop right side bar, move content to left side bar
Move user avatar and name from the left nav bar to the left of the publisher
2016-03-22 13:00:50 +01:00
Steffen van Bergerem
832c85d835
Unify mobile and desktop registration and session forms
2016-03-21 20:23:36 +01:00
Jonne Haß
47f6ea4b98
Merge pull request #6762 from svbergerem/fix-notifications-design-regression
...
Fix notifications page design regressions
2016-03-21 13:48:41 +01:00
Jonne Haß
7c5d6886ba
Merge pull request #6729 from theworldbright/6696-api-scope-escalation-fix
...
#6696 - Fix API scope escalation
2016-03-21 13:45:18 +01:00
Steffen van Bergerem
1d86c8196c
Fix notifications page design regressions
2016-03-20 02:25:50 +01:00
Dennis Schubert
3bb28ec016
Merge pull request #6757 from svbergerem/fix-mentions-input-box-submitting
...
Fix publisher overflow on submit
2016-03-18 07:28:36 +01:00
Dennis Schubert
446201b584
Merge branch 'stable' into develop
2016-03-18 07:24:44 +01:00
Benjamin Neff
67fbd02ae0
use AppConfig.url_to for generated urls for oembed
...
_url doesn't with generate https if the pod uses https
2016-03-18 07:24:25 +01:00
Steffen van Bergerem
3210d0d260
Fix publisher overflow on submit
2016-03-18 05:04:22 +01:00
theworldbright
bb3849e4b1
Fix API privilege scope escalation
2016-03-11 17:18:21 -08:00
Dennis Schubert
69ac153fe9
Merge pull request #6745 from cmrd-senya/remove_diaspora_handle_shareables
...
Remove diaspora_handle from shareables
2016-03-08 23:45:16 +01:00
Dennis Schubert
df1c1ab24e
Merge pull request #6744 from SuperTux88/refactor-services
...
Refactor services
2016-03-08 23:35:43 +01:00
Dennis Schubert
485f7c5263
Merge pull request #6742 from svbergerem/fix-tooltips-in-media
...
Fix tooltips inside of .media elements
2016-03-07 18:47:15 +01:00
cmrd Senya
2986aa8b24
Remove diaspora_handle from shareables
...
We can determine diaspora_handle from a relation with people for the
shareables (posts, photos). So we don't need to store diaspora_handle in
the DB. Also remove tmp_old_id from photos which is not refenrenced anywhere.
2016-03-07 18:47:21 +03:00
Steffen van Bergerem
11b659864f
Fix typeahead suggestions with nonlatin chars
2016-03-07 14:54:45 +01:00
Benjamin Neff
0c8588eec8
PostService: create find!
...
* find returns nil if nothing found
* find! raises errors if not found or not visible
2016-03-07 05:52:54 +01:00
Benjamin Neff
e6b72b526f
remove "not public" error page
...
this is not used anymore:
* not logged in users are redirected to the login page
* logged in users see the normal 404 page
2016-03-07 05:52:54 +01:00
Benjamin Neff
017842cc01
don't update updated_at date when read the notifications.
...
updated_at is displayed in the frontend and should only be updated when
another notification_actor gets added
Also improved the sql-queries: update directly and not select first and
update then.
2016-03-07 05:52:54 +01:00
Benjamin Neff
d94eae0d45
refactoring PostService
...
* move presenters back to controllers, this is view-logic
* use PostService in CommentService
* remove iframe route, this is not used anymore
* id/guid limit at 16 chars, hex(8) is 16 chars long
2016-03-07 05:52:54 +01:00
Benjamin Neff
b398b115bc
refactoring CommentService
2016-03-07 05:52:54 +01:00
Benjamin Neff
5a46da47c3
refactoring StatusMessageCreationService
...
* move parameter normalization back to controller, because this is
frontend-specific.
* if the StatusMessage is public, save also public photos
2016-03-07 00:00:27 +01:00
Benjamin Neff
10af3a8b11
fix pod table migration if someone deleted a user (owner) manually
2016-03-06 23:55:28 +01:00
Steffen van Bergerem
665015859a
Fix tooltips inside of .media elements
2016-03-06 00:42:29 +01:00
Jonne Haß
39ae5e741e
Merge pull request #6732 from SuperTux88/cleanup-aspect_visibilities
...
Cleanup aspect visibilities
2016-03-05 11:05:55 +01:00
Dennis Schubert
91d636b9f6
Merge pull request #6727 from SuperTux88/improve-pod-check
...
Improve pod check
2016-03-05 06:03:20 +01:00
Benjamin Neff
acb91c79d2
improve pod connection check
...
* use port for check
* respect entries in /etc/hosts
* test /.well-known/host-meta
* don't allow redirects to other domains
2016-03-05 02:57:11 +01:00
Benjamin Neff
b1a6516474
add migration for pods-table
...
* add port to pods
* remove url from person and link people with pod-table
2016-03-05 00:12:54 +01:00
Steffen van Bergerem
f556a5210e
Refactor js search views
2016-03-04 22:55:39 +01:00
Benjamin Neff
f913128967
don't add public shareables to aspect_visibilities
2016-03-04 20:13:52 +01:00
Steffen van Bergerem
bf17205c17
Fix some publisher.scss scss-lint errors
2016-03-04 18:02:22 +01:00
Steffen van Bergerem
f06ff01c9e
Remove jquery.hotkeys
2016-03-04 18:02:22 +01:00
Steffen van Bergerem
bee08daca6
Remove jquery-elastic
2016-03-04 18:02:22 +01:00
Steffen van Bergerem
f948120ba6
Refactor keycodes
2016-03-04 18:02:22 +01:00
Augier
e34960392c
Code simplifications and typo
2016-03-04 18:02:22 +01:00
Augier
8f021be20b
Do not instanciate publisher if not publisher element is present
2016-03-04 18:02:22 +01:00
augier
b1d60d7c9a
Jasmine tests
2016-03-04 18:02:22 +01:00
augier
f1e8c57c26
CSS guidestyle
2016-03-04 18:02:22 +01:00
augier
c9f87796cc
Using Typeahead for mentionning box
2016-03-04 18:02:22 +01:00
Benjamin Neff
7011f2961d
Revert "Back out #6723 due to Postgres breakage"
...
This reverts commit 84cfbd22fc
2016-03-04 14:01:31 +01:00
Dennis Schubert
84cfbd22fc
Back out #6723 due to Postgres breakage
...
This reverts commit 832a56134b75c3e6068c
2016-03-04 13:33:32 +01:00
Benjamin Neff
e3d1f0fd16
fix order with two posts with the same timestamp for all streams
2016-03-03 21:43:11 +01:00
Benjamin Neff
7583568be8
update queries for new ShareVisibility
...
Also:
* remove ShareablesFromPerson evil-query
* improve multi-stream and aspect-stream queries
* fix logging for recieve
* don't add last 100 public posts to users streams after sharing
* delete share visibility when shareable is deleted
2016-03-03 21:43:11 +01:00
Dennis Schubert
75c3e6068c
Merge branch 'stable' into develop
2016-03-03 17:58:05 +01:00
Steffen van Bergerem
b98af83c9d
Sort tag search result by name
...
closes #6734
2016-03-03 17:57:58 +01:00
Dennis Schubert
7c88fb7936
Merge pull request #6586 from cmrd-senya/drop-signatures
...
Remove parent author signature for relayables from the DB
2016-03-03 17:39:28 +01:00
Steffen van Bergerem
b69361838b
Merge pull request #6621 from Fensterbank/6610-improved-gallery
...
add a card footer in gallery containing meta data and link to single post view
2016-03-02 21:47:53 +01:00
Frédéric Bolvin
e8bddcc7a7
add a card footer in gallery containing meta data and link to single post view
2016-03-02 19:50:32 +01:00
Dennis Schubert
51366e287c
Merge pull request #6719 from cmrd-senya/pkey_archive
...
Include a private key to the user data export archive
2016-02-26 11:41:04 +01:00
Steffen van Bergerem
70a67e1824
Fix reshare icon style regression from #6709
2016-02-25 17:42:42 +01:00
cmrd Senya
6d9fa06e32
Include a private key to the user data export archive
...
In order to allow a user to notify his contacts of his migration
with a trustworthy signature the old private key must be available
to the new pod where we import data.
2016-02-25 13:38:24 +03:00
Dennis Schubert
51eb3a79fc
Merge pull request #6718 from svbergerem/fix-contacts-page-notification-count
...
Fix notification count change on contacts page
2016-02-25 09:26:34 +01:00
Dennis Schubert
477e2572ac
Merge pull request #6717 from svbergerem/fix-contacts-page-style-regression
...
Fix style regression on contacts page from #6697
2016-02-25 09:24:42 +01:00
Dennis Schubert
de37bbbed0
Merge pull request #6712 from svbergerem/spv-avatar-alignment
...
Improve interaction avatar alignment for SPV
2016-02-25 09:24:28 +01:00
Steffen van Bergerem
dafafcd680
Fix notification count change on contacts page
2016-02-24 23:56:01 +01:00
Steffen van Bergerem
5692190f09
Fix style regression on contacts page from #6697 for notification dropdown and no contacts well
2016-02-24 22:46:47 +01:00
cmrd Senya
8683067ace
Remove #publisher_photo_upload from haml
...
It seems like #publisher_photo_upload is relict of blueprint.
It was removed from CSS in 0c7d319fdc
2016-02-24 13:47:45 +03:00
Steffen van Bergerem
f9fe64da23
Improve interaction avatar alignment for SPV
2016-02-23 22:15:43 +01:00
Dennis Schubert
5e02dd0864
Merge pull request #6709 from svbergerem/unify-spv-ui
...
Adjust the SPV design
2016-02-23 11:47:09 +01:00
Steffen van Bergerem
d9e3f3a734
Merge branch 'stable' into develop
2016-02-23 09:38:53 +01:00
Dennis Schubert
9f2e5b1868
Only mark unread notifications as read otherwise, the UPDATE statement would update all the notifications...
...
closes #6711
2016-02-23 09:38:34 +01:00
Steffen van Bergerem
c7e3f2fc19
Adjust the SPV design
2016-02-23 09:20:54 +01:00
Dennis Schubert
dbdf352a6b
Merge branch 'stable' into develop
2016-02-23 06:35:26 +01:00
Steffen van Bergerem
0392549702
Add footer on conversations page
...
closes #6710
2016-02-23 06:35:15 +01:00
Dennis Schubert
535057aca4
Merge branch 'stable' into develop
2016-02-21 04:26:25 +01:00
Marien Fressinaud
27a8e0fbca
Test if user is nil in #reset_authentication_token
...
Actually it redirects to stream page and says that user is already logged in.
Fix https://github.com/diaspora/diaspora/issues/6326
2016-02-21 04:24:50 +01:00
Dennis Schubert
3d3e82f7f0
Merge branch 'stable' into develop
2016-02-21 04:20:19 +01:00
Saritha
7fe7287928
Fix for Empty input field when editing aspect name Fix #6548
2016-02-21 04:18:07 +01:00
Steffen van Bergerem
f8f05371e0
Merge pull request #6394 from AugierLe42e/mobile-js-refactor
...
Mobile JS refactor
2016-02-15 22:22:35 +01:00
Augier
28c509baeb
Add jasmine specs for mobile view
2016-02-15 12:14:35 +01:00
Dennis Schubert
41ccccb85a
Merge pull request #6697 from svbergerem/unify-ui
...
Unify contacts, notifications and settings UI
2016-02-15 01:41:16 +01:00
Steffen van Bergerem
89f21e87f8
Remove unused code
2016-02-14 02:48:51 +01:00
Steffen van Bergerem
1ba4357aaa
Unify contacts, notifications and settings UI
2016-02-14 00:12:11 +01:00
Jonne Haß
e873b6cd4f
Merge branch 'stable' into develop
2016-02-12 15:51:29 +01:00
Steffen van Bergerem
c805ee2cec
Remove unused variables, fix undefined variables
...
closes #6694
2016-02-12 15:51:25 +01:00
augier
cc1faa63ec
Mobile JS refactor
2016-02-11 10:21:24 +01:00
Steffen van Bergerem
be254a7d4d
Fix placement of gallery navigation arrows
2016-02-10 01:20:05 +01:00
Steffen van Bergerem
6efde34bb8
Remove stream faces
2016-02-08 17:42:36 +01:00
Dennis Schubert
5b21be845e
Merge branch 'stable' into develop
2016-02-08 08:21:35 +01:00
Steffen van Bergerem
f066daedbb
Disable share button in mobile publisher on submit
...
closes #6682 , closes #6330
2016-02-08 08:20:24 +01:00
Dennis Schubert
695ca83638
Merge branch 'stable' into develop
2016-02-08 08:18:33 +01:00
Steffen van Bergerem
f9f5e990f9
Remove bidi-override for author names
...
closes #6680 , closes #4785
2016-02-08 08:16:37 +01:00
Dennis Schubert
5933c63a4a
Merge pull request #6684 from svbergerem/fix-mobile-js-avatar-upload
...
Fix uncaught type error for mobile avatar upload
2016-02-08 08:01:21 +01:00
Dennis Schubert
9f6cc7cf12
Merge pull request #6683 from svbergerem/fix-mobile-500-like
...
Fix 500 for mobile like without javascript
2016-02-08 08:00:07 +01:00
Dennis Schubert
73ab7e253e
Merge pull request #6681 from svbergerem/mobile-getting-started-completed
...
Mark getting started as completed on mobile website
2016-02-08 07:58:29 +01:00
Dennis Schubert
a87f313927
Merge pull request #6679 from svbergerem/post-report-reason-in-mail
...
Add reason for post report to email sent to admins
2016-02-08 07:56:49 +01:00
Steffen van Bergerem
9cc40af69c
Fix 500 for mobile like without javascript
2016-02-08 03:11:55 +01:00
Steffen van Bergerem
6e895532c5
Fix uncaught type error for mobile avatar upload
2016-02-08 02:46:50 +01:00
Steffen van Bergerem
77d45c28c9
Mark getting started as completed on mobile website
2016-02-07 23:21:38 +01:00
Steffen van Bergerem
482cbe7fcc
Add reason for post report to email sent to admins
2016-02-07 17:58:03 +01:00
Dennis Schubert
0c1483b16a
Merge pull request #6678 from svbergerem/mobile-registration
...
Fix mobile registration design
2016-02-07 16:33:17 +01:00
Dennis Schubert
15d5e0febc
Merge branch 'stable' into develop
2016-02-07 16:31:53 +01:00
Steffen van Bergerem
785665b9ad
Fix mobile registration layout after failed registration
...
closes #6677
2016-02-07 16:31:48 +01:00
Steffen van Bergerem
b06981c031
Fix mobile registration design
2016-02-07 13:42:52 +01:00
Dennis Schubert
d67ec12913
Merge branch 'Faldrian-3307-collapse_long_images' into develop
2016-02-07 05:55:14 +01:00
Dennis Schubert
26e37c46bd
Merge branch 'svbergerem-textarea-autosize' into develop
2016-02-07 05:39:49 +01:00
Dennis Schubert
868a45e3e0
Merge branch 'svbergerem-unify-ui' into develop
2016-02-07 05:29:08 +01:00
Steffen van Bergerem
936460e874
Merge branch 'stable' into develop
2016-02-06 15:40:16 +01:00
Dennis Schubert
87ef4446e1
Remove uma.jpg and wolf.jpg
...
closes #6673
2016-02-06 15:39:38 +01:00
Steffen van Bergerem
3f72b231d4
Enable autosize for all textareas
2016-02-06 15:10:32 +01:00
Steffen van Bergerem
ada0ad6eb5
Unify settings ui
2016-02-06 14:15:04 +01:00
Steffen van Bergerem
03ef5bd064
Set max-width to 1200px for container-fluid
2016-02-06 14:15:04 +01:00
Steffen van Bergerem
0c34452840
Merge pull request #6654 from korun/set-default-resize-style-01
...
CSS: set "resize: vertical" as default for textarea
2016-02-06 12:00:44 +01:00
Steffen van Bergerem
0c05b474c5
Merge pull request #6509 from AugierLe42e/fix-mobile-comment
...
Refactor mobile comment section
2016-02-05 11:30:04 +01:00
Faldrian
6da2720168
Check for collapsible content_view again after images are loaded
2016-02-04 21:39:28 +01:00
Augier
a5198e9a01
Fix no reaction case
2016-02-03 16:06:24 +01:00
Jonne Haß
1832c2956e
Merge branch 'stable' into develop
2016-02-01 11:27:06 +01:00
Sayed Abdelhaleem
fa97a5a5a2
Issue #6662 : fix refresh my photos routing error
...
closes #6667
2016-02-01 11:24:16 +01:00
Steffen van Bergerem
17e8d2fcbb
Fix blueimp gallery indicators
2016-02-01 02:32:49 +01:00
Jonne Haß
f4454f4488
Merge branch 'stable' into develop
2016-01-30 15:04:29 +01:00
Jonne Haß
32bda8fe20
Merge branch 'stable' into develop
2016-01-28 18:47:18 +01:00
Faldrian
8e3816e64e
let mention-regex only match usable strings
...
closes #6658
2016-01-28 18:47:13 +01:00
Steffen van Bergerem
40c42eb5b3
Merge pull request #6641 from Flaburgan/add-poll-result
...
Add answer poll counts
2016-01-26 23:54:37 +01:00
Dennis Schubert
7c197756dd
Merge branch 'stable' into develop
2016-01-26 15:19:55 +01:00
Dennis Schubert
211365c169
Merge branch 'master' into stable
2016-01-26 15:19:27 +01:00
Dennis Schubert
ad20bb052c
Fix include_root_in_json misuse
...
since it is no longer exposed for instances, our post_presenter failed
hard.
2016-01-26 15:18:02 +01:00
fla
1e27b509f9
Add number of votes on poll answers
2016-01-24 14:31:06 +01:00
Ivan
b631b4c0e5
set "resize: vertical" as default for textarea
2016-01-24 10:53:19 +03:00
cmrd Senya
ed61ef6d6a
Replace sidetiq with sidekiq-cron
...
closes #6616
2016-01-24 07:20:44 +01:00
Dennis Schubert
515cda7658
Merge branch 'stable' into develop
2016-01-24 07:15:04 +01:00
Benjamin Neff
44ab0df02b
fix suppress_annoying_errors
...
closes #6653
2016-01-24 07:14:58 +01:00
Dennis Schubert
b1aa8aacfd
Merge branch 'stable' into develop
2016-01-24 07:13:11 +01:00
Steffen van Bergerem
0213bbc028
Add podmin email to 500 error page
...
closes #6652
2016-01-24 07:12:06 +01:00
Steffen van Bergerem
a3adc2fb36
Fix timeago tooltips for reshares
2016-01-21 22:42:30 +01:00
Dennis Schubert
dd93cb6cad
Merge pull request #6646 from svbergerem/commenting-when-ignored
...
Tell user that the author might ignore them when commenting/liking failed
2016-01-21 21:07:37 +01:00
Steffen van Bergerem
a52c8a2f55
Tell user that the author might ignore them when commenting/liking failed
2016-01-21 21:02:39 +01:00
Dennis Schubert
ff867cd471
Merge branch 'stable' into develop
2016-01-21 21:00:32 +01:00
Steffen van Bergerem
749016a7b4
Fix keyboard shortcuts on profile pages
...
closes #6647
2016-01-21 21:00:26 +01:00
Steffen van Bergerem
6fce81fc99
Merge branch 'stable' into develop
2016-01-20 21:37:30 +01:00
tamatsyk
960e651764
internationalize controller rescue_from text
...
Fix typos
change forbitten to forbidden
fix styling issue and copypaste
improve code style for aspec_memberships_controller.rb with rubocop
fix styling issues
aligned elements of hash literals
fix typo
fix locale name and styling of its usage
fix failing tests
closes #6554
2016-01-20 21:37:02 +01:00
augier
054971c7de
Big refactor on mobile comments
2016-01-15 15:54:34 +01:00
Marien Fressinaud
bde3b47c02
[WIP] [mobile] Embedded new comment form in HTML
2016-01-15 15:54:34 +01:00
Steffen van Bergerem
5bd15e23f8
Clean up scss code for original white background
2016-01-10 00:48:30 +01:00
jpope
cab192b69e
add original white background color theme
2016-01-10 00:48:30 +01:00
Steffen van Bergerem
67922f8ad4
Merge pull request #6483 from Flaburgan/add-not-connected-header-to-mobile
...
Add header on not connected pages on mobile version
2016-01-08 13:33:04 +01:00
Jonne Haß
baeff22451
Merge pull request #6095 from AugierLe42e/openid
...
OpenID Connect
2016-01-06 12:30:15 +01:00
Manuel Vögele
4f34ecafa4
Show posts of ignored users on their profile page
2016-01-04 18:29:30 +01:00
theworldbright
38439277d6
Add licenses where appropriate
2016-01-04 17:22:44 +09:00
theworldbright
58aef5658b
Fix remaining remarks
2016-01-04 17:01:40 +09:00
augier
ef7ea1a855
General text error + CSS styling
...
Minor merge conflict fix by theworldbright
2016-01-04 16:49:59 +09:00
augier
10314ffc8c
Fixing more remarks
2016-01-04 16:49:58 +09:00
theworldbright
c1e1f9bf69
Fix 500 error when unknown algorithm is used for JWT
2016-01-04 16:49:58 +09:00
theworldbright
4cde41486b
Fix handling of prompt=login
2016-01-04 16:49:58 +09:00
theworldbright
9f85a90f55
Update code_used to false after issues new code
2016-01-04 16:49:58 +09:00
theworldbright
a4095692b7
Add default kid to jwks.json
2016-01-04 16:49:58 +09:00
theworldbright
1e3421713a
Handle error when request object is signed
2016-01-04 16:49:58 +09:00
theworldbright
7e8bd0f411
Add fallback for failed app logo rendering
2016-01-04 16:49:58 +09:00
theworldbright
fd4022a55c
Fix pronto remarks
2016-01-04 16:49:58 +09:00
theworldbright
773a5a67d9
Add default kid to ID token
2016-01-04 16:49:58 +09:00
theworldbright
ed1dc256a8
Fix handling of error message in authorization controller
2016-01-04 16:49:58 +09:00
augier
ebeafb7894
Add custom error page when prompt=none
2016-01-04 16:49:57 +09:00
augier
73c1f0bc70
Fix pronto remarks
2016-01-04 16:49:57 +09:00
theworldbright
c6bec2f2dc
Return error to RP instead of user for prompt=none
2016-01-04 16:49:57 +09:00
theworldbright
7865a30fec
Return an JSON error response for invalid jwks_uri
2016-01-04 16:49:57 +09:00
theworldbright
3440709ec5
Explicitly state no support for user info alg
2016-01-04 16:49:57 +09:00
theworldbright
f1b394de0f
Fix remaining remarks
2016-01-04 16:49:57 +09:00
augier
d028b5672e
Fix remarks
2016-01-04 16:49:57 +09:00
theworldbright
2f8c391ac6
Fix pronto and travis errors
2016-01-04 16:49:57 +09:00
theworldbright
8f5094c29e
Gracefully handle SSL verification failure
2016-01-04 16:49:56 +09:00
theworldbright
0fbcb71255
Add support for request_uri and claims
2016-01-04 16:49:56 +09:00
theworldbright
82600003b3
Flash error messages when redirect_uri is invalid
2016-01-04 16:49:56 +09:00
theworldbright
e4edad0646
Fix test for the auth missing the response_type parameter
2016-01-04 16:49:56 +09:00
theworldbright
adcf2ab7ab
Fix test for prompt == "none"
2016-01-04 16:49:56 +09:00
augier
d351db1982
Filter for prompt handling
2016-01-04 16:49:56 +09:00
augier
7b2be0d3c6
Support displaying TOS and policy
2016-01-04 16:49:56 +09:00
augier
6fcb9a9d3a
Add XSS spec for application's name
2016-01-04 16:49:56 +09:00
theworldbright
9c9880d880
Move JWKs files to database
2016-01-04 16:49:56 +09:00
augier
2c7d102019
Design for authorization page when client_name not providen + XSS spec
2016-01-04 16:49:55 +09:00
theworldbright
80cbc7d915
Destroy previous auths on new auth request
2016-01-04 16:49:55 +09:00
theworldbright
da766d8e8b
Revoke previously issued tokens on duplicate request
2016-01-04 16:49:55 +09:00
theworldbright
b3b9b39690
Fix request with prompt=none when not logged in
2016-01-04 16:49:55 +09:00
