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

9946 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sarah Mei
d1044298d4 Remove export display for now to see if it affects travis 2011-12-05 21:14:48 -08:00
Sarah Mei
925753e6e4 travis needs to fail faster 2011-12-05 20:50:30 -08:00
Sarah Mei
df06b04d83 Perhaps the bundler prerelease is the reason we're running specs twice? Let's see. 2011-12-05 20:20:48 -08:00
Daniel Grippi
0d41c9c5f3 update gems -- mainly omniauth (we explicitly include omniauth libs now... much cleaner) 2011-12-05 19:53:03 -08:00
Pistos
548c225102 Can haz idiomatic English? 2011-12-04 21:47:37 -05:00
Sarah Mei
085471fb55 Remove default rake task's dependency on spec:fixtures for now, to see if that stops travis from running all the specs twice 2011-12-04 17:46:26 -08:00
Sarah Mei
e0a74b7806 Config rspec tags for travis 2011-12-04 17:28:16 -08:00
Gonzalo Rodriguez
77d30949a0 Refactor some cucumber steps 2011-12-03 23:09:51 -02:00
tmlee
3b6c6c564f Include "Looking For #link" under params[:q] blank else branch 2011-12-03 21:23:39 -02:00
Gonzalo Rodriguez
3c74f3d848 Failing spec for empty search bug #2427 2011-12-03 21:19:58 -02:00
Gonzalo Rodriguez
c62a9a2e63 Little refactor on PeopleController#index 2011-12-03 21:19:58 -02:00
Jonne Hass
fbb17ec1a5 Merge pull request #2475 from aabril/master 
Just a mispelled 'diaspora' on the Readme.md
 2011-12-03 14:45:57 -08:00
Albert Abril
73bbf08dc8 fix Diasproa->Diaspora mispelled on the README.md 2011-12-03 22:46:27 +01:00
Daniel Grippi
8212268b99 Merge pull request #2379 from Robsteranium/patch-1 
guid default of "" never gets set to a secure random hex (in mysql at least)
 2011-12-02 10:47:24 -08:00
Daniel Grippi
71354a1673 Merge pull request #2469 from geckoxx/comment_stream_new 
better commented_posts_stream
 2011-12-02 10:42:36 -08:00
Pistos
14e5d9b1c7 Merge remote-tracking branch 'kaleemullah/2265-upload-photo-alt-text' 2011-12-02 12:32:08 -05:00
Johannes Hackel
36c9b9ecdd fix next sql error 2011-12-02 16:33:12 +01:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Robsteranium
08b23d3a7f Condensed as per Daniel's comment 2011-12-02 12:17:24 +00:00
Sarah Mei
c77c9df646 Let's see if travis respects the .rspec file 2011-11-30 22:33:01 -08:00
Kaleem Ullah
afa1274d7c change upload photo alt text 2011-12-01 10:22:35 +04:00
Sarah Mei
03f33f9313 Specify exclusion of fixture and performance separately 2011-11-30 22:14:24 -08:00
Sarah Mei
993b410d95 Fix default rake task so it runs the fixture-generation specs first explicitly. 2011-11-30 21:43:04 -08:00
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