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

9922 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sarah Mei
4db288bc65 Check order of generation and use of host-meta fixture on travis 2011-11-30 20:55:59 -08:00
Sarah Mei
2518987538 Try doing join differently for travis 2011-11-30 20:23:48 -08:00
Pistos
aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream" 
This reverts commit 8a27568273, reversing
changes made to 31ef2d60f7.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb
 2011-11-30 22:22:32 -05:00
Daniel Grippi
cec1f09202 specs green 2011-11-30 09:56:47 -08:00
Daniel Grippi
682d45d9bd Merge pull request #2426 from geckoxx/like_stream 
Like stream
 2011-11-30 09:11:17 -08:00
Daniel Grippi
5a1b73dc61 Merge pull request #2433 from geckoxx/2274-empty-tag 
Fix Bug 2274, empty tag
 2011-11-30 09:07:30 -08:00
Daniel Grippi
b741286634 Merge pull request #2461 from aboire/master 
modify url invitation facebook
 2011-11-30 09:06:30 -08:00
aboire
d03695e128 update url invitation facebook 2011-11-30 17:44:45 +04:00
Sarah Mei
3c82511690 Turning off cucumber on travis until we can at least get the specs to run 2011-11-29 21:55:06 -08:00
Daniel Grippi
c27d0b8780 Merge pull request #2281 from justindthomas/backup-postgres 
backup task handles postgresql dumps
 2011-11-29 14:09:51 -08:00
Jonne Hass
2f3876ec64 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-11-29 21:02:55 +01:00
Jonne Hass
759015a309 updated 51 locale files [ci skip] 2011-11-29 21:02:43 +01:00
Jonne Hass
8073264990 Merge pull request #2457 from michaelklishin/patch-1 
Try bundler 1.1.rc on travis-ci.org
 2011-11-29 11:59:09 -08:00
Justin Thomas
3e1561db24 moved pass_file deletion to postgres code block 2011-11-29 11:34:50 -08:00
Michael Klishin
c1ac4207c9 Try bundler 1.1.rc on travis-ci.org to shorten dependencies installation time 2011-11-29 22:19:59 +04:00
Daniel Grippi
ee618714df Merge pull request #2400 from pixelistik/patch-1 
Let notification dropdown action links float so they don't overlap with the heading. [ci skip]
 2011-11-29 09:52:35 -08:00
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
Johannes Hackel
e16e28a7eb better english 2011-11-29 08:36:48 +01:00
danielgrippi
873e04f24d Revert "use select distinct as opposed to group by". Using a distinct 
causes a 500

This reverts commit 805346c70c.
 2011-11-28 15:17:36 -08:00
danielgrippi
805346c70c use select distinct as opposed to group by 2011-11-28 15:09:20 -08:00
Daniel Grippi
161d9d527c Merge pull request #2270 from fermionic/allow-photo-views-in-mobile 
re-enable photo viewing on mobile
 2011-11-28 11:03:13 -08:00
danielgrippi
09d8726555 fix spelling error in spec 2011-11-28 10:02:06 -08:00
Daniel Grippi
a672dfc787 Merge pull request #2319 from rekado/2173-oembed-overlapping-css-fix 
Fix issue #2173 (oembed overlapping top bar) // CSS approach
 2011-11-28 09:39:10 -08:00
Daniel Grippi
a4027f3d22 Merge pull request #2417 from jperyl/2284-display-user-handle-in-hovercard-2 
Issue #2284: simple fix
 2011-11-28 09:32:41 -08:00
Daniel Grippi
908d0b99a7 Merge pull request #2404 from torrancew/capistrano_colorized 
Capistrano colorized
 2011-11-28 09:11:10 -08:00
Daniel Grippi
8a27568273 Merge pull request #2428 from geckoxx/comment_stream 
comment_stream
 2011-11-28 09:05:45 -08:00
Daniel Grippi
31ef2d60f7 Merge pull request #2448 from dmorley/patch-6 
remove resque, remove 404 images from bothering thin [ci skip]
 2011-11-28 09:02:02 -08:00
Jordi Mallach
963fe2cf76 Remove extra # in Catalan translation. 2011-11-27 22:30:45 +01:00
Jordi Mallach
c17d9973aa Update Catalan translation to 64a8083. 2011-11-27 05:16:30 +01:00
Jonne Hass
50ac25ec4c Merge pull request #2447 from dmorley/patch-5 
add pp and toc for translation
 2011-11-26 16:30:36 -08:00
David Morley
1859975ab1 remove resque, remove 404 images from bothering thin 2011-11-26 14:02:31 -08:00
David Morley
64a8083744 add pp and toc for translation 2011-11-26 13:30:40 -08:00
Jonne Hass
8d6f1552e3 updated 11 locale files [ci skip] 2011-11-26 21:15:00 +01:00
Sarah Mei
a594d8f7ce Fix cucumber log in and close account feature 2011-11-25 04:48:47 -08:00
Sarah Mei
81476b79ca The home page is now /stream 2011-11-25 03:54:47 -08:00
Jonne Hass
a91c7faffe Merge pull request #2435 from vcuculo/master 
Fix typo + Show diaspora_handle on profile [mobile]
 2011-11-24 01:09:24 -08:00
Vittorio Cuculo
fdd52782d2 show diaspora_handle on profile [mobile] 2011-11-24 09:42:15 +01:00
Vittorio Cuculo
df45a628c5 Fix typo 2011-11-24 09:17:13 +01:00
Johannes Hackel
ef28e89809 people_controller_spec 2011-11-23 23:45:09 +01:00
Jonne Hass
a40fbc9617 Merge pull request #2403 from gandaro/outdated-information-cubbies 
deleted tokens:show:login_with_diaspora_is_comming
 2011-11-23 13:07:10 -08:00
Johannes Hackel
0c1be5002d end 2011-11-23 08:00:08 +01:00
Michael Sofaer
2b8d07f94b Censorship point has been made ... for now. 2011-11-22 15:54:50 -08:00
Jonne Hass
61d809659c updated 11 locale files [ci skip] 2011-11-22 20:30:58 +01:00
Johannes Hackel
66acd7db14 specs, stay on page 2011-11-22 12:54:19 +01:00
Johannes Hackel
eb65074360 Fix Bug 2274, empty tag 2011-11-22 12:16:00 +01:00
Dan Hansen & Sarah Mei
d9bd25e114 Only repopulate cache on contact destroy if user exists 2011-11-21 21:39:26 -08:00
Gonzalo Rodriguez
0de6512789 Decrease cukes default wait time 
This will not fix cukes, but at least travis is going
to throw failures output instead of timing out
 2011-11-22 00:18:14 -02:00
Johannes Hackel
7368bb9e62 comment_stream 2011-11-20 18:37:10 +01:00
Dan Hansen & Sarah Mei
7e4028626f Fix lightbox for non-logged-in user 2011-11-19 21:45:31 -08:00
Sarah Mei
ad27eaac3d Fix photo#show for non-logged-in user 2011-11-19 21:17:39 -08:00