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

10041 commits

This branch
This branch
All branches
Author SHA1 Message Date
danielgrippi
97b8045f20 added counter cache for photos on StatusMessage 2011-12-16 20:39:24 -08:00
Maxwell Salzberg
0929f153a1 Merge pull request #2528 from torrancew/with_whenever_tasks 
Adds maintenance rake tasks for logrotate and temp file deletion
 2011-12-16 09:59:32 -08:00
Tray Torrance
dc71396a4d Adds maintenance rake tasks for logrotate and temp file deletion; Adds whenever gem + sample whenever file 2011-12-15 15:18:07 -08:00
Jonne Hass
139e2af6c8 Merge pull request #2527 from lprelle/close_account_translation 
added translation for close account button
 2011-12-15 07:46:38 -08:00
Jonne Hass
e6f614b21c improve pod_url docs [ci skip] 2011-12-15 16:39:54 +01:00
Lennart Prelle
20a39714bf added translation for close account 2011-12-15 15:35:30 +01:00
Jonne Hass
56f0457c03 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-12-15 14:01:53 +01:00
Jonne Hass
af66bfe840 updated 18 locale files [ci skip] 2011-12-15 14:01:32 +01:00
Jordi Mallach
3bfaf7ef8b Merge branch 'master' of git://github.com/diaspora/diaspora 2011-12-12 13:48:03 +01:00
Jordi Mallach
38f06ae258 Update Catalan translation to 12d0eee. 2011-12-12 13:47:46 +01:00
Jordi Mallach
450d0de753 Update Catalan translation to e38cb41. 2011-12-12 13:27:31 +01:00
Jonne Hass
95790bf891 only update rubygems if not current already 2011-12-12 12:26:06 +01:00
Sarah Mei
3c8b26b051 refactor infinite scroll features to take less time 2011-12-11 17:14:23 -08:00
Jonne Hass
a8a9399060 Merge branch 'master' of github.com:diaspora/diaspora 2011-12-12 00:21:25 +01:00
Sarah Mei
78f4758d6d Collapsing some cucumber features to save time. Removing features that should be tested elsewhere in the stack. 2011-12-11 15:08:43 -08:00
Jonne Hass
d18c9c8591 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-12-12 00:02:49 +01:00
Sarah Mei
5494cf1fde Move websockets out of production group for ruby 1.8.7 2011-12-11 13:54:43 -08:00
Sarah Mei
bb3c6f3120 Add production group back in and move what we can in there so that travis gem installs don't take as long 2011-12-11 13:31:31 -08:00
Sarah Mei
82fd591b07 There is no production group to exclude 2011-12-11 12:34:52 -08:00
Sarah Mei
62833595da Specify version of rubygems in .rvmrc 2011-12-11 12:25:01 -08:00
David Kettler
03feec5eb3 jasmine out of group into top-level 2011-12-11 12:05:19 -08:00
danielgrippi
80a090c766 update twitter gem 2011-12-11 11:48:47 -08:00
Jonne Hass
94aaa46a12 slight speed improvement by tweaking devise in the test env 2011-12-11 13:12:40 +01:00
Jonne Hass
dbdee43cc6 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-12-11 05:11:21 +01:00
Jonne Hass
4e8d991487 updated 56 locale files [ci skip] 2011-12-11 05:11:12 +01:00
Jonne Hass
3f92fd4c40 reenable cucumber on travis aka break it again (?) 2011-12-11 05:07:35 +01:00
Jonne Hass
d6f98d12e1 even more spec fixing, postgres throws statement invalids for duplicate keys, luckily record not unique is a subsubclass of it so we can just catch the higher error 2011-12-11 04:45:11 +01:00
Jonne Hass
4582c11dfd Merge branch 'master' of ../run 2011-12-11 04:13:08 +01:00
Jonne Hass
fe82cd6609 lets not set NOT NULL fields to null… 2011-12-11 04:12:58 +01:00
Jonne Hass
c23a2cdc5c bundler pre is faster, so use it again 2011-12-11 03:43:56 +01:00
Jonne Hass
afb5e5e7f0 fix json in aspects controller spec 2011-12-11 03:35:19 +01:00
Jonne Hass
12d0eee7d9 use new translation keys for will_paginate instead of the setting 2011-12-11 02:49:43 +01:00
Jonne Hass
77d850f492 fix jasmine:ci 2011-12-11 02:43:04 +01:00
Jonne Hass
57661fe9dd fixed a couple of specs 2011-12-11 02:08:38 +01:00
Jonne Hass
dac3796336 Merge branch 'master' of github.com:diaspora/diaspora 2011-12-11 01:37:52 +01:00
Jonne Hass
5726b37fb9 diaspora connect: fix edge case where pod lost the client information 2011-12-11 01:37:15 +01:00
Dan Hansen
4dcdf2899d bump will_paginate from 3.0.pre2 to 3.0.2 2011-12-10 14:07:43 -08:00
Jonne Hass
559016af7e oh well, touching Capybara.app_host resets the session 2011-12-10 20:53:19 +01:00
Jonne Hass
8f13f2182e ensure the expected port is actually used by cucumber 2011-12-10 12:54:39 +01:00
Jonne Hass
247863c6f7 update diaspora-client 2011-12-10 12:54:39 +01:00
Jonne Hass
8b141ed5d5 oauth feature green, except for the pod forgot client edge case 2011-12-10 12:54:39 +01:00
Jonne Hass
4dd55ebdad fix diaspora connect for the new oauth stuff WIP. There's one bug where the oauth_identifier changes but the client doesn't get informed or doesn't save it. I hope it's the last bug. Btw. this is all ugly 2011-12-10 12:54:39 +01:00
Jonne Hass
05be43e21a fix #2504 2011-12-10 12:44:55 +01:00
danielgrippi
8666c6e209 update linecache, jasmine, selenium-webdriver 2011-12-09 18:36:45 -08:00
danielgrippi
02fb45e6fe update chef, ohai, fuubar, json 2011-12-09 18:15:52 -08:00
danielgrippi
89b3314d01 upgrade rspec-core, parallel, capistrano 2011-12-09 18:04:53 -08:00
danielgrippi
fb39a1e16d fix account deletion specs 2011-12-09 17:51:45 -08:00
Maxwell Salzberg
af7962e2e8 fix photo feature 2011-12-09 13:52:32 -08:00
Maxwell Salzberg
c3c112244e Merge pull request #2495 from laserlemon/patch-1 
Add dependency status from Gemnasium to README
 2011-12-09 12:11:28 -08:00
Maxwell Salzberg
8f8769aab5 basic NSFW filtering for authors who say their post is nsfw 2011-12-08 18:22:27 -08:00