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
|
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 |
|
Maxwell Salzberg
|
dea01600aa
|
Merge branch 'close_account_rework'
|
2011-12-08 16:34:25 -08:00 |
|
Maxwell Salzberg
|
c0ac664d64
|
translated close account
|
2011-12-08 16:32:20 -08:00 |
|
danielgrippi
|
342593988b
|
MS DG; fixed close account cukes
|
2011-12-08 16:32:20 -08:00 |
|
Maxwell Salzberg
|
7bf1970dd8
|
adding account deletion factory, fixed a user spec
|
2011-12-08 16:32:20 -08:00 |
|
Maxwell Salzberg
|
70dcc5becc
|
rebased this branch onto master
|
2011-12-08 16:32:20 -08:00 |
|
Maxwell Salzberg
|
90458381f5
|
basic page for deleting account with temporary text and cute cat picture
|
2011-12-08 16:32:20 -08:00 |
|
Maxwell Salzberg
|
ee12f19ff6
|
dispatch before deleting
|
2011-12-08 16:32:20 -08:00 |
|
Ilya Zhitomirskiy
|
e57698bbe8
|
setting the account deletion name in the xml
|
2011-12-08 16:32:19 -08:00 |
|
Ilya Zhitomirskiy
|
1552b5bcc2
|
keep the pivate key, required for retries
|
2011-12-08 16:32:19 -08:00 |
|
Maxwell Salzberg
|
f800d50a2b
|
i think this works
|
2011-12-08 16:32:19 -08:00 |
|
Ilya Zhitomirskiy
|
0bd101dca9
|
change close account to clear profile, still need to dispatch account deletion xml
|
2011-12-08 16:32:19 -08:00 |
|
Ilya Zhitomirskiy
|
7667029e71
|
wip, stated the serialized model
|
2011-12-08 16:32:19 -08:00 |
|
Ilya Zhitomirskiy
|
03ca34767a
|
ms iz rendering nothing for hcard and webfinger if account is closed, not showing aspect dropdown if the user account is closed
|
2011-12-08 16:32:18 -08:00 |
|
danielgrippi
|
e6ed2d397a
|
added close account to user
|
2011-12-08 16:32:18 -08:00 |
|
danielgrippi
|
cd6f97fa0e
|
DG IZ; remove authorizations from user; double check that aspect_visibilities are deleted
|
2011-12-08 16:32:18 -08:00 |
|
danielgrippi
|
644e382cfd
|
DG IZ; remove more stuff associated with user; removed dependant destroys
|
2011-12-08 16:32:18 -08:00 |
|
Ilya Zhitomirskiy
|
3035f173bd
|
ms iz wip, clearing profile, started deleting post visibilities
|
2011-12-08 16:32:18 -08:00 |
|
Ilya Zhitomirskiy
|
05612ef733
|
ms iz wip
|
2011-12-08 16:32:18 -08:00 |
|
Maxwell Salzberg
|
455e5375d8
|
add 1.9.3 to travis. remove deprecation warning from cukes
|
2011-12-08 16:30:58 -08:00 |
|
Maxwell Salzberg
|
2282fd35d1
|
kill no longer used youtube titles code with fire
|
2011-12-08 16:16:57 -08:00 |
|