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

18989 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
c74a7041f1 Merge pull request #7000 from svbergerem/router-trailing-slash 
Fix backbone router for URLs with trailing slashes
 2016-08-18 11:59:20 +02:00
Steffen van Bergerem
0a1a7b167f
Merge pull request #6983 from AugierLe42e/fix-mobile-photo-page-avatar 
Fixes the avatar on mobile multiphoto page
 2016-08-18 11:22:29 +02:00
Steffen van Bergerem
18683f9ca8
Fix backbone router for URLs with trailing slashes 2016-08-18 10:57:59 +02:00
Augier
8a3f0778f5 Fixes the avatar display on mobile the photo page 2016-08-18 10:52:31 +02:00
Steffen van Bergerem
34e3fb2e14
Merge pull request #6991 from cmrd-senya/dropdown-regression 
Fix aspect dropdown when person is being fetched
 2016-08-18 10:07:35 +02:00
Jonne Haß
1c799ccebd Merge pull request #6996 from svbergerem/refactor-contacts-page 
Refactor contacts page
 2016-08-18 08:47:57 +02:00
Steffen van Bergerem
21887675a6
Use Bootstrap pagination on people search page 2016-08-18 01:54:43 +02:00
Steffen van Bergerem
993f3d5ab0
Refactor contacts page using pagination 2016-08-18 01:54:43 +02:00
Benjamin Neff
fb318373c7 only create mentions after creating statusmessages 2016-08-17 02:26:58 +02:00
Jonne Haß
d022e51a0c Merge pull request #6993 from cmrd-senya/diaspora-id-validation 
Use diaspora_id validation from the federation gem
 2016-08-16 11:55:59 +02:00
cmrd Senya
6fba0e498e
Use diaspora_id validation from the federation gem 
DRY
 2016-08-16 12:08:06 +03:00
Jonne Haß
fedd378dcf
Merge pull request #6992 from SuperTux88/4491-fetch-mentioned-people 
fetch mentioned people if they don't exist locally yet
 2016-08-16 10:41:02 +02:00
Steffen van Bergerem
e5c5490932
Merge pull request #6981 from AugierLe42e/fix-6979 
Fixes #6979
 2016-08-15 23:00:16 +02:00
cmrd Senya
4b3f36e92a
Fix aspect dropdown when person is being fetched 
fix #6989
 2016-08-15 23:43:24 +03:00
Dennis Schubert
9d662a90d6
Merge pull request #6987 from SuperTux88/allow-hovercard-for-remote-people 
Allow hovercards of remote people when not logged in
 2016-08-15 16:25:48 +02:00
Jonne Haß
c53393c5de
Merge pull request #6903 from CSammy/6152-tags-page-slow 
Improve /tag page performance.
 2016-08-15 14:09:59 +02:00
CSammy
8491df1625 Added test for loading of previous posts on a tag page. 2016-08-15 13:30:20 +02:00
CSammy
adc9492bf0 Added tests for various result cardinalities of tag pages. 2016-08-15 04:39:36 +02:00
CSammy
1d793fcc49 Reused tag stream query for tag pages. 2016-08-15 04:39:11 +02: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ß
e712e4c92f Merge pull request #6986 from SuperTux88/cleanup-rake-tasks 
Cleanup old rake tasks
 2016-08-14 20:57:22 +02:00
Benjamin Neff
80d1352ba4 Cleanup old rake tasks 
* accounts:run_deletions: was added with 0.4.0.0 two years ago for one-time usage.
* db:rebuild: db:reset does basically the same
* db:integration:preprare: the integration environments are not used.
* db:reset: there is a default db:reset, no need to write our own.
* db:drop_integration: the integration environments are not used.
* db:fix_diaspora_handle: really old migration from 2010
* db:move_private_key: also old migration from 2010
* maintenance:clear_carrierwave_temp_uploads: tmp/uploads doesn't exist anymore. And we have CleanCachedFiles as cronjob.
* maintenance:install_logrotate_config: diaspora has built-in logrotate support now, and people who want to use logrotate instead can write their own configs with the values they want.
* migrations:copy_hidden_share_visibilities_to_users: old migration from 2012
* migrations:invitations: legacy invitations were removed with #6976
* migrations:absolutify_image_references: old migration from 2010
* migrations:rewire_uppercase_hashtags: old migration from 2012
* migrations:remove_uppercase_hashtags: old migration from 2012
 2016-08-14 19:42:30 +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
Jonne Haß
4afa77b003 Merge pull request #6980 from svbergerem/post-content-inline-images 
Display markdown images inline
 2016-08-14 12:22:03 +02:00
Jonne Haß
76a5f8e6be Merge pull request #6982 from svbergerem/update-gems 
Update gems
 2016-08-14 12:13:19 +02:00
Steffen van Bergerem
7c6cbf364c
Bump jquery.slimscroll 2016-08-14 11:09:00 +02:00
Augier
c5618591c3 Fixes #6979 2016-08-14 11:04:11 +02:00
Steffen van Bergerem
cea77f5f74
Bump get_process_mem 2016-08-14 11:01:21 +02:00
Steffen van Bergerem
04dc3be21a
Bump font-awesome-rails 2016-08-14 11:00:01 +02:00
Steffen van Bergerem
d2725b11dd
Bump domain_name 2016-08-14 10:54:05 +02:00
Steffen van Bergerem
0a56e409dc
Bump coffee-rails 2016-08-14 10:51:37 +02:00
Steffen van Bergerem
163fc98e20
Bump chunky_png 2016-08-14 10:50:45 +02:00
Steffen van Bergerem
61f6966fc4
Bump celluloid-supervision 2016-08-14 10:47:52 +02:00
Steffen van Bergerem
7e3d770572
Bump uglifier 2016-08-14 10:41:09 +02:00
Steffen van Bergerem
3691bba100
Bump typhoeus 2016-08-14 10:39:35 +02:00
Steffen van Bergerem
0f5ab81d0b
Bump twitter-text 2016-08-14 10:37:59 +02:00
Steffen van Bergerem
3afc998b2d
Bump test_after_commit 2016-08-14 10:35:53 +02:00
Steffen van Bergerem
2ba6ed0b48
Bump spring 2016-08-14 10:34:36 +02:00
Steffen van Bergerem
21712f7c8f
Bump sass-rails 2016-08-14 10:31:23 +02:00
Steffen van Bergerem
30fb58a3df
Bump perfect-scrollbar 2016-08-14 10:27:08 +02:00
Steffen van Bergerem
beab9e9925
Bump markdown-it-diaspora-mention 2016-08-14 10:25:50 +02:00
Steffen van Bergerem
5dd6e143ea
Bump markdown-it 2016-08-14 10:23:20 +02:00
Steffen van Bergerem
be4d7c9a43
Bump highlightjs 2016-08-14 10:22:22 +02:00
Steffen van Bergerem
f71d5c472b
Bump bootstrap-markdown 2016-08-14 10:21:20 +02:00
Steffen van Bergerem
1148e3a839
Bump blueimp-gallery 2016-08-14 10:19:02 +02:00
Steffen van Bergerem
d4a700d939
Bump autosize 2016-08-14 10:18:01 +02:00
Steffen van Bergerem
e2cc9f9c24
Bump openid_connect 2016-08-14 10:15:47 +02:00
Steffen van Bergerem
0fbddbe8f8
Bump omniauth-facebook 2016-08-14 10:13:26 +02:00
Steffen van Bergerem
a01764278a
Bump js-routes 2016-08-14 10:05:46 +02:00