maxwell
|
d6c5a88836
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-08 14:34:31 -08:00 |
|
maxwell
|
1f8f07f48d
|
added slightly better error message on aspect update failure
|
2010-12-08 14:21:14 -08:00 |
|
maxwell
|
3dbb80bf9f
|
added slightly better error message on aspect update failure
|
2010-12-08 14:14:49 -08:00 |
|
Raphael
|
f421f1327c
|
Take nested queried out of aspects manage
|
2010-12-07 00:21:05 -08:00 |
|
Raphael
|
9442553504
|
Refactor aspectscontroller and aspect_contacts.haml
|
2010-12-06 17:20:21 -08:00 |
|
maxwell
|
0a8af9e72b
|
DG MS some fixes for getting started
|
2010-12-04 23:05:47 -08:00 |
|
maxwell
|
119599bfeb
|
Revert "Commented-on posts bubble up to the top"
This reverts commit 6da410079b.
|
2010-12-02 09:51:26 -08:00 |
|
Raphael
|
6da410079b
|
Commented-on posts bubble up to the top
|
2010-12-01 15:38:56 -08:00 |
|
Raphael
|
f2cb43bb4e
|
Take queries out of aspect contacts pane on home page
|
2010-11-30 15:58:07 -08:00 |
|
Raphael
|
d733d2c3bf
|
Take out print statements
|
2010-11-30 15:51:37 -08:00 |
|
Raphael
|
366734ca5e
|
Take queries out of aspect contacts pane on home page
|
2010-11-30 15:35:32 -08:00 |
|
Raphael
|
fce428826c
|
Try to take photos query out of views
|
2010-11-29 23:41:03 -08:00 |
|
Raphael
|
7ca124c002
|
Refactor views to not be so dumb.
|
2010-11-27 21:27:27 -05:00 |
|
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 |
|
Sarah Mei
|
abae16472d
|
pagination works on aspects#show
|
2010-11-26 13:09:05 -08: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
|
16d023e800
|
if you create an aspect from the aspect manage page it redirects back there
|
2010-11-25 16:18:39 -08:00 |
|
maxwell
|
0965b45f23
|
fixing getting started 2
|
2010-11-22 18:28:04 -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
|
9b7d2ed0f6
|
DG MS; status messages can now have photos.
|
2010-11-21 16:13:01 -08:00 |
|
maxwell
|
7fb751b00c
|
making photo uploader work better
|
2010-11-21 16:11: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 |
|
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
|
7f7697c11d
|
Merge remote branch 'traction/441-failed-aspect-creation-redirect'
|
2010-10-31 23:22:10 -07: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 |
|
Gabriel Gilder
|
bdb77ff282
|
redirecting to :back instead of manage page on failed aspect creation +spec
|
2010-10-28 21:01:53 -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
|
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
|
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 |
|
zhitomirskiyi
|
fa484e95e4
|
MS IZ refactored querying
|
2010-10-26 17:05:38 -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 |
|
danielvincent
|
b2e8ebd0bc
|
OmniauthService -> Service. Cleaned up views.
|
2010-10-25 17:41:59 -07:00 |
|
ilya
|
c27f05ed42
|
Initial refactor done, need to stop mapping user.friends to people so much
|
2010-10-22 18:11:04 -07:00 |
|
Raphael
|
fe1a6bce20
|
Attr-accessible on aspects, check whether built user is persisted
|
2010-10-21 12:49:50 -07:00 |
|
ilya
|
bec1842bed
|
redirects to the right place
|
2010-10-20 17:40:58 -07:00 |
|
ilya
|
6fa82490c9
|
remove friend from aspect box, with js call to remove the person from the aspect
|
2010-10-20 17:34:52 -07:00 |
|
ilya
|
554adeae69
|
MS IZ; querying through for person not in aspect is tested
|
2010-10-20 16:39:37 -07:00 |
|
ilya
|
6bee872039
|
moved the add people into a partial
|
2010-10-20 15:42:03 -07:00 |
|