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 |
|