MrZYX
|
56a6f0e43b
|
cleaned up craziness in users and likes routing, fixed #961
|
2011-03-24 03:02:14 +01:00 |
|
zhitomirskiyi
|
7a31531258
|
added location to the profile
|
2011-03-23 15:56:46 -07:00 |
|
zhitomirskiyi
|
9abe22d5d2
|
added a dependant destroy to the service_users
|
2011-03-23 11:56:15 -07:00 |
|
danielgrippi
|
43315e14f9
|
sort contacts by name, not by a potentially nil field
|
2011-03-23 10:16:55 -07:00 |
|
Sarah Mei
|
4ff67b0200
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-03-22 21:03:43 -07:00 |
|
Sarah Mei
|
87fb4b0552
|
alert is not the way to indicate a pending jasmine spec. >.< Try xit and xdescribe instead!
|
2011-03-22 21:03:33 -07:00 |
|
zhitomirskiyi
|
e45a3503d0
|
on aspect edit the contacts are now sorted by first name
|
2011-03-22 18:01:17 -07:00 |
|
Sarah Mei
|
631163ec02
|
"Add contact" buttons on tag page are smaller and don't appear on top of names.
Moved some logic from view into user model.
|
2011-03-22 13:16:58 -07:00 |
|
maxwell
|
413acc59ca
|
remove stray puts in test"
|
2011-03-22 12:32:48 -07:00 |
|
maxwell
|
a036a8035f
|
add a plaintext layout for emails, and include a link to change your email settings in the emails
|
2011-03-22 12:26:38 -07:00 |
|
maxwell
|
dc60181033
|
404 googlebotz left and right on public remote person pages
|
2011-03-22 11:26:39 -07:00 |
|
Raphael Sofaer
|
fdd158d86a
|
Make urls not change on processing
|
2011-03-21 18:42:36 -07:00 |
|
Raphael Sofaer
|
2b997e70c2
|
Refactor image processing to use 2 uploaders. Federation and s3 need testing
|
2011-03-21 16:40:53 -07:00 |
|
zhitomirskiyi
|
c929ce21ad
|
fixed validation on tag length in profile
|
2011-03-21 16:01:34 -07:00 |
|
zhitomirskiyi
|
32f08ef345
|
fixed the nil photo_url and the all being called twice in the specs
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
93d69c4ec7
|
fixed the views for the friend finder
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
aa5bef0c3f
|
calls the job on login does a sync call if the cache friends was not called before, fixed the views
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
dcc80d5b43
|
almost done, need to figure out how whats the deal with the controller not being called
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
70d71ec491
|
service users is green
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
ede7d4e8e2
|
made the job, broke outthe save_users, still need to do lifecycle callbacks
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
3afa14d341
|
wip
|
2011-03-21 14:56:50 -07:00 |
|
MrZYX
|
1b1a23aa8f
|
likes/dislikes WIP TODO: better icons, better styling, integration on photo show page
|
2011-03-20 18:10:58 +01:00 |
|
Sarah Mei
|
69c0d8e1d9
|
A bit of refactoring on the invitation spec. Remove old pending specs.
|
2011-03-19 23:10:20 -07:00 |
|
Sarah Mei
|
c3612ee66d
|
Remove empty helper and spec files.
|
2011-03-19 22:39:21 -07:00 |
|
Sarah Mei
|
c3b9da8d37
|
Add specs to conversations#new. Unpending spec for create.
|
2011-03-19 22:30:58 -07:00 |
|
Sarah Mei
|
44ca687100
|
Remove annoying constant warning from resque spec
|
2011-03-19 21:12:43 -07:00 |
|
Sarah Mei
|
0b1fa4d014
|
You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files.
|
2011-03-19 20:53:55 -07:00 |
|
Sarah Mei
|
1bd693eb14
|
Added cucumber step for searching, and feature for searching for tags.
|
2011-03-19 19:06:24 -07:00 |
|
Sarah Mei
|
10019bb3db
|
Fix User spec. Also, people_in_aspects now won't let you get people for aspects you don't own. people_in_aspects should probably be arel and/or an association extension.
|
2011-03-19 13:25:27 -07:00 |
|
MrZYX
|
dce54f3d40
|
fixed #947
|
2011-03-19 15:05:45 +01:00 |
|
Raphael Sofaer
|
42a361dcce
|
Don't redirect ajax requests to getting_started. Fix a possible source of errors and backfill a couple tests
|
2011-03-18 21:07:31 -07:00 |
|
danielgrippi
|
3db11cf38d
|
PostsController#index -> TagsController#show
|
2011-03-18 20:57:39 -07:00 |
|
maxwell
|
8f9f24f383
|
fix for photo urls before they are processed
|
2011-03-18 19:00:24 -07:00 |
|
Raphael Sofaer
|
e2f78a8b8c
|
Protect against pre-existing post_visibilities, log them so we can find out where they are coming from.'
|
2011-03-18 14:52:27 -07:00 |
|
maxwell
|
93f7f28b07
|
if you search for a hash (with a '#') it will just take you to that hash page
|
2011-03-17 19:16:29 -07:00 |
|
maxwell
|
924dc13adc
|
profile tagging now federates #FO #REAL
|
2011-03-17 18:05:49 -07:00 |
|
maxwell
|
562c0d40ac
|
profile tags now federate
|
2011-03-17 16:28:17 -07:00 |
|
Raphael Sofaer
|
1c14e2676b
|
Fix another expectation
|
2011-03-17 16:14:01 -07:00 |
|
Raphael Sofaer
|
325eeb0ca2
|
Fix expectation
|
2011-03-17 15:40:26 -07:00 |
|
Raphael Sofaer
|
bef06d18d8
|
Move notifying iteration into resque job
|
2011-03-17 15:19:26 -07:00 |
|
zhitomirskiyi
|
2b6165d8ea
|
wip
|
2011-03-17 14:32:07 -07:00 |
|
maxwell
|
4e419f7d1a
|
photo specs pass
|
2011-03-17 13:59:53 -07:00 |
|
maxwell
|
82a79c95fe
|
wrote a test for the callback, need to make it pass...
|
2011-03-17 13:59:53 -07:00 |
|
maxwell
|
bca184eaf3
|
photos are now successfully delayed
|
2011-03-17 13:59:53 -07:00 |
|
maxwell
|
b987b47f5f
|
there is a job to process photos and it is called from the controller
|
2011-03-17 13:59:53 -07:00 |
|
Raphael Sofaer
|
0aa5193434
|
Use the new local batch receive job
|
2011-03-17 13:41:30 -07:00 |
|
Raphael Sofaer
|
d2cdc20e2b
|
Finish receive local batch job
|
2011-03-17 12:56:23 -07:00 |
|
Raphael Sofaer
|
72523cc7f9
|
SocketsController now takes a user object or a user id, so that we only instantiate the user if we need to
|
2011-03-17 12:56:23 -07:00 |
|
danielgrippi
|
f0df6deed3
|
added job and spec for BatchLocalReceive. wip
|
2011-03-17 12:56:23 -07:00 |
|
Raphael Sofaer
|
3718a72f46
|
log renders of collections of partials with more info
|
2011-03-17 11:36:16 -07:00 |
|