Jonne Haß
13029235d0
Merge branch 'stable' into develop
2015-12-13 12:28:04 +01:00
cmrd Senya
f0fc62e94d
Fix a security issue that author_signature is not checked on the to-downstream receive of a federated relayable entity, allowing to forge relayables if you are an owner of the pod where a parent object is stored.
...
closes #6539
2015-12-13 12:26:59 +01:00
Jonne Haß
21cb1f44cd
Merge branch 'stable' into develop
2015-12-08 17:30:32 +01:00
apsc92
fdb3ae5cb8
Fix_notifications_timestamp_issue #4826
...
closes #6573
2015-12-08 17:30:27 +01:00
Steffen van Bergerem
75e3085ca9
Merge branch 'stable' into develop
2015-11-27 12:46:46 +01:00
Manoj Mishra
ab21e6b134
Fix: Adding mention through paste user name from clipboard is not successfull
...
Input buffer wasn't getting updated with the user input when user did a
paste from clipboard, it caused search for the available contacts
to not trigger
closes #6510
2015-11-27 12:46:02 +01:00
Jonne Haß
086931d745
Merge branch 'stable' into develop
2015-11-23 03:13:13 +01:00
Jonne Haß
29d10a42f8
start 0.5.6.0 cycle
2015-11-23 03:12:00 +01:00
Jonne Haß
5f2e0907b7
freeze 0.5.5.0
2015-11-23 03:10:46 +01:00
Dennis Schubert
5081d69847
Merge branch 'stable' into develop
2015-11-22 02:52:37 +01:00
Jason Robinson
9a35a0d8dd
Add participation to root.author on receiving reshare
...
When author of the root post receives a reshare to it, no participation is added to the root author on the reshare. This causes any comments on the reshare on remote pods not to be sent to the author. Adding a participation should subscribe to the reshare and thus bring added comments back to the author.
closes #6481
2015-11-22 02:50:38 +01:00
Jonne Haß
17d0ddab41
Merge branch 'stable' into develop
2015-11-18 03:37:34 +01:00
Manuel Vögele
0925a26506
Do not add participation for comment if comment validation failed The same fix is also done for the other social actions
...
closes #6552
2015-11-18 03:16:54 +01:00
Jonne Haß
c6939361ee
Revert "Revert "Force flash message width to 80% of screen on small devices""
...
This reverts commit 53a7d36e44
2015-11-13 16:04:32 +01:00
Jonne Haß
f2091f3b73
Merge branch 'stable' into develop
2015-11-13 16:03:44 +01:00
Jonne Haß
53a7d36e44
Revert "Force flash message width to 80% of screen on small devices"
...
This reverts commit e731bb86c5
2015-11-13 15:59:18 +01:00
Jonne Haß
5de0655e54
Merge branch 'stable' into develop
2015-11-13 14:31:10 +01:00
Augier
e731bb86c5
Force flash message width to 80% of screen on small devices
...
closes #6529
2015-11-13 14:31:06 +01:00
Jonne Haß
910e9e815c
Merge pull request #6543 from manuelVo/5485-mobile-empty-comment-handling
...
Do not disable submit button if comment is empty in mobile view
2015-11-13 03:56:36 +01:00
Steffen van Bergerem
3c43819bce
Merge pull request #6504 from sarithats/fix/login_button
...
Change login button color
2015-10-21 08:16:54 +02:00
Dennis Schubert
228f3852b2
Merge branch 'stable' into develop
2015-10-15 05:58:44 +02:00
Steffen van Bergerem
995ce18c37
Display publisher on user profile path
...
closes #6503
2015-10-15 05:58:38 +02:00
Jonne Haß
99d4e0b332
Merge branch 'stable' into develop
2015-10-14 22:33:14 +02:00
cmrd Senya
69b46df3d6
Notifications for comments on local posts by non-contacts
2015-10-14 22:32:19 +02:00
Jonne Haß
d9572ec337
Merge branch 'stable' into develop
2015-10-14 11:00:47 +02:00
Lincoln Stoll
6ac6dc1059
Don't set key for logfile on Heroku
...
This fixes the issue reported in #5947 . Sidekiq will only log to stdout when this key evals to false, so this can't be forced with an empty string. This change eliminates the key altogether when running on Heroku.
closes #6500
2015-10-14 11:00:42 +02:00
Jonne Haß
09f4eeac2a
Merge branch 'stable' into develop
2015-10-12 16:12:36 +02:00
Steffen van Bergerem
b68daaece3
Redirect to sign in on 401 ajax response
...
closes #6496
2015-10-12 16:12:30 +02:00
Dennis Schubert
2b2ce66126
Merge branch 'stable' into develop
2015-10-12 03:44:44 +02:00
Dennis Schubert
9df2cb7290
Prepare 0.5.5.0 release
...
[ci skip]
2015-10-12 03:41:38 +02:00
Jonne Haß
2aed793d19
Merge branch 'stable' into develop
2015-10-11 17:30:47 +02:00
Steffen van Bergerem
123e6d1dd4
Redirect logged out users to sign up page for limited posts
...
closes #6490
2015-10-11 17:29:01 +02:00
Jonne Haß
77295ffcfb
Merge pull request #6487 from svbergerem/move-reshare-count
...
Move reshare count
2015-10-10 20:51:27 +02:00
Steffen van Bergerem
bce7157b86
Merge pull request #6395 from AugierLe42e/drop-flash-messages-widget
...
Use backbone for flash messages
2015-10-10 17:17:52 +02:00
Dennis Schubert
aab21be09d
Merge branch 'stable' into develop
2015-10-10 06:45:15 +02:00
Steffen van Bergerem
230f6d6d62
Fix hovercard view console error
...
closes #6480
2015-10-10 06:45:09 +02:00
Steffen van Bergerem
1ad48d7ce3
Fix changelog for #6462 [ci skip]
2015-10-08 16:18:49 +02:00
Steffen van Bergerem
0dd6c71b6d
Fix changelog for #6462 [ci skip]
2015-10-08 16:14:13 +02:00
Jonne Haß
23099823c1
Merge branch 'stable' into develop
2015-10-08 10:52:25 +02:00
Steffen van Bergerem
0c214cd4ca
Make click on active stream link reload the stream
...
closes #6466
2015-10-08 10:52:18 +02:00
Jonne Haß
92b5ea29ed
Merge branch 'stable' into develop
2015-10-07 22:29:45 +02:00
Steffen van Bergerem
e0be1b49f1
Add public stream
...
closes #6465
2015-10-07 22:29:39 +02:00
Steffen van Bergerem
c663d9d55e
Merge branch 'stable' into develop
2015-10-07 22:00:52 +02:00
Faldrian
058bcb43f8
Added avatar image fallback for notifications
...
closes #6463
2015-10-07 21:58:56 +02:00
Steffen van Bergerem
fc9d7396cc
Merge branch 'stable' into develop
2015-10-07 21:38:26 +02:00
Faldrian
d486e37487
following tags now normalized and sorted in ui
...
closes #6454
2015-10-07 21:38:12 +02:00
Jonne Haß
1df5c7f7bf
Merge branch 'stable' into develop
2015-10-07 10:58:10 +02:00
Faldrian
a946251a9e
Show getting_started only if user has made no profile changes on the page
...
closes #6456
2015-10-07 10:58:06 +02:00
Jonne Haß
ebe2754196
Merge pull request #6457 from svbergerem/permalink-v1
...
Add permalink for stream elements
2015-10-07 02:02:37 +02:00
Jonne Haß
7b4d7dc737
Merge branch 'stable' into develop
2015-10-06 22:50:42 +02:00
Steffen van Bergerem
517cd56f21
Don't reload stream pages
...
closes #6462
2015-10-06 22:46:58 +02:00
Jonne Haß
1ce967e873
Merge pull request #6378 from Zauberstuhl/bootstrap3_and_user_detail_btn
...
Report tab; Bootstrap3 compatible and reported-user-detail button
2015-10-03 19:12:08 +02:00
Steffen van Bergerem
7c777ca904
Merge branch 'stable' into develop
2015-10-02 23:42:36 +02:00
augier
22882aa24d
Infinite scroll triggered relative to last element top rather than window bottom
...
closes #6451
2015-10-02 23:42:26 +02:00
Steffen van Bergerem
dca23d1369
Merge pull request #6415 from AugierLe42e/replace-mobile-background-image
...
Replace mobile background image by a color
2015-10-02 21:57:16 +02:00
Steffen van Bergerem
7bcf464cf4
Merge pull request #6435 from Flaburgan/publisher-xsmall-cancel
...
Hide publisher cancel button on xsmall screens
2015-10-01 00:08:17 +02:00
Jonne Haß
2569c48050
Merge pull request #6431 from svbergerem/conversations-style-changes
...
Change conversation page style
2015-09-28 18:44:26 +02:00
Jonne Haß
4087036e63
Merge pull request #6428 from svbergerem/unify-error-pages
...
Unify error pages
2015-09-27 11:42:03 +02:00
Jonne Haß
600457a552
Merge pull request #6429 from svbergerem/fix-location-post-preview
...
Fix post preview with location
2015-09-27 11:37:15 +02:00
Steffen van Bergerem
9d6ce5b110
Merge pull request #6336 from AugierLe42e/clean-publisher
...
Cleaning publisher
2015-09-26 00:49:34 +02:00
Steffen van Bergerem
b40d5362cf
Merge pull request #6256 from TeamDeltaQuadrant/5813-show-geolocation-on-osm
...
5813 show geolocation on osm
2015-09-23 01:43:49 +02:00
Steffen van Bergerem
f2456eda9c
Merge pull request #6345 from Flaburgan/override-bootstrap-list-group
...
Override bootstrap list group default
2015-09-20 01:37:14 +02:00
Jonne Haß
c3c84b95a4
Merge branch 'stable' into develop
2015-09-19 11:33:10 +02:00
Achilleas Pipinellis
9888b4ce43
Add option to set a pid file for unicorn in diaspora.yml
...
http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-pid
closes #6411
2015-09-19 11:33:04 +02:00
Jonne Haß
3a29cb28ff
Merge branch 'stable' into develop
2015-09-14 22:09:04 +02:00
Jonne Haß
43a09fec39
add changelog entry for #6398 [ci skip]
2015-09-14 22:08:57 +02:00
Jonne Haß
6407b446fc
Merge branch 'stable' into develop
2015-09-13 12:35:56 +02:00
Jonne Haß
f7a883917c
Merge branch 'master' into stable
2015-09-13 12:35:46 +02:00
Jonne Haß
04b3531cd0
bump to 0.5.3.1
2015-09-13 12:33:44 +02:00
Jonne Haß
ba61ca4bdf
Merge branch 'stable' into develop
2015-09-07 13:25:14 +02:00
Jonne Haß
0e64d8de2a
Refactor tumblr service spec
...
closes #6386
2015-09-07 13:24:53 +02:00
Jonne Haß
176b32c815
Merge branch 'stable' into develop
2015-09-07 12:41:36 +02:00
zaziemo
d38741d5eb
add more specs to test moderator role
...
fixes #5324
closes #6351
2015-09-07 12:38:12 +02:00
Steffen van Bergerem
426f55e685
Merge branch 'stable' into develop
2015-09-05 16:12:00 +02:00
sjain1107
928576bc88
6306-add-spinner-on-initial-stream-load
...
closes #6384
2015-09-05 16:11:09 +02:00
Dennis Schubert
39fb1a6db2
Merge branch 'stable' into develop
2015-08-30 10:17:28 +02:00
Jason Robinson
0087fefd14
Change default autofollow_on_join_user
...
Due to performance of joindiaspora.com, a decision was made to set up a project pod that hosts the official support and news autofollow account (see https://www.loomio.org/d/tyZdcGNo/diasporahq-account-move-to-a-project-pod ). The new account is hq@pod.diaspora.software .
closes #6369
2015-08-30 10:17:05 +02:00
Dennis Schubert
4f2f3cca59
Merge branch 'stable' into develop
2015-08-29 21:44:31 +02:00
Steffen van Bergerem
1874c37706
Fix back-to-top backbone view
...
closes #6360
2015-08-29 21:44:24 +02:00
Steffen van Bergerem
5020ac45c7
Merge branch 'stable' into develop
2015-08-29 18:19:12 +02:00
SansPseudoFix
110284626a
Fix mobile pagination for notifications view
...
Fix syntax
Fix syntax
closes #6364
2015-08-29 18:13:54 +02:00
Jonne Haß
05e87b3170
Merge pull request #6363 from svbergerem/mobile-view-multiple-reaction-boxes
...
Mobile view multiple reaction boxes
2015-08-29 17:02:45 +02:00
Steffen van Bergerem
1b8d61f44c
Merge pull request #6285 from AugierLe42e/port-mobile-header-bs3
...
Styling of mobile header consistant with desktop version
2015-08-28 21:44:15 +02:00
Steffen van Bergerem
9446a3ae21
Merge pull request #6301 from AugierLe42e/image-gallery
...
Using Blueimp image gallery
2015-08-27 23:59:46 +02:00
Jonne Haß
24d9be2e68
Merge branch 'stable' into develop
2015-08-27 21:03:16 +02:00
augier
2ce7a1e185
Mobile subdomain
...
closes #6354
2015-08-27 21:01:36 +02:00
Jonne Haß
a30ba5697e
Merge pull request #6290 from Raven24/pod_test
...
test pods for connectivity
2015-08-27 11:38:18 +02:00
Steffen van Bergerem
b4a5819aa8
Merge pull request #6349 from Faldrian/beautify-blocked-persons
...
Beautify ignored people list and add diaspora handle for identification
2015-08-27 11:00:56 +02:00
Dennis Schubert
6b863defa3
Merge branch 'stable' into develop
2015-08-27 05:25:51 +02:00
Steffen van Bergerem
3c370ea56e
Remove unused js code (stream widget and dropdowns)
...
closes #6279
2015-08-25 04:26:17 +02:00
Jonne Haß
2bf6c87964
Merge branch 'stable' into develop
2015-08-23 22:49:51 +02:00
theworldbright
6e74ee7d21
Make PostPresenter inherit from BasePresenter
...
closes #6315
2015-08-23 22:49:45 +02:00
Steffen van Bergerem
eddfa7cb5c
Merge pull request #6309 from AugierLe42e/left-navbar-polishing
...
Left and right navbar polishing
2015-08-23 11:29:51 +02:00
Jonne Haß
e54208d39b
Merge branch 'stable' into develop
2015-08-23 11:13:47 +02:00
Steffen van Bergerem
a7287f4f93
Disable the handlebars auto-indent feature
...
closes #6339
2015-08-23 11:13:42 +02:00
Steffen van Bergerem
40ef382a6e
Merge branch 'stable' into develop
2015-08-22 01:35:32 +02:00
Anton Tkachov
ef6c8a5448
Issue #6180 : Update stream faces block if somebody was blocked
...
closes #6320
2015-08-22 01:35:23 +02:00
Jonne Haß
d396d5555f
Merge branch 'stable' into develop
2015-08-21 14:23:46 +02:00
Benjamin Neff
663835ed3a
remove old webfinger/hcard code
...
closes #6310
2015-08-21 14:23:08 +02:00
Jonne Haß
bd707c0d12
Merge pull request #6293 from svbergerem/typeahead
...
Replace jquery.autocomplete with typeahead.js
2015-08-12 15:05:46 +02:00
Jonne Haß
25be9ecfd2
Merge branch 'stable' into develop
2015-08-09 18:35:44 +02:00
theworldbright
d7c92431ae
Extract service from comments controller
...
closes #6307
2015-08-09 18:35:11 +02:00
Jonne Haß
480384a077
Merge branch 'stable' into develop
2015-08-06 22:56:30 +02:00
Steffen van Bergerem
dc576fb0d6
Check if person is nil in person_image_tag
...
closes #6286
2015-08-06 22:55:41 +02:00
Steffen van Bergerem
0aa453e437
Merge pull request #6291 from AugierLe42e/change-actions-icons-mobile
...
Use entypo icons on mobile posts
2015-08-06 18:00:03 +02:00
Steffen van Bergerem
633d65fe27
Merge branch 'stable' into develop
2015-08-06 14:42:28 +02:00
Anton Tkachov
f1d6e9440b
Issue #6281 : add url to hovercard avatar
...
closes #6297
2015-08-06 14:42:14 +02:00
Jonne Haß
85f9a0eaa9
Merge branch 'stable' into develop
2015-08-04 10:41:43 +02:00
Mikica Ivosevic
78b0fbbee6
Refactor HomeController#toggle_mobile
...
closes #6260
2015-08-04 10:41:21 +02:00
Steffen van Bergerem
b9db891fef
Merge pull request #6283 from AugierLe42e/clean-images
...
Suppress useless images
2015-08-02 23:26:46 +02:00
Jonne Haß
b7864a9976
Merge branch 'stable' into develop
2015-08-02 16:58:07 +02:00
theworldbright
cae5f94af0
Refactor status messages controller
...
closes #6280
2015-08-02 16:58:01 +02:00
Jonne Haß
4442616b0d
Merge branch 'stable' into develop
2015-07-30 12:01:35 +02:00
Steffen van Bergerem
536d1fe0e7
Move nsfw-shield to status-message
...
closes #6270
2015-07-30 12:00:48 +02:00
Steffen van Bergerem
bdfbbdc3eb
Merge branch 'stable' into develop
2015-07-30 04:20:26 +02:00
Mohammed Rashid
dd42635442
Issue #6235 : Add hoverable class inside the a tag
...
closes #6267
2015-07-30 04:18:06 +02:00
Steffen van Bergerem
e402bbdd3d
Merge pull request #6245 from AugierLe42e/fix-nsfw-author
...
Fix nsfw author
2015-07-30 00:28:15 +02:00
Steffen van Bergerem
922d700d92
Merge pull request #6233 from Flaburgan/improve-mobile-drawer-transition
...
Rework mobile drawer transition
2015-07-29 17:34:47 +02:00
Dennis Schubert
23c83b9447
Merge branch 'stable' into develop
2015-07-29 12:10:36 +02:00
Steffen van Bergerem
d8505b2ae0
Fix conversations view with no contacts
...
closes #6266
2015-07-29 12:08:35 +02:00
Jonne Haß
99f7e2fc52
Merge pull request #6261 from svbergerem/remove-mbp-helper
...
Remove mbp helper and refactor mobile publisher js
2015-07-29 00:26:20 +02:00
Jonne Haß
602ad2d209
Merge branch 'stable' into develop
2015-07-28 18:35:18 +02:00
Mikica Ivosevic
c8b01cb62c
application_controller.rb
...
refactor method after_sign_out_path_for
closes #6258
2015-07-28 18:35:13 +02:00
Jonne Haß
d62c4387f3
Merge branch 'stable' into develop
2015-07-28 18:24:19 +02:00
cmrd Senya
fa411c73a7
Remove unused minified js files mbp-respond.min.js and mbp-modernizr-custom.js ( #5939 ).
...
closes #6257
2015-07-28 18:24:10 +02:00
Steffen van Bergerem
9fdc1bd9c5
Merge pull request #6254 from SansPseudoFix/Fix-6241-Capitalize-Powered
...
Fix capitalize for powered by diaspora - translation
2015-07-28 15:36:21 +02:00
Dennis Schubert
1bd2fb3c73
Merge branch 'stable' into develop
2015-07-27 02:11:45 +02:00
Dennis Schubert
6c610ee587
PR #6243 is not included in 0.5.2.0...
2015-07-27 02:11:09 +02:00
Dennis Schubert
04135d7b28
Merge branch 'stable' into develop
2015-07-27 02:05:14 +02:00
Steffen van Bergerem
6fea450777
Fix mobile photos index page
...
closes #6243
2015-07-27 01:59:26 +02:00
Jonne Haß
6ee3843449
Merge branch 'stable' into develop
2015-07-26 13:11:49 +02:00
theworldbright
2a3dde1ae5
Refactor PostService and extract its tests
...
Squashed commits:
[ada0f09] Remove favorites from Posts table
closes #6208
2015-07-26 13:10:24 +02:00
Dennis Schubert
3c584ce335
Add Changelog entry for #6207
...
[ci skip]
2015-07-26 00:13:19 +02:00
Jonne Haß
11a8ac614c
Merge pull request #6240 from svbergerem/contact-page-update-counts
...
Update number of contacts on contact page when adding/removing contacts
2015-07-24 22:02:39 +02:00
Dennis Schubert
1904520d30
Merge branch 'stable' into develop
2015-07-24 04:17:02 +02:00
Jonne Haß
d68b3f02bd
Expose whether chat is enabled as NodeInfo metadata
...
related to #6211
2015-07-24 04:16:54 +02:00
Jonne Haß
5a5d595339
Merge pull request #6238 from svbergerem/mobile-location-polls
...
Add location and polls to mobile website
2015-07-23 20:02:11 +02:00
Jonne Haß
2cede713b1
Merge pull request #6228 from svbergerem/refactor-publisher-js
...
Refactor publisher_view.js
2015-07-22 20:59:35 +02:00
Jonne Haß
5ecafa2bb0
Merge pull request #6227 from svbergerem/accessibility
...
Improve accessibility of signin/signup/password and conversation pages
2015-07-22 15:09:21 +02:00
Jonne Haß
3af30718f9
Merge branch 'stable' into develop
2015-07-22 11:55:59 +02:00
Steffen van Bergerem
aa53763b98
Fix peeping tom on 404 error page
...
closes #6226
2015-07-22 11:55:24 +02:00
Jonne Haß
0cbe7ec9a8
Merge branch 'stable' into develop
2015-07-22 10:05:46 +02:00
Steffen van Bergerem
f8bbe71f54
Remove correlations
...
closes #6223
2015-07-22 09:46:52 +02:00
Jonne Haß
d6587469e4
Merge pull request #6218 from svbergerem/mobile-entypo
...
Entypo on mobile website
2015-07-22 00:11:55 +02:00
Jonne Haß
dbbaf90c27
Merge pull request #6216 from svbergerem/admin-page-update-notifications
...
Add dashboard to admin page
2015-07-21 16:55:27 +02:00
Steffen van Bergerem
94b745d5c8
Merge branch 'stable' into develop
2015-07-20 01:31:33 +02:00
Ivan Korunkov
5ca9ca9844
Default home page: fix wiki link title; GitHub wiki is obsolete, because it has been moved from GitHub to independent resource.
...
closes #6212
2015-07-20 01:31:22 +02:00
Jonne Haß
3e841905ec
Merge branch 'stable' into develop
2015-07-20 00:58:33 +02:00
Jonne Haß
ccf2fad903
Start 0.5.3.0 development cycle
2015-07-20 00:57:24 +02:00
Jonne Haß
0e439f6c1c
Merge branch 'stable' into develop
2015-07-16 11:12:16 +02:00
