danielvincent
|
8daf2d0fd5
|
add none message to aspect#index
|
2010-10-14 15:23:15 -07:00 |
|
danielvincent
|
cf2a4c25ae
|
DG RS; remove empty message from stream upon adding something
|
2010-10-14 15:19:37 -07:00 |
|
danielvincent
|
5722f85c85
|
message in aspect if stream is empty
|
2010-10-14 15:00:47 -07:00 |
|
danielvincent
|
32a0f60a2f
|
moved photos link to the side bar for now
|
2010-10-14 14:38:19 -07:00 |
|
danielvincent
|
2b97e8751c
|
include blueprint/print.css in layout
|
2010-10-14 10:40:39 -07:00 |
|
danielvincent
|
58d5fbfb3e
|
moved invite link to account#edit on settings page. changed text on person partial.
|
2010-10-14 10:26:06 -07:00 |
|
ilya
|
d0c6f12ea8
|
added another attack vector spec
|
2010-10-13 18:43:22 -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 |
|
ilya
|
3b8998ab71
|
Invitations contains the inviters
|
2010-10-13 13:29:45 -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
|
82f526ea23
|
DG MS; added tooltip
|
2010-10-11 10:53:00 -07:00 |
|
danielvincent
|
c5affa07e8
|
tweaked reshare button
|
2010-10-08 16:19:51 -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 |
|
danielvincent
|
44338a9897
|
removed traces of :public
|
2010-10-08 14:44:56 -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 |
|
danielvincent
|
a3aab92212
|
fixed photo partial
|
2010-10-08 12:25:42 -07:00 |
|
danielvincent
|
3a876770f3
|
minor tweaks
|
2010-10-08 00:36:55 -07:00 |
|
danielvincent
|
5b66a191cd
|
more stream tweaks
|
2010-10-07 23:25:49 -07:00 |
|
danielvincent
|
b314ee22ec
|
intermediate misc ui polish
|
2010-10-07 22:51:08 -07:00 |
|
danielvincent
|
ed1cb5a0e7
|
DG MS; moved change password to account page; fixed the styling on password inputs
|
2010-10-07 18:52:46 -07:00 |
|
danielvincent
|
7a56d82873
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 16:56:22 -07:00 |
|
danielvincent
|
4deea95057
|
DG MS; export photos button in users#edit
|
2010-10-07 16:56:10 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
danielvincent
|
0ebb597b72
|
DG MS; test for users#export
|
2010-10-07 15:22:03 -07:00 |
|
Raphael
|
ec9e180eab
|
Merge branch 'master' into HEAD
Conflicts:
public/stylesheets/application.css
|
2010-10-07 13:58:06 -07:00 |
|
Raphael
|
d7bbb66d27
|
Run whitespace:cleanup
|
2010-10-07 10:47:37 -07:00 |
|
maxwell
|
c68a026658
|
MS changed the profile edit field to be private
|
2010-10-06 18:19:58 -07:00 |
|
danielvincent
|
6b74053e06
|
scratch that last commit
|
2010-10-05 20:37:28 -07:00 |
|
danielvincent
|
982f51b9c7
|
prepend pod_url to image paths
|
2010-10-05 20:31:40 -07:00 |
|
danielvincent
|
dc88110716
|
img tag in hcard
|
2010-10-05 20:22:13 -07:00 |
|
danielvincent
|
d519e46f4d
|
webfinger edit
|
2010-10-05 19:01:04 -07:00 |
|
maxwell
|
ec4c63ada7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:51:10 -07:00 |
|
maxwell
|
d638bdb018
|
MS IZ password change field is now in edit profile
|
2010-10-05 17:49:06 -07:00 |
|
Raphael
|
5847e7767d
|
Add profile photo url to hcard parser
|
2010-10-05 17:24:01 -07:00 |
|
kook
|
85b384010e
|
exchange photos on adding new friend
|
2010-10-05 17:18:51 -07:00 |
|
Raphael
|
22f90086ca
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 16:58:06 -07:00 |
|
Raphael
|
37fb2bfd32
|
Don't require a facebook yml
|
2010-10-05 16:57:22 -07:00 |
|
UserAd
|
e7c153df4e
|
Add translation support in profile ('or' between buttons). Fix Russian locale
|
2010-10-06 07:56:23 +08:00 |
|
danielvincent
|
c284c9b07f
|
added public back into webfinger
|
2010-10-05 13:47:42 -07:00 |
|