danielvincent
d3d7131c8d
stream using data-guid for messages. view fix in photo show
2010-10-20 13:47:16 -07:00
danielvincent
e9ced7b2e6
changing photo now updates all user images in page
2010-10-20 12:35:16 -07:00
danielvincent
65ffe2ecdd
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-20 12:19:24 -07:00
danielvincent
61122b83d0
make profile button on photo show page. (removed clean hash on usercontroller)
2010-10-20 12:19:06 -07:00
ilya
e6de6179e9
MS IZ dependant destroy is back for aspects
2010-10-20 11:47:09 -07:00
ilya
992bd42b55
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
spec/models/aspect_spec.rb
2010-10-20 11:30:06 -07:00
ilya
ea1ab59c3a
MS, IZ finished adding and removing people from aspects methods, refactored the move friend method
2010-10-20 11:28:56 -07:00
Raphael
961510a8ed
Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build.
2010-10-20 11:03:47 -07:00
Raphael
f97f63e2d1
Merge remote branch 'tristil/239-380-identity-error-handling'
2010-10-20 10:36:03 -07:00
danielvincent
e4d6e170e3
aspect tab no longer selected on user#edit and person#show, person#index
2010-10-20 10:22:29 -07:00
Raphael
e52e600a4d
Revert "Revert "Merge remote branch 'upstream/master'""
...
This reverts commit 3faca8380b
2010-10-20 09:52:03 -07:00
Raphael
fd8028db33
Revert "Revert "Merge remote branch 'upstream/master'""
...
This reverts commit 1481056af2
2010-10-20 09:51:55 -07:00
ilya
4d1ce410d7
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-20 09:39:32 -07:00
Alec Leamas
1481056af2
Revert "Merge remote branch 'upstream/master'"
...
This reverts commit fb70dc8c9953fef63a9a
2010-10-20 14:59:55 +02:00
Alec Leamas
3faca8380b
Revert "Merge remote branch 'upstream/master'"
...
This reverts commit 4bb5aeb34bfb70dc8c99
2010-10-20 14:52:18 +02:00
danielvincent
e7d7e1f258
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-20 00:02:22 -07:00
danielvincent
d2945c83dc
status message show is now a real show page. photo partial in stream shouldn't display a slideshow of album.
2010-10-20 00:02:15 -07:00
Raphael
a01c1c7461
Remove remove_all_aspects without ill effect
2010-10-19 23:54:12 -07:00
Sarah Mei
b007ba1487
Fixed cucumber features. Backfilled tests for AspectsController#create.
2010-10-19 22:57:55 -07:00
Sarah Mei
f8400389de
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 22:39:05 -07:00
Sarah Mei
81ef7386b3
validation errors in profile and person bubble up to user.
2010-10-19 22:33:12 -07:00
maxwell
d0055cee37
changed a bit of text in the invite, also made it show on all aspects now that we have it fixed
2010-10-19 21:07:10 -07:00
Joseph Method
4b588ccefb
Addresses [ #380 ] and [ #239 ] by handling the errors from bad identities
2010-10-19 23:44:43 -04:00
maxwell
f26dc039c9
removed empty hash from invite email
2010-10-19 20:43:45 -07:00
maxwell
bfe57b13cc
added diaspora handle to user profile page
2010-10-19 20:34:10 -07:00
maxwell
da95930c9a
added a bit to test email
2010-10-19 20:23:20 -07:00
ilya
38e8af2300
better querying
2010-10-19 19:16:44 -07:00
ilya
e3ffd2ffe7
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 18:26:06 -07:00
danielvincent
d200aaab52
mail has some style. couldn't figure out devise mailer templating at the time...
2010-10-19 18:26:02 -07:00
ilya
b31b2de6f5
MS IZ aspect add and delete for a person
2010-10-19 18:25:59 -07:00
Raphael
14a5eee41c
Return if there is a failure to create a user
2010-10-19 17:29:22 -07:00
danielvincent
8751503aa4
header on public explain fancybox
2010-10-19 16:28:45 -07:00
danielvincent
f6303b8fff
reshare dropdown looks nicer. fixed user menu to drop down on click
2010-10-19 16:16:46 -07:00
Raphael
3557d66749
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 16:07:03 -07:00
Raphael
9309be2d69
Merge branch 'import'
...
Conflicts:
spec/models/user/invite_spec.rb
2010-10-19 16:06:48 -07:00
danielvincent
0a4bf225d0
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 14:06:51 -07:00
danielvincent
b218a53bf7
fancyboxes have title bars now, kind of.
2010-10-19 14:06:44 -07:00
Raphael
d6f8fe106a
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 13:51:43 -07:00
Raphael
2c66bbbe00
Strip profile names, resolve 357
2010-10-19 13:51:31 -07:00
danielvincent
8c92c31323
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 12:29:34 -07:00
danielvincent
0621aa2f6c
fixed no friends/posts message positioning
2010-10-19 12:28:54 -07:00
Raphael
962f282cbc
Validate uniqueness of aspect name, 359
2010-10-19 12:23:24 -07:00
danielvincent
d87345ca33
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 12:10:36 -07:00
danielvincent
ea00d35f1f
padding on stream fix. added add aspect button in aspect nav.
2010-10-19 12:10:22 -07:00
Raphael
d68644c358
Resolve #387
2010-10-19 11:47:43 -07:00
Raphael
296afdc871
Beat Dan at bugfixing
2010-10-19 11:43:10 -07:00
Raphael
9f653e39f1
Fix bug 376
2010-10-19 11:39:52 -07:00
Raphael
de0b240dbb
Remove unused helper method
2010-10-19 11:36:33 -07:00
danielvincent
3866b83dab
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 11:29:47 -07:00
danielvincent
7e9585c5f0
default user picture change. stream link on all aspects page fix. layout view is not fragmented.
2010-10-19 11:29:29 -07:00
Raphael
fce902821b
Remove downcasing of diaspora_handle, verify that diaspora_handle querying and validation is case insensitive.
2010-10-19 11:06:43 -07:00
maxwell
8ada8414c7
username can be any case, but diaspora handle should always, always, ALWAYS be lowercase, for webfinger reasons
2010-10-18 22:55:09 -07:00
ilya
8894fa4daa
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-18 16:28:57 -07:00
ilya
d642928268
invite sends friend request if already friends, and raises if already friends
2010-10-18 16:27:02 -07:00
Raphael
676e802fd2
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-18 15:46:44 -07:00
Raphael
b681850783
Get rid of warning/error on invites/_new partial
2010-10-18 15:46:14 -07:00
ilya
7ab2b00231
moved fb posting into the user model
2010-10-18 14:50:48 -07:00
ilya
a8bf082e35
The invitation now has an optional personal message
2010-10-18 14:35:41 -07:00
Raphael
244accc9a9
flash error on friending self
2010-10-18 12:11:32 -07:00
Raphael
f90d38bb9c
Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge
2010-10-18 12:00:20 -07:00
Raphael
3436371a96
Merge remote branch 'archi/332-quickfix'
2010-10-18 11:44:47 -07:00
Raphael
8e4691b9d0
Merge remote branch 'rmaskey/269-album-link'
2010-10-18 11:27:13 -07:00
danielvincent
4b1516542d
various. fixed publisher in new layout.
2010-10-18 11:00:52 -07:00
danielvincent
54e5fb4abb
add new aspect back on manage page. changed badges
2010-10-18 11:00:52 -07:00
danielvincent
15104cf920
somewhat there
2010-10-18 11:00:52 -07:00
ilya
e648042b15
the user destroy now deletes the aspects
2010-10-18 10:26:45 -07:00
ilya
73dfab8601
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-18 09:56:36 -07:00
archi
5e97fd3b52
Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix
2010-10-18 11:06:42 +02:00
danielvincent
eca37e1a28
small view cleanups
2010-10-17 21:55:03 -07:00
danielvincent
2f5547626e
fixed error in status_messages_controller
2010-10-17 21:31:12 -07:00
danielvincent
1139299f42
removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller
2010-10-17 20:47:51 -07:00
danielvincent
108bf9d99e
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-17 19:33:57 -07:00
Joseph Method
e3e4a6b319
Continuation of previous commit
2010-10-17 19:07:54 -04:00
archi
baa0b43655
Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix
2010-10-17 21:19:27 +02:00
Sarah Mei
fcdcf88a79
Person.by_webfinger preserves case of identifier. Backfill specs for PublicsController#webfinger.
2010-10-17 12:18:53 -07:00
archi
1d9aa4c43d
Modified spec (doesn't check Youtube handling due to disabled net::http)
2010-10-17 21:07:49 +02:00
archi
f2af56f4b2
Youtubelink support :)
...
Tested with Firefox, Chrome and Mobile Safari (IE8 is broken anyway)
2010-10-17 20:18:24 +02:00
danielvincent
7160e9f85b
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-17 10:25:38 -07:00
archi
f676e284f7
Added Youtube links - Still TODO: Caching of titles!
2010-10-17 16:14:01 +02:00
archi
8e753cc073
Youtube proof of concept patch/preview - not done yet (see bug #332 )
2010-10-17 12:56:26 +02:00
Sarah Mei
50f9e8f240
Reorganize User model. Preserve case of username.
2010-10-16 23:58:01 -07:00
Sarah Mei
f688653936
disallow whitespace in username
2010-10-16 23:34:58 -07:00
Sarah Mei
798d904e7e
strip username on create
2010-10-16 23:27:18 -07:00
Sarah Mei
d3a62c7a45
RegistrationsController#create deals with validation errors. Username, email, password now required on sign-up.
2010-10-16 22:02:51 -07:00
Sarah Mei
1b6726354f
Backfill specs for RegistrationsController#create.
...
Remove RegistrationsController#new (which just called super, so it's not necessary).
2010-10-16 21:14:37 -07:00
archi
035db98367
Added HTML links to posts
2010-10-17 02:06:46 +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
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
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
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
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
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
a61c126aad
manage page now uses partial
2010-10-15 11:29:23 -07:00
maxwell
20f164fd45
fixing some of the invite copy
2010-10-15 11:11:25 -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
ilya
b4b338b3cd
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-14 18:12:34 -07:00
ilya
4a7c4e0848
requests are made on invite but perhaps they should be made on signup so that we have a person
2010-10-14 18:12:18 -07:00
Raphael
9e90463455
Fix bug if app_config[url] has no trailing slash. Thanks to binarycleric.
2010-10-14 17:29:26 -07:00
Raphael
51c5b73256
Merge branch 'empty-page'
...
Conflicts:
public/stylesheets/application.css
2010-10-14 17:00:19 -07:00
Raphael
08e629668d
I18ning empty_messages
2010-10-14 16:55:00 -07:00
maxwell
d61a227fc7
posts now serialize their created_at time
2010-10-14 16:49:08 -07:00
maxwell
a30a2666c6
merging
2010-10-14 16:32:37 -07:00
danielvincent
45d7d54c66
added an empty message for the case of an aspect with no friends
2010-10-14 16:23:29 -07:00
Raphael
65958cf85c
Should close Issue 368
2010-10-14 15:53:43 -07:00
danielvincent
750b4b4388
empty message re-appears if all stream posts are deleted
2010-10-14 15:40:34 -07:00
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
Raphael
d66c1e70bc
Merge remote branch 'bigbash/280-bug-fix'
2010-10-14 13:21:50 -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
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
Shawn McGuire
711dcdc5f4
Issue #280 Fixed trailing whitespace error
2010-10-13 14:36:03 -05: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
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
ilya
9a34ca07c4
Merge branch 'master' of github.com:diaspora/diaspora into invites
2010-10-07 19:25:42 -07:00
ilya
ddb98502b9
setup the controller, still need to make the person
2010-10-07 19:25:34 -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
ilya
4ecda6ab8f
Merge branch 'master' of github.com:diaspora/diaspora into invites
...
Conflicts:
Gemfile
Gemfile.lock
2010-10-07 18:20:51 -07:00
danielvincent
c756e1a331
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 18:17:38 -07:00
danielvincent
2e73104d6f
DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2
2010-10-07 18:17:26 -07:00
ilya
3c61365fa1
initial invitable in user
2010-10-07 18:11:17 -07:00
Raphael
399e437655
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 17:34:03 -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
1d463d22a1
Person show for a nonexistent person now redirects to people index page, rather than giving a 500
2010-10-07 16:50:19 -07:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
danielvincent
6531a27594
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 15:22:14 -07:00
danielvincent
0ebb597b72
DG MS; test for users#export
2010-10-07 15:22:03 -07:00
Raphael
6dbe429ed1
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 15:02:37 -07:00
danielvincent
206e10f66a
dont put log behind devise
2010-10-07 14:57:00 -07:00
Raphael
9646a453a1
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 14:34:57 -07:00
danielvincent
8f1973815e
DG MS; added route for exported xml
2010-10-07 14:21:53 -07:00
Raphael
9912769b5b
Merge remote branch 'guillei/s3_upload'
2010-10-07 14:17:43 -07:00
Raphael
ec9e180eab
Merge branch 'master' into HEAD
...
Conflicts:
public/stylesheets/application.css
2010-10-07 13:58:06 -07:00
Raphael
9cbdf78aa7
Don't redirect on status message create
2010-10-07 12:01:49 -07:00
Raphael
0859d8ebfe
Merge remote branch 'jeffry/master'
2010-10-07 11:45:39 -07:00
Raphael
d7bbb66d27
Run whitespace:cleanup
2010-10-07 10:47:37 -07:00
ilya
131e905322
fixed the public route
2010-10-06 19:05:43 -07:00
maxwell
0fb091ebbc
MS pretty sure we dont need to get the oauth path every time we load the public aspect...
2010-10-06 18:38:37 -07:00
maxwell
c68a026658
MS changed the profile edit field to be private
2010-10-06 18:19:58 -07:00
danielvincent
66b356b5fe
moved public route
2010-10-06 18:14:37 -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
danielvincent
7c4feb7464
better log message
2010-10-05 17:34:03 -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
danielvincent
c9d97d3233
render public with correct mime type
2010-10-05 17:15:00 -07:00
danielvincent
66ec5f0570
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-05 17:00:20 -07:00
danielvincent
830b3772d5
self reference in atom
2010-10-05 16:59:55 -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
09b861c7a3
remove .atom from public url
2010-10-05 16:51:27 -07:00
danielvincent
6723a51149
correctly indent xml
2010-10-05 16:40:50 -07:00
danielvincent
4a8a21b95f
public fix
2010-10-05 16:28:01 -07:00
danielvincent
c284c9b07f
added public back into webfinger
2010-10-05 13:47:42 -07:00
danielvincent
33e478229e
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-05 13:40:10 -07:00
danielvincent
f3c34692d8
pubsub support
2010-10-05 13:39:56 -07:00
ilya
57b61f6827
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-05 13:00:54 -07:00
ilya
63cb7dcbdd
Fb friends are displayed only once
2010-10-05 13:00:42 -07:00
danielvincent
aed9125e93
more querying through the current_user in controllers
2010-10-05 12:41:41 -07:00
ilya
ce4f8cab8b
not encrypting the entire thing
2010-10-03 17:39:16 -07:00
ilya
304e4ad32b
removed the puts
2010-10-02 12:37:53 -07:00
ilya
7dcde292e1
user posting spec is now green, now stubbing on the apropriate method
2010-10-02 12:34:16 -07:00
ilya
b6a912dd02
slowly getting specs to pass on with the new api
2010-09-30 15:17:53 -07:00
Jeffry Degrande
132eec2c63
Merge branch 'upstream'
...
Conflicts:
app/controllers/aspects_controller.rb
2010-09-29 02:11:20 -03:00
Jeffry Degrande
046dbf063b
fix i18n => I18n
2010-09-29 01:49:35 -03:00
danielvincent
f5a57a6f4a
photo partial now has labels
2010-09-28 13:05:58 -07:00
danielvincent
e0159aaaeb
small visual tweaks
2010-09-28 12:58:34 -07:00
danielvincent
4627c5338e
found placement of all aspects tab confusing; moved it to be the first tab
2010-09-28 12:29:35 -07:00
danielvincent
bf15514bc9
redirect users#public to root_url if user does not exist.
2010-09-28 10:23:03 -07:00
danielvincent
263615ad14
all status messages have labels
2010-09-27 23:51:20 -07:00
danielvincent
79926da3d3
removed owner image repeat
2010-09-27 23:16:19 -07:00
danielvincent
cb7c35af73
fixed thumbnail positioning
2010-09-27 23:15:48 -07:00
danielvincent
bf587be461
public indicator tag on status message partial.
2010-09-27 22:50:11 -07:00
danielvincent
15a4609c14
moved user's public route to user controller. changed person.public_url to reflect change.
2010-09-27 22:30:16 -07:00
danielvincent
eac6b8a63b
builder is now a class initialized with a user. added director class.
2010-09-27 21:54:01 -07:00
danielvincent
eb7244e07c
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-27 19:07:01 -07:00
danielvincent
26a4dc76a6
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-27 18:34:55 -07:00
danielvincent
3b8ddf76a3
temp route for atom feed. also, public atom currently displays all posts.
2010-09-27 18:34:47 -07:00
ilya
7852c346f2
mode the visible posts api more general and moved to it on the public controller
2010-09-27 18:31:37 -07:00
danielvincent
df800dc87e
ostatus builder
2010-09-27 17:58:44 -07:00
ilya
6e407572c4
removed unused repost method, going through the warden object
2010-09-27 17:27:49 -07:00
Guillermo
c835814ee1
Merging prep_image_url with master
2010-09-27 19:20:42 -05:00
ilya
c2b84fd9c6
added a public key to post
2010-09-27 16:59:54 -07:00
ilya
52313b799b
added a warning, moved connected as into a partial, removed the
...
publishing box from settings page
2010-09-27 16:31:19 -07:00
ilya
d41b370630
removing the fb feed for now
2010-09-27 16:20:27 -07:00
ilya
7b29e6ec26
checking that a user is logged in before doing fb checking
2010-09-27 15:50:52 -07:00
ilya
08b9aa864a
Merge branch 'master' of github.com:diaspora/diaspora into fb
...
Conflicts:
app/views/layouts/application.html.haml
app/views/shared/_publisher.haml
app/views/shared/_sub_header.haml
app/views/users/edit.html.haml
config/deploy_config.yml
config/routes.rb
2010-09-27 15:39:50 -07:00
ilya
8f55852ea9
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-27 15:30:27 -07:00
Raphael
12bd0f2301
Merge branch 'master' of http://github.com/uiri/diaspora
2010-09-27 14:48:11 -07:00
Raphael
1ab536bf04
Merge branch 'master' of http://github.com/sarahmei/diaspora
2010-09-27 11:09:14 -07:00
Raphael
ce0accafbb
Don't depend on user => person delagation so we can eventually get rid of that, thanks astronouth7303
2010-09-27 11:03:48 -07:00
ilya
98bc2df841
removed the encryption key= method, and user with private key factory
2010-09-27 10:10:54 -07:00
ilya
cf0df90dae
moved the private key into user where it belongs, two failing cucumber tests
2010-09-26 22:08:42 -07:00
Sarah Mei
4bb4602762
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-26 13:14:50 -07:00
Stephen Caudill
43fa70f90b
Label error notification as such.
2010-09-26 16:10:13 -04:00
Sarah Mei
68a8ecb05f
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-26 13:08:56 -07:00
Sarah Mei
0ec074be6d
Remove annoying deprecation warning from spec runs
...
Add spec for validation hook
2010-09-26 10:00:29 -07:00
Dorian
e792344c0e
Use improved whitespace:scrub_gratuitous_newlines
2010-09-26 12:52:39 -04:00
Dorian
6ffc03a4c9
Big clean up: delete trailing whitespace
2010-09-26 12:48:40 -04:00
Stephen Caudill
fd69f0201f
User creates an aspect
2010-09-26 12:05:39 -04:00
Guillermo
86cbce288b
Isn't necessary prepare URL if file is saved in S3
2010-09-26 11:05:17 -05:00
Guillermo
8a92f15948
storage isn't required here since is set in initializer
2010-09-26 11:04:19 -05:00
Uiri
151a57cc93
well, that explains why it was adding the url variable. Fixed so that now new pictures work too.
2010-09-26 11:47:34 -04:00
Sarah Mei
17757a2e2d
Merging upstream changes
2010-09-25 15:57:59 -07:00
Uiri
e8d6fb26e7
Merge branch 'master' of git://github.com/diaspora/diaspora
2010-09-25 18:30:15 -04:00
Uiri
0b19b77b5f
A fix for the image breaking if you don't change anything on the edit profile page but hit update profile instead of cancel
2010-09-25 17:34:13 -04:00
Stephen Caudill
536cea5e44
Remove consecutive empty lines
2010-09-25 12:06:39 -04:00
Sarah Mei
e3ec00595d
Cleaned up file path joining in some of the dev utilties.
...
Backfilled tests where necessary to make sure changes didn't break existing code.
2010-09-25 04:34:48 -07:00
Chiggins
f74b0a6f2c
Added "shadow text" to caption text field while editing a photo, since about every other text field has "shadow text".
2010-09-25 08:13:16 +08:00
Raphael
f4d18ce9bc
don't use request.host as data
2010-09-24 17:12:18 -07:00
ilya
f38bcc9eb3
tiny change in view
2010-09-24 15:54:53 -07:00
ilya
e414558f79
passing the right things to the partial
2010-09-24 15:52:29 -07:00
Raphael
999d229225
Post photos in either 1.8.7 or 1.9.2
2010-09-24 15:18:30 -07:00
Raphael
004e659ee1
fix album posting
2010-09-24 15:10:49 -07:00
ilya
c7757a302c
typo
2010-09-24 15:06:48 -07:00
ilya
ac9854596f
fb_status partial rendered in public
2010-09-24 15:04:31 -07:00
ilya
bb58678556
added a fb_status model & parser method
2010-09-24 14:41:31 -07:00
Raphael
950c6a7cab
Merge branch '1.9.2' into HEAD
...
Conflicts:
app/models/photo.rb
2010-09-24 14:36:00 -07:00
Raphael
40120bb441
Moving to activemodel validations
2010-09-24 11:15:39 -07:00
ilya
82b99decbb
putting the token in the warden session
2010-09-24 10:45:27 -07:00
Raphael
b9bff76054
Initial 1.9.2, specs fail (possibly validatable), need to pull in aredridel photo fixes
2010-09-24 09:49:42 -07:00
Raphael
70a22ae839
Merge branch 'master' into HEAD
...
Conflicts:
app/models/post.rb
app/models/user.rb
config/initializers/socket.rb
2010-09-24 09:15:10 -07:00
danielvincent
4f17eb4e02
stray aspect name removed from publisher
2010-09-23 20:33:34 -07:00
ilya
a594c9a34f
friends in the public bucket
2010-09-23 20:19:02 -07:00
danielvincent
265753b5fe
user edit is now divided into real sections
2010-09-23 20:13:07 -07:00
ilya
eaea26e58d
the public aspect is now set in application controller
2010-09-23 19:33:33 -07:00
ilya
796f198d8c
notification only on user page
2010-09-23 17:20:55 -07:00
ilya
11dc225311
removed the old publish box
2010-09-23 17:19:43 -07:00
Raphael
16b6fc6cdc
Don't give exception on webfinger with no query
2010-09-23 17:18:34 -07:00
ilya
75e1ddf9d2
saying going to FB in public aspect
2010-09-23 17:17:18 -07:00
ilya
0d71a1896c
posting to FB from public now works
2010-09-23 17:11:42 -07:00
ilya
107fb58917
added a logger statement
2010-09-23 17:04:27 -07:00
ilya
d7833c66b2
typo
2010-09-23 16:48:58 -07:00
ilya
4d2bd52310
public aspect param on statusMessage create and in the partial
2010-09-23 16:41:05 -07:00
Raphael
d748d456b5
Revert "fix in person partial"
...
This reverts commit 8c0bc4b9e6
2010-09-23 16:21:08 -07:00
ilya
be10681945
IZ tying the publisher to fb in public aspect
2010-09-23 16:06:55 -07:00
ilya
fc2cf4fde6
typo
2010-09-23 15:21:15 -07:00
ilya
1fdbc637d1
trying profile pictures on remote
2010-09-23 15:18:29 -07:00
ilya
19c3a5ce4b
fetching friend data
2010-09-23 15:07:07 -07:00
ilya
f0999628ae
trying to get friends from fb
2010-09-23 14:43:08 -07:00
ilya
5857838a0a
adding the new files
2010-09-23 12:29:00 -07:00
ilya
48c212c1ab
made a public view, copied the fb publisher there
2010-09-23 12:18:26 -07:00
danielvincent
af91eb51b4
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-23 10:49:41 -07:00
danielvincent
8c0bc4b9e6
fix in person partial
2010-09-23 10:49:35 -07:00
maxwell
40d736d233
MS changed the session page to show APP_CONFIG[:terse_pod_url]
2010-09-23 10:39:47 -07:00
maxwell
457be4385b
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-23 10:39:04 -07:00
danielvincent
5d0f4dd587
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-23 10:29:50 -07:00
Raphael
95396cd9b2
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-23 10:24:17 -07:00
Raphael
ed6df7d1bf
Delete user.terse_url
2010-09-23 10:24:10 -07:00
danielvincent
6025bee819
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-23 10:17:21 -07:00
danielvincent
c000b31ffb
query for post through user
2010-09-23 10:17:13 -07:00
uiri
c711e85c89
adding gif support
2010-09-24 01:10:46 +08:00
Raphael
cc3819c256
Forgot a merge conflict
2010-09-22 21:39:22 -07:00
Raphael
2489f8503f
Merge branch 'master' into HEAD
...
Conflicts:
app/controllers/albums_controller.rb
app/controllers/aspects_controller.rb
app/controllers/photos_controller.rb
app/controllers/registrations_controller.rb
app/controllers/requests_controller.rb
app/helpers/dashboards_helper.rb
app/views/albums/show.html.haml
app/views/aspects/manage.html.haml
app/views/shared/_aspect_nav.haml
app/views/shared/_sub_header.haml
app/views/status_messages/_status_message.html.haml
app/views/status_messages/show.html.haml
config/locales/de.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
2010-09-22 21:32:03 -07:00
danielvincent
7303212784
DG IZ; haml typo
2010-09-22 17:50:47 -07:00
danielvincent
fc0350e4e1
DG IZ; user can post a status update from user edit page to facebook.
2010-09-22 17:49:11 -07:00
danielvincent
bc70ebdb95
DG IZ; quick form in user edit
2010-09-22 17:33:57 -07:00
danielvincent
ae58120deb
another typo...
2010-09-22 17:18:46 -07:00
danielvincent
ddbde60e8c
another indent...
2010-09-22 17:17:24 -07:00
danielvincent
aef3c8d7bb
indent, whoops
2010-09-22 17:16:16 -07:00
danielvincent
26478403e2
DG IZ; connecting/disconnecting from fb
2010-09-22 17:14:58 -07:00
danielvincent
159d72c04c
DG IZ; logged in as?
2010-09-22 16:56:39 -07:00
danielvincent
fcc681df71
DG IZ moved to be APP_CONFIG for host
2010-09-22 16:32:52 -07:00
danielvincent
8ed98270a6
Merge branch 'master' of github.com:diaspora/diaspora into fb
...
Conflicts:
config/routes.rb
2010-09-22 16:09:25 -07:00
danielvincent
81250c0e9d
Merge branch 'master' of github.com:diaspora/diaspora into reposting
2010-09-22 15:49:13 -07:00
danielvincent
e9d16cc09b
DG IZ; cleanup
2010-09-22 15:48:50 -07:00
danielvincent
b9be543ef6
DG IZ; reshare redirects to specific page
2010-09-22 15:32:11 -07:00
Thomas Krehbiel
10e6ff9df8
Fix for sending unlimited duplicate friend requests
2010-09-22 18:16:10 -04:00
danielvincent
474cf77708
DG IZ; reposting now works. redirects to a template missing page, though.
2010-09-22 15:05:51 -07:00
root
aaa4d75a5e
Merge branch 'master' of http://github.com/diaspora/diaspora
2010-09-22 16:41:43 -04:00
danielvincent
5ef32b7d55
DG IZ; a user can repost. aspects are not sent through the websocket. post does not show where it curently is going in its partial
2010-09-22 12:03:25 -07:00
maxwell
23e9520a9e
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-22 11:33:26 -07:00
danielvincent
6dd7911c8c
DG IZ; update_or_repost
2010-09-22 10:52:29 -07:00
Raphael
7049cb3ca4
A less efficient, but simpler way of checking whether the photo is the profile photo
2010-09-22 10:31:40 -07:00
ilya
6bd22034b7
typo in user
2010-09-21 21:45:29 -07:00
maxwell
63ed6a3a95
MS DG made async webfingering controller. need to call it from javascript to prevent seeds from blocking. remember to update your gems
2010-09-21 21:31:53 -07:00
ilya
dc0bd363a1
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-21 20:02:13 -07:00
ilya
6d6ca3d8bc
added terse_pod_url to the APP_CONFIG hash
2010-09-21 20:01:56 -07:00
danielvincent
df5b7d6d84
DG MS; new function in post
2010-09-21 18:14:46 -07:00
ilya
76f140aa8b
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-21 16:59:16 -07:00
ilya
020ff603bd
terse_url in user, db seeds are fixed, config/app_config.yml is now in gitignore, copy over config/app_config_example.yml.
2010-09-21 16:59:06 -07:00
danielvincent
03638ee68e
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-21 16:35:25 -07:00
danielvincent
107c05ef6f
DG MS; validate_aspect_permissions broken out of post method
2010-09-21 16:35:18 -07:00
root
fe2be748a0
Merge branch 'master' of http://github.com/diaspora/diaspora
2010-09-21 19:21:40 -04:00
ilya
d26e7850ac
RS, IZ; removed url from user and views
2010-09-21 15:52:26 -07:00
ilya
efd901dcd9
RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG
2010-09-21 15:46:57 -07:00
danielvincent
44db21ffd4
DG MS; cleaned up spec
2010-09-21 15:41:29 -07:00
Raphael
95d852b181
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-21 14:00:12 -07:00
Raphael
11d31901e4
IZ, RS, Pulled receiving out of user file, refactored receive method to be clearer
2010-09-21 13:59:52 -07:00
root
03f8cbc249
Merge branch 'master' of http://github.com/diaspora/diaspora
2010-09-21 16:59:26 -04:00
danielvincent
0a99b82bd3
Merge branch 'master' of github.com:diaspora/diaspora into fb
2010-09-21 13:40:17 -07:00
ilya
4d00a0e99e
IZ posting to all albums should now work, needed to check for all in user.post
2010-09-21 12:35:48 -07:00
danielvincent
9571ade89c
basic setup
2010-09-21 12:29:39 -07:00
ilya
e4ac3afc3e
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-21 11:59:17 -07:00
ilya
1882509a0b
removed the auto_link seems to fix HTML injection, no more autolinking
2010-09-21 11:59:04 -07:00
Dorian
003a8b454f
Some refactoring again (define code rules would be good)
2010-09-22 02:55:54 +08:00
danielvincent
4d200fea87
removed view all link from status_message#show
2010-09-20 20:17:18 -07:00
Thomas Krehbiel
bdd752f07b
Fix for 'Local variable hides method'
2010-09-20 21:49:14 -04:00
Raphael
441f75203a
Add autolink and sanitize to show page
2010-09-20 17:33:05 -07:00
danielvincent
9c334e24e4
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-20 17:26:35 -07:00
danielvincent
e588d7ab6a
DG IZ moving friends is now ajaxy
2010-09-20 17:26:20 -07:00
maxwell
24ca139241
MS remove some stray puts
2010-09-20 17:11:07 -07:00
maxwell
2be0cca2cd
MS adding downcase to webfinger lookup
2010-09-20 16:51:02 -07:00
maxwell
e2fc48c9ff
MS being slightly more proper with application helper, and fixing the person search page
2010-09-20 16:44:35 -07:00
danielvincent
b80d75c382
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-20 15:54:07 -07:00
danielvincent
40c96fc619
DG IZ; click to edit rollover text on aspect manage page
2010-09-20 15:53:56 -07:00
maxwell
d8c5541e12
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-20 15:32:26 -07:00
maxwell
cb0f0b72eb
MS removed a log and trying to be slightly more pedantic
2010-09-20 15:32:18 -07:00
danielvincent
fb2f027b24
DG IZ; escape regex characters in Person.search
2010-09-20 15:25:19 -07:00
danielvincent
9787c45159
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-20 15:15:53 -07:00
danielvincent
5bb4ee5d36
DG IZ; posting now ensures aspect ownership.
2010-09-20 15:15:37 -07:00
maxwell
5e2fdedf8b
MS removed another logging of encrypted data....
2010-09-20 15:07:30 -07:00
danielvincent
4fe4326ed1
DG IZ photo uploading now works
2010-09-20 15:00:02 -07:00
danielvincent
aa2ea3f300
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-20 13:18:21 -07:00
danielvincent
af9cda52af
DG IZ; always query through the current_user in the controllers.
2010-09-20 13:18:11 -07:00
Arnaud Delcasse
eeb132d825
Writing "Already friends" instead of proposing to add people that we already added successfully or accepted in the search results.
2010-09-21 03:20:06 +08:00
danielvincent
b097f93bf5
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-20 11:39:17 -07:00
maxwell
5d1fdcaf3a
MS fixing bug #67 . stripping whitespace from search
2010-09-20 11:38:24 -07:00
danielvincent
fe306b37ab
DG IZ; mass-assignment quick-fix in controllers
2010-09-20 11:30:27 -07:00
maxwell
64d371d9d6
MS added a warning for account
2010-09-20 11:30:08 -07:00
Ariel Zavala
db7ad16503
Added localization to comments views
2010-09-21 02:03:51 +08:00
Ariel Zavala
6501974f30
added more translations missing on views
2010-09-21 01:43:54 +08:00
TJ Peden
e6c8cf20d3
Fixed receive_url problem
2010-09-21 01:26:51 +08:00
maxwell
5bf6d358a4
MS added small log for when user is found from webfinger
2010-09-19 20:40:03 -07:00
maxwell
07d2de6646
removed an annoying log of encrypted salmon.
2010-09-19 20:36:39 -07:00
danielvincent
14ad24ba7e
visual tweaks on header. moved upload a file button to header on album#show
2010-09-19 14:27:20 -07:00
danielvincent
b40b81e447
aspect manage tab now reads 'manage aspects'
2010-09-19 10:11:41 -07:00
Ariel Zavala
e9f74675e9
Merged with diaspora; fixed conflicts; only 2 red
2010-09-19 11:16:00 -04:00
danielvincent
cc4e9f8d39
description text for all boxes in manage page. search box text defaults to query on people#index.
2010-09-18 17:56:26 -07:00
danielvincent
b5a2971302
search results for people now look like the stream
2010-09-18 17:49:52 -07:00
danielvincent
08f833ba7a
case insensitivity on search
2010-09-18 17:21:18 -07:00
danielvincent
e9a3f46fbd
fixed query function to go through mongomapper instead of custom
2010-09-18 16:42:07 -07:00
Aria Stewart
45b6ff53f1
Ruby 1.9 fixes
2010-09-18 16:35:48 -06:00
mishudark
c46ad0d7fa
photo description with ajax request
2010-09-18 12:33:22 -05:00
mishudark
b7bc4b8615
prevent next prev when youre add writting
2010-09-18 04:14:44 -05:00
mishudark
910bd71c78
prevent photho redirect next,prev if textarea has focus
2010-09-18 03:32:37 -05:00
Ariel Zavala
58c2d0dd28
merged with diaspora master; this fork has spanish, german and french translations (need some help with the last two)
2010-09-18 02:21:45 -04:00
Don Park
2d16289e46
use photos_path to generate the correct POST destination for photo uploads
2010-09-18 07:50:12 +08:00
Patrick Aljord
182c6228f3
show comments ordered by created_at, they are showing up at random order without that
2010-09-18 07:36:21 +08:00
Ariel Zavala
4558f9901e
Added translations to photos and registrations controllers
2010-09-17 18:25:36 -04:00
Raphael
84789f64c9
scope album queries through user
2010-09-17 14:57:14 -07:00
Ariel Zavala
ce3284f1a1
Merge branch 'master' into i18n
2010-09-17 17:28:55 -04:00
Ariel Zavala
7bb3d9c87a
Merge branch 'master' of http://github.com/diaspora/diaspora
2010-09-17 17:21:29 -04:00
Ariel Zavala
c1c20e14f7
Added translations to requests controller
2010-09-17 17:05:54 -04:00
Ariel Zavala
f95cebcb8b
Added translations to new requests view and aspects controller
2010-09-17 16:38:50 -04:00
Raphael
b3549c79f4
Give slightly more specific error message
2010-09-17 12:49:49 -07:00
Ariel Zavala
cb145c346a
Added I18n translations to helpers
2010-09-17 15:30:02 -04:00
Ariel Zavala
0014024870
Added I18n translations to helpers
2010-09-17 15:26:31 -04:00
Raphael
ce2260b747
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-17 11:57:36 -07:00
Raphael
5df33a6fd0
Take out users/show, use current_user in update
2010-09-17 10:50:18 -07:00
Raphael
be26794e4a
only write to your own profile
2010-09-17 10:46:14 -07:00
Raphael
99ad001d28
Fix websocket spec, take out puts in by_webfinger
2010-09-17 09:52:31 -07:00
Ariel Zavala
271925a7f6
added photo view translations
2010-09-17 11:34:45 -04:00
Ariel Zavala
c6b34be63d
Added people views translations
2010-09-17 11:27:08 -04:00
Ariel Zavala
375f4f6808
added more translations missing on views
2010-09-17 10:43:59 -04:00
Raphael
2e8ecceaf7
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-16 21:53:34 -07:00
Raphael
b45906f902
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-16 21:35:48 -07:00
Raphael
c520fb71a7
Moved socket out to separate process. Multiple thins should now be possible
2010-09-16 21:34:15 -07:00
Ariel Zavala
d7e9744e84
Merge branch 'master' of http://github.com/diaspora/diaspora
2010-09-16 23:53:18 -04:00
Ariel Zavala
07138041b0
Fixed album controller errors
2010-09-16 23:35:57 -04:00
maxwell
e668071ea5
README.md
2010-09-16 18:48:18 -07:00
Ariel Zavala
db41bcc144
Merge branch 'locale-de' of http://github.com/ccoenen/diaspora
2010-09-16 21:09:11 -04:00
Ariel Zavala
0be3314e0a
merge with diaspora and resolved a conflict
2010-09-16 20:42:45 -04:00
danielvincent
95a4120e57
DG IZ; dropzones on left back on aspect manage page.
2010-09-16 17:22:42 -07:00
danielvincent
ae83dae1ca
added git info (branch,date,author) to debug partial
2010-09-16 17:03:14 -07:00
danielvincent
25b4b409be
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-16 16:19:48 -07:00
danielvincent
cbb692b6a3
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-16 16:06:28 -07:00
danielvincent
0c7ba49e34
DG IZ; aspect deletion
2010-09-16 16:03:18 -07:00
Ariel Zavala
b727fe42f5
Merge branch 'master' of http://github.com/diaspora/diaspora
2010-09-16 18:56:02 -04:00
Claudius Coenen
64b07fca55
Merge branch 'master' of http://github.com/diaspora/diaspora into locale-de
2010-09-17 00:23:43 +02:00
Claudius Coenen
5197c1b3ec
adding localisation for controller's flash messages'
2010-09-17 00:23:35 +02:00
Ariel Zavala
f430961672
Merge branch 'master' of http://github.com/diaspora/diaspora
2010-09-16 18:15:32 -04:00
maxwell
e7afebece8
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-16 15:07:02 -07:00
maxwell
2e8785b596
applying this change from wiki, thanks astronouth7303
2010-09-16 15:04:29 -07:00
Raphael
0eb2c97aef
object_path shouldn't create links to users
2010-09-16 14:51:27 -07:00
maxwell
b155d07abd
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-16 14:38:32 -07:00
maxwell
6f867d60c4
MS fixed the nil hostname on user
2010-09-16 14:38:24 -07:00
Raphael
d8460ed37b
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-16 14:21:51 -07:00
Ariel Zavala
be9ae343cc
Added localizations that I had missed
2010-09-16 15:55:54 -04:00
Ariel Zavala
6a967e7fe9
Added localization to status message views
2010-09-16 15:47:12 -04:00
Ariel Zavala
ec9affb849
Merge branch 'master' of http://github.com/diaspora/diaspora
2010-09-16 15:14:38 -04:00
Raphael
feb4cbfd29
Merge branch 'master' of http://github.com/fbrubacher/diaspora
2010-09-16 12:14:11 -07:00
Ariel Zavala
51b6ce9dfb
Added localization to layouts and shared views
2010-09-16 15:11:58 -04:00
Ariel Zavala
a673257eef
Added localization to photos views
2010-09-16 15:11:21 -04:00
Michael Nutt
cd9639cf29
websocket js should honor app socket port configuration
2010-09-17 03:11:11 +08:00
Ariel Zavala
5078830785
Added localization to comments views
2010-09-16 15:00:21 -04:00
Ariel Zavala
9bdd11b383
Added localization to album views
2010-09-16 14:58:42 -04:00
Ariel Zavala
443b5af4ce
Added localization to aspect views
2010-09-16 14:57:56 -04:00
maxwell
649839567d
MS added pagination to the search page
2010-09-16 11:47:34 -07:00
Daniel Vincent Grippi
07a8fa8bb6
fixed xss bug in comment view partial.
2010-09-16 08:32:19 -07:00
Federico Brubacher
05808456d8
fixed small issue in albums#update anad added corressponding controller test
2010-09-16 12:21:08 -03:00
Raphael
1e646fb0a9
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-15 23:54:57 -07:00
Raphael
32fc6212ab
Put only the hostname in diaspora_handle
2010-09-15 23:49:55 -07:00
Michael Fellinger
35c9922c61
And fix some more requires
2010-09-16 15:24:26 +09:00
Raphael
d124686723
Need more stack traces!
2010-09-15 23:22:02 -07:00
Raphael
d760725145
Don't webfinger another server on receiving a webfinger request
2010-09-15 23:01:13 -07:00
Michael Fellinger
ba058a39a8
Replace require_relative with compatible version
2010-09-16 14:50:30 +09:00
Michael Fellinger
c6f5b4ed16
Basic 1.9.2 port
2010-09-16 14:41:33 +09:00
Raphael
c67a8ea100
Merge branch 'master' of github.com:diaspora/diaspora into production
...
Conflicts:
config/deploy.rb
config/environments/production.rb
spec/models/request_spec.rb
2010-09-15 22:37:05 -07:00
Stephen Caudill
5595dc5f48
Retab the project
2010-09-16 13:16:10 +08:00
Jamie Wilkinson
fbdd50172d
Cleanup stray whitespace
2010-09-16 10:07:59 +08:00
Jamie Wilkinson
eb0f011236
Show the signup link
2010-09-16 10:07:58 +08:00
Jamie Wilkinson
5d87ca0904
Use /signup instead of /an_excellent_meme_reference, and don't use hardcoded paths when redirecting
2010-09-16 10:07:57 +08:00
Raphael
e9009ea609
Downcase username only if it is there
2010-09-15 18:23:54 -07:00
Raphael
de93fd2818
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-15 18:10:13 -07:00
Raphael
708e9f88a5
Spell our own name right
2010-09-15 17:56:18 -07:00
Raphael
04594d7ac5
Merge branch 'production' of github.com:diaspora/diaspora into production
...
Conflicts:
app/models/user.rb
2010-09-15 17:25:14 -07:00
Raphael
33048fe6db
Merge branch 'master' of github.com:diaspora/diaspora into production
...
Conflicts:
app/models/user.rb
spec/models/aspect_spec.rb
2010-09-15 17:24:00 -07:00
Raphael
0e0df7fb22
downcase before validation
2010-09-15 17:21:23 -07:00
Raphael
bf33313bf9
take out index, change backer seed, no puts
2010-09-15 17:13:17 -07:00
Raphael
02dda4f0a7
change the name of instantiate back
2010-09-15 17:08:56 -07:00
Raphael
d2f5d3c4c1
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-15 17:05:36 -07:00
Raphael
01d26f6d0e
Using custom registrations controller
2010-09-15 17:05:21 -07:00
Daniel Vincent Grippi
3681ae62c7
remove google analytics
2010-09-15 16:43:38 -07:00
Raphael
e0ffc8bba0
First pass at having a custom registrationsController
2010-09-15 16:40:03 -07:00
Daniel Vincent Grippi
ee89bfaf8f
removed do bad things
2010-09-15 16:18:33 -07:00
maxwell
b8bbc58d30
save person after changing handle
2010-09-15 16:02:23 -07:00
Daniel Vincent Grippi
f0dad8c16a
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-15 15:55:45 -07:00
maxwell
77bd68e7c7
MS the deploy config is wrong
2010-09-15 15:55:26 -07:00
Daniel Vincent Grippi
e94b48e19a
Merge branch 'master' of github.com:diaspora/diaspora into production
...
Conflicts:
app/models/user.rb
2010-09-15 15:55:18 -07:00
maxwell
6e29a66e09
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/models/user.rb
2010-09-15 15:46:15 -07:00
maxwell
3a4eb294f8
MS made it two callbacks for handles and keys
2010-09-15 15:45:26 -07:00
Daniel Vincent Grippi
b2b2748fea
seed aspects on user create
2010-09-15 15:39:04 -07:00
Daniel Vincent Grippi
82ada7d2d6
Merge branch 'production' of github.com:diaspora/diaspora into production
2010-09-15 15:36:59 -07:00
Daniel Vincent Grippi
cd21ee8652
just seed family and work
2010-09-15 15:36:41 -07:00
maxwell
7741951a42
MS removing production stuff from master... yowch
2010-09-15 15:26:06 -07:00
maxwell
8828707c45
MS fixed the login bug, deploying to master
2010-09-15 15:15:15 -07:00
maxwell
c1077b3eed
Merge branch 'production' of github.com:diaspora/diaspora into production
2010-09-15 14:11:24 -07:00
maxwell
55c1530c9f
MS DG fixing an edit profile bug
2010-09-15 14:09:05 -07:00
maxwell
b68ec3a5b8
MS DG setting diaspora handle in a unclean way
2010-09-15 13:53:36 -07:00
maxwell
84c60e5f2e
DG MS fixing webfinger, i hope to goodness
2010-09-15 13:28:06 -07:00
Daniel Vincent Grippi
aad24fdfcc
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-15 12:22:16 -07:00
Daniel Vincent Grippi
57bd052c5b
user edit bug
2010-09-15 12:22:03 -07:00
Daniel Vincent Grippi
97b0b7b322
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-15 11:59:51 -07:00
Daniel Vincent Grippi
deac53f178
see yourself in aspect sidebar, because you're going to post to yourself anyway
2010-09-15 11:59:39 -07:00
Daniel Vincent Grippi
10bbf367ad
Merge branch 'production' of github.com:diaspora/diaspora into production
2010-09-15 11:55:52 -07:00
Daniel Vincent Grippi
fe35d60b13
hack on aspect nav for ff & chrome compatability
2010-09-15 11:44:56 -07:00
Daniel Vincent Grippi
ea3e372474
fixed 500 error with @photos
2010-09-15 11:24:23 -07:00
Raphael
1006e8a680
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-15 11:01:11 -07:00
Raphael
d9eb3abd9d
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-15 10:59:00 -07:00
Raphael
aa3ebe372c
License notices replaced
2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
a38a354065
moving things around for consistency. consistency isn't pretty right now.
2010-09-15 10:26:57 -07:00
Raphael
8c8eb02316
Reset albumscontroller
2010-09-15 10:20:46 -07:00
Daniel Vincent Grippi
73dab4b3ef
fixed stream elements
2010-09-15 10:17:37 -07:00
Raphael
5d303518c2
Adding in COPYRIGHT, AUTHORS, and blueprint attribution
2010-09-15 10:09:42 -07:00
Raphael
d63cc358c5
Remerging master and production
2010-09-15 09:48:06 -07:00
Daniel Vincent Grippi
4a86632cf3
show default user photos for requests
2010-09-14 20:47:21 -07:00
Daniel Vincent Grippi
8647220328
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-14 20:44:47 -07:00
Daniel Vincent Grippi
f2c6e7b820
made group manage a little nicer
2010-09-14 20:35:30 -07:00
Daniel Vincent Grippi
d0c8f9ccd6
silent comments on views
2010-09-14 19:54:48 -07:00
Daniel Vincent Grippi
fc3fb817c8
profile photo doesn't change to null if not changed on profile update
2010-09-14 19:48:11 -07:00
Daniel Vincent Grippi
f256d433fd
nevermind
2010-09-14 19:34:26 -07:00
Daniel Vincent Grippi
02e1ed82a3
making profiles socket
2010-09-14 19:07:23 -07:00
maxwell
0d37f065dc
MS RS fixed a small group adding bug
2010-09-14 15:13:55 -07:00
ilya
8aa39c5f08
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-14 11:58:55 -07:00
ilya
0560b46080
MS IZ added friend redirect, and moved the webfinger responces to fixture directory
2010-09-14 11:58:40 -07:00
Daniel Vincent Grippi
3a468a9f1b
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-14 11:45:33 -07:00
Daniel Vincent Grippi
be7c3f28a9
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-14 11:43:03 -07:00
Daniel Vincent Grippi
71ef54dbcc
spelling mistake, broken links on search page
2010-09-14 11:42:47 -07:00
Daniel Vincent Grippi
426d038aaf
Remove email based filter
2010-09-14 11:22:32 -07:00
Daniel Vincent Grippi
7643fb4125
remember that aspects are seeded
2010-09-14 11:15:10 -07:00
ilya
cb12e497f6
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-14 11:14:10 -07:00
ilya
2311c33626
MS IZ mocked all the webrequest tests
2010-09-14 11:13:58 -07:00
Daniel Vincent Grippi
c1a9a89be7
Merge branch 'production' of github.com:diaspora/diaspora into production
...
Conflicts:
app/models/user.rb
config/deploy.rb
spec/factories.rb
spec/models/request_spec.rb
spec/spec_helper.rb
2010-09-14 11:08:18 -07:00
Daniel Vincent Grippi
24cd518f11
DG, RS; Album creation no longer ejects you from context
2010-09-14 11:00:16 -07:00
Daniel Vincent Grippi
da8ec589b7
RS, DG; display the correct tab on manage, change edit to manage
2010-09-14 10:05:59 -07:00
Daniel Vincent Grippi
a7c6e22e01
DG RS; passing around params[:aspect]. querying in application controller for current aspect.
2010-09-14 09:44:09 -07:00
Daniel Vincent Grippi
01b14a66e8
fixed photo show header
2010-09-13 22:51:51 -07:00
Daniel Vincent Grippi
b49eaa1ceb
minor visual tweaks
2010-09-13 20:51:27 -07:00
Daniel Vincent Grippi
0782e0b199
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 19:54:56 -07:00
Daniel Vincent Grippi
fe57a698d3
minor cleanup on album flow
2010-09-13 19:54:30 -07:00
Daniel Vincent Grippi
aa5447f553
Albums are now created within a context
2010-09-13 19:39:51 -07:00
maxwell
15651a7bb6
IZ MS group manage page can now add friends to groups
2010-09-13 18:10:07 -07:00
Daniel Vincent Grippi
5ecbb28dc7
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 17:57:59 -07:00
Daniel Vincent Grippi
c059069144
albums don't show publisher, refactored css
2010-09-13 17:57:30 -07:00
Daniel Vincent Grippi
b2b60af8aa
Albums_by_aspect now takes :all
2010-09-13 17:32:29 -07:00
Daniel Vincent Grippi
1b92bcd17c
Add albums_by_aspect method to user
2010-09-13 17:26:24 -07:00
maxwell
650a502404
MS IZ removed a bunch of unused request stuff
2010-09-13 16:58:23 -07:00
maxwell
63b3513a12
MS IZ removed the links to the requests index
2010-09-13 16:53:33 -07:00
Daniel Vincent Grippi
84b29770fe
Put raise back in webfinger fail
2010-09-13 16:05:43 -07:00
maxwell
3b1223c9dd
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 15:48:50 -07:00
maxwell
6f75a81a9d
IZ MS trying again on fixing remote profile images
2010-09-13 15:48:30 -07:00
Daniel Vincent Grippi
26e4e088d7
flash messages are now being set.
2010-09-13 15:44:26 -07:00
Raphael
35a4e0aaa1
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 15:21:38 -07:00
Raphael
ff348eb944
Add flashes back in to aspect and albums
2010-09-13 15:20:57 -07:00
Daniel Vincent Grippi
48403996f0
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 15:11:38 -07:00
Daniel Vincent Grippi
2fae1049d9
silent comments in all views except the layout and session wall
2010-09-13 15:11:14 -07:00
maxwell
a7231d041e
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 15:09:20 -07:00
maxwell
c098be99bc
MS IZ attempt one to fix remote profile images
2010-09-13 15:08:39 -07:00
Raphael
34a4804b9f
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 14:49:01 -07:00
Raphael
fd31e9aeeb
Force downcase on usernames
2010-09-13 14:48:55 -07:00
Daniel Vincent Grippi
a87925b359
missing license on layout
2010-09-13 14:39:18 -07:00
Daniel Vincent Grippi
40ecf176e8
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 14:26:15 -07:00
Daniel Vincent Grippi
4c15b1a01c
added license to every single goddamn file. also, put one in the root dir.
2010-09-13 14:23:50 -07:00
maxwell
0b33e6b3eb
MS IZ album page is now not completely wonky, but still kind of pointless...
2010-09-13 14:23:38 -07:00
maxwell
a9b64232df
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 12:21:04 -07:00
maxwell
24d957cb32
MS IZ removed the views and redirected the edit route
2010-09-13 12:20:47 -07:00
Raphael
f6b6720349
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 12:16:49 -07:00
Raphael
b05d106aed
Remove user_refs from Person, put pendings in the broken photo specs
2010-09-13 12:16:43 -07:00
maxwell
27f1b29581
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 11:54:50 -07:00
maxwell
812f2550aa
removed status message webfinger link
2010-09-13 11:52:47 -07:00
Daniel Vincent Grippi
3c893454e9
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 11:43:00 -07:00
Daniel Vincent Grippi
6aeaea1b7d
removed some things. also, comment buttons are now css-ified when they come through the socket
2010-09-13 11:42:41 -07:00
Raphael
e33d6d8123
Don't create 500s on comment posting
2010-09-13 11:30:10 -07:00
Raphael
1312728b88
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
public/stylesheets/application.css
public/stylesheets/sass/application.sass
2010-09-13 11:16:45 -07:00
Raphael
aa0a00d9cb
Finish moving to aspects, DB reset required
2010-09-13 11:15:08 -07:00
Daniel Vincent Grippi
7579c0ec50
more cleanup
2010-09-13 11:05:10 -07:00
Raphael
9837340eb2
Rename files from group to aspect
2010-09-13 10:43:15 -07:00
Daniel Vincent Grippi
a74e00c159
removed hover user menu
2010-09-13 10:40:09 -07:00
Raphael
44a1f82da9
Rename group to aspect
2010-09-13 10:38:38 -07:00
ilya
a738807cf4
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-12 22:56:29 -07:00
ilya
0896efa5d6
now requests are called requested people, same css but less hacky selection
2010-09-12 22:54:53 -07:00
Daniel Vincent Grippi
897074c869
replace in comment websocket action replaces one or more number instead of just the first
2010-09-12 22:33:51 -07:00
Daniel Vincent Grippi
4bf8bc9c0b
wrong key being sent in recieve method for posts (group_id => group_ids)
2010-09-12 22:17:39 -07:00
Daniel Vincent Grippi
945a6ffbeb
added a logger in post
2010-09-12 22:11:01 -07:00
Daniel Vincent Grippi
31a746db2f
group_ids to string in post
2010-09-12 22:05:07 -07:00
Daniel Vincent Grippi
1ee78c28b7
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-12 21:47:11 -07:00
Daniel Vincent Grippi
cf48079446
group_ids must be converted to strings
2010-09-12 21:47:03 -07:00
ilya
94ce3b3666
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-12 21:34:52 -07:00
Daniel Vincent Grippi
1874ebe51d
forgot to map to group ids in retraction
2010-09-12 21:33:39 -07:00
ilya
370e2ef688
not displaying requests in the remove
2010-09-12 21:31:03 -07:00
Daniel Vincent Grippi
a3ec81add0
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-12 21:24:49 -07:00
Daniel Vincent Grippi
62994f1660
retractions should now actually websocket again
2010-09-12 21:24:22 -07:00
ilya
1e74acd9b0
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-12 19:56:47 -07:00
ilya
6b7f0888d0
Testing ignore friend request on remote
2010-09-12 19:56:23 -07:00
Daniel Vincent Grippi
31df3cea11
friend pictures on group edit page should now display the default person image if friend's picture isn't present
2010-09-12 18:11:05 -07:00
maxwell
08233a74c5
MS added anohter logger so i can debug friend requests
2010-09-11 14:39:09 -07:00
Daniel Vincent Grippi
db5d000757
made a sticky request link on the bottom of every page
2010-09-11 12:09:55 -07:00
Daniel Vincent Grippi
1092c7b8d1
moved manage to be its own tab on right
2010-09-11 07:53:45 -07:00
Daniel Vincent Grippi
266a896bde
mtweaking comments in stream
2010-09-10 23:55:33 -07:00
Daniel Vincent Grippi
9c7e0e3bcb
minor sass tweaks
2010-09-10 23:16:46 -07:00
Raphael
ebd4bea5de
Adding a log statement to zombiefriends
2010-09-10 18:57:08 -07:00
Raphael
d9bb850b5b
pass group not id into send_friend_request
2010-09-10 17:00:27 -07:00
Raphael
17be027738
redirect to root instead of search
2010-09-10 16:52:28 -07:00
Raphael
b704704334
People index now works when there is a non-friend on the page
2010-09-10 16:49:09 -07:00
Raphael
ab6d631a27
White space in user file, deleting net/curl as unused
2010-09-10 16:25:19 -07:00
Raphael
4922ebd84c
Finish removing encryption from retractions
2010-09-10 16:14:37 -07:00
Raphael
c170726f6c
Merge branch 'master' of github.com:diaspora/diaspora into salmon
2010-09-10 16:04:30 -07:00
Raphael
a44d40168a
Encryption removed from everything other than comments, most irrelevant specs removed
2010-09-10 16:04:09 -07:00
Daniel Vincent Grippi
d3a8e27833
DG IZ; selector fix
2010-09-10 15:37:59 -07:00
Daniel Vincent Grippi
b4e3ea3937
another little fix
2010-09-10 15:33:16 -07:00
Daniel Vincent Grippi
9fd8cfcc99
DG IZ added the same structure as groups
2010-09-10 15:31:00 -07:00
Daniel Vincent Grippi
8afb590128
small fix
2010-09-10 15:28:11 -07:00
Daniel Vincent Grippi
4770616a26
DG IZ; small fix
2010-09-10 15:19:04 -07:00
Daniel Vincent Grippi
82a31228fa
DG IZ; requests bar added to group/edit
2010-09-10 15:07:55 -07:00
Daniel Vincent Grippi
136eb61b02
DG IZ; groups = relations. now you can rename groups in the manage relation page
2010-09-10 14:52:11 -07:00
Daniel Vincent Grippi
f70ade6705
DG IZ; moved info on the person show page
2010-09-10 13:52:12 -07:00
Raphael
cab8610bea
Actually use salmon to push comments
2010-09-10 10:38:16 -07:00
Raphael
aa1f3c6438
Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file
2010-09-10 10:31:23 -07:00
Raphael
68dc74e0b7
Tests pass again, use id => in retraction.perform
2010-09-09 18:15:30 -07:00
Raphael
7448684358
Return results of queries
2010-09-09 17:56:21 -07:00
Raphael
222847ca92
Using methods that exist can be helpful
2010-09-09 17:54:33 -07:00
Raphael
e9377a681c
Don't use push_to_groups for retractions
2010-09-09 17:52:35 -07:00
Raphael
2b1724c42f
Pass id to groups_with_post
2010-09-09 17:44:33 -07:00
Raphael
8b09d8107c
Add encryptable to profiles
2010-09-09 17:43:07 -07:00
Raphael
87bef90932
Salmon for retractions and profiles
2010-09-09 17:28:32 -07:00
Raphael
6b4501c342
Move generate key back into user
2010-09-09 16:23:08 -07:00
Raphael
c73ce3ff99
RS IZ added a logger statement and a guid in the webfinger profile
2010-09-09 16:20:27 -07:00
Raphael
522450c9d3
RS IZ added a logger statement and a guid in the webfinger profile
2010-09-09 16:19:34 -07:00
Raphael
86d9a41d25
send_friend_request_to now takes a person and group, rather than a receive url and a group id
2010-09-09 16:06:42 -07:00
Raphael
d0de8b4988
Merge branch 'master' of github.com:diaspora/diaspora into salmon
2010-09-09 15:43:20 -07:00
Raphael
fd61535e11
Hcards working
2010-09-09 15:43:16 -07:00
Raphael
67f9d9dab5
Add hcard, add id for pod_location
2010-09-09 15:34:20 -07:00
Raphael
59006e657f
Hcard done manually
2010-09-09 15:15:37 -07:00
Raphael
3e9a36e1f1
Layout false on all publics controller routes
2010-09-09 14:15:20 -07:00
Raphael
c6aff4a562
making the hcard work
2010-09-09 13:02:59 -07:00
Raphael
240dda4eab
Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished
2010-09-09 12:21:36 -07:00
Daniel Vincent Grippi
1c2bfa64a1
cleaned login page resources
2010-09-08 23:30:08 -07:00
Daniel Vincent Grippi
bb30b69685
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-08 20:52:43 -07:00
Daniel Vincent Grippi
134bdab49d
group header now has a page_title field.
2010-09-08 20:52:35 -07:00
maxwell
3cf7938028
MS fixing pagination numbers and couple of other things
2010-09-08 20:51:46 -07:00
maxwell
2ce4fb27fa
MS; removing some dumb user stuff
2010-09-08 20:39:05 -07:00
maxwell
c3a1b36282
MS fixing this to be request host on the login page
2010-09-08 19:49:09 -07:00
Daniel Vincent Grippi
7072c633ec
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-08 19:39:42 -07:00
Raphael
4fd0853e71
Moving to salmon
2010-09-08 18:29:39 -07:00
Raphael
061f9de668
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-08 17:35:39 -07:00
Raphael
91f2e2e6ae
Add public key to webfinger profile
2010-09-08 17:35:18 -07:00
Daniel Vincent Grippi
ca780f3560
DG MS; hide debug info by default. also, made the text lighter.
2010-09-08 16:35:30 -07:00
Daniel Vincent Grippi
1e6b309163
DG MS; tweaking top nav and publisher.
2010-09-08 14:34:42 -07:00
Daniel Vincent Grippi
20d5043e81
DG MS; moved tabs around up top
2010-09-08 12:52:28 -07:00
Daniel Vincent Grippi
f7dd0b10b9
DG MS; changed the gear on top nav to not be a tab
2010-09-08 12:34:08 -07:00
Daniel Vincent Grippi
5fd105c1dc
DG MS; search now links user names if you're friends with them
2010-09-08 12:04:05 -07:00
Daniel Vincent Grippi
edae8f1e66
DG MS; fixed a view bug in user edit page. page also displays diaspora username .
2010-09-08 11:58:03 -07:00
Daniel Vincent Grippi
36730978ca
login page is more elegant
2010-09-08 11:37:54 -07:00
Raphael
d25327d32d
Add example to request partial
2010-09-08 11:07:49 -07:00
Raphael
91667c1990
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-08 10:59:17 -07:00
Raphael
960d40278c
Add username, login with username or email
2010-09-08 10:59:08 -07:00
Daniel Vincent Grippi
1749a9c52d
no console
2010-09-08 10:51:18 -07:00
Raphael
5fd1602731
Group batch edit is for all groups
2010-09-08 10:00:31 -07:00
maxwell
2b165df85c
Merge branch 'master' of github.com:diaspora/diaspora into rails_rc
2010-09-07 18:21:17 -07:00
Daniel Vincent Grippi
20d9334ce1
DG IZ; changed the photo uploader to drag and drop. now works in firefox.
2010-09-07 17:20:48 -07:00
maxwell
804777f9ae
MS; updated to released rails
2010-09-07 16:47:53 -07:00
Daniel Vincent Grippi
41afd86fe7
DG IZ; fixed photos.
2010-09-07 12:03:43 -07:00
maxwell
6c33c2a463
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-07 00:55:02 -07:00
Daniel Vincent Grippi
39c366e2e9
group edit button up top.
2010-09-06 17:22:57 -07:00
Daniel Vincent Grippi
48415b4de8
cleaned up group edit a little
2010-09-06 13:01:24 -07:00
maxwell
919d7d23c0
MS fixed log view; also, now pagination is now working, check out the new method which returns plucky queries instead of arrays
2010-09-06 17:46:09 +02:00
Daniel Vincent Grippi
7e909d4034
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-31 16:38:52 -07:00
Daniel Vincent Grippi
f9c2e0e76d
moved publisher down.wn. header is now a dark grey instead of black.
2010-08-31 13:07:11 -07:00
ilya
12f7d16c0b
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-31 10:48:29 -07:00
ilya
98db03d36e
the group edit resets the data started to reset the from id attr
2010-08-31 10:46:49 -07:00
Daniel Vincent Grippi
5e34506df6
added custom as_json methods to models
2010-08-29 23:46:19 -07:00
Daniel Grippi
de8450c7c5
line spacing adjustments.
2010-08-29 23:04:28 -07:00
Daniel Grippi & Raphael Sofaer
7984756aa7
controller cleanup: using respond_to and respond_with.
2010-08-29 22:49:13 -07:00
Daniel Grippi & Raphael Sofaer
5babda044d
cleaned up group controller. added custom as_json to group model.
2010-08-29 21:56:10 -07:00
Raphael
b85333e52b
error.new
2010-08-28 18:36:49 -07:00
Raphael
d25e6017e3
Make a couple of generic errors ArgumentError
2010-08-28 14:53:08 -07:00
Raphael
aa22a0d5c8
Removing unused method
2010-08-28 14:38:22 -07:00
Daniel Grippi & Raphael Sofaer
cf161cb8cf
publisher box back up top
2010-08-27 16:09:10 -07:00
maxwell
34cb15c423
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-27 13:33:39 -07:00
maxwell
d1bac3e078
MS added a log route for easy access
2010-08-27 13:33:28 -07:00
Raphael
7b36ae7009
Move back link out of big_text
2010-08-27 12:28:39 -07:00
Raphael
7223d21721
Add singular move friend route, it must be eliminated later
2010-08-27 12:27:16 -07:00
Raphael
5ff1bdae90
Groups can now be batch edited
2010-08-27 12:23:20 -07:00
Raphael
5ef442d93f
RS, IZ; Socket spec now more realistic, visible_person_by_id fixed
2010-08-27 10:48:14 -07:00
Raphael
f309299e22
Take out remove friend button on stranger, there should be an add friend
2010-08-27 10:26:03 -07:00
Raphael
e1d6c9ce03
fixing person show on stranger
2010-08-27 10:24:42 -07:00
Raphael
39380c3c06
check if you are friends before displaying group list
2010-08-27 10:22:58 -07:00
Raphael
831609ad15
Make a stranger that you receive a comment from visible
2010-08-27 10:19:10 -07:00
Raphael
c629c23232
Tests now pass, export_key changed to exported_key, profile.person changed to _parent_document
2010-08-27 10:05:14 -07:00
Raphael
ba4468f9cc
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-26 19:15:42 -07:00
Raphael
2dd2f38442
Attempting to make comments from unknown users save
2010-08-26 19:15:22 -07:00
danielvincent
390bf24e14
Don't try to put yourself in any groups
2010-08-26 17:34:06 -07:00
danielvincent
435db1ecb1
Pass the right url in websocketed photo json
2010-08-26 17:23:23 -07:00
danielvincent
007b4e4ff0
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-26 17:10:37 -07:00
danielvincent
81438678cd
Refactored more photo js out to photos.js. That should be it for that refactor
2010-08-26 17:10:19 -07:00
Raphael
36342db7a8
logging statement in the user receive after parsing the person
2010-08-26 17:04:40 -07:00
danielvincent
81edef9b8a
Fading out every form tag on photo upload was a bad idea
2010-08-26 17:00:45 -07:00
Raphael
977786aa65
remove the raise from the top of user receive
2010-08-26 16:31:57 -07:00
Raphael
9d48b45ee4
merge conflict line
2010-08-26 16:28:34 -07:00
Raphael
3ed191e972
MS IZ testing on remote
2010-08-26 16:27:01 -07:00
Raphael
c3e199a00a
Also set object.person
2010-08-26 15:36:56 -07:00
danielvincent
dba8e2efe6
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-26 15:13:48 -07:00
danielvincent
a886b8ddbc
made photos for album previews 200x200, small thumbnails now at 50x50
2010-08-26 15:13:33 -07:00
Raphael
0e36d89711
Also set object.person
2010-08-26 15:09:54 -07:00
Raphael
40957b5370
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-26 15:06:50 -07:00
Raphael
94bb754c34
Changed parseing person from xml a little, using it for comments.
2010-08-26 15:06:39 -07:00
danielvincent
1d515e7b7e
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-26 15:02:29 -07:00
danielvincent
239ae048cc
group names are now editable
2010-08-26 15:02:13 -07:00
Raphael
1ce34bc6fc
Parenthases
2010-08-26 14:42:16 -07:00
Raphael
73d8317534
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-26 14:38:22 -07:00
Raphael
31f79be068
Save the person on receiving a comment
2010-08-26 14:38:06 -07:00
ilya
915144e08b
size 30 by 30
2010-08-26 12:32:14 -07:00
ilya
df74020a16
small thumbnail
2010-08-26 12:27:10 -07:00
ilya
3554de48d8
trying image url
2010-08-26 12:24:53 -07:00
ilya
1d69b88e2e
to id so that change of group works
2010-08-26 12:17:35 -07:00
Raphael
6a48c07c90
Return if nil
2010-08-26 12:10:22 -07:00
Raphael
5a92f9e8a8
Do some logging
2010-08-26 12:07:35 -07:00
Raphael
f3c20bf3c0
accept comments from strangers
2010-08-26 12:01:11 -07:00
Raphael
c7974f8046
Save comment's person in receive
2010-08-26 11:53:32 -07:00
Raphael
c3fe3bf443
RS, IZ, check against self.person, not self in user receive
2010-08-26 11:48:34 -07:00
Raphael
9f11a474d8
Take out some logging, put in log user on receive
2010-08-26 11:46:04 -07:00
Raphael
7feb30e3e1
RS, IZ, try saving the comment
2010-08-26 11:41:16 -07:00
Raphael
958627cc1c
RS IZ object.post
2010-08-26 11:32:33 -07:00
Raphael
a65f512fa3
verify post creator signature in receive
2010-08-26 11:29:06 -07:00
Raphael
f186dd98c8
SIGNATOR
2010-08-26 11:13:44 -07:00
Raphael
7911357210
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-26 11:11:40 -07:00
Raphael
36f265fa2f
Log safely
2010-08-26 11:11:30 -07:00
danielvincent
d2b471a58d
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-26 11:09:07 -07:00
danielvincent
39551a0162
fixed comments not showing for photos in stream
2010-08-26 11:08:03 -07:00
Raphael
a29a1bec3e
Add some logging to comments
2010-08-26 11:07:26 -07:00
Raphael
19e8aa5c35
Refactored view js
2010-08-26 11:06:35 -07:00
maxwell
9b690b863a
droping things
2010-08-25 21:53:04 -07:00
Raphael
6d3d37b7c6
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-25 18:20:37 -07:00
Raphael
ad67798004
User to_id on groups_with_post
2010-08-25 18:15:38 -07:00
maxwell
a26229223c
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-25 18:07:49 -07:00
maxwell
b4174c664e
you can now reassign a peson's group
2010-08-25 18:07:31 -07:00
Raphael
e714e0d457
Comment sets now pop open on receiving a new comment
2010-08-25 18:00:53 -07:00
Raphael
50459d896c
Socket received comments
2010-08-25 17:34:12 -07:00
Raphael
00f8a3e628
removed ensure_bson in user. added to_id method to String and ObjectID classes
2010-08-25 17:11:57 -07:00
maxwell
22f63a4c44
MS IZ added the move friend method
2010-08-25 16:58:07 -07:00
Raphael
3a91858bcf
Don't alert
2010-08-25 16:47:11 -07:00
Raphael
55c94c385c
fixed photos going through the websocket. added a spec to SocketsController
2010-08-25 16:08:44 -07:00
maxwell
c9e64ae209
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-25 13:54:27 -07:00
maxwell
6a613c3304
addded the draggable javascript
2010-08-25 13:53:53 -07:00
Raphael
17636f4fd2
View modifications, refactored stream javascript to another file
2010-08-25 13:51:16 -07:00
Raphael
3121cf57d3
Refactored top nav haml, added non-functional gear link next to group
2010-08-25 11:35:50 -07:00
danielvincent
8497586547
linked group titles on group pages
2010-08-25 10:09:39 -07:00
danielvincent
90ce31173a
fixed errors on album/photo pages
2010-08-25 09:59:18 -07:00
danielvincent
f4b3a2eb3a
more cleaning up of comment box. javascript stuff.
2010-08-24 20:49:32 -07:00
danielvincent
d87f330369
added titles for columns in layout
2010-08-24 19:46:57 -07:00
Raphael
f9dd462957
Check for current user again
2010-08-24 19:32:38 -07:00
Raphael
174dbc069b
Fix publisher checkboxes on index
2010-08-24 19:25:38 -07:00
Raphael
5ac5f58679
Tabs on the top aren't all selected on group select, some other view tweaks
2010-08-24 19:22:43 -07:00
Raphael
d3c10f8777
made left column in layout a little wider
2010-08-24 19:02:00 -07:00
Raphael
008c450f66
Add friend button resized
2010-08-24 18:52:50 -07:00
Raphael
5779610659
messed with the views
2010-08-24 18:31:16 -07:00
Raphael
559b6cd02f
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 17:43:35 -07:00
Raphael
1faaf1dd81
Fix profile pic getting unset on profile update
2010-08-24 17:43:11 -07:00
maxwell
326f17567e
bad signature valid hack
2010-08-24 17:34:13 -07:00
Raphael
41aa8ed10e
Specs pass again, need to make albums have a group
2010-08-24 17:12:27 -07:00
Raphael
c102e81b03
put the visible back in
2010-08-24 16:56:04 -07:00
ilya
385472351d
not going through user.post
2010-08-24 16:25:12 -07:00
maxwell
68bd5bf5f5
MS merging in master again
2010-08-24 16:21:20 -07:00
ilya
9db4838543
collecting the ids
2010-08-24 16:15:59 -07:00
ilya
0f04cad670
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 16:05:43 -07:00
ilya
f5ae090e9b
posting empty albums to people
2010-08-24 16:05:29 -07:00
Raphael
de3044fa0a
Remove publisher selection remnants, fix posting
2010-08-24 15:55:35 -07:00
Raphael
10bd40d1a2
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 15:49:04 -07:00
Raphael
abafa03e92
Spec for posting to no group
2010-08-24 15:48:51 -07:00
maxwell
ec3d902c36
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 15:48:02 -07:00
maxwell
204c910f66
MS fixing small bugs, adding a very dump list of a groups that a friend is in for you
2010-08-24 15:47:44 -07:00
ilya
f3f2eb5abf
Made it green now making it clean
2010-08-24 15:43:53 -07:00
Raphael
72c41a5ff8
User post now requires a :to field
2010-08-24 15:42:24 -07:00
ilya
1aef262165
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 15:24:18 -07:00
ilya
82d140aa80
trying to redeploy to get photos working
2010-08-24 15:23:58 -07:00
maxwell
92a2df5c77
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 15:23:02 -07:00
maxwell
2a28607bc6
Moved some prod changes into master
2010-08-24 15:22:48 -07:00
maxwell
51b2737dde
fixed some album stuff
2010-08-24 15:21:27 -07:00
maxwell
46f062a5f3
fixing merge confilts
2010-08-24 14:50:01 -07:00
ilya
19e2c8f898
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 14:48:41 -07:00
ilya
17080730f8
opening the file in the set photo
2010-08-24 14:48:26 -07:00
maxwell
f5316fb3c1
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-08-24 14:45:04 -07:00
Raphael
03abd1ac21
Remove statuS MESsages new page. TaKE New OUt OF ROutes
2010-08-24 14:44:32 -07:00
Raphael
ef9cf8fc52
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 14:41:04 -07:00
maxwell
13253d3591
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 14:40:50 -07:00
maxwell
de335e7366
MS messed with the temporary group picker thing: whatever, it is less annoying
2010-08-24 14:37:47 -07:00
Raphael
db33d94f07
Render nothing on status_messages create, Websockets now honestly
...
support multiple groups.
2010-08-24 14:36:03 -07:00
ilya
27de7f930a
forgot the backer number set photo
2010-08-24 14:29:05 -07:00
ilya
d92ae1c871
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 14:22:47 -07:00
ilya
a70132fcdc
IZ we update profile in zombie friends accept
2010-08-24 14:22:21 -07:00
maxwell
cc1f1e2f24
removed the plus button from the all people add a friend page
2010-08-24 14:16:54 -07:00
maxwell
4f63f60b03
MS merging, and added a dumb check for the email validating twice
2010-08-24 14:03:57 -07:00
maxwell
b4ab91043a
MS added check for current user
2010-08-24 13:45:38 -07:00
Raphael
abf48cefd4
Putting back in both generate_key
2010-08-24 13:41:09 -07:00
Raphael
2814dfceb7
Deleted the wrong generate_key
2010-08-24 13:40:36 -07:00
Raphael
ebfe77fc6d
Making warzombie work again
2010-08-24 12:17:06 -07:00
Raphael
d1c540439e
Moved friending out to a lib file, specs all pass
2010-08-24 12:13:10 -07:00
danielvincent
c3cf135a3f
tabs on top
2010-08-24 11:33:20 -07:00
Raphael
b5bb61a135
Merging master into production
2010-08-24 11:18:42 -07:00
danielvincent
85c268b5eb
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 11:12:04 -07:00
Raphael
fb33d955c9
Fix group show controller/view and haml error in nav
2010-08-24 11:11:25 -07:00
danielvincent
4ffb8e7fa3
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 11:07:56 -07:00
danielvincent
86146d195f
moving stuff around to the header
2010-08-24 11:07:39 -07:00
Raphael
6ab6dc1c3a
Removing some unused routes
2010-08-24 11:06:56 -07:00
Raphael
7ca9d1e791
Changed group_nav a little, deleted people_sidebar
2010-08-24 11:02:30 -07:00
maxwell
f172c9e1d2
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-23 18:45:31 -07:00
maxwell
a37b5ae09b
IZ MS; added a basic salmon library to help with directed messages, and made an keyhash method
2010-08-23 18:45:20 -07:00
danielvincent
562656e96a
added edit link for group
2010-08-23 18:42:30 -07:00
Raphael
ab4ad249df
Forgot to return in that rescue
2010-08-23 17:09:20 -07:00
Raphael
21e2b323d0
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-23 17:05:33 -07:00
Raphael
e05956bddd
rescuing 500 on friending someone that was already friends
2010-08-23 17:05:24 -07:00
danielvincent
2b125fdc66
fixed left friends bar a bit
2010-08-23 17:00:40 -07:00
danielvincent
f9a19e679f
made header shorter
2010-08-23 15:27:34 -07:00
Raphael
dbb16faed1
Photo filename is now better
2010-08-23 15:10:19 -07:00
Raphael
0cff5a45a2
Deleting gridfs controller
2010-08-23 15:02:28 -07:00
Raphael
511f571ae5
Specs mostly pass again
2010-08-23 15:01:39 -07:00
Raphael
48959b3ded
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-23 14:45:20 -07:00
Raphael
76f2aa98ac
Push to multiple groups
2010-08-23 14:45:13 -07:00
danielvincent
fb7e945fc2
removed useless if/else
2010-08-23 14:19:16 -07:00
danielvincent
60b7c30a8a
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-23 14:17:26 -07:00
danielvincent
d874ba3b38
dropdown menu for user
2010-08-23 14:17:05 -07:00
Raphael
5a02f92448
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-23 13:58:46 -07:00
Raphael
ae6f0fdc51
new photo form now loads through ajax
2010-08-23 13:58:33 -07:00
danielvincent
d9c091d3f8
search box in top nav
2010-08-23 12:43:12 -07:00
Raphael
0092069372
Take signed in check out of websocket js
2010-08-23 11:57:29 -07:00
Raphael
01dac4d173
Take tinymce out of layout
2010-08-23 11:56:06 -07:00
danielvincent
37a67b29a4
left/right arrow keys on photo show page go to prev/next
2010-08-23 11:22:55 -07:00
danielvincent
2355947d8e
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-23 11:05:36 -07:00
danielvincent
2d21ac0460
moving things around
2010-08-23 11:05:28 -07:00
Raphael
dc1dd07720
Don't crash on requesting a non-existent email address
2010-08-23 11:04:57 -07:00
Raphael
364cdfed22
Allowed email checking no longer so ridiculous
2010-08-23 10:20:19 -07:00
Raphael
15b2c23b51
Merge branch 'master' of github.com:diaspora/diaspora into pivots
2010-08-23 09:50:38 -07:00
maxwell
361adda6cd
added group picker. sends the right params, but posts only have one group right now so thats a bummer
2010-08-22 22:20:34 -07:00
ilya
643c52fd62
making a clear text on the user index page
2010-08-19 18:10:55 -07:00
Raphael
8e253a6d49
Left in a merge marker
2010-08-19 16:20:38 -07:00
Raphael
f66b5f4006
Merge branch 'master' of github.com:diaspora/diaspora into pivots
...
Conflicts:
app/controllers/users_controller.rb
app/models/user.rb
config/sprinkle/provision.rb
2010-08-19 16:09:08 -07:00
ilya
7eb1bb5a00
removing the sanity check
2010-08-19 14:36:15 -07:00
ilya
542c1769f9
doing a sanity check, that not requiring serialized key passes the validation
2010-08-19 14:25:34 -07:00
ilya
501d62f215
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-19 14:13:27 -07:00
ilya
f7608f6292
RS IZ trying to create user through instantiate in seed script
2010-08-19 14:12:52 -07:00
danielvincent
36b2445a11
added title to search page
2010-08-19 13:41:48 -07:00
maxwell
35f6856380
MS search and index works
2010-08-19 12:40:50 -07:00
maxwell
756278f498
MS added friend search, and allow for autodiscover
2010-08-19 12:37:34 -07:00
maxwell
c98c52ad14
MS IZ renamed the array
2010-08-19 12:17:29 -07:00
maxwell
02da9bf634
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-19 12:00:21 -07:00
maxwell
df435dc319
MS IZ made a reques form in the user index page
2010-08-19 11:59:58 -07:00
ilya
b723c5997e
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-19 10:49:18 -07:00
ilya
54afb1bad4
Rolling assign_key into setup_person
2010-08-19 10:49:04 -07:00
maxwell
9942aef5d4
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-19 10:46:58 -07:00
maxwell
5d25861dc6
IZ MS person profile page now displays only posts a user can see
2010-08-19 10:46:47 -07:00
ilya
2e463c0e69
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-19 10:23:48 -07:00
ilya
9b47e67a15
call the right method in before_validation_on_create
2010-08-19 10:23:40 -07:00
maxwell
af8448dd51
photos on the profile edit page now are only your photos, for now. also, no more remove friend button on your profile page
2010-08-19 10:20:43 -07:00
maxwell
8131e413a4
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-18 22:59:18 -07:00
maxwell
84cc598017
MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page
2010-08-18 22:58:57 -07:00
ilya
9e78c9b64c
removing setup person
2010-08-18 21:58:29 -07:00
ilya
0a3277d306
maybe the instantiate method will help
2010-08-18 21:51:51 -07:00
ilya
0f6ec71dcd
we need assign key as well
2010-08-18 21:45:41 -07:00
ilya
0c9f041f28
we need do bad things in the user for seeding the database
2010-08-18 21:42:37 -07:00
Raphael
7ce8f94d58
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-18 21:10:48 -07:00
Raphael
a23df47dbc
Trying to merge in the pivots changes that we want in master
2010-08-18 21:10:42 -07:00
ilya
36c06349c5
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-18 20:59:18 -07:00
ilya
284601c6b1
got moved photo.image.stuff to photo.url[:stuff]
2010-08-18 20:59:01 -07:00
Raphael
701bec670f
Merge branch 'master' of github.com:diaspora/diaspora into pivots
...
Conflicts:
app/views/groups/index.html.haml
config/deploy_config.yml
2010-08-18 20:50:28 -07:00
Raphael
0459631d47
Show debug
2010-08-18 20:49:06 -07:00
ilya
3243435015
the album create doesn't crash the app
2010-08-18 20:14:31 -07:00
ilya
ef15cddf19
RS, IZ a slash
2010-08-18 18:13:17 -07:00
ilya
5cae2b21b1
RS, IZ fixed the url for the image
2010-08-18 18:06:13 -07:00
ilya
f6892b88d6
photo.remote_photo is relative
2010-08-18 17:50:13 -07:00
ilya
76b4b55e98
Added spec for remote photo url setting to photos
2010-08-18 17:39:38 -07:00
ilya
4019e4425a
Checking for failing to set url in photo
2010-08-18 17:12:28 -07:00
ilya
b279d6582b
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-18 16:59:52 -07:00
ilya
803de25cc0
DG IZ albums are now posts
2010-08-18 16:59:19 -07:00
Raphael
5a2b42e4e5
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-18 16:37:12 -07:00
Raphael
7ed31ab96a
Moving to file store
2010-08-18 16:37:05 -07:00
ilya
516a667ce4
going back to showing the first group on the index page
2010-08-18 16:35:11 -07:00
ilya
5de9362933
DG IZ setting group id to nil and changing the deploy script for renaming of the repo
2010-08-18 16:27:08 -07:00
ilya
d0b2a23fcb
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-18 16:17:00 -07:00
ilya
21f70c643d
DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing
2010-08-18 16:15:10 -07:00
Raphael
ac694eda8c
A bunch of dumb checks to make the group index publisher pass tests
2010-08-18 15:42:06 -07:00
ilya
1ab21fe8b1
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-18 15:25:23 -07:00
ilya
08739ad23d
DG IZ; retractions remove post references in group objects
2010-08-18 15:23:46 -07:00
Raphael
70247f987b
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
2010-08-18 15:04:30 -07:00
Raphael
a52077b176
Redirect to the group you put someone in after adding them as friends
2010-08-18 14:57:53 -07:00
Raphael
61c906a9d3
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
...
Conflicts:
app/models/user.rb
app/views/groups/index.html.haml
config/deploy_config.yml
2010-08-18 14:45:41 -07:00
Raphael
f570199d17
Add a couple specs to groups, moved socketing into each block, unclear where or why groups are being created wrongly
2010-08-18 14:30:16 -07:00
Raphael
0cc5cc5487
Merge branch 'master' of github.com:diaspora/diaspora_rails
...
Conflicts:
app/models/user.rb
2010-08-18 12:20:07 -07:00
ilya
034755368b
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-18 12:17:23 -07:00
Raphael
9b2f2bbddf
Move socketing out to method from receive
2010-08-18 12:14:47 -07:00
ilya
f5811df5b7
DG IZ; added info text to add new friend button
2010-08-18 11:59:20 -07:00
Raphael
5e439bdb28
Ensure_bson on groups_with_person
2010-08-18 11:56:11 -07:00
Raphael
b7d648e173
Validate presence of name on group
2010-08-18 11:54:44 -07:00
Raphael
4cd46abaac
render nothing at the top
2010-08-18 11:48:32 -07:00
Raphael
10aef7a0a3
Begin rescue on publics controller to make the post for nonexistent user error more readable
2010-08-18 11:46:28 -07:00
ilya
4d86933f4a
DG IZ; user's visible posts method queries group objects for their posts
2010-08-18 11:40:02 -07:00
Raphael
d640c0672f
switch deploy branch to actually be one we are working on
2010-08-18 10:56:09 -07:00
ilya
055c222fc2
DG IZ; using group_id instead of group in post method. passing in :group_id into publisher partial
2010-08-18 10:53:43 -07:00
ilya
b0088c73d8
DG IZ; user's own post gets referenced in group model
2010-08-18 10:37:33 -07:00
Raphael
1685e0c28b
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
...
Conflicts:
app/models/user.rb
2010-08-18 10:13:25 -07:00
Raphael
045878de64
call ensure_bson once in visible_person_by_id and group_by_id
2010-08-18 10:12:22 -07:00
Raphael
b99a86e6bd
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
...
Conflicts:
app/models/user.rb
2010-08-18 10:10:20 -07:00
Raphael
9a188fd9f0
Don't try to unsocket albums
2010-08-18 10:08:38 -07:00
Raphael
36f8289522
Fixing retractions on albums, adding back remove_from_view
2010-08-18 10:03:37 -07:00
danielvincent
2409fd3f20
user page doesn't give an error anymore. fixed visible_person_by_id to return self.person instead of self
2010-08-18 02:40:53 -07:00
Raphael
539316a235
Removing posts relation from person
2010-08-17 23:50:07 -07:00
Raphael
98a0a3032a
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-17 23:28:00 -07:00
Raphael
42cc1da9f6
Removing posts array from person
2010-08-17 23:27:17 -07:00
ilya
501bcdd197
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
2010-08-17 23:25:33 -07:00
ilya
c501707f80
DG IZ posts_for to visible posts
2010-08-17 23:24:42 -07:00
Raphael
4a4686ce6e
refactored signature validation got specs passing
2010-08-17 23:21:00 -07:00
ilya
55b4d4758f
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
...
Conflicts:
app/models/user.rb
spec/models/user_spec.rb
2010-08-17 22:58:46 -07:00
Raphael
cb152ea3c3
Shortened user receive, moderated groups.first in the socketing
2010-08-17 22:34:01 -07:00
Raphael
55d84b3288
Broke up user spec, put user update back in routes
2010-08-17 22:03:45 -07:00
Raphael
82f53663ab
remove user index
2010-08-17 20:39:05 -07:00
Raphael
9285839296
Merging in socket-group
2010-08-17 20:30:30 -07:00
Raphael
20bc88c0bf
Merge branch 'socket-group' of github.com:diaspora/diaspora_rails
2010-08-17 20:19:29 -07:00
Raphael
9fcc02a580
Ensure bson on visible person
2010-08-17 19:56:21 -07:00
Raphael
9f9395bc9c
visible_person_by_id should check against self.person.id
2010-08-17 19:51:29 -07:00
Raphael
456e9e9634
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
...
Conflicts:
app/models/user.rb
2010-08-17 19:34:19 -07:00
Raphael
48756e77f3
Friend_by_id changed to visible_person_by_id
2010-08-17 19:32:42 -07:00
Raphael
eb84b39f93
change before to after
2010-08-17 19:11:59 -07:00
Raphael
e8e141b24e
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
2010-08-17 19:04:03 -07:00
Raphael
2b8e637934
no names in publisher
2010-08-17 19:03:47 -07:00
Raphael
f75ff0b680
Remove links from publisher
2010-08-17 18:57:26 -07:00
Raphael
86afa7a987
Remove bookmarks and blogs
2010-08-17 18:56:42 -07:00
Raphael
4fe6a54c09
seed groups
2010-08-17 18:54:27 -07:00
Raphael
1c91faa2c5
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
2010-08-17 18:52:35 -07:00
Raphael
43160496c9
Tommy
2010-08-17 18:52:15 -07:00
Raphael
d554b3ef1a
flashsocket
2010-08-17 18:49:23 -07:00
ilya
2614cb5add
DG IZ; find_all_by instead of find_by
2010-08-17 18:37:08 -07:00
Raphael
ffc9b00489
taking group seed out
2010-08-17 18:35:33 -07:00
Raphael
07549ed17e
Start with a group'
2010-08-17 18:30:08 -07:00
Raphael
8619584834
things mostly working
2010-08-17 18:27:50 -07:00
ilya
f4f377e7e7
DG IZ finding albums by person_id
2010-08-17 18:26:48 -07:00
ilya
daf08cd9f9
DG IZ posts by the user get websocketed on the group page and albums
...
get signed?
2010-08-17 18:06:35 -07:00
Raphael
6901b4f83e
Devise routes
2010-08-17 17:54:20 -07:00
Raphael
7186f3537a
Move back paragraph tag in confirmations view
2010-08-17 17:48:00 -07:00
ilya
f15b3c46b2
DG IZ; reverted to before removing latest message methods
2010-08-17 17:40:48 -07:00
Raphael
bb85c46be1
syntax error
2010-08-17 17:28:17 -07:00
Raphael
244023ac47
Infield labels on sign in
2010-08-17 17:26:37 -07:00
Raphael
6f24a454c8
merge
2010-08-17 17:23:37 -07:00
Raphael
fb84daf68a
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
2010-08-17 17:21:38 -07:00
Raphael
1aefaedda1
merge
2010-08-17 17:21:10 -07:00
Raphael
08de5caf97
make signup page look better
2010-08-17 17:20:29 -07:00
ilya
054dafdf99
couple more
2010-08-17 17:16:11 -07:00
ilya
c1ff8544d3
removed a couple of js lines
2010-08-17 17:04:37 -07:00
ilya
e5036862f6
DG IZ removed the latest message javascript as well as the hash
2010-08-17 16:49:58 -07:00
Raphael
26a892ab4c
putting email verification back in
2010-08-17 16:43:54 -07:00
ilya
d211abb1bc
DG IZ on page for group js method now returns true
2010-08-17 16:32:14 -07:00
ilya
d5d1a2d00f
DG IZ; javascript variable misnamed
2010-08-17 16:29:51 -07:00
Raphael
ba83cb9d29
Index on email
2010-08-17 16:24:52 -07:00
ilya
5e95650ae3
DG IZ logger info
2010-08-17 16:11:25 -07:00
ilya
f70cf4a60a
DG IZ first group for now, added logging statements
2010-08-17 16:09:55 -07:00
ilya
7d68089c8b
DG IZ using group_id when passing the id around the app
2010-08-17 16:02:12 -07:00
ilya
87bc9dad1d
DG IZ added group id to the action hash
2010-08-17 15:27:12 -07:00
Raphael
88cb7aaa8b
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
2010-08-17 14:52:17 -07:00
ilya
fd539926c2
DG IZ; changed variable 'c' to 'comment'
2010-08-17 13:59:58 -07:00
Raphael
063164fea2
comma
2010-08-17 13:59:57 -07:00
Raphael
0fdb337076
Confirmable
2010-08-17 13:57:45 -07:00
ilya
b5c6bbd1df
DG IZ; moved commenting methods into User (from Person).
2010-08-17 13:56:52 -07:00
Raphael
771c594814
Take out pivotal only for a second
2010-08-17 13:49:18 -07:00
Raphael
e6768cb5c8
helper method
2010-08-17 13:21:29 -07:00
Raphael
1d6e132a9f
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
2010-08-17 13:07:26 -07:00
Raphael
d5c608c7ae
Removing welcome home line
2010-08-17 13:07:11 -07:00
Raphael
842b321dfa
User email checking, routes working again
2010-08-17 13:02:42 -07:00
ilya
2a90e59f1e
DG IZ the group should view the posts for the group (and yourself) w
2010-08-17 12:22:14 -07:00
ilya
2af41a0ea9
DG IZ; posts_for :group method in User
2010-08-17 12:14:02 -07:00
Raphael
ccbbf40584
validation lambda out to method
2010-08-17 11:48:59 -07:00
Raphael
015940b60e
Pass to the lambda
2010-08-17 11:45:47 -07:00
ilya
4f8b8ad3c5
DG IZ saving the post
2010-08-17 11:03:31 -07:00
Raphael
453cb06691
changing settings and deploy scripts, validating email
2010-08-17 11:01:30 -07:00
ilya
7316c6073c
DG IZ local person bug
2010-08-17 10:58:50 -07:00
ilya
0af6f7b0e5
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-17 10:48:47 -07:00
ilya
5dff3369ad
DG IZ; removed puts statements.
2010-08-17 10:48:40 -07:00
ilya
a9c9619a54
DG IZ; posting from a user includes adding to the many posts association in said user
2010-08-17 10:43:18 -07:00
Raphael
72559cbce1
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-17 10:37:18 -07:00
Raphael
50919ef491
Requesting now searches the local server by email for a matching person.
2010-08-17 10:37:09 -07:00
ilya
5761d5db36
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-17 10:35:37 -07:00
ilya
dea6551374
DG IZ; moved post() into User from Person.
2010-08-17 10:35:25 -07:00
Raphael
e32315b6c6
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-17 10:25:11 -07:00
Raphael
2c1c5df281
Moved search specs, renamed method
2010-08-17 10:24:59 -07:00
ilya
fc7f59bdfc
DG IZ stream for the current user's posts
2010-08-17 10:13:23 -07:00
danielvincent
7e5ace7cbc
minor cleanup in models
2010-08-16 22:44:22 -07:00
ilya
1d92d11841
DG IZ; user refs are incremented as well as decremented for Posts
2010-08-16 20:39:24 -07:00
ilya
74c70d9410
Merge branch 'master' of github.com:diaspora/diaspora_rails
...
Conflicts:
app/models/user.rb
spec/lib/diaspora_parser_spec.rb
2010-08-16 18:18:30 -07:00
ilya
b5594ad6bc
DG IZ; post user refs started (permissions)
2010-08-16 18:11:23 -07:00
Raphael
eae4053902
Encryption removed from callbacks, except retractions sort of. verification is in user.receive
2010-08-16 17:23:54 -07:00
Raphael
fbee1aabb1
Special casing comments from people that you are not friends with so it accepts them
2010-08-16 16:32:20 -07:00
Raphael
3ff4387cd8
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-16 16:22:55 -07:00
Raphael
ad07521e07
Made a few more tests pass
2010-08-16 16:22:46 -07:00
ilya
b3d8f59c77
removed many posts association within group model
2010-08-16 15:51:31 -07:00
Raphael
3a591b0713
Merging in friend-refactor...
2010-08-16 15:35:14 -07:00
ilya
16a4cbc4e2
DG IZ redirect to requests on error
2010-08-16 15:21:45 -07:00
Raphael
6bb8c52dc4
Syntax error in requests
2010-08-16 15:16:29 -07:00
ilya
7e7b71efd4
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-16 15:08:36 -07:00
ilya
33ed838b79
DG IZ added an error message on request delete
2010-08-16 15:08:05 -07:00
Raphael
2e3066d82d
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-16 15:04:20 -07:00
Raphael
b0537e2f34
Comments pushing in the right directions
2010-08-16 15:04:09 -07:00
ilya
4a36df29e5
DG IZ now the links are of button style
2010-08-16 14:59:23 -07:00
ilya
92aa72447f
DG IZ fixed the css in selector
2010-08-16 14:57:30 -07:00
ilya
373321beef
DG IZ made the selector box going to the right thing by passing only the id
2010-08-16 14:52:59 -07:00
ilya
97e5468cea
adding the user to the correct group
2010-08-16 14:46:15 -07:00
ilya
6a3eb97fd4
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector
2010-08-16 14:43:13 -07:00
ilya
b1c29083df
changed the link data-method
2010-08-16 14:34:16 -07:00
Raphael
fa2e621b0f
Syntax error
2010-08-16 14:24:30 -07:00
Raphael
e4af2ccb1f
Rename send_comment to dispatch_comment, simplify it
2010-08-16 14:22:14 -07:00
Raphael
71aaa9240c
only socket if the object isn't yours
2010-08-16 14:18:08 -07:00
Raphael
b463958f0d
Check ownership on the comment's post
2010-08-16 14:06:52 -07:00
Raphael
deeb4832c1
Error: insufficient parenthases
2010-08-16 14:02:26 -07:00
Raphael
1f40ea23b6
logging is awesome
2010-08-16 13:58:05 -07:00
Raphael
91b0a1e8f9
PAAAARSER
2010-08-16 13:51:49 -07:00
Raphael
f8e2e6bf2d
Infinite loops are the best
2010-08-16 13:49:48 -07:00
Raphael
598c646b07
Hack to get comments working for now
2010-08-16 12:56:02 -07:00
Raphael
e2d5bf909f
Call right method in dev_utilities, clear junk out of comments helper
2010-08-16 12:45:31 -07:00
Raphael
1f0ca49ce5
url, not user.url
2010-08-16 12:29:26 -07:00
Raphael
fb8d3b3e85
Check for local person before destroying accepted request
2010-08-16 12:26:15 -07:00
Raphael
d7a9c3c087
Take out another couple friends.first and replace with friend_by_id
2010-08-16 12:18:36 -07:00
Raphael
4f22222b30
Splitting accept_friend_request into two methods
2010-08-16 12:10:23 -07:00
ilya
2bc9d0156d
2 arguments in the hidden field
2010-08-16 11:59:13 -07:00
Raphael
b37b8303d3
Check for friending yourself in requests helper
2010-08-16 11:55:32 -07:00
ilya
9df38199ab
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector
2010-08-16 11:50:51 -07:00
Raphael
00a9bd820b
Parser confused :(
2010-08-16 11:50:43 -07:00
ilya
122da43058
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector
2010-08-16 11:50:04 -07:00
Raphael
a8b402636a
Shorten ensure_bson
2010-08-16 11:47:23 -07:00
Raphael
f4d6a04f4f
Get objects by bson id
2010-08-16 11:46:36 -07:00
ilya
0ee03afe1d
DG IZ selector box on request page
2010-08-16 11:39:33 -07:00
Raphael
4c731bf818
special-casing local webfinger
2010-08-16 11:29:14 -07:00
Raphael
6ae4c31e05
Person show should be scoped through user
2010-08-16 11:18:52 -07:00
Raphael
99fb383dc0
BSONify ids in by_id methods
2010-08-16 11:13:00 -07:00
Raphael
eb793ea129
Took out a couple more references to User.owner
2010-08-16 11:07:18 -07:00
Raphael
3efa36587a
Took out a bunch of user.owner references
2010-08-16 11:01:58 -07:00
Raphael
26abc68236
Use group_by_id or friend_by_id, no querying on friends or groups
2010-08-16 10:50:38 -07:00
Raphael
0e67ef8d7e
Inspect the friend before calling unfriended by
2010-08-16 10:38:36 -07:00
Raphael
ad2d8f8b46
Specify id field in the query whose result is passed to unfriended_by
2010-08-16 10:37:07 -07:00
Raphael
e84b25b3f5
Log the xml again
2010-08-16 10:31:39 -07:00
ilya
053ed9176d
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-16 10:00:25 -07:00
ilya
d0c02859e6
DG IZ got one more log statement in the user person retraction
2010-08-16 10:00:04 -07:00
danielvincent
f1f827120b
intentional failing test in user for tomorrow.
2010-08-15 21:03:19 -07:00
danielvincent
80b81c1ae1
comment now validates presence of text. also, removed unused method overriding ==.
2010-08-15 19:28:59 -07:00
danielvincent
18cd4b858a
broke out group index and show
2010-08-14 00:27:43 -07:00
danielvincent
c81ea5a632
minor changes
2010-08-14 00:21:10 -07:00
danielvincent
a7eab9e50c
minor section header tweaks (album stuff)
2010-08-13 23:20:39 -07:00
ilya
22910ef4ce
Check retraction signature on person retraction
2010-08-13 19:09:55 -07:00
ilya
99c8869b8f
Removing a friend now deletes them from the group(s) they are in
2010-08-13 18:56:33 -07:00
ilya
ac40f7974e
RS, IZ; A variety of fixes and some refactoring on unfriending and activate friend
2010-08-13 18:37:09 -07:00
ilya
bd271b7bec
RS, IZ; Refactored the user unfriend and unfriended_by
2010-08-13 17:33:26 -07:00
ilya
c1d2f271d9
RS, IZ; close the file after writing the backer number
2010-08-13 12:43:27 -07:00
ilya
7e377fc292
RS, IZ; adding set backer number to routes, not authenticating it
2010-08-13 12:37:49 -07:00
ilya
23c57c653f
RS, IZ; Trying to speed up cap db reset
2010-08-13 12:34:24 -07:00
ilya
5c9a96d245
That last commit was dumb, including the right module
2010-08-13 12:11:10 -07:00
ilya
0b23b959b4
Adding parser methods to devutilities, these should probably be in controller helpers
2010-08-13 12:06:29 -07:00
ilya
99eec04265
Using webfinger in dev_utilities
2010-08-13 11:59:54 -07:00
ilya
339f1a65e2
Removing friends check on zombiefriends
2010-08-13 11:50:43 -07:00
ilya
085dd61607
RS, IZ; changed zombiefriends to use webfinger
2010-08-13 11:43:30 -07:00
ilya
ef97b4f19d
RS, IZ; updated DB seed to have a group, zombiefriend with a group
2010-08-13 11:36:59 -07:00
ilya
7bd1193c5e
RS, IZ; wrote and tested user retractions actually removing people from the friend lists on retractions
2010-08-13 11:19:20 -07:00
ilya
1fcb033b68
RS, IZ; receiving a request no longer overwrites the group it is destined for, specs pass
2010-08-13 10:55:18 -07:00
ilya
23fc799b4d
Turning up logging on friend request receive
2010-08-13 10:04:33 -07:00
ilya
af6c70db47
RS, IZ; hack to test requests, accepted friends go into the first group.
2010-08-13 09:56:18 -07:00
ilya
3d57fb7f78
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-13 09:47:29 -07:00
ilya
5e33de7e56
unfriended method in the user
2010-08-13 09:47:08 -07:00
danielvincent
64c7a87aeb
removed two bogus lines from user.receive
2010-08-13 08:57:22 -07:00
danielvincent
3d12e9ab51
DG RS; friending through groups
2010-08-12 21:30:16 -07:00
ilya
26bebbe393
MS IZ changing it back
2010-08-12 10:04:56 -07:00
ilya
9bec1131f6
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-12 10:03:51 -07:00
danielvincent
f7e43ee3d0
photo fancybox indicates progress. unfortunately, it doesn't reset after you close it right now...
2010-08-12 00:27:26 -07:00
danielvincent
013a6d0849
add photo is now in a fancy-pancy box
2010-08-11 20:45:57 -07:00
ilya
352b9f65e0
MS IZ unfriending maybe works
2010-08-11 20:23:28 -07:00
danielvincent
97b04fc0d7
nevermind
2010-08-11 20:12:10 -07:00
danielvincent
3e1081acaa
commented out tinyMCE js for the time being
2010-08-11 20:09:16 -07:00
Raphael
8b51f94d1d
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-11 18:13:38 -07:00
Raphael
eb36190188
DG, RS; Albums create failure prettier
2010-08-11 18:13:23 -07:00
ilya
283b4a40b5
IZ MS tests now pass
2010-08-11 17:51:46 -07:00
ilya
b0455b9532
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-11 17:45:13 -07:00
ilya
dd3fb1677b
MS IZ continuiung to squash failing tests
2010-08-11 17:44:43 -07:00
Raphael
a19e29f2c2
RS, DG; Album.mine_or_friends actually fixed
2010-08-11 17:33:37 -07:00
Raphael
144d673dac
DG, RS; album button looks better
2010-08-11 17:16:20 -07:00
Raphael
3d46a49b97
RS, DG; fixing Album.mine_or_friends
2010-08-11 16:50:22 -07:00
Raphael
cf5476f601
RS, DG; stop crashing trying to socket albums
2010-08-11 16:40:08 -07:00
Raphael
ab25e35a71
Comment guids now serialize
2010-08-11 16:31:12 -07:00
Raphael
d8959326d5
RS, DG; unsocketing is back in
2010-08-11 16:24:05 -07:00
Raphael
4b5071ec05
DG, RS; socketing back in for your own posts
2010-08-11 16:12:55 -07:00
Raphael
2d14f64745
RS, DG; Socketing moved to user
2010-08-11 16:10:27 -07:00
Raphael
0907d7a9fd
RS, DG; Cleaned up the switch in user.receive
2010-08-11 16:01:16 -07:00
Raphael
bee71c5a23
RS, DG; All saving moved to user
2010-08-11 15:22:06 -07:00
Raphael
c6a620c7dd
RS, DG; store_from_xml is gone, use user.receive
2010-08-11 15:05:05 -07:00
Raphael
5228e51262
RS, DG; store_from_xml now takes one objects. All talk of arrays and collections has been eliminated.
2010-08-11 14:40:48 -07:00
Raphael
5abd604dad
RS, DG; build_xml_for has been eliminated.
2010-08-11 14:21:53 -07:00
Raphael
d7828a8bf3
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
...
Conflicts:
spec/controllers/publics_controller_spec.rb
2010-08-11 13:59:21 -07:00
Raphael
9c9ebbf4c7
build_xml_for is no longer static, we should probably change the name
2010-08-11 13:58:18 -07:00
ilya
29b1217fcd
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-11 12:29:35 -07:00
ilya
11a8b8f3d4
MS IZ testing many the friend request user methods
2010-08-11 12:28:48 -07:00
Raphael
599d1da620
Moved socket code out to lib, unsocketing from view should now work again
2010-08-11 12:03:26 -07:00
Raphael
144e9ed439
Bookmarks now clean link in instantiate, posting them should work right again
2010-08-11 11:18:40 -07:00
Raphael
683bb0dbef
Took out create redirects on ajaxy things, authenticating statusmessages
2010-08-11 10:52:01 -07:00
Raphael
355aba75df
RS, DG; removing the last link_to_person
2010-08-11 10:02:45 -07:00
Raphael
f73c5c6a05
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-10 18:08:37 -07:00
Raphael
cc070ba168
RS, DG; Removed fancybox gone mad from photo adder
2010-08-10 18:08:27 -07:00
Raphael
a201390123
DG, RS; Added fancybox, made the contextual panes fancyboxes, photo adding is all broken
2010-08-10 17:59:22 -07:00
maxwell
1683370da5
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-10 17:36:54 -07:00
maxwell
a45d852f30
MS IZ request specs now PASS
2010-08-10 17:36:25 -07:00
Raphael
bd7ce5250f
renamed the route for signup. also, removed the link from the login page: get_to_the_choppa
2010-08-10 17:14:58 -07:00
Raphael
4b102de1db
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-10 16:56:42 -07:00
Raphael
37bf5b45f1
RS, DG; You now can't open the photo upload form while photos are uploading
2010-08-10 16:56:19 -07:00
Raphael
3104eeebc9
RS, DG; Photo websocket margins fixed
2010-08-10 16:40:25 -07:00
maxwell
b9718c079b
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-10 16:05:10 -07:00
maxwell
8a3eb9f6cf
IZ MS one last receive url...i think...
2010-08-10 16:04:08 -07:00
Raphael
a9ebe44b1d
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-10 16:03:54 -07:00
Raphael
0fb55be7a0
RS, DG; You can now sign up to be a user on a seed
2010-08-10 16:03:38 -07:00
maxwell
89c54d1a63
MS IZ receive url in the request and a slash in person
2010-08-10 15:56:34 -07:00
Raphael
8b9cd3453d
RS, DG; User.instatntiate simplified
2010-08-10 15:44:14 -07:00
maxwell
432ce02a14
MS IZ receive url is better
2010-08-10 15:35:40 -07:00
Raphael
a8b77cf868
DG RS; made an instantiate method for user which makes a person and profile
2010-08-10 15:35:27 -07:00
maxwell
da4de20ce1
IZ MS made things push to the receive url
2010-08-10 15:24:51 -07:00
maxwell
487de2d865
MS IZ receive, not recieve
2010-08-10 15:17:12 -07:00
maxwell
7ff25ef81a
MS IZ saved the person model
2010-08-10 15:10:11 -07:00
maxwell
016c8fa471
MS IZ taking out URL options in sockets helper. hopefully the websocket doesnt blow up
2010-08-10 14:11:41 -07:00
maxwell
b5f962c725
trying root path in host meta
2010-08-10 13:58:17 -07:00
maxwell
0ffe893f8a
MS IZ merging diffs
2010-08-10 12:37:04 -07:00
maxwell
71612ba33d
changing some webfinger resources
2010-08-10 12:36:00 -07:00
Raphael
aa1f892c35
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-10 12:27:02 -07:00
Raphael
9947a2abb8
RS, DG; latest_status thing now works, started putting signup back in
2010-08-10 12:26:43 -07:00
Raphael
a48fbaaf59
RS, DG; DashboardsController has been eliminated.
2010-08-10 11:36:00 -07:00
maxwell
95c4de5d6c
MS IZ fixed all of the request specs zomg
2010-08-10 11:26:32 -07:00
Raphael
b645eb3f3d
RS, DG, comments socket again
2010-08-10 11:05:29 -07:00
Raphael
aa4d428ab7
RS, DG; Groups can now include other users, the user's first group is displayed by default, never use many without :in =>
2010-08-10 11:02:04 -07:00
Raphael
4308f35b4b
Changed partial on request index
2010-08-10 10:18:16 -07:00
Raphael
d1bedeb993
RS, DG; don't show the group-specific nav if there is no group
2010-08-10 10:11:13 -07:00
maxwell
d7d9c8aac5
MS put some current users checks into a single one
2010-08-09 21:30:56 -07:00
danielvincent
4e062c143b
new album partial has a title. album title is in italics in new photo partial
2010-08-09 21:29:19 -07:00
danielvincent
d207c8b955
fixed way too high z-index in album div
2010-08-09 21:27:17 -07:00
danielvincent
988eea4215
fixed comment view bug
2010-08-09 21:21:35 -07:00
danielvincent
36adf1b6fd
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-09 21:10:31 -07:00
maxwell
9d41ed3ef1
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-09 21:10:14 -07:00
danielvincent
96fa34ea60
changed the pop-up boxes. going to probably switch to fancybox jquery plugin... also, fixed the user page so viewing it doesn't throw an error.
2010-08-09 21:10:11 -07:00
maxwell
38abd51666
MS IZ fixed a couple of failing specs in the parser
2010-08-09 21:09:51 -07:00
danielvincent
fd8d92a095
moved next/prev links in photo show to be inline with full size link.
2010-08-09 20:23:01 -07:00
danielvincent
d712218a14
removed commented out stuff on photo_new partial. also, fixed the delete button in photo show.
2010-08-09 20:18:20 -07:00
danielvincent
acd00c2a59
fixed top right buttons on album page, etc. also, made the image loader simpler.
2010-08-09 20:14:03 -07:00
maxwell
68c4de6c16
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-09 19:05:12 -07:00
Raphael
91b42ac0e2
Specs now mostly pass again, one is failing
2010-08-09 18:06:09 -07:00
Raphael
744693e7fb
RS, DG; There is now a add friend box on the front page that passes group idto the app
2010-08-09 17:33:54 -07:00
maxwell
d443be35f9
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
...
Conflicts:
app/controllers/publics_controller.rb
app/models/user.rb
2010-08-09 17:31:46 -07:00
maxwell
56d7c67bbb
Going toward pending requests
2010-08-09 17:21:41 -07:00
Raphael
838fec4921
RS, DG; Working on group nav, fixed some stuff in photo
2010-08-09 16:34:06 -07:00
Raphael
02f66d4c0e
Merge branch 'group-top' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-09 15:59:23 -07:00
Raphael
aebe7b97c0
DG RS; added groups. can't delete, but can make new ones
2010-08-09 15:58:53 -07:00
Raphael
d71966476b
Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top
...
Conflicts:
app/views/albums/show.html.haml
app/views/authors/show.html.haml
app/views/layouts/application.html.haml
app/views/photos/show.html.haml
2010-08-09 15:09:05 -07:00
Raphael
039ec0d06e
warzombie is now more friendly
2010-08-09 15:05:54 -07:00
Raphael
c14bb5a4f8
Changed info logging to debug logging almost everywhere
2010-08-09 14:39:37 -07:00
Raphael
59147eb232
Person.new in dev seed
2010-08-09 13:03:27 -07:00
Raphael
33a827c33a
RS, DG; Websocket is now working again, users have a channel
2010-08-09 13:02:08 -07:00
maxwell
82578ad80c
MS IZ doing the friend querying correctly in user
2010-08-09 12:25:36 -07:00
maxwell
4243d8efca
MS IZ using the particular user's friends in the send_friend_request_to
2010-08-09 12:19:26 -07:00
maxwell
ac7530d17f
MS IZ person doesn't have friends user does
2010-08-09 11:51:32 -07:00
maxwell
f4428679ef
First attempt at fixing warzombie friendingw
2010-08-09 11:44:13 -07:00
maxwell
921ee029b6
MS IZ putting the person in the return trip
2010-08-09 11:12:15 -07:00
maxwell
8532be1307
MS IZ moved activate_friend to user
2010-08-09 11:03:16 -07:00
maxwell
67843a21e2
MS IZ saving the person in accept of FR
2010-08-09 10:50:49 -07:00
Raphael
0a40efdaf7
Removing unused messages
2010-08-09 10:47:45 -07:00
Raphael
73a6cd911b
DG, RS; User person delegation fixed
2010-08-09 10:46:02 -07:00
maxwell
544f7f08e5
MS IZ doesn't delete from pending friends since there is nothing in it
2010-08-09 10:38:13 -07:00
maxwell
7be374ac48
MS IZ fixed a couple of view things as well as the dev db seed script
2010-08-09 10:10:41 -07:00
ilya
890f927492
removed references of mine? method in all views
2010-08-08 22:53:23 -07:00
ilya
719bf450e1
I can't get no satisfaction from get satisfaction
2010-08-08 20:54:50 -07:00
ilya
8e6dfe7166
DG IZ having an email key makes devise work, ring to deploy
2010-08-08 17:00:39 -07:00
danielvincent
a6f5603dc9
added email field to login screen. strange error won't let me log in?
2010-08-06 23:55:05 -07:00
maxwell
f4ca29da41
PeopleController now renders json when given a query. Unfortunately, it only renders the matching friend ids without first or last names...
2010-08-06 17:19:33 -07:00
Raphael
214685e5a9
Dev seed might now work
2010-08-06 17:11:50 -07:00
Raphael
7076097ee4
RS, IZ; The tests are green.
2010-08-06 16:56:13 -07:00
maxwell
58de12df5e
DG MS; PeopleController#index now accepts query string for search (only looks at first_name and last_name)
2010-08-06 16:35:02 -07:00
Raphael
4350e17656
RS, IZ; removed lots of putses, fixed up request, parser, retractions
2010-08-06 16:01:39 -07:00
Raphael
f2e327d908
User factory now works
2010-08-06 13:27:42 -07:00
Raphael
0f596af5c4
Refactored message_queue getting, fixed retraction spec
2010-08-06 13:13:00 -07:00
Raphael
d130b82e42
RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns?
2010-08-06 11:52:33 -07:00
danielvincent
6f1a596dff
small color changes
2010-08-06 00:40:44 -07:00
danielvincent
c54d47337b
updated button style
2010-08-06 00:15:22 -07:00
Raphael
b5cbfab36e
RS, IZ; Comment spec now passes
2010-08-05 19:01:45 -07:00
maxwell
5d924dadf4
MS DG; 19 failing specs left
2010-08-05 17:16:51 -07:00
maxwell
dc0eb7de51
Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-05 15:13:59 -07:00
maxwell
5e6d0c1153
Merge branch 'master' of github.com:diaspora/diaspora_rails into
...
friend-refactor, also fixed more specs
Conflicts:
app/models/person.rb
app/models/user.rb
spec/factories.rb
2010-08-05 15:13:05 -07:00
Raphael
bffb63d9f0
IZ, RS; Moved every instance of hardcoded backer info out to yml file config/deploy_config.yml
2010-08-05 14:39:48 -07:00
danielvincent
dae8f26692
DG MS; fixed most photo specs
2010-08-05 11:56:37 -07:00
Raphael
bb66e87905
RS, IZ; Encryption specs now pass with openssl
2010-08-05 11:56:31 -07:00
Raphael
f8e7d3f313
RS, IZ; Rolling back special casing of friend-request
2010-08-05 11:14:40 -07:00
Raphael
2429a1a476
RS, IZ; keys should roxml
2010-08-05 11:13:38 -07:00
Raphael
ebe14b5afd
RS, IZ; Not using person in friend request verification
2010-08-05 11:09:36 -07:00
Raphael
f487e271c0
RS, IZ; Posts now sign, signatures and keys now serialize
2010-08-05 10:43:02 -07:00
danielvincent
4827953bec
DG MS; person specs are now passing. retraction on unfriend is now uncommented
2010-08-05 10:29:30 -07:00
danielvincent
42c0b82068
one failing test in Person. i have no idea.
2010-08-04 23:54:15 -07:00
danielvincent
d6bc93fb96
commented out retraction on unfriending due to ROXML messing things up
...
.
2010-08-04 23:47:27 -07:00
ilya
4a3f6b2986
need to serialize key to bson
2010-08-04 21:08:25 -07:00
ilya
f11e973602
added the inport key thing in user
2010-08-04 20:44:18 -07:00
ilya
5dfc097c88
replaced the functionality with openssl, didn't do the encryption spec
2010-08-04 20:32:15 -07:00
danielvincent
f2d7f35b84
unfriend still not removing association from bad_friend
2010-08-04 20:29:54 -07:00
danielvincent
7a556e1b3c
Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-04 19:23:56 -07:00
danielvincent
c92a225556
DG MS; user-person relationship done. bunch of failing stuff.
2010-08-04 19:22:14 -07:00
Raphael
6832c67a78
RS IZ friend requests are hopefully now signed
2010-08-04 17:20:34 -07:00
Raphael
7676179e54
IZ, RS; now passing correct object to verify_signature
2010-08-04 17:10:38 -07:00
Raphael
5a802299d5
IZ, RS; Retractions should now be signed
2010-08-04 17:06:15 -07:00
Raphael
2388237174
RS, IZ; Replace type_name method with object.class.to_s
2010-08-04 16:36:08 -07:00
Raphael
b8a2e8ecdf
RS, IZ; Fix Photo.instantiate, make photo url include spec a little more specific
2010-08-04 16:13:32 -07:00
Raphael
e2c0ae2cee
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-04 16:01:37 -07:00
Raphael
c245d8c60c
Merging ostatus deletion with selenium start
2010-08-04 16:01:19 -07:00
danielvincent
75663b2447
DG MS; user can edit photo caption. also, photos have captions.
2010-08-04 16:00:59 -07:00
Raphael
58addca8dd
RS, IZ; extracted and murdered ostatus.
2010-08-04 16:00:01 -07:00
danielvincent
09958bc207
DG MS; removed delete friend button from current user's show page
2010-08-04 15:43:24 -07:00
danielvincent
278189462b
fixed ostatus generator references in models
2010-08-04 09:59:15 -07:00
danielvincent
c5ace3069d
diaspora module correctly loads everything (lazy)
2010-08-04 00:41:23 -07:00
danielvincent
c78b111fec
Merge branch 'master' into group-top
2010-08-03 16:42:33 -07:00
Raphael
e3c28c4fee
Fixed Photos, and Carrierwave initializer
2010-08-02 21:31:14 -07:00
Raphael
da3bf35d81
Typo in album
2010-08-02 18:30:09 -07:00
Raphael
6b1f020839
Moved utilities out to special controller, took pound sign out of database name
2010-08-02 18:03:16 -07:00
danielvincent
5030fbb8b5
Merge branch 'master' into group-top
2010-08-02 17:28:17 -07:00
danielvincent
3d5f27fe5a
javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing
2010-08-02 17:27:45 -07:00
Raphael
74691228d3
RS, IZ; All relevant controllers now create with user.post
2010-08-02 16:32:52 -07:00
danielvincent
102b912878
moved group nav to its own partial
2010-08-02 16:20:30 -07:00
Raphael
9fe37b1d8c
RS, IZ; Cleaned up user spec, started to add current_user.post
2010-08-02 16:16:23 -07:00
danielvincent
3e5cecd532
Merge branch 'master' into group-top
...
Conflicts:
public/stylesheets/application.css
public/stylesheets/sass/application.sass
2010-08-02 16:09:13 -07:00
Raphael
d503c6541f
RS; posted statuses now use the websocket to update latest, time is now styled right
2010-08-02 11:13:21 -07:00
Raphael
b8ae6b44a2
RS; Image filename is now the Photo model id
2010-08-02 10:05:34 -07:00
danielvincent
5974bf3571
group nav is now links to nothing
2010-08-01 23:26:24 -07:00
danielvincent
19b633d3a3
top nav for groups partially there.
2010-08-01 22:26:56 -07:00
Raphael
c95ceecf9e
Clarified socket helper, added a selenium test
2010-07-30 12:40:02 -07:00
Raphael
6fe00982f2
RS, IZ, fixing another error on person show
2010-07-30 10:32:36 -07:00
Raphael
0fd35709b1
RS, IZ, fixing error on person show with no posts
2010-07-30 10:26:00 -07:00
Raphael
e7ef3c06ed
Websocketed photos now fade in
2010-07-30 10:20:50 -07:00
ilya
3eeb81ad34
DG IZ; time_created_at uses published_at instead of created_at for OstatusPost
2010-07-29 20:43:03 -07:00
ilya
f191aef981
DG IZ profile profile photos should update, removed the scaled down hack
2010-07-29 19:44:58 -07:00
ilya
abc5ee412d
DG IZ assiging the new profile to the person in the parse objects from xml
2010-07-29 19:24:52 -07:00
ilya
0aa268a62d
DG IZ trying asymetric searization and marshaling
2010-07-29 19:12:20 -07:00
ilya
27bf29119d
restoring display inline
2010-07-29 18:03:18 -07:00
ilya
085ea0a665
RS, IZ, DG Removing display inline
2010-07-29 17:59:44 -07:00
ilya
f6495e2bec
RS IZ photos now fade in on the album upload page
2010-07-29 17:26:05 -07:00
maxwell
6aa1fa1826
DG MS profiles send? who knows...
2010-07-29 15:53:38 -07:00
Raphael
a636d97837
Removed crash if there was no latest status message
2010-07-29 14:38:46 -07:00
Raphael
3376057c33
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-29 13:58:49 -07:00
danielvincent
11a099914c
on photo delete, photo checks to see if it is set in user profile. if it is, profile is edited.
2010-07-29 11:07:44 -07:00
danielvincent
fd4475370d
added profile url to author show page
2010-07-29 10:30:24 -07:00
maxwell
cb3d6db9b0
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-29 10:06:11 -07:00
maxwell
7a0db375ab
MS added rails 3rc
2010-07-29 09:59:03 -07:00
ilya
c8b40001e5
IZ album edit page was not added
2010-07-28 21:10:35 -07:00
Raphael
1e954eae4f
took out old puts, put in new one
2010-07-28 20:37:42 -07:00
maxwell
6a8291b56f
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-28 18:35:06 -07:00
maxwell
049361ea15
MS profiles should send, need to just make the parser now
2010-07-28 18:32:00 -07:00
ilya
96a9c9455d
DG IZ; make photos in stream larger, because they need love too
2010-07-28 17:46:43 -07:00
ilya
6f3e7bc78b
DG IZ; minor tweaks
2010-07-28 17:31:05 -07:00
ilya
acb295d695
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-28 17:05:14 -07:00
ilya
03cf61bd7c
new user top bar
2010-07-28 17:04:56 -07:00
maxwell
e14e391a22
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-28 16:50:48 -07:00
maxwell
80db1132d1
Fixed the tests;
2010-07-28 16:50:38 -07:00
ilya
1700ce8e18
DG IZ; tweaks to album index page
2010-07-28 16:12:49 -07:00
ilya
3f27e1f67d
DG IZ photo spacing now works
2010-07-28 14:48:28 -07:00
ilya
5723d91dae
DG IZ; moved some buttons around, added album edit page
2010-07-28 14:00:02 -07:00
ilya
9e3c6a0936
DG IZ; brushed up ostatus user page
2010-07-28 12:13:36 -07:00
maxwell
eb4262dfc7
MS merged master
2010-07-28 11:13:17 -07:00
danielvincent
e2b5af35c1
minute changes
2010-07-28 00:04:43 -07:00
maxwell
a57727c1fc
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-27 16:18:59 -07:00
maxwell
c41dea1e8b
MS small profile tweaks
2010-07-27 16:18:46 -07:00
danielvincent
7992b1b0e0
delete photo button on photo show page instead of delete album.
2010-07-27 16:10:42 -07:00
danielvincent
fdd1a5d93b
more recovery
2010-07-27 16:04:59 -07:00
maxwell
92cc48beaf
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-27 15:52:50 -07:00
maxwell
3cecbf1511
MS profile page fixes
2010-07-27 15:52:42 -07:00
danielvincent
34291340b2
trying to get back up to speed
2010-07-27 15:50:44 -07:00
maxwell
9dd5c08296
fixed two small UI bugs
2010-07-27 14:45:04 -07:00
maxwell
86e090bac3
MS figured out moz gradient business
2010-07-27 14:34:16 -07:00
maxwell
9c7b3f0c07
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-27 14:23:44 -07:00
maxwell
bdca2348a6
MS IZ profile page has more useful info, but ultimatly kinda ugly
2010-07-27 14:23:31 -07:00
danielvincent
d4ac19e9ce
all form buttons are now using button definition in UI
2010-07-27 12:23:21 -07:00
danielvincent
dbc8f0112e
some misc design cleanup. album page toggle pending.
2010-07-27 12:12:25 -07:00
danielvincent
97daaf81c2
made custom css3 buttons (pending FF compatability; works in webkit for now.)
2010-07-26 21:48:02 -07:00
maxwell
bda87bbeab
MS switched request new links to just the request link
2010-07-26 18:13:20 -07:00
maxwell
d73d36f162
MS i had broke atom generation in my refactor. now it is fixed
2010-07-26 17:39:48 -07:00
danielvincent
9afb8beb25
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-26 17:04:00 -07:00
danielvincent
ec59b89e83
DG IZ; few changes to uploader. added prefetching to photo prev/next links on photo show page
2010-07-26 16:57:44 -07:00
maxwell
a9b1954ff6
MS status message now updates the big one on the index page...hooray for jquery
2010-07-26 16:27:10 -07:00
danielvincent
f6687316d6
DG IZ; only a remote scaled photo is downloaded, not the full res
2010-07-26 16:08:19 -07:00
danielvincent
65acd48885
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-26 15:52:02 -07:00
danielvincent
36abb19e2c
added the uploading photo wjava script
2010-07-26 15:50:41 -07:00
maxwell
88c83bb028
MS added pagination to the author show page
2010-07-26 15:15:42 -07:00
maxwell
47f5c77e1a
kinda prettied up the albums page
2010-07-26 15:09:02 -07:00
maxwell
d7550568ad
added pagination to photo picker on the user profile. still ugly, less sucky
2010-07-26 13:55:44 -07:00
maxwell
0c2fc54c0f
MS we didnt serialize the post creator sig....sigh.... this could not be the problem
2010-07-26 13:29:39 -07:00
Maxwell Salzberg
66f66b85a6
MS added test, things still seem broken though
2010-07-24 23:21:02 -07:00
maxwell
b797704a14
MS small pointless webhooks refactor
2010-07-24 16:11:32 -07:00
maxwell
416f128ba8
MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module
2010-07-24 15:48:42 -07:00
maxwell
2cbdc5413f
MS nuked some random non helpful puts statements
2010-07-24 12:12:48 -07:00
danielvincent
261a7d177d
fixed for real
2010-07-24 11:09:25 -07:00
danielvincent
926eacc588
mend
2010-07-24 10:37:35 -07:00
danielvincent
03e06cb279
person sidebar has a view all; displays user images with names in tooltips instead of text
2010-07-24 10:24:43 -07:00
maxwell
9095a06738
MS just broke common.rb out into 3 files.... all tests pass, dont shoot me if something is broken, but on first pass we look ok
2010-07-24 01:56:07 -07:00
maxwell
c9709dd1e7
MS put current status back on page
2010-07-24 01:39:15 -07:00
maxwell
8a174d37c7
MS trying a dan-like thing in the publisher
2010-07-23 23:56:41 -07:00
danielvincent
4c3a51833f
user name is bigger
2010-07-23 22:35:12 -07:00
danielvincent
4d2b11310b
nudged layout
2010-07-23 21:34:47 -07:00
maxwell
302cf54fab
MS subscribers should now unsubscribe
2010-07-23 21:31:28 -07:00
maxwell
c34f5e5ee0
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-23 21:20:05 -07:00
maxwell
311a60f7b7
MS should be able to unsubscribe from an ostatus feed now, now it needs to be put in the controller
2010-07-23 21:16:36 -07:00
danielvincent
e5d298040d
little things
2010-07-23 21:11:21 -07:00
danielvincent
f6fd6bc9e6
added breadcrumb to albums
2010-07-23 20:28:10 -07:00
danielvincent
7eb59a654c
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-23 20:12:37 -07:00
danielvincent
d93c331615
moved publisher
2010-07-23 20:12:28 -07:00
ilya
2fa9462e05
Next and Previous for photos buttions are now in the center
2010-07-23 20:09:52 -07:00
danielvincent
b63b7fe482
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-23 19:44:41 -07:00
danielvincent
ad61c290fb
took current user's name out of the layout
2010-07-23 19:44:34 -07:00
maxwell
00159d1fb8
MS minor defaults change
2010-07-23 18:17:48 -07:00
ilya
8793709284
No file is now complained about in the view
2010-07-23 16:57:34 -07:00
ilya
61a9ba7a6e
put album owner on unless mine
2010-07-23 16:36:59 -07:00
ilya
48975cc59e
put album owner on album show page
2010-07-23 16:33:10 -07:00
ilya
4eccf63fef
Can't upload to other people's album
2010-07-23 16:26:05 -07:00
ilya
1c0d5f6e6b
Removing destroy link from albums that are not yours
2010-07-23 16:07:15 -07:00
ilya
79aa12ee67
RS IZ Removing the destroy link from photos
2010-07-23 15:59:42 -07:00
ilya
f866872d7a
now should be saving to the directory without the wrong id in the name
2010-07-23 15:49:08 -07:00
ilya
031234f763
Failing at syntax
2010-07-23 15:42:12 -07:00
ilya
bb251e73b3
Logging photo.inspect after save
2010-07-23 15:37:07 -07:00
ilya
e754e97c7e
Logging for the differing id problem in remote photos
2010-07-23 15:32:27 -07:00
ilya
2f35d07807
Broke photo signing
2010-07-23 15:22:04 -07:00
ilya
e43f54cc72
RS IZ remote photo url does not change on marshaling'
2010-07-23 15:13:40 -07:00
ilya
1b32afc78f
Switching to Grid_FS, correctly
2010-07-23 14:53:12 -07:00
ilya
283bbc4850
Switching to Grid_FS
2010-07-23 14:32:55 -07:00
Raphael
d8ebbf8d26
Adding some logging to requesting/subscribing
2010-07-23 14:20:02 -07:00
ilya
a52adba95b
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-23 11:59:31 -07:00
ilya
082274d0d7
RS IZ a nicer fail(notice) on wrong file format on upload
2010-07-23 11:59:04 -07:00
Raphael
473662a265
Layout false on hubub controller
2010-07-23 11:50:14 -07:00
maxwell
e0baf9d6c5
MS sort the updates on a author's page
2010-07-22 23:36:37 -07:00
maxwell
dfad30e33b
MS typo
2010-07-22 22:34:30 -07:00
maxwell
3e3fcc57f9
MS author author?
2010-07-22 22:32:47 -07:00
maxwell
1f414c9347
MS so close to subscribing to tantek
2010-07-22 22:30:08 -07:00
maxwell
7ba85e0d4e
MS tantek?
2010-07-22 22:22:08 -07:00
maxwell
8c50ea0c97
MS i really wanna subscribe to tantek
2010-07-22 22:14:06 -07:00
maxwell
0fdce91756
DG MS added views for ostatus following
2010-07-22 21:27:43 -07:00
maxwell
3f4219cf94
added debugging stuff to index page for ostatus stuffs
2010-07-22 20:19:52 -07:00
maxwell
16bbce3054
DG MS ostatus post and author now exsist
2010-07-22 20:16:24 -07:00
maxwell
c5bcab94e1
DG MS...dumb, forgot to call it in the controller
2010-07-22 17:11:44 -07:00
maxwell
82e61ff99d
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-22 13:53:46 -07:00
maxwell
b3668956ab
MS DG following now works on identica, you subscribe, and then identica spams you for the rest of your life
2010-07-22 13:53:39 -07:00
ilya
7df902b9db
XML reader was assuming photos were local
2010-07-22 12:39:53 -07:00
ilya
065c790e4e
not saving in photo receive and logging the saving in common
2010-07-22 12:23:18 -07:00
ilya
a1a8fc1ea4
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-22 12:07:36 -07:00
ilya
b2dcaed5e2
RS IZ saving in the photo parsing
2010-07-22 12:07:18 -07:00
maxwell
daf0de2eb0
Merge branch 'master' of github.com:diaspora/diaspora_rails into ostatus
2010-07-22 11:54:07 -07:00
ilya
b90cb95c64
RS IZ the photo controller now uses instantiate
2010-07-22 11:41:00 -07:00
ilya
24f8b33f2f
Tests all pass!
2010-07-22 11:36:36 -07:00
ilya
773dbd91aa
RS IZ one more test passing going to bisect
2010-07-22 10:21:10 -07:00
ilya
8d87f07d31
using owner instead of first user
2010-07-22 09:55:13 -07:00
maxwell
6869384732
i think it works - max
2010-07-21 21:15:16 -07:00
ilya
14533f6534
url not path
2010-07-21 21:13:31 -07:00
maxwell
9b1fcdbab2
MS DG some serious message handler and user request API stuff....needs way more tests
2010-07-21 20:33:43 -07:00
ilya
a222edc646
Url not path
2010-07-21 20:22:30 -07:00
ilya
ef7b9f58a7
IZ remote files
2010-07-21 19:51:34 -07:00
ilya
a75dfb0201
Album retractions
2010-07-21 18:27:18 -07:00
ilya
6b9a3fc518
Pushing Albums out
2010-07-21 18:26:03 -07:00
ilya
5a5842dbdc
Accidently started websocketing albums
2010-07-21 18:22:57 -07:00
ilya
a6104fd2b5
RS, IZ; Albums must be pushed
2010-07-21 18:07:38 -07:00
ilya
606fa3353c
RS, IZ; Photos might push urls to friends
2010-07-21 18:02:13 -07:00
maxwell
0d268905e7
DG MS all photos of a album are destroyed on album deletion
2010-07-21 17:05:40 -07:00
maxwell
21bd875a3f
MS DG request bar fix, and some other small tweaks
2010-07-21 16:38:33 -07:00
maxwell
3cee09407c
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-21 15:47:46 -07:00
maxwell
6f7f82e818
added helpers for photo show page
2010-07-21 15:47:30 -07:00
Raphael
9b4d92e1fa
trying to patch relationship controller
2010-07-21 15:36:14 -07:00
maxwell
a5f359ef1b
MS DG added a safe for viewing photosize
2010-07-21 15:08:00 -07:00
maxwell
0f407b11ed
MS DG comments now work on photo show page; full size photos now available
2010-07-21 14:58:06 -07:00
maxwell
6410b68ea4
added correct path to ignore for uploads
2010-07-21 14:31:08 -07:00
maxwell
695a93ddad
DG MS added basic album traversal
2010-07-21 14:29:58 -07:00
danielvincent
d5c28eb9a6
album photos as links were too janky; removed
2010-07-21 00:42:41 -07:00
danielvincent
5fc2dfa0bb
delete links removed from album index
2010-07-21 00:40:57 -07:00
danielvincent
aece0fc1c7
removed duplications used for testing
2010-07-21 00:32:38 -07:00
danielvincent
c01e9846cf
began album index page. added a larger thumbnail on image upload. also, there is one HUGE memory leak somewhere
2010-07-21 00:24:11 -07:00
maxwell
301343ae01
DG MS added basic album support
2010-07-20 21:28:24 -07:00
maxwell
f07740454a
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-20 19:30:28 -07:00
danielvincent
249948a500
hotfix for photos/collection relationship to fix photo saving
2010-07-20 19:29:19 -07:00
maxwell
dac3c7a8de
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-20 16:22:08 -07:00
maxwell
933bf61db8
RS, MS, relationship_flow returns the action and the url to execute it to
2010-07-20 16:15:36 -07:00
danielvincent
51fd87db36
no ideas why collection saving isn't working...
2010-07-20 15:15:11 -07:00
ilya
1bd2c16ef1
DG IZ started the collection spec
2010-07-20 14:01:56 -07:00
Raphael
afc150c719
Reverting reverrsion
2010-07-20 11:56:11 -07:00
Raphael
382caf7adc
Reverting last commit
2010-07-20 11:53:13 -07:00
Raphael
7b6289c78a
Took label out of publisher for photo
2010-07-20 11:52:38 -07:00
ilya
715a6ae770
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-20 11:50:45 -07:00
ilya
7901791ee3
DG IZ; added simple image picker for edit profile page. currently displays all images uploaded.
2010-07-20 11:50:36 -07:00
maxwell
453d2ee827
RS MS fail. totally made a new bug and fixed it re: resizing
2010-07-20 11:50:23 -07:00
maxwell
d420652311
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-20 11:41:56 -07:00
maxwell
e856945a94
RS MS photos are no longer ginormous, and also a small bug where photos were going to the status message show page.
2010-07-20 11:41:50 -07:00
Raphael
8e8c48eac9
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-20 11:31:51 -07:00
Raphael
d8cbbcf6c8
Added photo file validation spec
2010-07-20 11:31:41 -07:00
Raphael
de3a08d031
Took out putses
2010-07-20 10:23:19 -07:00
ilya
e08ed8805f
DG IZ photo upload form now with all the others
2010-07-20 10:00:02 -07:00
danielvincent
55710ffbdb
image uploader does two thumbnails
2010-07-17 21:10:21 -07:00
maxwell
ec3f6e6765
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-17 19:22:26 -07:00
danielvincent
c53efbe56f
Merge branch 'master' of github.com:diaspora/diaspora_rails
...
Conflicts:
app/models/post.rb
2010-07-17 19:00:53 -07:00
Raphael
bb21361a6b
Photo controller fixed
2010-07-17 18:13:51 -07:00
maxwell
917d58acbb
MS found one more duplicate in the Gemfile
2010-07-17 14:10:31 -07:00
Raphael
7d7c39e3dc
callbacks not running on photo save
2010-07-17 14:09:21 -07:00
danielvincent
c8c76ddab5
added auth_user back to photos controller
2010-07-17 14:08:18 -07:00
danielvincent
79536dcfb7
all post partials now use object_path for links
2010-07-17 13:59:04 -07:00
danielvincent
b221e19746
every post partial shows a user picture. a post's comments are displayed with a count in its show page
2010-07-17 13:41:54 -07:00
Raphael
93e900b998
fixed comments, did I break request url?
2010-07-17 11:29:30 -07:00
Raphael
d8ad4367d5
Tests now pass
2010-07-17 09:32:41 -07:00
maxwell
eb4153ec8f
did a couple of things to the request page
2010-07-16 23:22:18 -07:00
maxwell
5d0c5dbd86
MS kinda hacky webfinger email fix
2010-07-16 23:03:59 -07:00
danielvincent
180138610c
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-16 23:02:31 -07:00
danielvincent
04eb66b2e6
user has a image url field for user picture
2010-07-16 23:02:24 -07:00
maxwell
44b4defb69
MS IZ YEAAAAAAAAAAAAHHHHHgit push origin master git push origin master
2010-07-16 22:20:25 -07:00
maxwell
cd31d11aca
MS IZ adding a friend through the webfinger profile
2010-07-16 22:11:55 -07:00
maxwell
f34e033bce
MS IZ getting the profile
2010-07-16 21:59:40 -07:00
maxwell
58b052b07f
IZ MS small bugfix
2010-07-16 21:35:16 -07:00
maxwell
a742ef1253
Merge branch 'master' of github.com:diaspora/diaspora_rails
...
Conflicts:
Gemfile
2010-07-16 21:33:57 -07:00
maxwell
36c911d20b
IZ MS added diaspora rel to webfinger profile
2010-07-16 21:33:08 -07:00
danielvincent
5637ab2a8e
added multipart option to new photo form. needed to remove remote true for now.
2010-07-16 21:14:42 -07:00
Raphael
93fdbae9c5
fixed small bug on user show page, added header text to user edit page
2010-07-16 17:27:57 -07:00
Raphael
bb4d5cad59
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-16 17:26:22 -07:00
Raphael
fa46fb31f4
Added photos, profile editing
2010-07-16 17:26:06 -07:00
maxwell
c124a9ab41
IZ MS blogs ctivity streams/atom
2010-07-16 16:07:58 -07:00
maxwell
06238703c3
IZ MS bookmarks now create activity streams
2010-07-16 15:54:26 -07:00
maxwell
98bc754627
trying to get it reporting from diaspora
2010-07-16 14:54:14 -07:00
maxwell
86718dbec3
trying to get it reporting from diaspora
2010-07-16 14:53:07 -07:00
maxwell
642db5006f
trying to get it reporting from diaspora
2010-07-16 14:49:44 -07:00
maxwell
03a8f2ea5c
trying to get it reporting from diaspora
2010-07-16 14:36:50 -07:00
maxwell
3d87c111df
webfinger is now not washington specific
2010-07-16 14:15:19 -07:00
Raphael
9165ac413a
image uploading started
2010-07-16 12:31:24 -07:00
maxwell
7e190047ec
IZ MS host
2010-07-16 11:14:26 -07:00
maxwell
4259dc7dfe
IZ MS changing end slash
2010-07-16 11:10:38 -07:00
maxwell
172141db0a
IZ MS setting alias to not idendica
2010-07-16 11:07:17 -07:00
maxwell
b39f7cebd0
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-16 10:39:18 -07:00
maxwell
081a6a2c73
MS IZ trying to delete commented stuff
2010-07-16 10:39:02 -07:00
Raphael
256757f02a
Rails.logger in a model
2010-07-16 10:29:42 -07:00
Raphael
9f90ae4db0
Syntax errors are awesome
2010-07-16 10:20:41 -07:00
Raphael
4178a78b23
Logger in receive friend request
2010-07-16 10:18:45 -07:00
Raphael
567d3f4dc5
Fixing friending deploy
2010-07-16 10:06:29 -07:00
Raphael
7dd8acadf7
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-16 09:59:24 -07:00
Raphael
05e6dada58
Fixing deploy friending
2010-07-16 09:59:06 -07:00
maxwell
bf3d34090e
MS IZ = AHHH
2010-07-15 19:08:25 -07:00
maxwell
9ff4cd015d
MS IZ = AHHH
2010-07-15 19:05:59 -07:00
maxwell
f927ace140
MS IZ = AHHH
2010-07-15 19:01:14 -07:00
maxwell
8f59a9d788
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-15 18:42:44 -07:00
maxwell
b903163d3f
MS IZ = AHHH
2010-07-15 18:42:25 -07:00
Raphael
cae5700222
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-15 18:41:01 -07:00
Raphael
501620e9fb
DG RS; fixed some visual bugs. request link now turns red on new request
2010-07-15 18:40:55 -07:00
maxwell
65deaba558
MS IZ hcard, emptyfiles, routesw
2010-07-15 18:36:07 -07:00
maxwell
45abeb2346
MS IZ small webfinger bug fixes
2010-07-15 17:11:20 -07:00
maxwell
6bab2fedc8
MS IZ small webfinger bug fixes
2010-07-15 17:06:48 -07:00
maxwell
2dc6b5f46a
MS IZ small webfinger bug fixes
2010-07-15 17:02:36 -07:00
maxwell
9119d8af93
MS IZ small webfinger bug fixes
2010-07-15 16:59:22 -07:00
maxwell
5dea277294
MS IZ small webfinger bug fixes
2010-07-15 16:56:54 -07:00
maxwell
d393458ae8
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-15 16:55:09 -07:00
maxwell
cc712196a6
MS IZ small webfinger bug fixes
2010-07-15 16:54:46 -07:00
Raphael
7fb7c519cc
Adding active to friend view
2010-07-15 16:30:56 -07:00
Raphael
e5a5b5a828
Fixing zombies
2010-07-15 16:20:38 -07:00
Raphael
613e2da3e6
Made logging clearer, fixing zombiefriends
2010-07-15 16:11:19 -07:00
Raphael
82e3f6a14e
debugging zombiefriends
2010-07-15 16:06:10 -07:00
Raphael
417df7f874
debugging zombiefriends
2010-07-15 16:03:48 -07:00
Raphael
57d9bd1543
Added friending route to dashboards
2010-07-15 15:38:49 -07:00
Raphael
d7e07dfda8
comment specs fixed, comments now signed by post poster
2010-07-15 14:41:39 -07:00
Raphael
64c81f0551
merge in master, only friend tom
2010-07-15 14:18:22 -07:00
Raphael
862787ea93
RS, DG; person destruction no longer deletes comments
2010-07-15 14:12:01 -07:00
Raphael
2d5d3a2f2d
commit more often
2010-07-15 13:29:21 -07:00
Raphael
fd18ac6c4b
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
2010-07-15 13:06:46 -07:00
maxwell
720550189d
MS more cleanup
2010-07-15 10:59:36 -07:00
maxwell
1412265150
MS IZ now we can unsubscribe...probally
2010-07-15 10:43:18 -07:00
maxwell
99446d82c4
MS IZ more fixes
2010-07-15 10:30:51 -07:00
maxwell
f97218c005
MS IZ cleanup of pubsub stuff
2010-07-15 10:24:41 -07:00
maxwell
892eec1959
MS fixed the websocket bug pushing out all updates to single clients. we should get selenium so we can actually test it :(
2010-07-15 09:32:13 -07:00
Raphael
c82f41e740
Merging in master
2010-07-14 12:16:24 -07:00
Raphael
d7d1af8058
always import the key
2010-07-14 11:55:15 -07:00
Raphael
2e0e904cdb
Sending key in friend request response
2010-07-14 11:47:36 -07:00
Raphael
a7ba1d8920
Assign key before validation
2010-07-14 11:25:34 -07:00
Raphael
335f202e2b
RS, IZ; Profiles are now embedded
2010-07-14 11:22:44 -07:00
maxwell
1b63fbbec7
DG MS added pubsub gem, added hub to message queue
2010-07-14 11:01:28 -07:00
Raphael
f680c4b71e
RS, IZ; Signature Verification now stubbed out outside of encryption specs, green
2010-07-14 11:01:21 -07:00
ilya
4a0bd5fc0c
RS IZ; removed validations on marshaling and removed key deletion on person destroyw
2010-07-13 17:36:18 -07:00
ilya
2862925e2d
before validations on create
2010-07-13 15:19:39 -07:00
ilya
6614285644
params string now a method
2010-07-13 15:08:14 -07:00
ilya
0df76daab5
assign key
2010-07-13 14:44:30 -07:00
ilya
4a53d29939
assign key
2010-07-13 14:40:10 -07:00
ilya
d4d1aa0fd5
RS IZ validations of signature are now called on craeeton of a post
2010-07-13 14:34:30 -07:00
maxwell
9e93fd072e
DG MS; added subscriber model for ostatus interop
2010-07-13 14:32:27 -07:00
ilya
83ea15c97a
merging in master
2010-07-13 12:23:09 -07:00
ilya
964ee65b11
rs iz ; the signature of the signable_accessors are now in the xml
2010-07-13 12:21:11 -07:00
maxwell
0bcbd5b16c
DG MS; diaspora xml generate model genereates a valid atom feed for status messages
2010-07-13 12:09:06 -07:00
ilya
add9961ca4
Now signing only xml accessors other than person
2010-07-13 11:41:57 -07:00
ilya
7952385cdb
added newlines to post
2010-07-13 11:24:57 -07:00
ilya
25940cf567
Removed stray puts
2010-07-13 11:12:49 -07:00
ilya
a219801c2d
Now using detached signatures
2010-07-13 11:10:04 -07:00
ilya
6d431e9459
signing tests sort of almost done
2010-07-13 11:01:27 -07:00
ilya
b9146cbb41
RS IZ; now signatures work like in real life
2010-07-12 20:42:22 -07:00
danielvincent
ed8ed9be9e
DG MS; started Diaspora::XML for ostatus compliance
2010-07-12 20:15:12 -07:00
ilya
406c00aeb6
RS IZ; using detached signatures and verification things
2010-07-12 18:31:20 -07:00
maxwell
f9f7f0fcc7
DG MS; request makes sure http:// and an ending slash is present on a new request link
2010-07-12 12:33:31 -07:00
maxwell
5ba2e61ab8
MS DG moved xml accessor for profile
2010-07-12 11:37:46 -07:00
ilya
174eb7e8f7
Merging in Master
2010-07-12 11:28:39 -07:00
maxwell
18760f13f8
push changes
2010-07-12 11:25:53 -07:00
ilya
3dfb55ee85
IZ MS pulled in master: this is now the authoritative branch; waiting for dan to fix gpg so we can move on
2010-07-11 00:04:08 -04:00
ilya
72e7514535
MS fixed your key fingerprint bug. ROML sux. all things which are marshalled as a class need to be after the other fields, because those fields were ignored. also, ids were no long being marshalled correctlyw
2010-07-10 23:30:24 -04:00
maxwell
902a8cb349
MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change
2010-07-10 10:34:46 -07:00
ilya
1bed575b90
Added the Key Fingerprint validation to the person model(defaults to empty string)
2010-07-10 06:09:53 -04:00
ilya
7eba033c0d
Revert "RS IZ Friday night, key_fingerprint serialization weirdness"
...
This reverts commit c6e16835df9c5d46d0ec5e0f1860da1ef4c0986a.
2010-07-10 05:29:57 -04:00
ilya
8c75761ba1
RS IZ Friday night, key_fingerprint serialization weirdness
2010-07-10 02:25:48 -04:00
maxwell
c073fc6137
MS DG friend deletions dont work, but they do send, prob a parser problem
2010-07-09 19:36:02 -07:00
maxwell
d37461a432
ms dg post deletions now come thru the socket again
2010-07-09 19:27:39 -07:00
danielvincent
ce132dd782
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-09 18:54:59 -07:00
danielvincent
7bfdaac691
added unfriend button to person show page
2010-07-09 18:54:48 -07:00
maxwell
601da95c8c
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-09 18:54:05 -07:00
maxwell
29516d829e
MS flash now gives message if you have already friended a given person
2010-07-09 18:53:47 -07:00
danielvincent
aa916d0604
moved User.first out of the application view
2010-07-09 18:50:39 -07:00
maxwell
23057869e1
DG MS debugging friend request
2010-07-09 18:41:39 -07:00
maxwell
8147602570
DG MS friends now are delete
2010-07-09 18:10:11 -07:00
ilya
eec66395c1
Removed key password
2010-07-09 20:22:01 -04:00
ilya
91e96973ef
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
2010-07-09 19:17:14 -04:00
ilya
2f5ec3d7c4
added a bunch of public keys to test ring
2010-07-09 19:17:07 -04:00
maxwell
f5fd0b011a
DG MS; upon friend deletion, all connected posts and comments are purged
2010-07-09 16:08:00 -07:00
ilya
7eec041846
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
2010-07-09 18:15:22 -04:00
ilya
8c45dd4702
testing signing
2010-07-09 18:15:17 -04:00
ilya
b802db9194
writing signing
2010-07-09 17:41:01 -04:00
maxwell
cf352b6f8d
DG MS; cannot friend request an existing friend.
2010-07-09 14:35:42 -07:00
maxwell
b052ddeb84
DG MS; database seed scripts now ensure all friends are set to true
2010-07-09 14:13:39 -07:00
maxwell
48adc9ebc1
DG MS; person object now properly stored with request object save
2010-07-09 14:07:35 -07:00
maxwell
d21a3baf32
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-09 11:14:11 -07:00
maxwell
b49f198c4f
DG MS cleaned up some of the request stuff
2010-07-09 11:14:00 -07:00
ilya
cfaf13ac7d
Use pregenerated keys
2010-07-09 13:45:00 -04:00
maxwell
c7e1bc3a46
DG MS debugging friend requests
2010-07-09 10:18:29 -07:00
maxwell
c2c64d9938
MS DG more friend request tests pass
2010-07-08 23:14:54 -07:00
maxwell
408b58cbbf
Merge branch 'safe-without-gpg'
2010-07-08 21:45:27 -07:00
maxwell
6cc9deaa65
merging with head
2010-07-08 21:44:14 -07:00
maxwell
583d3d0c82
DG MS friending now tests out
2010-07-08 21:34:38 -07:00
maxwell
e1834cc887
DG MS fixed spec
2010-07-08 20:51:12 -07:00
maxwell
06eec9204a
DG MS; person request is now request. refactoring as well. user verbiage for request actions
2010-07-08 18:28:39 -07:00
ilya
895742824d
Sped up specs, fixed env
2010-07-08 21:23:08 -04:00
ilya
122bbf0cd2
Merging dashboards
2010-07-08 20:56:25 -04:00
ilya
a5db2cd231
Added keyrings to gitignore, symlinked to shared dir in cap scripts
2010-07-08 20:54:20 -04:00
ilya
9e8426ceb4
RS, IZ; Users now have keys, keyring now in db folder
2010-07-08 19:57:10 -04:00
maxwell
900f1080a2
DG MS; fixed destroy links for status messages, added link for requests on top nav
2010-07-08 14:38:26 -07:00
maxwell
db1811eb61
DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket
2010-07-08 14:14:03 -07:00
maxwell
1fa2dfd6eb
DG MS cleaning up friend request
2010-07-08 12:05:06 -07:00
maxwell
da4e148fed
DG MS; fixing friend request
2010-07-08 11:44:18 -07:00
maxwell
1885b5b6b9
MS DG fixed friend request
2010-07-08 11:30:58 -07:00
maxwell
0c00e6a512
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-08 10:42:55 -07:00
maxwell
89959bdcb8
MS dont make person request remote for now
2010-07-08 10:42:42 -07:00
Raphael
2a90fb2bdc
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-08 10:28:36 -07:00
Raphael
97b1e8dd5d
oops
2010-07-08 10:28:23 -07:00
ilya
6e6763de14
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-08 13:28:17 -04:00
ilya
93c5404cab
DG IZ message handler is a singleton'
2010-07-08 13:28:02 -04:00
Raphael
4819ce694b
removed emspec from gemfile
2010-07-08 10:27:22 -07:00
maxwell
09b79293f0
merged master
2010-07-08 10:19:58 -07:00
maxwell
d04093f456
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
2010-07-08 10:18:03 -07:00
maxwell
6293f9f585
socket is now a controller
2010-07-08 10:17:41 -07:00
ilya
3ff32e4905
DG IZ; removed views and controller associated with friend object
2010-07-08 12:38:14 -04:00
maxwell
58ed75a289
MS socket now works in the server, but I can't figure out how to mock this stuff
2010-07-07 22:20:15 -07:00
danielvincent
ebfc55ff28
DG IZ friend request, has a puts in the receive hook for debugging
2010-07-07 21:20:38 -07:00
maxwell
a35892428c
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
2010-07-07 20:09:27 -07:00
maxwell
947f1a60e7
RS MS added url for for the socket controller
2010-07-07 18:59:32 -07:00
danielvincent
a33acd134e
DG IZ; fixed person requesting (friend requests).
2010-07-07 18:10:47 -07:00
danielvincent
3d105e7c1e
DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.
2010-07-07 16:53:52 -07:00
maxwell
cc603a7943
autotest for rafi
2010-07-07 15:27:44 -07:00
maxwell
5350b40e3c
broken autotest for rafi
2010-07-07 15:27:22 -07:00
danielvincent
d705d39f70
DG IZ; added for action to friend request
2010-07-07 13:44:06 -07:00
ilya
79c0e960ad
DG IZ; friend now has an active flag
2010-07-06 23:43:01 -04:00
ilya
d5d4d4ae84
DG IZ; friend requests get saved locally, friend object gets transmitted and saved remotely
2010-07-06 21:29:49 -04:00
ilya
a23a2691f3
DG IZ; starting fresh with requests
2010-07-06 20:09:20 -04:00
ilya
f71b5b51d1
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-06 19:33:00 -04:00
ilya
14e5b23eb5
trying deploying
2010-07-06 19:32:44 -04:00
Raphael
bb325cbf6b
cleaned up a little
2010-07-06 12:41:28 -07:00
Raphael
d46e82d004
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-06 12:38:46 -07:00
Raphael
7bdf52e173
comment numbers update uncleanly
2010-07-06 12:38:24 -07:00
ilya
1a44cf5ab3
DG IZ push to wrapped to check before sending off a friend req
2010-07-06 15:11:24 -04:00
ilya
3974b01b29
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-06 14:49:08 -04:00
ilya
9cddf26a53
DG IZ fixed views for friend request
2010-07-06 14:48:44 -04:00
Raphael
e971c71451
refactor websocket receive insert javascript
2010-07-06 11:40:19 -07:00
ilya
0587688d18
DG IZ; friend requests pass through the webhook, need to refactor the parser because now the XML does not make sense, no big deal. P.S. WTF is send_to_seed in message_handler
2010-07-06 02:15:49 -04:00
ilya
027d953cf4
DG IZ added the FriendRequest model.
2010-07-05 23:28:51 -04:00
danielvincent
20b056586d
warming up the page. colors were too cold and non-human before.
2010-07-05 00:02:16 -07:00
danielvincent
0001797850
moved user's name to the right of their picture
2010-07-03 23:39:05 -07:00
danielvincent
85cee4064b
Merge branch 'master' of github.com:diaspora/diaspora_rails
...
Conflicts:
public/javascripts/publisher.js
2010-07-03 22:45:56 -07:00
danielvincent
e709eba243
publisher as a faux nav element.
2010-07-03 22:43:11 -07:00
Raphael
fffd3aebfc
Added remote is true to stream partials, no more redirecting
2010-07-02 15:36:07 -07:00
danielvincent
df3fe6c2a9
DG IZ RS; deletion now gets sent through the websocket
2010-07-02 15:16:28 -07:00
danielvincent
8e6ddb4b2e
propagate_delete -> propagate_retraction
2010-07-02 14:40:25 -07:00
Raphael
f9856517db
Post deletion now deletes comments
2010-07-02 14:34:58 -07:00
danielvincent
469599a4a9
DG RS IZ; added post deletion propagation
2010-07-02 13:08:53 -07:00
Raphael
737614e04b
google analytics for real
2010-07-01 22:20:57 -07:00
Raphael
418635aa72
Added google to session wall layout
2010-07-01 22:13:55 -07:00
danielvincent
1616f5573d
DG MS; fixed position of flash message
2010-07-01 19:55:38 -07:00
danielvincent
4f7579a5db
DG MS; fixed delete button bug on stream
2010-07-01 19:49:56 -07:00
danielvincent
88f0244353
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-01 17:22:30 -07:00
danielvincent
368f550f65
preview text next to diaspora in header
2010-07-01 17:22:24 -07:00
maxwell
2b2864b78d
now its just a message for ie 6, 7
2010-07-01 17:12:21 -07:00
maxwell
8d1ec57fa4
beefed it up to ie 7
2010-07-01 17:07:36 -07:00
maxwell
8e94fc5b4f
added mean message
2010-07-01 17:05:14 -07:00
maxwell
86c6cdcafa
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-01 16:38:51 -07:00
maxwell
ba984009f8
added chrome frame
2010-07-01 16:38:32 -07:00
danielvincent
c27bc09e75
fixed user image bug
2010-07-01 16:35:44 -07:00
danielvincent
b25880f04a
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-01 16:25:11 -07:00
danielvincent
03e7071aae
fixed nav list/link deal for firefox, html compliance
2010-07-01 16:24:51 -07:00
maxwell
6f17e5f28f
added chrome frame for ie lameos
2010-07-01 16:17:32 -07:00
maxwell
b0a3feb30c
fixed g analytics
2010-07-01 15:51:17 -07:00
danielvincent
c0a744b2ce
owner picture selector in application helper
2010-07-01 15:34:35 -07:00
danielvincent
99d12964b6
to warzombie, user must have email tom@joindiaspora.com, and there musn't be a bomb in the lasanga
2010-07-01 10:55:22 -07:00
ilya
5285753486
IZ warzombie route, the method is in the dsashboard controller
2010-07-01 13:28:17 -04:00
maxwell
428284abeb
sorry about that, removed tiny mce, but we still had things which inited it
2010-07-01 09:15:27 -07:00
maxwell
cb23766012
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-01 09:03:04 -07:00
maxwell
01132e3dc0
pushing js changes
2010-07-01 09:02:38 -07:00
Raphael
27d29d5d40
RS; I should have figured this one out way earlier...
2010-07-01 01:22:37 -07:00
maxwell
da59078b64
fixed small js bug so it only adds to the base route (or page 1 on pagination)
2010-06-30 17:49:45 -07:00
maxwell
9631977597
RS MS comments propagate, and show up IN REAL TIME
2010-06-30 17:29:32 -07:00
maxwell
e696ef7023
comments now go go go and are tested RS MS
2010-06-30 16:24:44 -07:00
maxwell
4077e4248e
pushing for cap deploy
2010-06-30 14:23:40 -07:00
maxwell
fcdba64828
pushing to test comment passing
2010-06-30 13:54:09 -07:00
Raphael
3d976ca47e
RS, a little bit of autolinking in statuses and comments
2010-06-30 08:36:51 -07:00
Raphael
340a57ea6d
RS; figured out recursive serialization with ROXML, posts and comments now serialize with their persons
2010-06-30 08:06:30 -07:00
maxwell
6bc68fb42e
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-30 00:27:30 -07:00
maxwell
dc5b321b62
sorry for the monster commit.... 4 small chores...1) moved tons of dynamic javascript to haml partials in the new js view folder, and moved some of the js that got put in the application layout into view.js 2. set up a static config prefrence loader in initializers, loaded from yaml 3) fixed the top right login text from being pushed over. 4) fixed a bug when no user is on the node and someone hits the landing page.... you still cant create a new user from there, but now at least it doesnt blow up.
2010-06-30 00:27:11 -07:00
danielvincent
a15cd932b6
nevermind, nevermind
2010-06-29 23:47:39 -07:00
danielvincent
cf8c669e83
login screen now black.
2010-06-29 23:24:31 -07:00
danielvincent
70ece3c180
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-29 20:56:51 -07:00
danielvincent
e159b8f7f4
Merge branch 'master' of github.com:diaspora/diaspora_rails
...
Conflicts:
app/views/friends/show.html.haml
2010-06-29 20:56:44 -07:00
maxwell
fcbe8e42a0
RS MS slightly less explosive end if you call real name on someone that doesn't have a profile
2010-06-29 20:54:53 -07:00
danielvincent
19c41fb6be
DG IZ; comments show and hide
2010-06-29 20:53:49 -07:00
maxwell
448fcf8f89
MS RS fixed real name, now profiles are created with a new friend
2010-06-29 20:33:55 -07:00
danielvincent
984f5f62b6
DG IZ; publisher reflects what type is selected
2010-06-29 19:55:50 -07:00
danielvincent
97cd3fb413
DG IZ; comment count in status message partial
2010-06-29 19:08:23 -07:00
danielvincent
8ff241cdde
DG IZ; all comments hidden by default. linking anchor issue.
2010-06-29 19:00:54 -07:00
danielvincent
746f2acaec
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-29 18:00:09 -07:00
danielvincent
7d6783e446
DG IZ; more little changes to UI
2010-06-29 18:00:01 -07:00
maxwell
3937483bd3
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-29 17:45:19 -07:00
maxwell
638b71ae28
Added a spec to person, cleaned up some putses
2010-06-29 17:45:13 -07:00
danielvincent
0c16038e2d
Merge branch 'master' of github.com:diaspora/diaspora_rails
...
Conflicts:
app/views/layouts/application.html.haml
public/stylesheets/application.css
public/stylesheets/sass/application.sass
2010-06-29 17:30:29 -07:00
danielvincent
acc782d5b2
DG IZ; cool labels fade in
2010-06-29 17:27:09 -07:00
maxwell
7961d11669
uncommenting get satisfaction
2010-06-29 17:09:07 -07:00
maxwell
eebed9d457
fixed publisher in chrome and broke it out to a seperate js file
2010-06-29 17:04:46 -07:00
danielvincent
a685c6c0ab
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-29 16:28:20 -07:00
danielvincent
39a1874ce3
DG IZ; all input fields are now textareas on dashboard page
2010-06-29 16:28:12 -07:00
maxwell
77c0bb5c4e
urls are now unique, and a user can not add a friend with the exact same url
2010-06-29 16:04:15 -07:00
maxwell
a0a0b9d0ad
fixed stream bull
2010-06-29 15:05:09 -07:00
maxwell
ee9acc5c82
thanks to dan, GS works great now MS RS
2010-06-29 15:00:30 -07:00
danielvincent
67123c664a
Merge branch 'master' of github.com:diaspora/diaspora_rails
...
Conflicts:
app/views/layouts/application.html.haml
2010-06-29 14:36:46 -07:00
danielvincent
5193a20458
DG IZ; getting there.
2010-06-29 14:34:33 -07:00
maxwell
6532962c1c
trying to get google analytics working
2010-06-29 13:58:36 -07:00
maxwell
60336bd520
trying to get GS working
2010-06-29 13:45:54 -07:00
maxwell
19e03c7077
person now has a url, and they cant add themselves any longer.... you need to add a url to your old development user, and we need to set it in the field
2010-06-29 12:33:00 -07:00
maxwell
f9d4eff7b0
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-29 12:32:07 -07:00
danielvincent
260805af64
DG IZ; publisher box & profile picture placeholder
2010-06-29 12:25:36 -07:00
maxwell
a683a2c1aa
RS MS added goog analytics
2010-06-29 11:45:41 -07:00
danielvincent
01f048b0a6
Merge branch 'master' of github.com:diaspora/diaspora_rails
...
Conflicts:
public/stylesheets/sass/application.sass
2010-06-28 22:18:47 -07:00
danielvincent
08d6a46bd8
login page
2010-06-28 22:18:05 -07:00
maxwell
45a9d9e342
moved the silly destory link over a bit
2010-06-28 22:15:52 -07:00
maxwell
46ab63de36
added will pagination action.
2010-06-28 21:56:58 -07:00
ilya
775aab996a
DG IZ picture in the profile
2010-06-28 23:39:55 -04:00
ilya
0fa11806ba
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-28 21:32:18 -04:00
ilya
b5b9c647d7
DG IZ Created the profile model & friend view now shows the information
2010-06-28 21:32:09 -04:00
maxwell
36b5a90d34
MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works
2010-06-28 17:35:38 -07:00
maxwell
3dce5f1b34
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-28 16:15:48 -07:00
maxwell
f4a8671854
fixed the remote socket updating bug? we will see
2010-06-28 16:15:30 -07:00
ilya
2ac4759067
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-28 18:21:03 -04:00
ilya
2b42ef216c
DG IZ; added a profile; one-to-one relation with Person (non-singleton)
2010-06-28 18:20:56 -04:00
maxwell
b6c6316886
trying to fix status message bug
2010-06-28 15:03:45 -07:00
maxwell
d9a6bb7ba2
merged my socket changes
2010-06-28 14:52:43 -07:00
maxwell
5cf2e3c3ea
commiting so i can pull
2010-06-28 14:47:23 -07:00
ilya
44b25e3eaa
DG IZ; fixed javascript bug. stream fades in recents again.
2010-06-28 17:02:26 -04:00
ilya
25198a7e86
IZ, RS; Moved XML parser to lib
2010-06-28 15:56:46 -04:00
danielvincent
762cbcb0f2
Merge branch 'master' of github.com:diaspora/diaspora_rails
...
Conflicts:
app/views/comments/_comment.html.haml
app/views/layouts/application.html.haml
2010-06-28 12:09:35 -07:00
ilya
a540f09109
RS, IZ; Added ids to views
2010-06-28 14:46:43 -04:00
ilya
3d76fa26ba
RS IZ testing GUID
2010-06-28 14:28:01 -04:00
maxwell
60091012bf
on client connect, websockets now tell the server where the user is. nothing more
2010-06-28 01:12:21 -07:00
danielvincent
462bd96189
ui fixup
2010-06-27 16:17:42 -07:00
danielvincent
5be27f33ec
Merge branch 'master' of github.com:diaspora/diaspora_rails
...
Conflicts:
app/views/layouts/application.html.haml
app/views/status_messages/_status_message.html.haml
2010-06-27 10:32:23 -07:00
maxwell
b017f1b0f9
forgot to add partial file to git...sorry
2010-06-26 23:43:30 -07:00
Maxwell Salzberg
b804bdc220
forgot to take out a debug line. i kept comments in, but they prevent a new post to be sent from the database to the view. on refresh everything works. also moved comments to its own partial so we can add it to all posts
2010-06-26 15:40:33 -07:00
Maxwell Salzberg
4402a84c32
fixed the webhook bug, now going to deploy and test
2010-06-26 15:21:23 -07:00
Maxwell Salzberg
2bbfcb0bb1
putting debug in for master so I can check deployed servers out
2010-06-26 14:16:19 -07:00
danielvincent
39e85754d8
nav should be collapsed into a filter list. comments are more clear.
2010-06-26 00:07:21 -07:00
maxwell
6467f943da
MS^2 Comments serialize and deserialize properly
2010-06-25 22:49:53 -07:00
maxwell
e4e2d52bcb
reverting typos
2010-06-25 22:29:36 -07:00
maxwell
0d700046c4
MS^2 Object parser can handle comments
2010-06-25 22:29:08 -07:00
maxwell
a6c33b3e7b
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-25 22:15:49 -07:00
maxwell
ec01e2c016
Comments now working, but no AJAX, need to refresh to see them
2010-06-25 22:15:41 -07:00
ilya
ad28f0cf82
RS, IZ; Maybe commited
2010-06-26 00:58:24 -04:00
ilya
a7f6eaefdf
no friends panel on page
2010-06-26 00:47:21 -04:00
ilya
d9ffb0d07d
RS IZ No Friends list before signin
2010-06-25 23:53:04 -04:00
ilya
f5ecfebcb9
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-25 23:23:44 -04:00
ilya
d4f528bba8
Removed bookmark new page, moved form to index
2010-06-25 23:23:37 -04:00
maxwell
faa5d21636
Change the form_for not to need a message passed, and adding it to the home page
2010-06-25 19:58:40 -07:00
maxwell
4d65cfab09
MS^2 Added the friends panel to application layout
2010-06-25 19:22:05 -07:00
ilya
f5d1ab14fb
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-25 22:15:58 -04:00
ilya
2557271dcc
removed users link
2010-06-25 21:57:18 -04:00
maxwell
a89e0d4a7f
We are sorry.
2010-06-25 18:46:27 -07:00
maxwell
2566b2d4e1
added person validations
2010-06-25 18:31:35 -07:00
maxwell
884af9a3b6
added debug partial
2010-06-25 15:35:40 -07:00
maxwell
b105b0d6f2
merged in
2010-06-25 15:34:40 -07:00
maxwell
5cade230ac
added silly debug toggle
2010-06-25 15:33:23 -07:00
ilya
c0167a445a
RS, IZ; Ended spec pollution, fixed up blog spec
2010-06-25 18:04:09 -04:00
maxwell
64c1d99b8c
MS found the stupid nil. from here, i have 33 failures.
2010-06-24 22:20:09 -07:00
ilya
179af4fbfa
Merged mongomapper and master
2010-06-25 00:11:45 -04:00
maxwell
e558d4833f
DG MS fixing tests
2010-06-24 20:45:49 -07:00
ilya
4323bc5fe7
RS, IZ, specs working again for real
2010-06-24 20:47:03 -04:00
maxwell
5f3a6a7aa0
MS mongomapper works kinda
2010-06-24 17:22:49 -07:00
Raphael
f0db58f912
Moved authentication to applicationcontroller for now, refactored posting statusmessages
2010-06-24 17:10:45 -07:00
ilya
b4cc4e797f
RS IZ my newest fix
2010-06-23 20:29:57 -04:00
ilya
81157190ac
RS, IZ, Merged from master
2010-06-23 20:19:25 -04:00
ilya
8829714e2d
RS, IZ, Cleaned up Post, finished Person refactor, FactoryGirl sequences are unpleasant
2010-06-23 20:17:44 -04:00
maxwell
a0eeb43176
DG friend url validation can now take a post, sligtly regressed on some really weird edge cases
2010-06-23 16:30:46 -07:00
maxwell
fb7ed9e0e7
DG MS pushing a small show page fix
2010-06-23 15:25:46 -07:00
maxwell
9fa26f020e
DG MS; clicking on a person's name redirects to that person's post stream
2010-06-23 14:32:51 -07:00
Raphael
6acee9d158
changed blog.owner to blog.person.real_name
2010-06-23 12:16:52 -07:00
maxwell
671772f901
MS DG added tinyMCE, now a blog is better than a status messsage
2010-06-23 11:58:46 -07:00
maxwell
fba4ce9e3b
DG MS; fixed flash message visual bug
2010-06-23 11:11:58 -07:00
maxwell
663b99924f
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-23 01:26:06 -07:00
maxwell
60fa7e3ac4
view stuffs
2010-06-23 01:26:00 -07:00
Maxwell Salzberg
e6e1c22b07
DG; webhooks apply incoming posts to current friends with a silent fail on no match
2010-06-23 01:20:56 -07:00
Maxwell Salzberg
523cb6f15f
DG; Post belongs to a Person, and a Person has many Posts. Also, added Person for real this time
2010-06-22 23:27:31 -07:00
Maxwell Salzberg
9a44578c37
DG; Person is now the parent of Friend and User
2010-06-22 23:11:55 -07:00
maxwell
fd5d7c63ad
messy application.haml file i know, but now the sockets only update pages which want their data
2010-06-22 18:59:11 -07:00
maxwell
94de043862
fixed not hardcoded port for websockets
2010-06-22 17:20:07 -07:00
maxwell
aa7a2da3d1
put debug back into websocket
2010-06-22 16:23:15 -07:00
maxwell
cc89cd5cda
reload object before send to websocket
2010-06-22 16:12:15 -07:00
maxwell
989949a8c9
added pretty (but dumb) update of sockets, and fixed some tests which broke as a result. needs better tests and the code is U G L Y
2010-06-22 15:14:55 -07:00
maxwell
3064d208eb
added firefox websocket stuffs, only loads if it is not safari or chrome
2010-06-22 14:31:16 -07:00
maxwell
0546bb2582
pulled in all of max's changes from yesterday to 187
2010-06-22 10:39:06 -07:00
maxwell
3a8394bd59
Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse
2010-06-21 19:24:07 -07:00
maxwell
f696ffc3a6
fixed up some views, but some stuff feels like it broke
2010-06-21 16:46:19 -07:00
danielvincent
1233c60f6f
DG IZ; user's real name displayed on top of every page
2010-06-21 16:09:48 -07:00
danielvincent
a1361da770
DG IZ; friend and owner now require a real name
2010-06-21 15:56:40 -07:00
maxwell
a0417d13af
fixed merge with master
2010-06-21 14:38:38 -07:00
danielvincent
7f795e05cb
Merge branch 'master' into half-decent
...
Conflicts:
app/controllers/dashboard_controller.rb
2010-06-21 14:25:22 -07:00
danielvincent
06271d5821
added dumb partial switcher function in dashboard controller
2010-06-21 14:23:59 -07:00
maxwell
655dd64a54
websockets work
2010-06-21 14:12:05 -07:00
maxwell
3581f7a7d6
merged in socket
2010-06-20 22:13:24 -07:00
danielvincent
26d675af11
some sass cleanup
2010-06-20 18:36:01 -07:00
danielvincent
c542c08e38
simpler
2010-06-20 17:06:10 -07:00
danielvincent
6647ce34ab
status message and bookmark page
2010-06-20 14:52:04 -07:00
danielvincent
aee5f7f04f
took out filler elements
2010-06-20 11:49:05 -07:00
maxwell
1610e72de9
fixed merge
2010-06-20 11:13:21 -07:00
maxwell
da9bcb8bec
just kidding. needed that test config, but pulled out some deprecated curl stuff hanging around statusmessages and checked tests accordingly
2010-06-19 15:53:37 -07:00
danielvincent
df2b9d6ad4
more shuffling
2010-06-19 14:44:08 -07:00
maxwell
2f6a11f018
fixed the stupid addressable bug, also started playing with 1.9.2...sorry for the spaced out commit
2010-06-19 14:42:23 -07:00
danielvincent
0c392a0cce
moved nav to bottom header
2010-06-19 03:01:39 -07:00
danielvincent
d1630b6c45
shrink that header
2010-06-19 00:53:42 -07:00
maxwell
f06b645b9c
typo in Friend
2010-06-19 00:50:16 -07:00
maxwell
5afb97b5f7
dashboard controller stopped resolving, but the old behavior seems to work now...nnot sure why, could have been mongoid bug...
2010-06-19 00:49:35 -07:00
maxwell
8019fc8d31
working websocket
2010-06-19 00:09:58 -07:00
danielvincent
1223011a4f
more semi-drastic changes.
2010-06-19 00:01:25 -07:00
maxwell
63866a8128
playing
2010-06-18 23:47:42 -07:00
danielvincent
de8d8d5cb5
in the shit
2010-06-18 23:32:47 -07:00
maxwell
5286b6be69
DG MS; require XML root node; added header to XML (not yet required)
2010-06-18 18:03:13 -07:00
maxwell
34df8fa946
DG MS; resolved unknown types going to receive handler. only post objects are inputted
2010-06-18 16:47:34 -07:00
maxwell
c430aaff18
DG MS; added database_cleaner for spec runner. touched up common specs for webhooks; depirated old status message to xml
2010-06-18 14:35:51 -07:00
maxwell
d4bf2f539d
DG MS; removed signup link and route
2010-06-18 10:48:37 -07:00
maxwell
043924b5f5
made everyting so the lastest is the first thing you see
2010-06-17 20:58:20 -07:00
danielvincent
39118293eb
DG MS; fixed minor webhook bug when generating xml collection.
2010-06-17 18:45:50 -07:00
danielvincent
02137b9fb9
DG MS; receive hook working.
2010-06-17 18:29:56 -07:00
danielvincent
ba6d136bc7
DG MS; added specs for common module
2010-06-17 15:22:02 -07:00
danielvincent
628af0372f
DG MS; completed event-queue intergration.
2010-06-17 14:29:41 -07:00
danielvincent
3371b87fff
DG MS; queue works. just need to move some tests over.
2010-06-17 11:32:13 -07:00
danielvincent
4cecb522b6
DG MS; queue still working. half-way finished cleaning up code.
2010-06-17 10:36:54 -07:00
danielvincent
d91cec0881
queue works. needs cleanup.
2010-06-17 10:29:30 -07:00
Maxwell Salzberg
67535c1113
tried to git rid of error in em-http-request
2010-06-17 09:20:59 -07:00
danielvincent
43207aeb41
pending: resolving post action in queue
2010-06-16 23:12:23 -07:00
danielvincent
da9f33aa72
fixed post stream to ascend by time
2010-06-16 17:35:39 -07:00
danielvincent
c63eac0fd9
added line delimiters for post stream on dashboard
2010-06-15 22:34:08 -07:00
Raphael Sofaer
ed26c82be4
RS, IZ; merged day's commits
2010-06-15 21:41:39 -07:00
Raphael Sofaer
8213443afd
RS, IZ; stubbed out and wrapped curl backtick
2010-06-15 21:34:52 -07:00
maxwell
9e89b2e0a7
DG MS did some basic work on the dashboard controller and some super basic fallback partial view
2010-06-15 21:08:29 -07:00
Raphael Sofaer
34127b070a
IZ Made the specs pass, time to clean
2010-06-15 20:38:14 -07:00
Raphael Sofaer
c4b931c309
IZ RS getting remote messages (not yet done)
2010-06-15 18:41:54 -07:00
maxwell
e6f3fc1d38
DG MS more test cleanup and removed a deprecation warning
2010-06-15 17:38:12 -07:00
maxwell
497b477e89
DG MS added a post model, going to put it more places than just status message now
2010-06-15 17:21:57 -07:00
danielvincent
f69a2bd8a1
RS; Merging whitespace
2010-06-15 11:14:00 -07:00
danielvincent
45c926f790
DG RS; added blog posts, cleaned up unnecessary warden mocks in all controller specs
2010-06-15 11:09:47 -07:00
ilya
8a37843cd9
IZ no more message= in newest in status message model
2010-06-15 13:23:24 -04:00
ilya
ee295d01ff
IZ using factories for the spec
2010-06-15 13:18:26 -04:00
danielvincent
99d9e50ed6
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-15 10:12:14 -07:00
danielvincent
d70cf5b7a7
DG RS; fixed newest messages bug in view. moved to helper.
2010-06-15 10:11:28 -07:00
maxwell
408c2c719d
swaped out js for jquery
2010-06-15 09:53:19 -07:00
maxwell
1a1887f77f
DG MS completed bookmark story
2010-06-14 20:20:19 -07:00
maxwell
58dfefc3ca
added home to nav bar
2010-06-14 18:50:38 -07:00
maxwell
3c3c194ed5
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-14 17:48:50 -07:00
maxwell
3eef53892c
DG MS; Dashboard shows the user's most recent update
2010-06-14 17:48:21 -07:00
ilya
08e64450f3
IZ Removed the - for = deprication warning in views, the devise ones are hardcoded so maybe they'll be gone on next version
2010-06-14 20:34:03 -04:00
maxwell
4532c39e93
DG MS; Status messages have owner field; defaults to user
2010-06-14 17:13:07 -07:00
maxwell
1f73c2351e
DG MS IZ; Status message renders to and from xml; Friend model in place
2010-06-14 16:20:57 -07:00
maxwell
db44081186
MS IZ DG completed friends should be displayed on dashboard
2010-06-14 13:17:20 -07:00
maxwell
960db53b9b
MS IZ DG completed crud for friend
2010-06-14 13:12:17 -07:00
danielvincent
63f5fe15d6
nav includes users and status messages
2010-06-14 11:55:52 -07:00
danielvincent
4584f1309e
Merge branch 'blueprint'
2010-06-14 11:51:56 -07:00
danielvincent
98abb75097
added blueprint
2010-06-14 11:50:17 -07:00
maxwell
0ff541ba43
fixed the dumb autotest bug. by adding mocha, it seemed to work. also fixed a bug where authenticate is called to warden and a view IZ MS
2010-06-14 11:05:55 -07:00
maxwell
29c6f9fa0f
DG, MS, IZ; status messages now functional
2010-06-13 22:11:16 -07:00
maxwell
85e6eb2132
added stray local files
2010-06-13 21:22:52 -07:00
maxwell
28ba205ef3
blerg rspec cache sux
2010-06-13 21:08:17 -07:00
maxwell
865d7d18cb
user login now drops to a dashboard page
2010-06-13 20:00:31 -07:00
danielvincent
eaeafd3240
added authentication via devise
2010-06-12 21:56:50 -07:00
danielvincent
8ecaf240e6
user session model authenticates against users
2010-06-12 19:51:54 -07:00
maxwell
8b0c3725a5
push for rafi
2010-06-12 15:55:29 -07:00
maxwell
e068707158
added nifty templates, and started a user model. session model is next
2010-06-12 15:26:37 -07:00
Raphael Sofaer
0390bbde8a
Activerecord this time\!
2010-06-11 10:40:49 -07:00
