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

6551 commits

Author SHA1 Message Date
Fábián Tamás László
6e178af551 Disable invite button after sending invite 2013-07-01 10:19:56 +02:00
Jonne Haß
30dff802d5 Merge pull request #4243 from davexunit/feature/2948 
Show the user if a contact is sharing with them when viewing their profile page
 2013-06-29 10:16:41 +02:00
Jonne Haß
521aaf894b Merge pull request #4255 from netom/4194-mobile-photo-view 
4194 mobile photo view
 2013-06-29 10:06:46 +02:00
Jonne Haß
92d3bb9c69 Merge pull request #4252 from Raven24/diasp-feature/1283-coppa-admin 
Admin: find users under the age of 13 (COPPA)
 2013-06-29 10:03:59 +02:00
Steffen van Bergerem
71f03544e4 Don't focus comment form on 'show n more comments' 2013-06-28 20:40:24 +02:00
Jonne Haß
837a1ba564 Merge pull request #4238 from Flaburgan/patch-4 
Improve participants link style, close #4236
 2013-06-27 23:09:40 -07:00
Antoine D
8e2633f8b3 Improve participants link style in conversation, close #4236 
Move it to the right and replace the text by an image with the nice tooltip, modify the test.
 2013-06-28 00:41:44 +02:00
Jonne Haß
a6dfdf45e4 ... and make the specs actually pass 2013-06-27 18:07:26 +02:00
Tamas Laszlo Fabian
175908e079 Return 404 for nonexistent photo on mobiles 2013-06-24 15:23:57 +02:00
Florian Staudacher
02be4a5335 make age search postgres compatible, add spec, changelog 2013-06-24 12:34:22 +02:00
Florian Staudacher
44fbb6472f Merge branch 'feature/1283-coppa-admin' of https://github.com/diasp/diaspora into diasp-feature/1283-coppa-admin 2013-06-23 13:38:48 +02:00
Jonne Haß
9c7237ca1c Merge pull request #4244 from svbergerem/4237-consistent-conversation-list 
Show avatar of recent user in conversation list

Conflicts:
	Changelog.md
 2013-06-22 02:38:54 +02:00
David Thompson
2e83736f43 Add SASS for sharing message. 2013-06-20 07:39:56 -04:00
David Thompson
1e5ef88d8c Use PeopleHelper#sharing_message view helper method in the profile sidebar. 2013-06-19 22:04:07 -04:00
David Thompson
f7cceecb52 Add PeopleHelper#sharing_message method and english localized message text. 2013-06-19 22:03:37 -04:00
Jason Robinson
f30cee3b6e Fix hashtags that start a line when posting to Facebook or Twitter, by applying all the same options to strip_markdown as applying to markdownify, fixes #3768 and #4154 2013-06-20 00:06:13 +03:00
Steffen van Bergerem
ffb150f227 Show avatar of recent user in conversation list 2013-06-19 22:59:05 +02:00
David Thompson
1109658e83 Show the user if a contact is sharing with them when viewing their profile page. 2013-06-19 07:38:14 -04:00
Jonne Haß
221c1bf959 update all wiki links 2013-06-17 20:00:48 +02:00
David Thompson
b3c859bcd5 Check for nil before splitting contact_ids param. 2013-06-15 17:14:30 -04:00
Jonne Haß
ed36786edc Merge pull request #4217 from svbergerem/4041-loading-indicator 
Add loading indicator on tag pages, remove second one from profile page

Conflicts:
	Changelog.md
 2013-06-14 18:23:39 +02:00
Jonne Haß
69db16ab34 Merge pull request #4221 from svbergerem/4123-fix-login-short-password 
Fix login for short passwords
 2013-06-14 09:21:43 -07:00
Jonne Haß
c6d2c714e9 never pass nil to image_tag 
In production that results in a not precompiled error
 2013-06-14 14:47:54 +02:00
