maxwell
|
a86d965079
|
DG MS; importer now takes params for username, password, and diaspora handle
|
2010-10-13 17:07:16 -07:00 |
|
maxwell
|
f04934cbae
|
DG MS; ensure aspect post_ids are only for user
|
2010-10-13 16:54:18 -07:00 |
|
ilya
|
f82f241932
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-13 16:53:17 -07:00 |
|
ilya
|
36b9f66f60
|
the invited user keeps track of who invited them, limit on invites,
removed the invites controller test
|
2010-10-13 16:52:33 -07:00 |
|
maxwell
|
b395208a51
|
DG MS; added more stuff to importer.
|
2010-10-13 16:42:27 -07:00 |
|
Raphael
|
3fb2ee6e1b
|
adding spec for password confirmation fail
|
2010-10-13 16:28:56 -07:00 |
|
Raphael
|
fd88e24a55
|
Forgot to commit a line
|
2010-10-13 16:16:22 -07:00 |
|
Robin Nilsson
|
96219b7360
|
Making fancybox modal
|
2010-10-14 00:23:14 +02:00 |
|
Raphael
|
51a02409c8
|
Another try at script server fix
|
2010-10-13 15:18:40 -07:00 |
|
Alec Leamas
|
0c5d197295
|
README update on Gemfile.lock problem, blocking.
|
2010-10-13 22:40:49 +02:00 |
|
maxwell
|
2c40fa5ebf
|
DG MS; spec for clean_aspects
|
2010-10-13 13:32:22 -07:00 |
|
ilya
|
57bf3aac33
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-13 13:30:16 -07:00 |
|
ilya
|
3b8998ab71
|
Invitations contains the inviters
|
2010-10-13 13:29:45 -07:00 |
|
maxwell
|
637a79a99d
|
DG MS; spec for clean_aspects
|
2010-10-13 13:28:10 -07:00 |
|
maxwell
|
55227f3f72
|
DG MS; filter_post method, aspect_clean method
|
2010-10-13 13:10:08 -07:00 |
|
Shawn McGuire
|
5c26b895f2
|
Fixed trailing whitespace bug
|
2010-10-13 14:39:04 -05:00 |
|
Shawn McGuire
|
711dcdc5f4
|
Issue #280 Fixed trailing whitespace error
|
2010-10-13 14:36:03 -05:00 |
|
Raphael
|
3274f109e5
|
Reorganize gitignore
|
2010-10-13 11:30:22 -07:00 |
|
ilya
|
bf42b5766c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-13 11:20:43 -07:00 |
|
Raphael
|
9a1590fa02
|
Move user module requires out to the user modules definition file
|
2010-10-13 11:18:06 -07:00 |
|
Raphael
|
9898c8b158
|
Typo in script/server
|
2010-10-13 11:07:26 -07:00 |
|
Raphael
|
9e27c802c3
|
Got port check in bash script working
|
2010-10-13 10:47:21 -07:00 |
|
Raphael
|
3f9a51fa3f
|
First attempt at detecting called port with getopts
|
2010-10-13 10:27:29 -07:00 |
|
danielvincent
|
0315869a24
|
all specs should pass again after merge
|
2010-10-13 09:43:58 -07:00 |
|
danielvincent
|
59c3be41b3
|
Merge branch 'master' of github.com:diaspora/diaspora into import
|
2010-10-13 09:21:27 -07:00 |
|
Shawn McGuire
|
eaef6bdf04
|
Issue #272 Fixed color contrast
|
2010-10-13 11:12:27 -05:00 |
|
Alec Leamas
|
ccdc259838
|
Comment update
|
2010-10-13 12:50:29 +02:00 |
|
Alec Leamas
|
7e1dea26b0
|
Merge branches 'master' and 'port-test'
|
2010-10-13 12:48:14 +02:00 |
|
Alec Leamas
|
d3a6031f88
|
Merge remote branch 'upstream/master' into port-test
|
2010-10-13 12:47:49 +02:00 |
|
Alec Leamas
|
49975d7010
|
Providing better message if port 3000 is in use, closing ticket 287.
|
2010-10-13 12:26:52 +02:00 |
|
Alec Leamas
|
8c2ccfc5a8
|
Updating to reflect new tests on 10.04 desktop.
|
2010-10-13 10:34:32 +02:00 |
|
Alec Leamas
|
2ffff53d2e
|
Merge branch 'ubuntu'
|
2010-10-13 10:27:37 +02:00 |
|
Alec Leamas
|
ea185ccf6a
|
Resolving merge conflict... My bad, apologies
|
2010-10-13 10:23:06 +02:00 |
|
Alec Leamas
|
747c95515e
|
Merge remote branch 'upstream/master' into ubuntu
|
2010-10-13 10:01:56 +02:00 |
|
ilya
|
add350ce16
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-13 00:19:29 -07:00 |
|
Alec Leamas
|
e922a3be5c
|
Ubuntu 10.10 desktop fixes
|
2010-10-13 08:29:24 +02:00 |
|
Sarah Mei
|
56c6688c81
|
Take out reloads so specs run on 1.9.2
|
2010-10-12 20:54:00 -07:00 |
|
Sarah Mei
|
da9819e0fa
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-12 19:09:28 -07:00 |
|
Sarah Mei
|
bbf396be42
|
Remove Gemfile.lock before each bundle install
|
2010-10-12 19:08:50 -07:00 |
|
danielvincent
|
7ea3fe5bf1
|
MS DG; verifys implemented, but need more tests
|
2010-10-12 18:53:12 -07:00 |
|
ilya
|
db1a01d51b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-12 18:24:20 -07:00 |
|
ilya
|
324f14c719
|
setting the token to nil on accept of invite
|
2010-10-12 18:23:59 -07:00 |
|
Raphael
|
3b82001a42
|
Step down font size 1px in info
|
2010-10-12 18:19:31 -07:00 |
|
Raphael
|
fe0120cc0d
|
Return everyone on an empty search
|
2010-10-12 18:18:03 -07:00 |
|
danielvincent
|
92e5622247
|
DG MS; adding verification methods to importer.
|
2010-10-12 17:41:09 -07:00 |
|
Alec Leamas
|
2a153316ce
|
Not used
|
2010-10-13 01:41:28 +02:00 |
|
Alec Leamas
|
6f2f9afe56
|
Merge remote branch 'upstream/master'
|
2010-10-13 01:10:13 +02:00 |
|
ilya
|
9b249281a1
|
moved verify comment sig before any saving goes on
|
2010-10-12 16:01:36 -07:00 |
|
ilya
|
b53462ee93
|
Merge branch 'malicious_friend_refactor' of github.com:diaspora/diaspora
|
2010-10-12 15:55:02 -07:00 |
|
ilya
|
c00a70dde1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-12 15:54:37 -07:00 |
|