danielvincent
a932547d12
minimizing some queries in the views. only select aspect names and ids in application controller.
2010-11-27 01:05:55 -05:00
danielvincent
ce63e13eca
aspect ids normalized to posts to minimize queries on views.
2010-11-26 18:55:06 -05:00
Raphael
77d46b2d66
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-26 17:09:38 -05:00
Sarah Mei
abae16472d
pagination works on aspects#show
2010-11-26 13:09:05 -08:00
danielvincent
bf66be9ea4
fixed template error on statusmessage controller
2010-11-26 13:29:49 -05:00
Raphael
3a24eb900d
Refine log lines
2010-11-26 13:02:52 -05:00
danielvincent
94d08954d9
401 -> 406 in controllers resolving http basic auth prompt on failed comment/status message creation. fixed status message validation.
2010-11-26 00:19:19 -05:00
danielvincent
e56df5c159
fixed issue rendering partial for a comment in comments#create
2010-11-25 23:34:59 -05:00
Michael Sofaer and Raphael Sofaer
e8a266b6dd
Make the getting_started aspects page more like the manage page
2010-11-25 23:17:27 -05:00
Raphael
6e14018abb
Fixing http referer
2010-11-25 19:50:14 -05:00
zhitomirskiyi
037f822287
removed the puts
2010-11-25 19:37:05 -05:00
zhitomirskiyi
421078bd0b
if you create an aspect from the aspect manage page it redirects back there
2010-11-25 19:37:05 -05:00
zhitomirskiyi
a2d3a940a6
removed the puts
2010-11-25 16:20:09 -08:00
zhitomirskiyi
de75617070
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-25 16:19:30 -08:00
zhitomirskiyi
16d023e800
if you create an aspect from the aspect manage page it redirects back there
2010-11-25 16:18:39 -08:00
Raphael
a061999e30
Don't inspect people in logging statements
2010-11-25 18:03:34 -05:00
Raphael
08ba387311
More sane redirect on failing to accept an invitation
2010-11-25 00:39:13 -05:00
Sarah Mei
fa602cabf2
fix messaging around invitation success/failure
2010-11-24 09:34:05 -08:00
danielvincent
d7609ef647
fixed issue with photos#index not recognizing an already sent request.
2010-11-23 21:03:35 -08:00
zhitomirskiyi
9ca54a2282
accepting an invitation correctly adds the request to the user
2010-11-23 18:58:26 -08:00
maxwell
52b02176db
invited users seed aspects
2010-11-23 11:07:33 -08:00
MrZYX
ed3dc10f79
various fixes to translations - i like downcased keys only :P - made stuff translatable - cleaned up en.yml a bit
2010-11-23 14:02:13 +01:00
maxwell
da16e3ee1e
PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once
2010-11-23 00:08:30 -08:00
maxwell
0965b45f23
fixing getting started 2
2010-11-22 18:28:04 -08:00
danielvincent
0e7b1f5eb7
status messages and comments made by user will ajax onto the current page, and websocket everywhere else.
2010-11-22 14:52:13 -08:00
zhitomirskiyi
7df35ade12
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-22 12:24:34 -08:00
zhitomirskiyi
1519fd46bf
Sending a request to someone who requested you autoaccepts the request
2010-11-22 12:21:26 -08:00
danielvincent
857a4b5f11
photo large is now at 300px. a person's profile photo now references the larger size instead of medium.
2010-11-22 10:32:14 -08:00
maxwell
f4ff48f5c0
commenting out mobile for now. photos now post from only a users photos
2010-11-22 10:26:00 -08:00
danielvincent
55952d00c0
fixed failing photoscontroller spec.
2010-11-21 22:58:24 -08:00
Sarah Mei
218aa1c0d6
MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent
2010-11-21 19:56:35 -08:00
danielvincent
752d50a6a9
editing captions on photos uses remote forms. removed photo in album from WSR.
2010-11-21 19:51:20 -08:00
maxwell
c4a270ef8b
putting mobile interface back in so we can get it cleaned up
2010-11-21 17:14:43 -08:00
danielvincent
069b372c19
photo show links to original post and siblings. status message shows all photos associated with it. youtube player makes http/s call instead of just http.
2010-11-21 16:30:47 -08:00
danielvincent
d16a4601c2
contact list on aspect#show is ajaxy
2010-11-21 16:30:46 -08:00
danielvincent
b3ec4d10c2
user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion.
2010-11-21 16:30:45 -08:00
maxwell
769c0e1055
DG MS trying to finish statusmessage refactor
2010-11-21 16:13:01 -08:00
maxwell
ea7bdfde28
fix validation and order of status message sent
2010-11-21 16:13:01 -08:00
maxwell
9b7d2ed0f6
DG MS; status messages can now have photos.
2010-11-21 16:13:01 -08:00
maxwell
7f97b6f812
MS DG form now works reasonably well. still need to limit number of photos
2010-11-21 16:13:00 -08:00
maxwell
fb0dc2db7e
added photos to status messages
2010-11-21 16:13:00 -08:00
maxwell
7fb751b00c
making photo uploader work better
2010-11-21 16:11:55 -08:00
danielvincent
242d0ab9c5
a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box.
2010-11-21 16:11:55 -08:00
zhitomirskiyi
0e171e8504
added a fixed the pending request query
2010-11-18 15:22:14 -08:00
Sarah Mei
c19ebcece3
Request delete now returns head :ok instead of redirecting. On client side, request div is removed.
2010-11-17 22:28:24 -08:00
danielvincent
056dc7d3ba
DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state.
2010-11-17 19:37:08 -08:00
Raphael
37a694ed1f
Added rescues to many of the webfinger methods and made EM-HTTP-Request follow 3 redirects
2010-11-17 18:49:03 -08:00
Raphael
5e269edb5a
Adding logging to webfinger in people_controller
2010-11-17 15:56:39 -08:00
Raphael
4853a55d9b
Don't expect raises from user receive
2010-11-17 15:35:25 -08:00
Raphael
6c97899d5d
Add logging statements, rescue callbacks in em-webfinger
2010-11-17 13:55:58 -08:00
Raphael
e2412d2e43
Add error messages for friending from aspect-manage
2010-11-16 18:00:55 -08:00
Raphael
c0414b8184
Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts
2010-11-16 16:18:16 -08:00
Raphael
7876da8fb8
Refactor raises in requesting to validations in request, move to better controller structure
2010-11-16 16:18:16 -08:00
Raphael
248e768846
search now sockets a person
2010-11-15 19:13:45 -08:00
Raphael
0f1517af15
Redirect directly to the login page no registrations closed
2010-11-15 12:24:58 -08:00
Raphael
d3098cf6bc
Add option to close registration in app_config
2010-11-15 12:15:40 -08:00
danielvincent
988e2afe3d
resolved missing translation, tweaked button css, commented out mobile_fu in application controller
2010-11-13 00:26:55 -08:00
danielvincent
ed50fe7f1f
Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes.
2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26
removed the word friend everywhere minus translation files
2010-11-12 20:22:55 -08: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
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
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
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
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
maxwell
4d2820e31c
MS RS fixed photo show bug
2010-11-08 14:05:01 -08:00
Raphael
8023b6f344
Check for birthday before putting in birthday paramaters
2010-11-05 18:32:18 -07:00
maxwell
4a39d1a516
date now has a default nil value
2010-11-05 17:38:51 -07:00
maxwell
4300b20c34
cleaned up profile page a bit more
2010-11-05 14:28:39 -07:00
Raphael
9970ee0e22
Write comments controller spec
2010-11-05 14:15:40 -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
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
Raphael
f6d899f1d9
Move prep_image_url into profile image_url setter
2010-11-04 18:46:15 -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
MrZYX
1102fcd565
made flash messages translatable
2010-11-04 20:49:50 +01: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
zhitomirskiyi
7771219a0a
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-03 13:16:57 -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
5cdeed6c54
Add a spec to people_controller, make those specs a little clearer
2010-11-02 17:10:19 -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
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
377cae8cba
Merge remote branch 'ed0h/i18n-fallbacks'
...
Conflicts:
pkg/ubuntu/dist
2010-11-01 15:57:43 -07:00
Raphael
488df6eaa0
RS IZ a good test to overwrite ids
2010-11-01 11:35:37 -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
livefromthemoon@gmail.com
cf82a0a9c8
Better to set the default locale in an initializer than in a before_filter
2010-10-31 22:39:54 +01:00
danielvincent
b08c4fb84e
removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts)
2010-10-31 12:34:26 -07:00
danielvincent
8ec49e685b
going to a non-friend's page contains a way to add them.
2010-10-29 15:43:44 -07:00
danielvincent
7acc138a21
resolved issue regarding profile images referenced at https:// locations.
2010-10-29 14:56:41 -07:00
danielvincent
6eb50ea934
profile photo uploader is now a standard form file element. Upload new image through people#update, which calls current_user.post to do so.
2010-10-29 14:11:59 -07:00
danielvincent
79ec02c6ad
photo uploader on edit profile page.
2010-10-29 14:11:59 -07:00
Raphael
d753e31205
Merge remote branch 'ed0h/309-user-choose-language'
...
Add explicit language set to spec in users_controller_spec.rb
Conflicts:
app/models/user.rb
2010-10-29 12:06:14 -07:00
maxwell
6d139ab946
more tests pass
2010-10-29 11:17:39 -07:00
maxwell
1b48572674
MS tests are now green
2010-10-29 11:16:50 -07:00
maxwell
fddec49655
adding nexttick
2010-10-29 11:15:14 -07:00
zhitomirskiyi
8b3a9cd801
adding some zombie friend puts
2010-10-29 11:15:14 -07:00
maxwell
dae9f6540b
adding case for error message being emmited
2010-10-29 11:14:28 -07:00
maxwell
eddcb71fcb
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:11:05 -07:00
maxwell
0aae89aa03
adding case for error message being emmited
2010-10-29 11:06:31 -07:00
maxwell
c645e2aff9
removing double fetch in dev utils controller
2010-10-29 11:05:18 -07:00
maxwell
8fe339b03b
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:05:17 -07:00
danielvincent
4776f4810e
fixed failing spec for photos_controller#edit
2010-10-29 10:38:53 -07:00
danielvincent
1d399598d3
user now has a uploads meta album for photos. fixed some view issues with photo#show, album#show
2010-10-29 10:38:17 -07:00
danielvincent
a7df1bca68
photos do not require an album. uploading files on a user's photos#index page will post to all aspects.
2010-10-29 10:38:17 -07:00
danielvincent
2b4e3e3a41
a person now has a photos#index page.
2010-10-29 10:38:17 -07:00
Sarah Mei
14fedf5369
GAHHH STOP EMAILING ME (specs pass)
...
Also, added attr_protected to Photo#person and Photo#person_id.
2010-10-29 00:59:26 -07:00
Gabriel Gilder
bdb77ff282
redirecting to :back instead of manage page on failed aspect creation +spec
2010-10-28 21:01:53 -07:00
Raphael
78acdb7368
Pushing broken photo controller spec for dan to fix
2010-10-28 16:19:18 -07:00
Raphael
512f40eac2
attr_accessible on Post
2010-10-28 15:50:19 -07:00
danielvincent
a0d83e28a1
copy in manage page by clicking 'add a new friend' for now
2010-10-28 11:28:58 -07:00
danielvincent
6626b00961
fix on aspect#show in @friends_not_in_aspect
2010-10-28 11:11:05 -07:00
danielvincent
bb9a6e47a4
added birthday and gender to Profile. fixed a view issue on getting_started#2
2010-10-28 11:01:16 -07:00
livefromthemoon@gmail.com
52522c102e
add some basic verification when loading the languages config file
2010-10-28 18:09:25 +02:00
livefromthemoon@gmail.com
c4d8f4e587
remove two useless lines of code
2010-10-28 17:38:45 +02:00
livefromthemoon@gmail.com
b7a586b1a5
allow user to change his language in his settings
2010-10-28 17:29:17 +02:00
livefromthemoon@gmail.com
6e1121179d
guess locale from browser settings
2010-10-28 17:29:17 +02:00
danielvincent
1d5b7a87f1
Merge branch 'master' into getting-started
2010-10-27 18:14:08 -07:00
danielvincent
db1a753add
major hack on getting_started#2 with aspect javascript. reload the page on ajax success on new aspect creation just to get it working.
2010-10-27 18:08:55 -07:00
danielvincent
05c5e770ee
removed real name from signup process.
2010-10-27 16:25:22 -07:00
danielvincent
bfb1c6df28
collapsed layout views
2010-10-27 13:33:42 -07:00
danielvincent
335bd9c96a
skip getting started button sets getting_started to false via js and redirects to root_path
2010-10-27 12:53:46 -07:00
danielvincent
b906dd5a1d
added redirect to getting_started_path in requests#create
2010-10-27 12:31:48 -07:00
danielvincent
cd726c0ba7
users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/
2010-10-27 12:21:25 -07:00
danielvincent
4ec11691cd
user has a getting_started flag, set true by default. aspect#index checks to see if getting_started flag is set.
2010-10-27 10:36:13 -07:00
zhitomirskiyi
63c740fce7
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
2010-10-27 09:53:50 -07:00
Raphael
49c09b9c8c
Remove unused clean_hash
2010-10-26 19:16:16 -07:00
danielvincent
f1fbb68fd8
added success to getting_started. fixed birthday selectors to display years down to 1930. made buttons rounder. all save and continue buttons step forward.
2010-10-26 18:35:14 -07:00
zhitomirskiyi
fa484e95e4
MS IZ refactored querying
2010-10-26 17:05:38 -07:00
danielvincent
385e1673ab
Merge branch 'master' into getting-started
...
Conflicts:
app/controllers/users_controller.rb
app/views/users/_account.haml
app/views/users/_profile.haml
2010-10-26 16:50:57 -07:00
danielvincent
6e015790a7
settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update
2010-10-26 16:02:53 -07:00
danielvincent
ea46fa8fd8
save and continue buttons on getting_started#1 and getting_started#2. raise fields
2010-10-26 15:03:38 -07:00
danielvincent
69b1b71a5d
removed javascript slider. made each getting_started section its own page. added bio to profile (and changed xml_accessors to xml_readers).
2010-10-26 13:04:47 -07:00
danielvincent
278a74f1f9
draft
2010-10-26 13:04:46 -07:00
danielvincent
7f1d87f424
fixed pagination bug on aspect#show (re: #445 )
2010-10-26 12:57:43 -07:00
zhitomirskiyi
e776389d19
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
2010-10-26 11:19:50 -07:00
