ilya
|
9a217d1fa8
|
MS IZ request acceptance email
|
2010-10-22 11:55:50 -07:00 |
|
Raphael
|
7dd86b3c87
|
Move comment signing spec to comment spec, make encryption spec not depend on message building
|
2010-10-22 11:18:43 -07:00 |
|
Raphael
|
d8bbe38019
|
Move spec to request_spec
|
2010-10-22 11:11:51 -07:00 |
|
Raphael
|
1a19c28199
|
Move spec to user_spec
|
2010-10-22 11:10:35 -07:00 |
|
Raphael
|
b67cee9af0
|
Trying to make spec directory structure the same as the lib and app structures
|
2010-10-22 11:09:20 -07:00 |
|
Raphael
|
61d539e555
|
Moving user_encryption_spec to lib
|
2010-10-22 11:06:31 -07:00 |
|
Raphael
|
6993f3e2b5
|
Fix spec in user_encryption
|
2010-10-22 11:05:37 -07:00 |
|
Raphael
|
cb02839e7e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-22 11:02:25 -07:00 |
|
Raphael
|
b404346c40
|
Stop stubbing signature verification unless it's necessary
|
2010-10-22 11:01:58 -07:00 |
|
ilya
|
47b03c45b2
|
commented out the email interceptor
|
2010-10-22 10:37:04 -07:00 |
|
Alec Leamas
|
97cdc12681
|
test
|
2010-10-22 17:38:19 +02:00 |
|
Alec Leamas
|
557142d809
|
testing
|
2010-10-22 17:19:06 +02:00 |
|
Alec Leamas
|
c55341632e
|
bugfix
|
2010-10-22 15:52:56 +02:00 |
|
Sarah Mei
|
ffa467b795
|
more stubbing! yay?
|
2010-10-22 06:38:46 -07:00 |
|
Alec Leamas
|
92ab2b277e
|
bugfix
|
2010-10-22 15:28:29 +02:00 |
|
Sarah Mei
|
7e4529f2bd
|
im in ur test stubbin ur mailers
|
2010-10-22 06:22:47 -07:00 |
|
Alec Leamas
|
f697064cb6
|
bugfix
|
2010-10-22 13:49:38 +02:00 |
|
Alec Leamas
|
70e1d2de53
|
bugfixes
|
2010-10-22 12:49:11 +02:00 |
|
Alec Leamas
|
e9ce7614bd
|
bugfix
|
2010-10-22 11:35:11 +02:00 |
|
maxwell
|
6620f33ae2
|
fixing spec with a mock on mailer
|
2010-10-22 01:07:57 -07:00 |
|
maxwell
|
32849e693a
|
Merge branch 'mailer' of github.com:diaspora/diaspora into mailer
|
2010-10-22 00:49:31 -07:00 |
|
maxwell
|
20a5ec863f
|
small bugfixes for the mailer
|
2010-10-22 00:49:01 -07:00 |
|
maxwell
|
5701c3a873
|
should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now
|
2010-10-22 00:49:01 -07:00 |
|
ilya
|
80cd4761f3
|
started the new invitation email
|
2010-10-22 00:49:01 -07:00 |
|
maxwell
|
93ba073009
|
small bugfixes for the mailer
|
2010-10-22 00:40:01 -07:00 |
|
Alec Leamas
|
830277c67a
|
Merge branch 'v2'
Conflicts:
pkg/fedora/diaspora-bundle.spec
|
2010-10-22 09:25:17 +02:00 |
|
Alec Leamas
|
56eeae464e
|
Merging
|
2010-10-22 09:21:49 +02:00 |
|
Alec Leamas
|
d5e8e516aa
|
First try on ubuntu
|
2010-10-22 09:19:10 +02:00 |
|
maxwell
|
d2e3be7262
|
should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now
|
2010-10-22 00:13:18 -07:00 |
|
Raphael
|
645685a8fb
|
Make flash notice CSS less deadly
|
2010-10-21 23:18:53 -07:00 |
|
Alec Leamas
|
19c0f50f78
|
Creates a working diaspora-bundle.rpm
|
2010-10-22 05:49:07 +02:00 |
|
ilya
|
e4eb7a9a79
|
started the new invitation email
|
2010-10-21 19:35:35 -07:00 |
|
ilya
|
9375bb6408
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-21 16:07:49 -07:00 |
|
ilya
|
e677e4782e
|
the handle is now in the email if only one user invited the person
|
2010-10-21 16:07:31 -07:00 |
|
Raphael
|
41cfd36b19
|
Refactor user_spec a little
|
2010-10-21 16:06:47 -07:00 |
|
Raphael
|
fe1a6bce20
|
Attr-accessible on aspects, check whether built user is persisted
|
2010-10-21 12:49:50 -07:00 |
|
Alec Leamas
|
7d2c426d20
|
makes a bundle app can't find
|
2010-10-21 21:10:53 +02:00 |
|
Raphael
|
705cef3696
|
Fix comment spec
|
2010-10-21 10:55:17 -07:00 |
|
MrZYX
|
5fa623552d
|
made smtp sender address configurable
|
2010-10-21 19:47:30 +02:00 |
|
Raphael
|
35a830aa03
|
Fix profile update spec
|
2010-10-21 10:39:19 -07:00 |
|
Raphael
|
c58b4706a5
|
Update carrierwave in Gemfile.lock
|
2010-10-21 10:09:52 -07:00 |
|
Sarah Mei
|
e414b1c553
|
Fix some comment specs (still one failing). Remove warning from receive spec.
|
2010-10-21 06:45:15 -07:00 |
|
Alec Leamas
|
c4b6ec4dd6
|
generates a RPM!
|
2010-10-21 13:59:08 +02:00 |
|
Alec Leamas
|
c0c45fa074
|
First try: the bundle looks OK.
|
2010-10-21 10:34:44 +02:00 |
|
danielvincent
|
06e2b43516
|
252,252,252 rgb for body background. you won't even notice.
|
2010-10-20 23:46:24 -07:00 |
|
danielvincent
|
8e175be2ba
|
fixed comments not showing up through websocket on photo show page
|
2010-10-20 23:40:48 -07:00 |
|
Sarah Mei
|
82e947a74a
|
Disabling ruby 1.9 build until we can move off capybara
|
2010-10-20 22:44:18 -07:00 |
|
Sarah Mei
|
2bab775973
|
ci.sh uses @diaspora gemset and forces removal of Gemfile.lock
|
2010-10-20 22:37:50 -07:00 |
|
Sarah Mei
|
d98b551464
|
Let's try something a little simpler.
|
2010-10-20 22:22:34 -07:00 |
|
Sarah Mei
|
48c13d81c5
|
rly rly remove Gemfile.lock. rly!
|
2010-10-20 21:56:59 -07:00 |
|