Steffen van Bergerem
4cbab628c9 Fix login for short passwords 2013-06-14 12:02:44 +02:00
Steffen van Bergerem
a8ade65e1a Add loading indicator on tag pages, remove the second one from the profile page 2013-06-14 01:25:36 +02:00
Steffen van Bergerem
21ef1c8e41 Remove alpha branding 2013-06-12 23:08:13 +02:00
Steffen van Bergerem
a02fdc6e45 unify ignore and hide #bugmash #monday 2013-06-12 14:11:06 +02:00
Florian Staudacher
4ee5d5f19c replace mentions of out-of-aspect people in limited posts with just a 
markdown link to their profile (fixes #2516)

add failing spec for #4160 / #2516

extend the spec a bit more

refactor mention handling in a status message

add method for filtering mentions by aspects

wire mention filtering into the status message model, adapt a few tests to
work properly

cosmetic changes

shorten helper methods

add changelog entry
 2013-06-09 19:16:40 +02:00
Steffen van Bergerem
bcd43cbfee Don't show hovercards for current user in comments 2013-06-09 12:31:18 +02:00
Jason Robinson
3fa9f6414d Fix Twitter crossposting (#2758). Refactor some service posting related code. 2013-06-08 17:38:07 +03:00
Steffen van Bergerem
17876d1de6 show medium avatar in hovercard 2013-06-07 11:23:28 +02:00
Florian Staudacher
f694a40992 use tooltip plugin to display the name under the avatar 
(temporary solution until the proposed solution from the
[pull request](https://github.com/diaspora/diaspora/pull/4149) is
implemented)
 2013-06-04 17:14:00 +02:00
Florian Staudacher
c2a9cb55ef Merge branch 'add_conv_participants_preview' of https://github.com/marpo60/diaspora into marpo60-add_conv_participants_preview 2013-06-04 17:12:38 +02:00
Florian Staudacher
b7b4edeeb0 Merge branch 'reoponed_issue3897' of https://github.com/RoonyH/diaspora into RoonyH-reoponed_issue3897 2013-06-04 16:43:16 +02:00
Juan Azambuja
3f3fe3ecc7 Add participants preview con conversations 2013-06-01 12:14:16 -03:00
Steffen van Bergerem
272cf60788 Add back-to-top button on tag and user pages 2013-05-31 02:02:14 +02:00
Juan Azambuja
e59066bd66 Fix icons-deletelabel styles 2013-05-27 10:25:04 -03:00
Aruna Herath
7803df5ecd Changed post/comment submit keyboard shortcut to ctrl+enter from shift+enter 
Fixes reopened #3897
 2013-05-27 17:08:39 +05:30
Liane Nakamura
5f25a52676 Fix post iframe src url 
Add test for posts helper
 2013-05-26 20:49:56 +02:00
Fabián Rodríguez
aed81c1b3b Fix tags ordering in chrome 2013-05-25 15:44:53 -03:00
Jonne Haß
3b03a7cdde strip trailing newlines from stripped markdown 2013-05-25 15:55:20 +02:00
Jonne Haß
d331242d94 Merge branch 'feature/retract_tweets_when_post_retracted' of git://github.com/Ruxton/diaspora into develop 
Conflicts:
	Changelog.md
 2013-05-25 13:50:28 +02:00
Jonne Haß
272f405ab7 Merge pull request #4177 from svbergerem/4157-post-preview-tag-page 
Fix #4157: post preview from tag pages
 2013-05-25 04:46:58 -07:00
Jonne Haß
f2f7800b30 drop fallback donation form 2013-05-25 13:37:17 +02:00
Steffen van Bergerem
7f596cfd36 Fix #4157: post preview from tag pages 2013-05-25 12:39:01 +02:00
Dennis Schubert
cdb4be14ce Merge branch 'hotfix/v0.1.0.1' into develop 2013-05-20 21:29:17 +02:00
Jonne Haß
286e948054 federate location 2013-05-20 21:26:04 +02:00
Dennis Schubert
e33f4e68a8 Fix 500 caused by deleted reshares 2013-05-20 21:25:58 +02:00
Ruxton
48b48470bc Service.delete_post now more generic, for future implementations 
Service.delete_post now accepts post to be more generic and supports deleting post from any service that overrides delete_post(post)
 2013-05-20 12:19:39 +08:00
Maxwell Salzberg
66911801f7 use ActiveRecord#find_each to prevent memory spikes in our workers 2013-05-19 20:33:04 -07:00