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
|
06654b13b2
|
posts don't socket into services#index anymore.
|
2010-10-27 22:55:58 -07:00 |
|
danielvincent
|
dc89d984f1
|
put remove buttons on incoming requests, allowing a user to ignore again.
|
2010-10-27 18:36:15 -07:00 |
|
danielvincent
|
59858cd86b
|
opts[:person] set to empty hash only if not already defined. same with opts[:person][:profile]. rake db:reset works properly again.
|
2010-10-27 18:34:51 -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
|
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 |
|
danielvincent
|
a8086f2990
|
further refinements. added back buttons, more explanation text.
|
2010-10-26 23:27:26 -07:00 |
|
Raphael
|
aa819d2113
|
Putting an index on Person#diaspora_handle
|
2010-10-26 19:16:16 -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
|
e62afae045
|
deselected tabs in top nav, made user drop down a bit clearer
|
2010-10-26 16:12:58 -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 |
|
zhitomirskiyi
|
1024b8a3a7
|
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
Conflicts:
app/controllers/aspects_controller.rb
|
2010-10-26 14:57:52 -07:00 |
|
zhitomirskiyi
|
b36ce1ac80
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-26 14:49:52 -07:00 |
|
zhitomirskiyi
|
8acdf21234
|
MS IZ got rid of the requests for me scope in the user
|
2010-10-26 14:49:37 -07:00 |
|
danielvincent
|
ec141a2019
|
a user can add a person to an aspect from getting_started#2
|
2010-10-26 13:04:47 -07:00 |
|
danielvincent
|
0c72257c50
|
aspects can be created/destroyed via ajax on getting_started#2
|
2010-10-26 13:04:47 -07:00 |
|
danielvincent
|
dd4f46c8b0
|
repositioning layout on getting started
|
2010-10-26 13:04:47 -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
|
f23d199230
|
added slider to getting started flow
|
2010-10-26 13:04:46 -07:00 |
|
danielvincent
|
b52afdd93c
|
changed account and profile partials to better reflect styling changes
|
2010-10-26 13:04:46 -07:00 |
|
danielvincent
|
31713d9597
|
html5 placeholder text
|
2010-10-26 13:04:46 -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 |
|
maxwell
|
af917557f6
|
can't call match on nil
|
2010-10-25 22:56:50 -07:00 |
|
maxwell
|
a992c5fbc2
|
dont show service if you dont have the keys for it. also, update deploy script
|
2010-10-25 22:06:53 -07:00 |
|
danielvincent
|
060d8f9c7b
|
DG MS; fixed some bugs with posting publicly.
|
2010-10-25 19:24:48 -07:00 |
|
zhitomirskiyi
|
917d1838de
|
MS IZ specs are green
|
2010-10-25 18:55:51 -07:00 |
|
danielvincent
|
287d633c44
|
user#post now handles posting to services.
|
2010-10-25 17:41:59 -07:00 |
|
danielvincent
|
b2e8ebd0bc
|
OmniauthService -> Service. Cleaned up views.
|
2010-10-25 17:41:59 -07:00 |
|
danielvincent
|
3d302f8db7
|
facebook and twitter both use omniauth and are saved as OmniauthServices
|
2010-10-25 17:41:59 -07:00 |
|
maxwell
|
c489f49a25
|
DG beginning to collapse twitter&facebook
|
2010-10-25 17:41:58 -07:00 |
|
maxwell
|
154b6e0ee7
|
MS DG added specs for posting to twitter, and basic services controller tests
|
2010-10-25 17:41:58 -07:00 |
|
maxwell
|
606c7a02a4
|
MS DG public message now post to twitter, if connected
|
2010-10-25 17:41:58 -07:00 |
|
maxwell
|
c4ff07b09a
|
twitter oauth dance complete
|
2010-10-25 17:41:58 -07:00 |
|
maxwell
|
b17ae0bf38
|
DG MS removed unused fb_status model and respective specs, fixtures.
|
2010-10-25 12:26:08 -07:00 |
|
danielvincent
|
7b3f6f66c1
|
removed second #stream declaration on status_message#show. fixed bug where show pages would get posts as well as comments.
|
2010-10-24 14:44:43 -07:00 |
|
danielvincent
|
661ad20a02
|
added delegate, proper finders, and more chaining to stream.js. removed div.comment_set from the DOM.
|
2010-10-24 14:44:43 -07:00 |
|
danielvincent
|
f8347a3dd4
|
added tipsy tooltips for user pictures on left pane in aspect#index and aspect#show
|
2010-10-23 22:21:51 -07:00 |
|
danielvincent
|
18acdc7b55
|
everyone instead of all on aspect#index page. photo partial avatar now links to poster's profile.
|
2010-10-23 22:01:01 -07:00 |
|
danielvincent
|
f5a0f44c25
|
fixed error in posting to all albums through publisher on albums#index
|
2010-10-23 00:36:29 -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 |
|
ilya
|
7083d2aa03
|
Moving friendships into a 'Contact' proxy object.
|
2010-10-22 18:11:04 -07:00 |
|
maxwell
|
606a6bb43a
|
status message length is limited to 1000 chars.
|
2010-10-22 17:42:59 -07:00 |
|
maxwell
|
6913381781
|
username now can only contain letters numbers, periods, and underscores
|
2010-10-22 17:26:10 -07:00 |
|
maxwell
|
096a0308e1
|
update attachment with emails
|
2010-10-22 17:12:28 -07:00 |
|
maxwell
|
de04e717c0
|
made image or default to help with hcard parsing, deleted old default user picture
|
2010-10-22 16:57:01 -07:00 |
|
maxwell
|
6720fa2c59
|
added tests to make sure Person.by_webfinger only returns exact matches
|
2010-10-22 16:28:03 -07:00 |
|
danielvincent
|
c0423e5e56
|
reverting commit manually
|
2010-10-22 15:57:00 -07:00 |
|
danielvincent
|
829ad6360a
|
multiple dropzones function. person image does not copy, delete is disabled.
|
2010-10-22 15:56:28 -07:00 |
|
danielvincent
|
a52870b21c
|
improved animations
|
2010-10-22 15:56:28 -07:00 |
|
danielvincent
|
e1f4e12b8f
|
style. also, made sense of aspect-edit.js
|
2010-10-22 15:56:28 -07:00 |
|
danielvincent
|
69528b95a3
|
removed ignore bucket. people now have x's to delete them
|
2010-10-22 15:56:27 -07:00 |
|
danielvincent
|
b5976753ea
|
removed unused view
|
2010-10-22 15:47:22 -07:00 |
|
danielvincent
|
f2cfa3c378
|
user name in breadcrumb
|
2010-10-22 15:38:22 -07:00 |
|
maxwell
|
837b418201
|
reverting, going to write a test
|
2010-10-22 15:37:22 -07:00 |
|
danielvincent
|
f20078cc5c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-22 15:32:50 -07:00 |
|
danielvincent
|
ed4c253ea8
|
show pages now identify content with content creator. publisher now takes a local
|
2010-10-22 15:32:41 -07:00 |
|
maxwell
|
bcec2d04e6
|
do not pass in the diaspora handle query as a regex, we want to search on the string literal. also use dynamic finder
|
2010-10-22 15:27:59 -07:00 |
|
ilya
|
9a217d1fa8
|
MS IZ request acceptance email
|
2010-10-22 11:55:50 -07:00 |
|
maxwell
|
20a5ec863f
|
small bugfixes for the mailer
|
2010-10-22 00:49:01 -07:00 |
|
maxwell
|
5701c3a873
|
should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now
|
2010-10-22 00:49:01 -07:00 |
|
ilya
|
80cd4761f3
|
started the new invitation email
|
2010-10-22 00:49:01 -07:00 |
|
ilya
|
e677e4782e
|
the handle is now in the email if only one user invited the person
|
2010-10-21 16:07:31 -07:00 |
|
Raphael
|
fe1a6bce20
|
Attr-accessible on aspects, check whether built user is persisted
|
2010-10-21 12:49:50 -07:00 |
|
danielvincent
|
8e175be2ba
|
fixed comments not showing up through websocket on photo show page
|
2010-10-20 23:40:48 -07:00 |
|
ilya
|
84e19f833a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-20 18:30:36 -07:00 |
|
ilya
|
30bae4f807
|
throws an alert if you try to remove person from the last aspect
|
2010-10-20 18:30:22 -07:00 |
|
danielvincent
|
a1830b5d40
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-20 18:15:19 -07:00 |
|
danielvincent
|
e880a5a11f
|
comment submit buttons show again. further changes to show pages.
|
2010-10-20 18:15:07 -07:00 |
|
maxwell
|
bc9c852e25
|
fixed translation showing en on person show page when the person had no posts
|
2010-10-20 17:52:07 -07:00 |
|
ilya
|
bec1842bed
|
redirects to the right place
|
2010-10-20 17:40:58 -07:00 |
|
danielvincent
|
183ac75c6a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-20 17:35:35 -07:00 |
|
danielvincent
|
6d8b670150
|
changed show layouts for album and photos. still needs work.
|
2010-10-20 17:35:27 -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
|
ae7891194e
|
added links to the aspects a person is in on the show page
|
2010-10-20 16:57:09 -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 |
|
ilya
|
62700387ad
|
MS IZ added an add to aspect form on the request partial
|
2010-10-20 15:30:30 -07:00 |
|
ilya
|
0afe83b5e3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-20 14:52:30 -07:00 |
|
ilya
|
94a7a3c6ad
|
IZ MS; deleted move_friends removed
|
2010-10-20 14:26:45 -07:00 |
|
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 |
|