maxwell
|
f2bdc98b47
|
Merge branch 'master' of github.com:diaspora/diaspora into import
|
2010-10-13 23:52:46 -07:00 |
|
maxwell
|
e1dd0cf6be
|
Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion
|
2010-10-13 23:49:13 -07:00 |
|
maxwell
|
e218ab6780
|
Merge branch 'master' of github.com:diaspora/diaspora into import
Conflicts:
app/controllers/users_controller.rb
|
2010-10-13 23:09:48 -07:00 |
|
ilya
|
d0c6f12ea8
|
added another attack vector spec
|
2010-10-13 18:43:22 -07:00 |
|
maxwell
|
04f6cdaacf
|
MS DG; basic view support; it works, but it is ugly
|
2010-10-13 18:42:24 -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 |
|
ilya
|
3b8998ab71
|
Invitations contains the inviters
|
2010-10-13 13:29:45 -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 |
|
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
|
fe0120cc0d
|
Return everyone on an empty search
|
2010-10-12 18:18:03 -07:00 |
|
ilya
|
d6b08de6fc
|
corrected link on the account page
|
2010-10-11 15:07:17 -07:00 |
|
ilya
|
bb7e2a9918
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 14:58:22 -07:00 |
|
ilya
|
007f6cfb6f
|
close account
|
2010-10-11 14:58:11 -07:00 |
|
danielvincent
|
be017bfb0a
|
DG MS; invite is now a lightbox on feed and manage pages
|
2010-10-11 14:16:24 -07:00 |
|
danielvincent
|
afad554f01
|
DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile
|
2010-10-11 13:42:05 -07:00 |
|
danielvincent
|
9bfb213465
|
Merge branch 'invites' of github.com:diaspora/diaspora into invites
|
2010-10-11 11:52:57 -07:00 |
|
danielvincent
|
b3d9884e0d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 11:38:26 -07:00 |
|
danielvincent
|
9162a4a168
|
DG MS; 404 show pages for objects that don't exist for given user
|
2010-10-11 11:32:20 -07:00 |
|
Raphael
|
09c6af28a4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 11:09:35 -07:00 |
|
Raphael
|
73e4d2b25b
|
Pull in search improvement, remove cruft
|
2010-10-11 11:08:54 -07:00 |
|
danielvincent
|
c630d3db6f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 10:53:18 -07:00 |
|
danielvincent
|
82f526ea23
|
DG MS; added tooltip
|
2010-10-11 10:53:00 -07:00 |
|
Raphael
|
fe360e386a
|
Merge remote branch 'rmaskey/master' into search
|
2010-10-11 10:47:24 -07:00 |
|
Raphael
|
8cf72441b4
|
Make intended behavior on hcard action clearer, return 404 on nonexistent person
|
2010-10-11 10:13:52 -07:00 |
|
Raphael
|
04d5271530
|
Merge remote branch 'crimer/master'
|
2010-10-11 10:03:09 -07:00 |
|
maxwell
|
0541833c18
|
stop the file include madness. using File.join and Rails.root for includes everywhere I could
|
2010-10-10 11:54:08 -07:00 |
|
rmaskey
|
94f20ba684
|
resolution for issue #151 - search with multiple words
|
2010-10-10 08:43:43 -07:00 |
|
Crimer
|
4163ce4544
|
Solved issue 166# "Clicking 'Photos' for an aspect appears to take you to the 'All Aspects' photo page"
|
2010-10-09 11:51:42 +00:00 |
|
danielvincent
|
c5affa07e8
|
tweaked reshare button
|
2010-10-08 16:19:51 -07:00 |
|
ilya
|
8e61b438ab
|
setting the username
|
2010-10-08 16:00:58 -07:00 |
|
Raphael
|
a720694364
|
Make logging less verbose
|
2010-10-08 15:51:12 -07:00 |
|
Raphael
|
b7116ca413
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-08 15:47:43 -07:00 |
|
Raphael
|
b7bf526b91
|
Make logging message clearer
|
2010-10-08 15:47:30 -07:00 |
|
danielvincent
|
9ac13ccb3e
|
fixed reshare a bit
|
2010-10-08 15:47:06 -07:00 |
|
ilya
|
ef3e627bed
|
the users are now made with people
|
2010-10-08 15:40:42 -07:00 |
|
danielvincent
|
086df28a37
|
removed connected to facebook text under everyone publisher
|
2010-10-08 15:21:27 -07:00 |
|
maxwell
|
255901dfab
|
fixing copypasta
|
2010-10-08 15:00:04 -07:00 |
|
maxwell
|
d7521cb288
|
MS trying to not use MiniFB to post since it is barfing
|
2010-10-08 14:49:09 -07:00 |
|
Raphael
|
b613361855
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-08 14:47:10 -07:00 |
|
Raphael
|
3729431ccf
|
don't translate css class to mark request count
|
2010-10-08 14:46:57 -07:00 |
|
danielvincent
|
44338a9897
|
removed traces of :public
|
2010-10-08 14:44:56 -07:00 |
|
maxwell
|
b6b192da01
|
MS DG trying to move around fb url
|
2010-10-08 14:25:39 -07:00 |
|
danielvincent
|
526fbe9a90
|
fixed error where publisher would cause status_message_controller to error out
|
2010-10-08 14:19:54 -07:00 |
|
danielvincent
|
7d96c95caf
|
fixed breaking aspect show pages
|
2010-10-08 14:15:35 -07:00 |
|
danielvincent
|
48e92c2c33
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-08 14:07:05 -07:00 |
|
danielvincent
|
154ec95717
|
killed the public tab. made a broadcast button in everyone tab
|
2010-10-08 14:06:49 -07:00 |
|
Crimer
|
3754b519a7
|
Solved issue #79 'Email Label in Forgot Password Appears Outside of Textbox'.
|
2010-10-08 21:51:59 +00:00 |
|