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

13438 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
091951a929 bumped unicorn timeout to 90 seconds and made it configurable 2013-07-03 12:52:35 +02:00
Jonne Haß
2c70222a76 add changelog entry for #4277 [ci skip] 2013-07-02 09:16:47 +02:00
Jonne Haß
07083c7076 Merge pull request #4277 from davexunit/feature/4069 
Background actual mailing when sending invitations
 2013-07-02 00:14:54 -07:00
David Thompson
0cc02fb512 Use InviteEmail worker in InvitationsController create action. 2013-07-01 21:10:56 -04:00
David Thompson
33f858b558 Create an InviteEmail worker. 2013-07-01 21:10:56 -04: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
Jonne Haß
bcd3ceac15 Merge pull request #4267 from svbergerem/4265-show-more-comments-behaviour 
Don't focus comment form on 'show n more comments'
 2013-06-29 01:01:50 -07: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ß
e0812c9a0e start new development cycle 2013-06-28 17:50:01 +02:00
Jonne Haß
032163b450 Merge branch 'release/0.1.1.0' into develop 2013-06-28 17:39:37 +02:00
Jonne Haß
2e7c571fa7 bump to 0.1.1.0 2013-06-28 17:38:13 +02:00
Jonne Haß
0bc1cb7177 make wolof and western frisian available 2013-06-28 16:10:35 +02:00
Jonne Haß
464cc34177 updated 37 locale files [ci skip] 2013-06-28 16:10:35 +02:00
Florian Staudacher
57312746b6 Merge pull request #4249 from MrZYX/prepare_uuid 
Remove restriction on guid length
 2013-06-28 06:12:10 -07:00
Jonne Haß
e286531687 remove restriction on guid length 2013-06-28 08:10:57 +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
Jonne Haß
94207e844c Drop weird stop in conversations controller spec 2013-06-27 17:50:44 +02:00
Jonne Haß
e7954132aa bump recommended Ruby version to 1.9.3-p448 
See http://www.ruby-lang.org/en/news/2013/06/27/hostname-check-bypassing-vulnerability-in-openssl-client-cve-2013-4073/
 2013-06-27 17:15:56 +02:00
Jonne Haß
8ea237d4b3 Merge pull request #4260 from Gallaecio/gl 
Updated the Galician (gl) translation
 2013-06-27 04:00:28 -07:00
Adrián Chaves Fernández (Gallaecio)
42bccb2bfc Updated the Galician (gl) translation 2013-06-27 06:45:26 +02:00
Tamas Laszlo Fabian
d59648504d Added test to avoid regression 2013-06-24 15:37:17 +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
Duke
13fa4af26f fixed #cat-footer overlay 2013-06-22 02:49:10 +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
Jonne Haß
8236e65f4e Merge pull request #4240 from jaywink/3768-hashmark-first-character 
Fix hashtags that start a line when posting to Facebook or Twitter
 2013-06-21 17:25:43 -07: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
Jonne Haß
a97bc64b58 tweak readme [ci skip] 
* Drop remaining links to the Github wiki
* Redirect Mailing list links through the wiki
* Update links that are redirects
* enable syntaxhighlighting
 2013-06-17 17:07:23 +02:00
Jonne Haß
c9e981096c Merge pull request #4229 from davexunit/4227-private-message-error 
Check for nil before splitting contact_ids param in ConversationsController
 2013-06-17 15:30:56 +02:00
Jonne Haß
d5c03f1d79 Merge pull request #4230 from Flaburgan/patch-1 
#4180 was placed in the wrong milestone
 2013-06-16 03:06:45 -07:00
Antoine D.
17067d6f79 #4180 was placed in the wrong milestone 2013-06-16 12:05:30 +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ß
d475a7d935 Merge pull request #4222 from rivendale2010/patch-1 
Update robots.txt comments
 2013-06-14 09:21:08 -07:00
rivendale
9aaf7ed422 Update robots.txt comments 
clarify comments and update permanently moved URL
 2013-06-14 12:58:02 -03: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