Sarah Mei
|
698dafb344
|
put ruby-debug back into Gemfile.lock
|
2010-10-16 20:14:01 -07:00 |
|
Sarah Mei
|
2ae05f39cd
|
Rails.root isn't always defined when you get to the top of a spec file
|
2010-10-16 20:05:05 -07:00 |
|
archi
|
e1d5f86f7e
|
Here we go again - fixed sepcs
|
2010-10-17 02:58:19 +02:00 |
|
archi
|
75d372c737
|
Fixed the name of the status_message_helper spec
|
2010-10-17 02:43:34 +02:00 |
|
archi
|
035db98367
|
Added HTML links to posts
|
2010-10-17 02:06:46 +02:00 |
|
archi
|
482b2f5ffb
|
Added Links to posts
|
2010-10-17 02:05:59 +02:00 |
|
rmaskey
|
569376df00
|
Issue #269: the album back link updated for aspect reference
|
2010-10-16 19:32:02 -04:00 |
|
rmaskey
|
7c99b89d43
|
Issue #269: the album back link updated for aspect reference
|
2010-10-16 19:31:47 -04:00 |
|
romanov
|
2787eb0c6b
|
Issue #269: the album back link updated for aspect reference
|
2010-10-16 19:26:46 -04:00 |
|
danielvincent
|
eafc01de2a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-16 12:33:33 -07:00 |
|
maxwell
|
4d3da589df
|
make the invite test pending until it doesnt take 300 seconds to run
|
2010-10-16 11:30:14 -07:00 |
|
maxwell
|
27bbbafe04
|
updated the hcard fixture, because the old one is not actually representive of what we are using
|
2010-10-16 11:16:33 -07:00 |
|
maxwell
|
13a2464484
|
adding a confirm link on the aspect remove button
|
2010-10-16 02:55:45 -07:00 |
|
danielvincent
|
5ca3570667
|
added prefetch rels to prev/next links in photo show. fixed shadow bug in header
|
2010-10-16 02:06:46 -07:00 |
|
ilya
|
f33298e762
|
removed the puts, initial token checking
|
2010-10-16 00:42:37 -07:00 |
|
ilya
|
2735cb026d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 17:44:34 -07:00 |
|
ilya
|
3ea382eac0
|
readme quick edit
|
2010-10-15 17:44:07 -07:00 |
|
danielvincent
|
72479343bc
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 17:37:39 -07:00 |
|
danielvincent
|
7611bc1c8f
|
user dropdown
|
2010-10-15 17:37:32 -07:00 |
|
ilya
|
6a4b21753e
|
removed the random duplicated line
|
2010-10-15 17:28:11 -07:00 |
|
ilya
|
d4702aefa3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 17:20:19 -07:00 |
|
ilya
|
9727b356e1
|
the invitations add requests which are now correctly auto accepted
|
2010-10-15 17:20:04 -07:00 |
|
maxwell
|
adbe5f7c38
|
i love foaf
|
2010-10-15 16:54:56 -07:00 |
|
maxwell
|
ca604ffe5a
|
added public atom discovery link
|
2010-10-15 16:51:37 -07:00 |
|
maxwell
|
f83bddadc5
|
forgot to add the test; and cleaned up the explain partial
|
2010-10-15 16:19:07 -07:00 |
|
maxwell
|
a0ce9630b1
|
added test for facebook posting
|
2010-10-15 16:03:02 -07:00 |
|
maxwell
|
3af3e86911
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 16:02:43 -07:00 |
|
ilya
|
d06c6ced38
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 15:30:39 -07:00 |
|
danielvincent
|
47be7b1f0a
|
correct html5 search box
|
2010-10-15 15:29:57 -07:00 |
|
maxwell
|
d56800f9e8
|
fixing facebook posting
|
2010-10-15 14:53:36 -07:00 |
|
ilya
|
2c9c4b0e14
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/views/invitations/_new.haml
|
2010-10-15 14:36:49 -07:00 |
|
danielvincent
|
3b01e86f90
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 14:22:43 -07:00 |
|
danielvincent
|
6f282e77ff
|
make public checkbox
|
2010-10-15 14:22:28 -07:00 |
|
ilya
|
0074aadd48
|
added a select tag to email invitations
|
2010-10-15 14:21:08 -07:00 |
|
Raphael
|
35ebe38cac
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 14:14:43 -07:00 |
|
Raphael
|
a8e8480e94
|
Add vendor/bundle to gitignore
|
2010-10-15 14:14:32 -07:00 |
|
maxwell
|
e8c49feca4
|
made the public info link in all aspects publisher
|
2010-10-15 14:10:10 -07:00 |
|
maxwell
|
7e0825e492
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 13:58:40 -07:00 |
|
danielvincent
|
12bdd1712d
|
share on facebook checkbox instead of broadcast button
|
2010-10-15 13:56:49 -07:00 |
|
maxwell
|
6a7538b273
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 11:29:31 -07:00 |
|
maxwell
|
a61c126aad
|
manage page now uses partial
|
2010-10-15 11:29:23 -07:00 |
|
danielvincent
|
db31357172
|
another typo change
|
2010-10-15 11:16:04 -07:00 |
|
danielvincent
|
d18b59f3d3
|
typo fix
|
2010-10-15 11:12:12 -07:00 |
|
maxwell
|
20f164fd45
|
fixing some of the invite copy
|
2010-10-15 11:11:25 -07:00 |
|
Sarah Mei
|
2a6279207e
|
Replace ref to github issues with link to redmine. Also, fussy copy edits.
|
2010-10-14 23:27:30 -07:00 |
|
maxwell
|
733fb3b68e
|
dump typo in spec
|
2010-10-14 23:12:44 -07:00 |
|
maxwell
|
0f75072477
|
make import spec pending with diaspora handle bug
|
2010-10-14 23:03:23 -07:00 |
|
maxwell
|
341009e20f
|
Merge branch 'master' of github.com:diaspora/diaspora into maxwell
Conflicts:
Gemfile
Gemfile.lock
spec/models/user/invite_spec.rb
|
2010-10-14 23:02:06 -07:00 |
|
Sarah Mei
|
85865bc9b1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-14 20:51:59 -07:00 |
|
Sarah Mei
|
5e8d34621a
|
ohai rails 3.0.1
|
2010-10-14 20:51:54 -07:00 |
|