maxwell
23db4fe278
merge complete
2010-10-29 11:33:31 -07:00
maxwell
39f66cc5d9
tests are green
2010-10-29 11:19:07 -07:00
maxwell
7c32649df4
rebasing master
2010-10-29 11:18:20 -07:00
maxwell
6d139ab946
more tests pass
2010-10-29 11:17:39 -07:00
maxwell
1e349e6a61
last time
2010-10-29 11:16:50 -07:00
maxwell
1b48572674
MS tests are now green
2010-10-29 11:16:50 -07:00
maxwell
b8a9025616
bad merge in receive
2010-10-29 11:16:11 -07:00
maxwell
a5ba14f89c
nope that last fix I was too tired. the problem is when someone sends me a request saying it is a response from me
2010-10-29 11:16:11 -07:00
maxwell
09c4def70b
bug; when someone sends you an unknown request, your server crashes.
2010-10-29 11:16:11 -07:00
maxwell
fdb169558a
dont restart servers after db:reset
2010-10-29 11:16:11 -07:00
maxwell
493969e458
trying a timer
2010-10-29 11:16:11 -07:00
maxwell
9f314f44d9
typo
2010-10-29 11:15:14 -07:00
maxwell
07b2e7e227
omg i was deploying the wrong branch for the past two hours
2010-10-29 11:15:14 -07:00
maxwell
fddec49655
adding nexttick
2010-10-29 11:15:14 -07:00
zhitomirskiyi
d1de921d46
longer timeout
2010-10-29 11:15:14 -07:00
zhitomirskiyi
483960ae98
MS IZ more begin rescue
2010-10-29 11:15:14 -07:00
zhitomirskiyi
8b3a9cd801
adding some zombie friend puts
2010-10-29 11:15:14 -07:00
zhitomirskiyi
534cc112bf
IZ MS rebase master
2010-10-29 11:15:13 -07:00
maxwell
acd977a115
adding pending spec to check for error within webfinger process
2010-10-29 11:14:55 -07:00
maxwell
dae9f6540b
adding case for error message being emmited
2010-10-29 11:14:28 -07:00
Raphael
7a44fc0194
Merge remote branch 'robustdj/479-exporter-fix'
2010-10-29 11:13:59 -07:00
maxwell
d89cb53e26
pumping up the zombie sleep to allow for mail to get send out .
2010-10-29 11:13:42 -07:00
maxwell
68a44af856
making a few more cleanup and tests
2010-10-29 11:13:08 -07:00
maxwell
eddcb71fcb
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:11:05 -07:00
maxwell
58f836ab46
adding pending spec to check for error within webfinger process
2010-10-29 11:06:31 -07:00
maxwell
0aae89aa03
adding case for error message being emmited
2010-10-29 11:06:31 -07:00
maxwell
53e9df5455
pumping up the zombie sleep to allow for mail to get send out .
2010-10-29 11:05:18 -07:00
maxwell
c645e2aff9
removing double fetch in dev utils controller
2010-10-29 11:05:18 -07:00
maxwell
9a2e3ef158
making a few more cleanup and tests
2010-10-29 11:05:17 -07:00
maxwell
8fe339b03b
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:05:17 -07:00
danielvincent
51dd6d32b3
upload a photo button next to publisher
2010-10-29 10:38:53 -07:00
danielvincent
4776f4810e
fixed failing spec for photos_controller#edit
2010-10-29 10:38:53 -07:00
danielvincent
1d399598d3
user now has a uploads meta album for photos. fixed some view issues with photo#show, album#show
2010-10-29 10:38:17 -07:00
danielvincent
a7df1bca68
photos do not require an album. uploading files on a user's photos#index page will post to all aspects.
2010-10-29 10:38:17 -07:00
danielvincent
2b4e3e3a41
a person now has a photos#index page.
2010-10-29 10:38:17 -07:00
zhitomirskiyi
aaff5083f0
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-29 10:35:20 -07:00
zhitomirskiyi
dfb2408447
couple of readme changes
2010-10-29 10:34:37 -07:00
Alec Leamas
5b6743d677
Bugfixes, non-interactive run possible
...
Closes remarks in tickets 436 and 437. Still has a nasty bug 440.
A little hesitant to remove the editor invocation for setting
up config file. This is still possible while using parameters for
non-interactive runs. But I was lazy, took the existing code, which
is a little simpler although much less powerful for user.
2010-10-29 15:55:15 +02:00
Alec Leamas
94327264d4
Comments on Swedish diaspora terms, trailing blanks killed
2010-10-29 11:11:56 +02:00
Sarah Mei
14fedf5369
GAHHH STOP EMAILING ME (specs pass)
...
Also, added attr_protected to Photo#person and Photo#person_id.
2010-10-29 00:59:26 -07:00
Sarah Allen
ef2c8fbfdc
Rails.env is a string, not a symbol
2010-10-28 21:28:20 -07:00
Justin Wienckowski
cdcb693c95
Issue #446 : Adding 32-character length limit to User#username, Profile#first_name, Profile#last_name
2010-10-28 21:12:36 -07:00
Curtis J Schofield
a1ccff0488
i put in a dash
2010-10-28 21:03:12 -07:00
Gabriel Gilder
bdb77ff282
redirecting to :back instead of manage page on failed aspect creation +spec
2010-10-28 21:01:53 -07:00
Derrick Camerino
5d0700001e
changing shell command to use FileUtils
2010-10-28 20:46:45 -07:00
Raphael
f1ae95fac9
443- patch trim on validation + spec
2010-10-28 20:03:49 -07:00
Raphael
fd2fac865b
Without typos
2010-10-28 18:07:17 -07:00
Raphael
83f8cbbb5c
Try fixing db:seed:backer
2010-10-28 18:02:06 -07:00
zhitomirskiyi
3fc5651e9d
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-28 17:03:14 -07:00
zhitomirskiyi
f5d54ff6f8
another silly malicious friend spec
2010-10-28 17:02:55 -07:00
