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

14566 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
d5fbeff03b Merge branch 'Ruxton-develop' into develop 2013-07-31 14:27:08 +02:00
Ruxton
3c605c47e0 Fix error in facebook service delete_post 
Add spec coverage for FB delete_post
 2013-07-31 14:23:13 +02:00
Florian Staudacher
fd748b314c Merge pull request #4332 from MrZYX/bump_cabybara 
Update capybara
 2013-07-31 05:03:58 -07:00
Jonne Haß
300752fc87 bump capybara 
* removed wait_until where possible
* replaced wait_until with DOM obersavtions
* added match: :first to all finders that assumed getting the first element
* replaced evaluate_script with execute_script where possible
* replaced a few execute_script with DOM observations through Capybara
* removed sleep where possible
* replaced sleep with DOM obersvations
* replaced "wait for ajax" with DOM obersavations
* replaced alert confirmation with new selenium API
* bump selenium webdriver
* made any other fixes to get green again
 2013-07-31 01:47:23 +02:00
Jonne Haß
cdc29e449d Move facebox configuration into the initialization of the Backbone app 
Facebox is already called from some Backbone views very early, making its icons 404 otherwise.
 2013-07-29 12:20:05 +02:00
Jonne Haß
3627f46b2d Merge pull request #4309 from jflemingprod/feature/4068-logout-delete-request 
Log out should be a DELETE request
 2013-07-17 21:56:15 +02:00
J. Fleming
b75bb8dc0a Change devise config and templates to make logout a delete request. 2013-07-17 21:00:18 +02:00
Jonne Haß
4d196c5453 Merge pull request #4289 from rivendale2010/patch-2 
fix link to background image
 2013-07-09 19:23:06 +02:00
carolina
8ba60853e9 fixes issue 4274 flash-messages stay longer 2013-07-09 14:35:35 +02:00
rivendale
f2481b0f55 fix link to background image 2013-07-07 18:06:01 -03:00
Jonne Haß
4fb3170f7f Merge branch 'netom-4257-conversations-timeago' into develop 2013-07-07 14:45:45 +02:00
Tamas Laszlo Fabian
37505c5ece Fixed timago tooltip in conversations 
Fixed timeago errors

Added cucumber stuff to test timeago at inbox

Show localized date/time in tooltip

Remove title attributes
 2013-07-07 14:43:47 +02:00
Jonne Haß
af332b6cab Fix typo in diaspora.yml.example 2013-07-06 15:45:30 +02:00
Jonne Haß
266f47526f Merge branch 'fabianfiorotto-patch-1' into develop 2013-07-06 13:11:00 +02:00
fabianfiorotto
3e5b29b289 Fix pagination for people list on the tag stream page 
Update _index.html.haml

This params broken the pagination of the followers list in tags page
To reproduce try to paginate in
https://joindiaspora.com/tags/diaspora

test for people pagination patch

reducing the per page limit

removing tabs
 2013-07-06 13:10:29 +02:00
Jonne Haß
d4b5261ba0 Merge branch 'Ruxton-feature/autofollow_any_user' into develop 2013-07-06 13:03:40 +02:00
Ruxton
dce1531ba6 Changed follow_diasporahq to be configurable to auto follow any user on join. 
Fixing example config file

Updated changelog
 2013-07-06 13:02:27 +02:00
Jonne Haß
405622ba6a Merge branch 'netom-4028-gon-current-user' into develop 2013-07-06 12:46:46 +02:00
Fábián Tamás László
aa472b25de Put preloads into gon.preloads 
Fixed tagFollowing not getting into preloads
 2013-07-06 12:45:23 +02:00
Fábián Tamás László
fb9b3e35c3 Put current user into gon 
Fixed bug in app.js, removed unnecessray test
 2013-07-06 12:44:08 +02:00
Jonne Haß
3da9b1bf7f Merge pull request #4259 from netom/4173-disable-invite-button 
Disable invite button after sending invite

Conflicts:
	Changelog.md
 2013-07-06 12:40:05 +02:00
Jonne Haß
9d4377dc23 Merge pull request #4251 from 0TWAIN0/feature/4182-render-markdown-in-mails 
Feature/4182 render markdown in mails

Conflicts:
	Changelog.md
 2013-07-06 12:20:09 +02:00
Jonne Haß
d762ca5a43 Merge pull request #4226 from kevivmatrix/ajax_message 
private message sending changed to ajax
 2013-07-06 02:41:24 -07:00
kevivmatrix
6623e86a5a private message sending changed to ajax 
added specs for change in controller

one form of hash used in single line of code

rendering create response on sending message

redirect user to conversation page if message sent successfully

removed deprecated way of rendering file

conversations create for mobile fixed

minor code style change

updated changelog
 2013-07-06 14:35:09 +05:30
Jonne Haß
091951a929 bumped unicorn timeout to 90 seconds and made it configurable 2013-07-03 12:52:35 +02:00
twain
e1ca8df15e added strip_markdown to notification mails 2013-07-03 11:16:31 +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
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
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ß
d3053ec1ea Merge branch 'release/0.1.1.0' 2013-06-28 17:39:00 +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