MrZYX
748efb1860
eliminated senseless duplicates in en.yml
2010-11-12 06:07:36 +01:00
MrZYX
6400dc244f
fixing again. it's getting anoying
2010-11-12 06:06:16 +01:00
MrZYX
8085a7bcd7
fixes to be in sync with latest commits
2010-11-12 06:06:15 +01:00
MrZYX
d91c26fb68
translated getting started, fixed #508
2010-11-12 06:06:15 +01:00
MrZYX
381c53b775
found some untranslatable strings
2010-11-12 06:04:05 +01:00
MrZYX
eef0901f36
unscoped fill_me_out
2010-11-12 06:04:05 +01:00
MrZYX
ca72bb40a6
refactored en.yml
...
removed unused keys out of en.yml
replaced some ' with "
2010-11-12 06:04:05 +01:00
danielvincent
85e2316280
Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect
2010-11-11 19:41:12 -08:00
Raphael
d62a7c4ce2
Fix request views, refactor identical forms into partial.
2010-11-10 20:12:09 -08:00
Raphael
8232a92ca0
Update _person and person show, add specs for those pages
2010-11-10 12:41:18 -08:00
Sarah Mei
a39bd2badb
AspectsController#manage now works if you have pending friend requests.
2010-11-10 12:05:28 -07:00
Sarah Mei
ca9331970a
Renaming image_picker to image-picker since js likes dashes better than underscores
2010-11-10 10:52:33 -07:00
maxwell
71da954a76
removing deletetion
2010-11-09 15:29:43 -08:00
maxwell
f7cc01ceb2
more work done. much more to go
2010-11-09 15:29:43 -08:00
maxwell
034d7ee2b1
first commit
2010-11-09 15:29:43 -08:00
Raphael
390fffdee6
Fix new request view
2010-11-09 15:03:56 -08:00
Raphael
6dd58fe875
Specs pass again, invitations moved to Invitation model, refactor possibly complete
2010-11-09 14:07:26 -08:00
Raphael
4818973643
Beginning to refactor invitations into an Invitation class
2010-11-09 14:07:26 -08:00
Raphael
71ab919ad3
Remove urls from requests, invitations are broken
2010-11-09 14:07:26 -08:00
maxwell
18505bf23c
resubmmiting object path bug. not sure how it got overwritten
2010-11-09 00:24:27 -08:00
maxwell
56c152ac6a
fixed a bug in the stream partial to use object_path
2010-11-08 21:16:46 -08:00
zhitomirskiyi
77fe7a1462
Revert "IZ local comment destroy"
...
This reverts commit cb9fb0ad94
2010-11-08 19:32:43 -08:00
zhitomirskiyi
34179d60db
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-08 18:21:02 -08:00
zhitomirskiyi
cb9fb0ad94
IZ local comment destroy
2010-11-08 18:19:55 -08:00
maxwell
091d98ea15
invite friends actually calls up the invite friends pane on all aspects
2010-11-08 18:00:36 -08:00
maxwell
7d6be51cfb
making photos#show be in no aspect
2010-11-08 17:53:47 -08:00
maxwell
a84f9437b0
trying another thing to get the redirect working
2010-11-08 17:43:59 -08:00
maxwell
4164ceaf90
trying another thing to get the redirect working
2010-11-08 16:30:46 -08:00
maxwell
52908cec1a
services controller should now go back to the referer. this might not actually work
2010-11-08 16:18:15 -08:00
maxwell
3fd5852d44
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-08 15:56:18 -08:00
maxwell
2162a2e3f9
collapse person's photos and status message into their profile; also, made these nested on a person
2010-11-08 15:55:58 -08:00
Raphael
70af10ee62
user#friends is now a many-foreign_key assoc, rather than a many-in
2010-11-08 15:19:23 -08:00
zhitomirskiyi
cbabc547a2
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-08 15:10:32 -08:00
zhitomirskiyi
e50f29b032
the profile cannot massassign diaspora handle
2010-11-08 15:10:23 -08:00
maxwell
4d2820e31c
MS RS fixed photo show bug
2010-11-08 14:05:01 -08:00
maxwell
7e40558dc4
reverse the years as they are displyed in the birthday dropdown
2010-11-08 10:33:05 -08:00
maxwell
80c8451bf2
fixing translation text of services page
2010-11-08 10:25:11 -08:00
maxwell
0d26348e69
remove arnold from the inviter mail form
2010-11-08 10:05:34 -08:00
danielvincent
58ce81f674
Add a person to aspect contains a searchable list as opposed to a dropdown.
2010-11-07 12:20:33 -08:00
danielvincent
0127c9eb6f
people on manage page are draggable again. took out jquery.cycle. fixed loading issue with tipsy.gif
2010-11-07 11:07:37 -08:00
danielvincent
a4df6a8a53
bugfix in peeople#_person partial displaying relationship status
2010-11-07 10:51:33 -08:00
danielvincent
f594fa1d80
Stream is its own partial, which takes a collection of posts
2010-11-07 10:38:00 -08:00
Sarah Mei
32d953f457
Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor.
2010-11-06 16:50:07 -07:00
maxwell
a971985884
removed private info if you are not friends
2010-11-06 16:34:41 -07:00
danielvincent
020cd90341
aspect labels on people#show view
2010-11-06 11:09:11 -07:00
danielvincent
ecfcc96f8e
Post a message to aspect dialog will only display if people are present.
2010-11-05 21:14:00 -07:00
Raphael
8023b6f344
Check for birthday before putting in birthday paramaters
2010-11-05 18:32:18 -07:00
danielvincent
58c3a4306f
fixed the build
2010-11-05 18:16:28 -07:00
danielvincent
ddb4b2b6ee
Clicking 'make public' label on everyone publisher selects respective checkbox
2010-11-05 17:49:15 -07:00
maxwell
32ed7e3b0f
forgot to add the birthday picker change in the previous commit. now getting started does not prompt you to look for photos you dont have
2010-11-05 17:48:33 -07:00
maxwell
1a642e044a
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-05 17:43:30 -07:00
danielvincent
1a481d43d2
Use _stream_element.haml as a wrapper for posts in the stream.
2010-11-05 17:40:28 -07:00
maxwell
4a39d1a516
date now has a default nil value
2010-11-05 17:38:51 -07:00
danielvincent
9a055b6cba
Photo partial now has a description and a link to view all photos by that person.
2010-11-05 17:27:36 -07:00
maxwell
e4f8f558a0
aspects now have a max length of 20 characters
2010-11-05 17:18:20 -07:00
maxwell
4300b20c34
cleaned up profile page a bit more
2010-11-05 14:28:39 -07:00
danielvincent
3ed10a22ff
xml_accessor creates attr_accessors in addition to xml_readers
2010-11-05 14:25:45 -07:00
Raphael
6468f0003b
Take out some xml accessors
2010-11-05 14:24:56 -07:00
danielvincent
bd9aa90278
User receives notification on new comment on post on any page.
2010-11-05 14:18:22 -07:00
Raphael
9970ee0e22
Write comments controller spec
2010-11-05 14:15:40 -07:00
maxwell
cc92f61583
mailer queue now works
2010-11-05 11:58:25 -07:00
maxwell
42c24e2b04
more testing
2010-11-05 11:46:43 -07:00
maxwell
53b25728ce
yay for typo
2010-11-05 11:46:43 -07:00
maxwell
4154cec28a
made mailer query based on ids, rather than making them serialize ruby objects
2010-11-05 11:46:43 -07:00
zhitomirskiyi
d793bdc3c7
inital commit for mailqueue
2010-11-05 11:46:43 -07:00
Raphael
4233e45bc5
Adjust wording
2010-11-05 11:23:21 -07:00
maxwell
997f9ad8d0
making profile not look so bad
2010-11-05 00:54:09 -07:00
Sarah Mei
c816a1f78e
RegistrationsController#create re-renders the form instead of redirecting, so user doesn't lose what they've entered.
...
Took out RegistrationsController#update, since all it was doing was calling super.
Took out stubbing of user save, because I actually want to check that save is doing the right thing.
2010-11-04 22:51:30 -07:00
Sarah Mei
a230763879
gender is a text field
2010-11-04 22:02:27 -07:00
Raphael
1bba4c60f7
Merge remote branch 'MrZYX/untranslated-strings'
...
Conflicts:
app/views/aspects/manage.html.haml
config/locales/diaspora/en.yml
2010-11-04 20:05:57 -07:00
Derrick Camerino
087f7e90d4
removing aspect in ui only if ok is clicked on confirmation
2010-11-04 19:54:11 -07:00
Raphael
abebd18c98
Move getting_started self link color to a css class
2010-11-04 19:29:15 -07:00
Raphael
c1c631d5ed
Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg
...
Conflicts:
config/locales/diaspora/en.yml
2010-11-04 18:56:43 -07:00
Raphael
4eba0595f9
Fix 328 profile images dying, thanks to theBernd
2010-11-04 18:46:15 -07:00
Raphael
f6d899f1d9
Move prep_image_url into profile image_url setter
2010-11-04 18:46:15 -07:00
danielvincent
be916384a1
collapsed remove from aspect and remove person into one function on aspects#manage
2010-11-04 17:50:48 -07:00
Raphael
20508ad37a
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-04 16:45:03 -07:00
Raphael
3634658cbf
The Governator's party has lost the election.
2010-11-04 16:44:17 -07:00
danielvincent
b74dfcf5fd
comments autolink
2010-11-04 16:18:49 -07:00
danielvincent
f4dba54ff3
posting to a person with a user on the same pod will send internally, skipping the http queue and encryption.
2010-11-04 15:33:16 -07:00
danielvincent
b4679c9041
Take application_controller before filters out of publicscontroller
2010-11-04 15:33:16 -07:00
zhitomirskiyi
ea0f0fbdc5
add moved dev controller to use the user post api
2010-11-04 15:07:24 -07:00
zhitomirskiyi
7f5b98a6cb
the photo image url is now randomized
2010-11-04 14:37:08 -07:00
danielvincent
9da7272e59
should query the correct collection on perform
2010-11-04 12:58:24 -07:00
MrZYX
1102fcd565
made flash messages translatable
2010-11-04 20:49:50 +01:00
MrZYX
63a5fdb000
made a bunch of strings translatable
2010-11-04 20:49:50 +01:00
MrZYX
f84b14bd19
unscope are_you_sure in photos/show.html.haml
2010-11-04 20:49:50 +01:00
danielvincent
b33aa9a0fb
retracting on a non existant post does not raise a permissions error.
2010-11-04 12:43:26 -07:00
danielvincent
82c82b8ccc
killed albums
2010-11-04 10:17:19 -07:00
zhitomirskiyi
2da1f860cd
validate user ownership on status message destroy
2010-11-03 18:04:10 -07:00
zhitomirskiyi
8246882067
MS IZ fixed some permissions in photo controller
2010-11-03 16:42:33 -07:00
Raphael
03b272db60
Requests are no longer tracked by id across servers, DELETED USELESS PUTS IN EM-WEBFINGER SPEC
2010-11-03 15:26:58 -07:00
zhitomirskiyi
7771219a0a
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-03 13:16:57 -07:00
zhitomirskiyi
0ac4c5b04f
IZ MS refactored invites to use user.build
2010-11-03 13:16:45 -07:00
zhitomirskiyi
3578daa14e
IZ MS more photo controller specs
2010-11-03 12:21:32 -07:00
danielvincent
3e001c74d6
Albums#index hidden from views. Photos must be accessed through a person.
2010-11-03 12:21:14 -07:00
Raphael
c8a8849518
Move to build_post and dispatch_post in most controllers
2010-11-03 09:30:41 -07:00
Raphael
d5a4de58b3
User#post is now like a future controller, Photo#instantiate no longer saves
2010-11-02 19:16:02 -07:00
Raphael
1c67211ebc
Move post dispatching to dispatch_post
2010-11-02 19:16:02 -07:00
maxwell
0ecc27a935
MS IZ posts should now update
2010-11-02 18:56:00 -07:00
maxwell
4de89df4dc
MS IZ setting the diaspora handle in photo instantiate
2010-11-02 18:32:02 -07:00
danielvincent
a31c22adb3
mailer doesn't break everything anymore. attachments are also inlined.
2010-11-02 17:59:50 -07:00
maxwell
8c350282d3
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-02 17:52:22 -07:00
maxwell
2f1fbaf686
temp. logging statement
2010-11-02 17:52:04 -07:00
Raphael
ae039442c3
Websocket now uses cookie to authenticate
2010-11-02 17:39:50 -07:00
danielvincent
a79d1f5240
tabbing on publisher to everyone focuses submit button
2010-11-02 17:35:12 -07:00
danielvincent
a995d250f1
added white text on grey asset to mailer
2010-11-02 17:19:49 -07:00
Raphael
5cdeed6c54
Add a spec to people_controller, make those specs a little clearer
2010-11-02 17:10:19 -07:00
danielvincent
e9f3efea79
person searchable by diaspora_handle
2010-11-02 16:48:58 -07:00
maxwell
8c89f8d87a
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-02 16:42:52 -07:00
maxwell
51d419f41a
removed diaspora handle method from user
2010-11-02 16:42:37 -07:00
Raphael
a5dedc9bdb
User.build no longer saves people, user now has attr_accessible
2010-11-02 16:28:55 -07:00
danielvincent
da8124f8a7
hcard has searchable field, and is taken in to account when building Person from webfinger
2010-11-02 16:12:43 -07:00
danielvincent
fff43bf650
profile defaults key searchable to true. search takes searchable into account.
2010-11-02 16:12:42 -07:00
Raphael
6503cefd68
Get rid of some repeated ids, fix infieldlabels on manage page
2010-11-02 15:37:06 -07:00
maxwell
c3d0c78bd1
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
lib/diaspora/user/receiving.rb
2010-11-02 12:46:08 -07:00
maxwell
19bbf8ce4d
IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive
2010-11-02 12:38:30 -07:00
Raphael
bfcb2a9e18
Remove random href
2010-11-02 12:37:32 -07:00
Raphael
a9b429d163
Merge remote branch 'ed0h/helper-method-for-markdown'
2010-11-02 12:14:41 -07:00
Raphael
ff21c827e4
Revert "Merge remote branch 'ed0h/336-markdown-for-status-messages'"
...
This reverts commit 2b128d88ec8778bdab3b
2010-11-02 12:14:12 -07:00
Raphael
2b128d88ec
Merge remote branch 'ed0h/336-markdown-for-status-messages'
...
Conflicts:
pkg/ubuntu/dist
2010-11-02 11:45:16 -07:00
Raphael
8778bdab3b
Merge remote branch 'ed0h/503-language-html-tag'
2010-11-02 11:43:12 -07:00
Raphael
9d71ed1120
Merge remote branch 'robustdj/453-aspect-labels'
...
Conflicts:
app/models/user.rb
pkg/ubuntu/dist
2010-11-02 11:31:51 -07:00
Raphael
7fdd0475ae
robustdj's specs now green
2010-11-02 11:27:51 -07:00
danielvincent
a3ce5f1cd7
REMOVED IMPORTER
2010-11-02 11:17:47 -07:00
Raphael
67219248b0
unscope i18n calls
2010-11-02 10:32:34 -07:00
Alec Leamas
fceffba261
Merge branch 'translation-refactor' of http://github.com/Hexagon/diaspora into Hexagon-translation-refactor
2010-11-02 16:34:47 +01:00
Sarah Mei
dc97c852f4
Person delegates first_name and last_name to profile.
2010-11-01 22:22:15 -07:00
livefromthemoon@gmail.com
aab74cf1ff
Added markdown support for status messages
2010-11-02 03:55:14 +01:00
maxwell
15d6cff837
MS IZ everything now uses diaspora handle. this feels so good
2010-11-01 18:42:42 -07:00
maxwell
3c8b40c427
IZ MS retractions now use diaspora handle
2010-11-01 17:11:06 -07:00
maxwell
06445901f8
IZ MS retrations for posts now green
2010-11-01 17:11:06 -07:00
Raphael
bd6a8df7cc
Revert to getElementById in FileUploader, jquery isn't working
2010-11-01 17:07:28 -07:00
Raphael
47f040f740
Use jquery id selector
2010-11-01 16:45:09 -07:00
Hexagon
938d146405
Common translations are used without the namespace
2010-11-02 00:07:24 +01:00
Raphael
377cae8cba
Merge remote branch 'ed0h/i18n-fallbacks'
...
Conflicts:
pkg/ubuntu/dist
2010-11-01 15:57:43 -07:00
danielvincent
3a4f100806
remove *
2010-11-01 15:01:49 -07:00
danielvincent
f6b4be97a3
requests are almost there
2010-11-01 14:54:40 -07:00
Hexagon
1acc206fa4
#475 : Fixed more untranslated strings
2010-11-01 22:22:13 +01:00
livefromthemoon@gmail.com
2b890e6ef2
Added 'lang' attribute in the html tag
2010-11-01 21:31:12 +01:00
Raphael
9d273c6d24
Now expecting a 500 on someone passing an id to create, should really be a 422
2010-11-01 12:31:00 -07:00
Raphael
488df6eaa0
RS IZ a good test to overwrite ids
2010-11-01 11:35:37 -07:00
Raphael
6c0b187d40
Merge remote branch 'jwinky/446-user-name-length-limit'
...
Conflicts:
app/models/user.rb
2010-11-01 11:00:02 -07:00
Raphael
07e96e5a37
Merge remote branch 'jdeisenberg/492-vague-signup-wording'
2010-10-31 23:44:50 -07:00
Derrick Camerino
1a03dd799a
showing aspect labels when posting status messages
2010-10-31 23:26:04 -07:00
Raphael
7f7697c11d
Merge remote branch 'traction/441-failed-aspect-creation-redirect'
2010-10-31 23:22:10 -07:00
zhitomirskiyi
c86a3eb608
moved getting started logic to the controller
2010-10-31 19:33:11 -07:00
Sarah Mei
ce213513eb
PeopleController#update handles getting an empty string for :image
2010-10-31 17:49:47 -07:00
Sarah Mei
0817409e9a
Fixed deprecation warning
2010-10-31 17:48:38 -07:00
danielvincent
3f7955f978
removed two unused methods
2010-10-31 14:50:14 -07:00
