nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3685 commits 4 branches 0 tags 121 MiB
Commit graph

1980 commits

Author SHA1 Message Date
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
maxwell
a7b3fc48ec https is now a valid url for people. thx grippi 2010-10-29 12:30:38 -07:00
maxwell
9c2ca15e93 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-29 12:09:32 -07:00
maxwell
c6fbcd28f7 stubbing out the hub publish method 2010-10-29 12:09:10 -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
51dd6d32b3 upload a photo button next to publisher 2010-10-29 10:38:53 -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
Justin Wienckowski
cdcb693c95 Issue #446: Adding 32-character length limit to User#username, Profile#first_name, Profile#last_name 2010-10-28 21:12:36 -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
f1ae95fac9 443- patch trim on validation + spec 2010-10-28 20:03:49 -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
zhitomirskiyi
55b38585d6 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-28 12:13:50 -07:00
zhitomirskiyi
f484eb957f comments now don't imbed the person in the xml 2010-10-28 12:13:39 -07:00
danielvincent
d02c36b53a quickfix in add_friend_dropdown 2010-10-28 11:30:45 -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
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