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

2608 commits

Author SHA1 Message Date
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
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
ilya
ea1ab59c3a MS, IZ finished adding and removing people from aspects methods, refactored the move friend method 2010-10-20 11:28:56 -07:00
Raphael
961510a8ed Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build. 2010-10-20 11:03:47 -07:00
Raphael
f97f63e2d1 Merge remote branch 'tristil/239-380-identity-error-handling' 2010-10-20 10:36:03 -07:00
danielvincent
e4d6e170e3 aspect tab no longer selected on user#edit and person#show, person#index 2010-10-20 10:22:29 -07:00
Raphael
e52e600a4d Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 3faca8380b.
 2010-10-20 09:52:03 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
ilya
4d1ce410d7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 09:39:32 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
Alec Leamas
3faca8380b Revert "Merge remote branch 'upstream/master'" 
This reverts commit 4bb5aeb34b, reversing
changes made to fb70dc8c99.
 2010-10-20 14:52:18 +02:00
danielvincent
e7d7e1f258 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-20 00:02:22 -07:00
danielvincent
d2945c83dc status message show is now a real show page. photo partial in stream shouldn't display a slideshow of album. 2010-10-20 00:02:15 -07:00
Raphael
a01c1c7461 Remove remove_all_aspects without ill effect 2010-10-19 23:54:12 -07:00
Sarah Mei
b007ba1487 Fixed cucumber features. Backfilled tests for AspectsController#create. 2010-10-19 22:57:55 -07:00
Sarah Mei
f8400389de Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 22:39:05 -07:00
Sarah Mei
81ef7386b3 validation errors in profile and person bubble up to user. 2010-10-19 22:33:12 -07:00
maxwell
d0055cee37 changed a bit of text in the invite, also made it show on all aspects now that we have it fixed 2010-10-19 21:07:10 -07:00
Joseph Method
4b588ccefb Addresses [#380] and [#239] by handling the errors from bad identities 2010-10-19 23:44:43 -04:00
maxwell
f26dc039c9 removed empty hash from invite email 2010-10-19 20:43:45 -07:00
maxwell
bfe57b13cc added diaspora handle to user profile page 2010-10-19 20:34:10 -07:00
maxwell
da95930c9a added a bit to test email 2010-10-19 20:23:20 -07:00
ilya
38e8af2300 better querying 2010-10-19 19:16:44 -07:00
ilya
e3ffd2ffe7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 18:26:06 -07:00
danielvincent
d200aaab52 mail has some style. couldn't figure out devise mailer templating at the time... 2010-10-19 18:26:02 -07:00
ilya
b31b2de6f5 MS IZ aspect add and delete for a person 2010-10-19 18:25:59 -07:00
Raphael
14a5eee41c Return if there is a failure to create a user 2010-10-19 17:29:22 -07:00
danielvincent
8751503aa4 header on public explain fancybox 2010-10-19 16:28:45 -07:00
danielvincent
f6303b8fff reshare dropdown looks nicer. fixed user menu to drop down on click 2010-10-19 16:16:46 -07:00
Raphael
3557d66749 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 16:07:03 -07:00
Raphael
9309be2d69 Merge branch 'import' 
Conflicts:
	spec/models/user/invite_spec.rb
 2010-10-19 16:06:48 -07:00
danielvincent
0a4bf225d0 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 14:06:51 -07:00
danielvincent
b218a53bf7 fancyboxes have title bars now, kind of. 2010-10-19 14:06:44 -07:00
Raphael
d6f8fe106a Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 13:51:43 -07:00
Raphael
2c66bbbe00 Strip profile names, resolve 357 2010-10-19 13:51:31 -07:00
danielvincent
8c92c31323 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 12:29:34 -07:00
danielvincent
0621aa2f6c fixed no friends/posts message positioning 2010-10-19 12:28:54 -07:00
Raphael
962f282cbc Validate uniqueness of aspect name, 359 2010-10-19 12:23:24 -07:00
danielvincent
d87345ca33 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 12:10:36 -07:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
Raphael
d68644c358 Resolve #387 2010-10-19 11:47:43 -07:00
Raphael
296afdc871 Beat Dan at bugfixing 2010-10-19 11:43:10 -07:00
Raphael
9f653e39f1 Fix bug 376 2010-10-19 11:39:52 -07:00
Raphael
de0b240dbb Remove unused helper method 2010-10-19 11:36:33 -07:00
danielvincent
3866b83dab Merge branch 'master' of github.com:diaspora/diaspora 2010-10-19 11:29:47 -07:00
danielvincent
7e9585c5f0 default user picture change. stream link on all aspects page fix. layout view is not fragmented. 2010-10-19 11:29:29 -07:00
Raphael
fce902821b Remove downcasing of diaspora_handle, verify that diaspora_handle querying and validation is case insensitive. 2010-10-19 11:06:43 -07:00
maxwell
8ada8414c7 username can be any case, but diaspora handle should always, always, ALWAYS be lowercase, for webfinger reasons 2010-10-18 22:55:09 -07:00
ilya
8894fa4daa Merge branch 'master' of github.com:diaspora/diaspora 2010-10-18 16:28:57 -07:00
ilya
d642928268 invite sends friend request if already friends, and raises if already friends 2010-10-18 16:27:02 -07:00
Raphael
676e802fd2 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-18 15:46:44 -07:00
Raphael
b681850783 Get rid of warning/error on invites/_new partial 2010-10-18 15:46:14 -07:00
ilya
7ab2b00231 moved fb posting into the user model 2010-10-18 14:50:48 -07:00
ilya
a8bf082e35 The invitation now has an optional personal message 2010-10-18 14:35:41 -07:00
Raphael
244accc9a9 flash error on friending self 2010-10-18 12:11:32 -07:00
Raphael
f90d38bb9c Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge 2010-10-18 12:00:20 -07:00
Raphael
3436371a96 Merge remote branch 'archi/332-quickfix' 2010-10-18 11:44:47 -07:00
Raphael
8e4691b9d0 Merge remote branch 'rmaskey/269-album-link' 2010-10-18 11:27:13 -07:00
danielvincent
4b1516542d various. fixed publisher in new layout. 2010-10-18 11:00:52 -07:00
danielvincent
54e5fb4abb add new aspect back on manage page. changed badges 2010-10-18 11:00:52 -07:00
danielvincent
15104cf920 somewhat there 2010-10-18 11:00:52 -07:00
ilya
e648042b15 the user destroy now deletes the aspects 2010-10-18 10:26:45 -07:00
ilya
73dfab8601 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-18 09:56:36 -07:00
archi
5e97fd3b52 Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix 2010-10-18 11:06:42 +02:00
danielvincent
eca37e1a28 small view cleanups 2010-10-17 21:55:03 -07:00
danielvincent
2f5547626e fixed error in status_messages_controller 2010-10-17 21:31:12 -07:00
danielvincent
1139299f42 removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller 2010-10-17 20:47:51 -07:00
danielvincent
108bf9d99e Merge branch 'master' of github.com:diaspora/diaspora 2010-10-17 19:33:57 -07:00
Joseph Method
e3e4a6b319 Continuation of previous commit 2010-10-17 19:07:54 -04:00
archi
baa0b43655 Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix 2010-10-17 21:19:27 +02:00
Sarah Mei
fcdcf88a79 Person.by_webfinger preserves case of identifier. Backfill specs for PublicsController#webfinger. 2010-10-17 12:18:53 -07:00
archi
1d9aa4c43d Modified spec (doesn't check Youtube handling due to disabled net::http) 2010-10-17 21:07:49 +02:00
archi
f2af56f4b2 Youtubelink support :) 
Tested with Firefox, Chrome and Mobile Safari (IE8 is broken anyway)
 2010-10-17 20:18:24 +02:00
danielvincent
7160e9f85b Merge branch 'master' of github.com:diaspora/diaspora 2010-10-17 10:25:38 -07:00
archi
f676e284f7 Added Youtube links - Still TODO: Caching of titles! 2010-10-17 16:14:01 +02:00
archi
8e753cc073 Youtube proof of concept patch/preview - not done yet (see bug #332) 2010-10-17 12:56:26 +02:00
Sarah Mei
50f9e8f240 Reorganize User model. Preserve case of username. 2010-10-16 23:58:01 -07:00
Sarah Mei
f688653936 disallow whitespace in username 2010-10-16 23:34:58 -07:00
Sarah Mei
798d904e7e strip username on create 2010-10-16 23:27:18 -07:00
Sarah Mei
d3a62c7a45 RegistrationsController#create deals with validation errors. Username, email, password now required on sign-up. 2010-10-16 22:02:51 -07:00
Sarah Mei
1b6726354f Backfill specs for RegistrationsController#create. 
Remove RegistrationsController#new (which just called super, so it's not necessary).
 2010-10-16 21:14:37 -07:00
archi
035db98367 Added HTML links to posts 2010-10-17 02:06:46 +02:00
rmaskey
569376df00 Issue #269: the album back link updated for aspect reference 2010-10-16 19:32:02 -04:00
rmaskey
7c99b89d43 Issue #269: the album back link updated for aspect reference 2010-10-16 19:31:47 -04:00
romanov
2787eb0c6b Issue #269: the album back link updated for aspect reference 2010-10-16 19:26:46 -04:00
danielvincent
eafc01de2a Merge branch 'master' of github.com:diaspora/diaspora 2010-10-16 12:33:33 -07:00
maxwell
13a2464484 adding a confirm link on the aspect remove button 2010-10-16 02:55:45 -07:00
danielvincent
5ca3570667 added prefetch rels to prev/next links in photo show. fixed shadow bug in header 2010-10-16 02:06:46 -07:00
ilya
f33298e762 removed the puts, initial token checking 2010-10-16 00:42:37 -07:00
danielvincent
72479343bc Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 17:37:39 -07:00
danielvincent
7611bc1c8f user dropdown 2010-10-15 17:37:32 -07:00
ilya
d4702aefa3 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 17:20:19 -07:00
ilya
9727b356e1 the invitations add requests which are now correctly auto accepted 2010-10-15 17:20:04 -07:00
maxwell
adbe5f7c38 i love foaf 2010-10-15 16:54:56 -07:00
maxwell
ca604ffe5a added public atom discovery link 2010-10-15 16:51:37 -07:00
maxwell
f83bddadc5 forgot to add the test; and cleaned up the explain partial 2010-10-15 16:19:07 -07:00
maxwell
a0ce9630b1 added test for facebook posting 2010-10-15 16:03:02 -07:00
maxwell
3af3e86911 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 16:02:43 -07:00
ilya
d06c6ced38 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 15:30:39 -07:00
danielvincent
47be7b1f0a correct html5 search box 2010-10-15 15:29:57 -07:00
maxwell
d56800f9e8 fixing facebook posting 2010-10-15 14:53:36 -07:00
ilya
2c9c4b0e14 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/views/invitations/_new.haml
 2010-10-15 14:36:49 -07:00
danielvincent
6f282e77ff make public checkbox 2010-10-15 14:22:28 -07:00
ilya
0074aadd48 added a select tag to email invitations 2010-10-15 14:21:08 -07:00
maxwell
e8c49feca4 made the public info link in all aspects publisher 2010-10-15 14:10:10 -07:00
maxwell
7e0825e492 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 13:58:40 -07:00
danielvincent
12bdd1712d share on facebook checkbox instead of broadcast button 2010-10-15 13:56:49 -07:00
maxwell
a61c126aad manage page now uses partial 2010-10-15 11:29:23 -07:00
maxwell
20f164fd45 fixing some of the invite copy 2010-10-15 11:11:25 -07:00
maxwell
341009e20f Merge branch 'master' of github.com:diaspora/diaspora into maxwell 
Conflicts:
	Gemfile
	Gemfile.lock
	spec/models/user/invite_spec.rb
 2010-10-14 23:02:06 -07:00
ilya
b4b338b3cd Merge branch 'master' of github.com:diaspora/diaspora 2010-10-14 18:12:34 -07:00
ilya
4a7c4e0848 requests are made on invite but perhaps they should be made on signup so that we have a person 2010-10-14 18:12:18 -07:00
Raphael
9e90463455 Fix bug if app_config[url] has no trailing slash. Thanks to binarycleric. 2010-10-14 17:29:26 -07:00
Raphael
51c5b73256 Merge branch 'empty-page' 
Conflicts:
	public/stylesheets/application.css
 2010-10-14 17:00:19 -07:00
Raphael
08e629668d I18ning empty_messages 2010-10-14 16:55:00 -07:00
maxwell
d61a227fc7 posts now serialize their created_at time 2010-10-14 16:49:08 -07:00
maxwell
a30a2666c6 merging 2010-10-14 16:32:37 -07:00
danielvincent
45d7d54c66 added an empty message for the case of an aspect with no friends 2010-10-14 16:23:29 -07:00
Raphael
65958cf85c Should close Issue 368 2010-10-14 15:53:43 -07:00
danielvincent
750b4b4388 empty message re-appears if all stream posts are deleted 2010-10-14 15:40:34 -07:00
danielvincent
8daf2d0fd5 add none message to aspect#index 2010-10-14 15:23:15 -07:00
danielvincent
cf2a4c25ae DG RS; remove empty message from stream upon adding something 2010-10-14 15:19:37 -07:00
danielvincent
5722f85c85 message in aspect if stream is empty 2010-10-14 15:00:47 -07:00
danielvincent
32a0f60a2f moved photos link to the side bar for now 2010-10-14 14:38:19 -07:00
Raphael
d66c1e70bc Merge remote branch 'bigbash/280-bug-fix' 2010-10-14 13:21:50 -07:00
danielvincent
2b97e8751c include blueprint/print.css in layout 2010-10-14 10:40:39 -07:00
danielvincent
58d5fbfb3e moved invite link to account#edit on settings page. changed text on person partial. 2010-10-14 10:26:06 -07:00
maxwell
f2bdc98b47 Merge branch 'master' of github.com:diaspora/diaspora into import 2010-10-13 23:52:46 -07:00
maxwell
e1dd0cf6be Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion 2010-10-13 23:49:13 -07:00
maxwell
e218ab6780 Merge branch 'master' of github.com:diaspora/diaspora into import 
Conflicts:
	app/controllers/users_controller.rb
 2010-10-13 23:09:48 -07:00
ilya
d0c6f12ea8 added another attack vector spec 2010-10-13 18:43:22 -07:00
maxwell
04f6cdaacf MS DG; basic view support; it works, but it is ugly 2010-10-13 18:42:24 -07:00
ilya
36b9f66f60 the invited user keeps track of who invited them, limit on invites, 
removed the invites controller test
 2010-10-13 16:52:33 -07:00
maxwell
b395208a51 DG MS; added more stuff to importer. 2010-10-13 16:42:27 -07:00
ilya
3b8998ab71 Invitations contains the inviters 2010-10-13 13:29:45 -07:00
Shawn McGuire
711dcdc5f4 Issue #280 Fixed trailing whitespace error 2010-10-13 14:36:03 -05:00
ilya
bf42b5766c Merge branch 'master' of github.com:diaspora/diaspora 2010-10-13 11:20:43 -07:00
Raphael
9a1590fa02 Move user module requires out to the user modules definition file 2010-10-13 11:18:06 -07:00
ilya
db1a01d51b Merge branch 'master' of github.com:diaspora/diaspora 2010-10-12 18:24:20 -07:00
ilya
324f14c719 setting the token to nil on accept of invite 2010-10-12 18:23:59 -07:00
Raphael
fe0120cc0d Return everyone on an empty search 2010-10-12 18:18:03 -07:00
ilya
d6b08de6fc corrected link on the account page 2010-10-11 15:07:17 -07:00
ilya
bb7e2a9918 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-11 14:58:22 -07:00
ilya
007f6cfb6f close account 2010-10-11 14:58:11 -07:00
danielvincent
be017bfb0a DG MS; invite is now a lightbox on feed and manage pages 2010-10-11 14:16:24 -07:00
danielvincent
afad554f01 DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile 2010-10-11 13:42:05 -07:00
danielvincent
9bfb213465 Merge branch 'invites' of github.com:diaspora/diaspora into invites 2010-10-11 11:52:57 -07:00
danielvincent
b3d9884e0d Merge branch 'master' of github.com:diaspora/diaspora 2010-10-11 11:38:26 -07:00
danielvincent
9162a4a168 DG MS; 404 show pages for objects that don't exist for given user 2010-10-11 11:32:20 -07:00
Raphael
09c6af28a4 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-11 11:09:35 -07:00
Raphael
73e4d2b25b Pull in search improvement, remove cruft 2010-10-11 11:08:54 -07:00
danielvincent
c630d3db6f Merge branch 'master' of github.com:diaspora/diaspora 2010-10-11 10:53:18 -07:00
danielvincent
82f526ea23 DG MS; added tooltip 2010-10-11 10:53:00 -07:00
Raphael
fe360e386a Merge remote branch 'rmaskey/master' into search 2010-10-11 10:47:24 -07:00
Raphael
8cf72441b4 Make intended behavior on hcard action clearer, return 404 on nonexistent person 2010-10-11 10:13:52 -07:00
Raphael
04d5271530 Merge remote branch 'crimer/master' 2010-10-11 10:03:09 -07:00
maxwell
0541833c18 stop the file include madness. using File.join and Rails.root for includes everywhere I could 2010-10-10 11:54:08 -07:00
rmaskey
94f20ba684 resolution for issue #151 - search with multiple words 2010-10-10 08:43:43 -07:00
Crimer
4163ce4544 Solved issue 166# "Clicking 'Photos' for an aspect appears to take you to the 'All Aspects' photo page" 2010-10-09 11:51:42 +00:00
danielvincent
c5affa07e8 tweaked reshare button 2010-10-08 16:19:51 -07:00
ilya
8e61b438ab setting the username 2010-10-08 16:00:58 -07:00
Raphael
a720694364 Make logging less verbose 2010-10-08 15:51:12 -07:00
Raphael
b7116ca413 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 15:47:43 -07:00
Raphael
b7bf526b91 Make logging message clearer 2010-10-08 15:47:30 -07:00
danielvincent
9ac13ccb3e fixed reshare a bit 2010-10-08 15:47:06 -07:00
ilya
ef3e627bed the users are now made with people 2010-10-08 15:40:42 -07:00
danielvincent
086df28a37 removed connected to facebook text under everyone publisher 2010-10-08 15:21:27 -07:00
maxwell
255901dfab fixing copypasta 2010-10-08 15:00:04 -07:00
maxwell
d7521cb288 MS trying to not use MiniFB to post since it is barfing 2010-10-08 14:49:09 -07:00
Raphael
b613361855 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 14:47:10 -07:00
Raphael
3729431ccf don't translate css class to mark request count 2010-10-08 14:46:57 -07:00
danielvincent
44338a9897 removed traces of :public 2010-10-08 14:44:56 -07:00
maxwell
b6b192da01 MS DG trying to move around fb url 2010-10-08 14:25:39 -07:00
danielvincent
526fbe9a90 fixed error where publisher would cause status_message_controller to error out 2010-10-08 14:19:54 -07:00
danielvincent
7d96c95caf fixed breaking aspect show pages 2010-10-08 14:15:35 -07:00
danielvincent
48e92c2c33 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 14:07:05 -07:00
danielvincent
154ec95717 killed the public tab. made a broadcast button in everyone tab 2010-10-08 14:06:49 -07:00
Crimer
3754b519a7 Solved issue #79 'Email Label in Forgot Password Appears Outside of Textbox'. 2010-10-08 21:51:59 +00:00
danielvincent
a3aab92212 fixed photo partial 2010-10-08 12:25:42 -07:00
danielvincent
3a876770f3 minor tweaks 2010-10-08 00:36:55 -07:00
danielvincent
5b66a191cd more stream tweaks 2010-10-07 23:25:49 -07:00
danielvincent
b314ee22ec intermediate misc ui polish 2010-10-07 22:51:08 -07:00
ilya
9a34ca07c4 Merge branch 'master' of github.com:diaspora/diaspora into invites 2010-10-07 19:25:42 -07:00
ilya
ddb98502b9 setup the controller, still need to make the person 2010-10-07 19:25:34 -07:00
danielvincent
ed1cb5a0e7 DG MS; moved change password to account page; fixed the styling on password inputs 2010-10-07 18:52:46 -07:00
ilya
4ecda6ab8f Merge branch 'master' of github.com:diaspora/diaspora into invites 
Conflicts:
	Gemfile
	Gemfile.lock
 2010-10-07 18:20:51 -07:00
danielvincent
c756e1a331 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 18:17:38 -07:00
danielvincent
2e73104d6f DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2 2010-10-07 18:17:26 -07:00
ilya
3c61365fa1 initial invitable in user 2010-10-07 18:11:17 -07:00
Raphael
399e437655 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 17:34:03 -07:00
danielvincent
7a56d82873 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 16:56:22 -07:00
danielvincent
4deea95057 DG MS; export photos button in users#edit 2010-10-07 16:56:10 -07:00
Raphael
1d463d22a1 Person show for a nonexistent person now redirects to people index page, rather than giving a 500 2010-10-07 16:50:19 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
danielvincent
6531a27594 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 15:22:14 -07:00
danielvincent
0ebb597b72 DG MS; test for users#export 2010-10-07 15:22:03 -07:00
Raphael
6dbe429ed1 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 15:02:37 -07:00
danielvincent
206e10f66a dont put log behind devise 2010-10-07 14:57:00 -07:00
Raphael
9646a453a1 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:34:57 -07:00
danielvincent
8f1973815e DG MS; added route for exported xml 2010-10-07 14:21:53 -07:00
Raphael
9912769b5b Merge remote branch 'guillei/s3_upload' 2010-10-07 14:17:43 -07:00
Raphael
ec9e180eab Merge branch 'master' into HEAD 
Conflicts:
	public/stylesheets/application.css
 2010-10-07 13:58:06 -07:00
Raphael
9cbdf78aa7 Don't redirect on status message create 2010-10-07 12:01:49 -07:00
Raphael
0859d8ebfe Merge remote branch 'jeffry/master' 2010-10-07 11:45:39 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
ilya
131e905322 fixed the public route 2010-10-06 19:05:43 -07:00
maxwell
0fb091ebbc MS pretty sure we dont need to get the oauth path every time we load the public aspect... 2010-10-06 18:38:37 -07:00
maxwell
c68a026658 MS changed the profile edit field to be private 2010-10-06 18:19:58 -07:00
danielvincent
66b356b5fe moved public route 2010-10-06 18:14:37 -07:00
danielvincent
6b74053e06 scratch that last commit 2010-10-05 20:37:28 -07:00
danielvincent
982f51b9c7 prepend pod_url to image paths 2010-10-05 20:31:40 -07:00
danielvincent
dc88110716 img tag in hcard 2010-10-05 20:22:13 -07:00
danielvincent
d519e46f4d webfinger edit 2010-10-05 19:01:04 -07:00
maxwell
ec4c63ada7 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 17:51:10 -07:00
maxwell
d638bdb018 MS IZ password change field is now in edit profile 2010-10-05 17:49:06 -07:00
danielvincent
7c4feb7464 better log message 2010-10-05 17:34:03 -07:00
Raphael
5847e7767d Add profile photo url to hcard parser 2010-10-05 17:24:01 -07:00
kook
85b384010e exchange photos on adding new friend 2010-10-05 17:18:51 -07:00
danielvincent
c9d97d3233 render public with correct mime type 2010-10-05 17:15:00 -07:00
danielvincent
66ec5f0570 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 17:00:20 -07:00
danielvincent
830b3772d5 self reference in atom 2010-10-05 16:59:55 -07:00
Raphael
22f90086ca Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 16:58:06 -07:00
Raphael
37fb2bfd32 Don't require a facebook yml 2010-10-05 16:57:22 -07:00
UserAd
e7c153df4e Add translation support in profile ('or' between buttons). Fix Russian locale 2010-10-06 07:56:23 +08:00
danielvincent
09b861c7a3 remove .atom from public url 2010-10-05 16:51:27 -07:00
danielvincent
6723a51149 correctly indent xml 2010-10-05 16:40:50 -07:00
danielvincent
4a8a21b95f public fix 2010-10-05 16:28:01 -07:00
danielvincent
c284c9b07f added public back into webfinger 2010-10-05 13:47:42 -07:00
danielvincent
33e478229e Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 13:40:10 -07:00
danielvincent
f3c34692d8 pubsub support 2010-10-05 13:39:56 -07:00
ilya
57b61f6827 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 13:00:54 -07:00
ilya
63cb7dcbdd Fb friends are displayed only once 2010-10-05 13:00:42 -07:00
danielvincent
aed9125e93 more querying through the current_user in controllers 2010-10-05 12:41:41 -07:00
ilya
ce4f8cab8b not encrypting the entire thing 2010-10-03 17:39:16 -07:00
ilya
304e4ad32b removed the puts 2010-10-02 12:37:53 -07:00
ilya
7dcde292e1 user posting spec is now green, now stubbing on the apropriate method 2010-10-02 12:34:16 -07:00
ilya
b6a912dd02 slowly getting specs to pass on with the new api 2010-09-30 15:17:53 -07:00
Jeffry Degrande
132eec2c63 Merge branch 'upstream' 
Conflicts:
	app/controllers/aspects_controller.rb
 2010-09-29 02:11:20 -03:00
Jeffry Degrande
046dbf063b fix i18n => I18n 2010-09-29 01:49:35 -03:00
danielvincent
f5a57a6f4a photo partial now has labels 2010-09-28 13:05:58 -07:00
danielvincent
e0159aaaeb small visual tweaks 2010-09-28 12:58:34 -07:00
danielvincent
4627c5338e found placement of all aspects tab confusing; moved it to be the first tab 2010-09-28 12:29:35 -07:00
danielvincent
bf15514bc9 redirect users#public to root_url if user does not exist. 2010-09-28 10:23:03 -07:00
danielvincent
263615ad14 all status messages have labels 2010-09-27 23:51:20 -07:00
danielvincent
79926da3d3 removed owner image repeat 2010-09-27 23:16:19 -07:00
danielvincent
cb7c35af73 fixed thumbnail positioning 2010-09-27 23:15:48 -07:00
danielvincent
bf587be461 public indicator tag on status message partial. 2010-09-27 22:50:11 -07:00
danielvincent
15a4609c14 moved user's public route to user controller. changed person.public_url to reflect change. 2010-09-27 22:30:16 -07:00
danielvincent
eac6b8a63b builder is now a class initialized with a user. added director class. 2010-09-27 21:54:01 -07:00
danielvincent
eb7244e07c Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 19:07:01 -07:00
danielvincent
26a4dc76a6 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 18:34:55 -07:00
danielvincent
3b8ddf76a3 temp route for atom feed. also, public atom currently displays all posts. 2010-09-27 18:34:47 -07:00
ilya
7852c346f2 mode the visible posts api more general and moved to it on the public controller 2010-09-27 18:31:37 -07:00
danielvincent
df800dc87e ostatus builder 2010-09-27 17:58:44 -07:00
ilya
6e407572c4 removed unused repost method, going through the warden object 2010-09-27 17:27:49 -07:00
Guillermo
c835814ee1 Merging prep_image_url with master 2010-09-27 19:20:42 -05:00
ilya
c2b84fd9c6 added a public key to post 2010-09-27 16:59:54 -07:00
ilya
52313b799b added a warning, moved connected as into a partial, removed the 
publishing box from settings page
 2010-09-27 16:31:19 -07:00
ilya
d41b370630 removing the fb feed for now 2010-09-27 16:20:27 -07:00
ilya
7b29e6ec26 checking that a user is logged in before doing fb checking 2010-09-27 15:50:52 -07:00
ilya
08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
 2010-09-27 15:39:50 -07:00
ilya
8f55852ea9 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 15:30:27 -07:00
Raphael
12bd0f2301 Merge branch 'master' of http://github.com/uiri/diaspora 2010-09-27 14:48:11 -07:00
Raphael
1ab536bf04 Merge branch 'master' of http://github.com/sarahmei/diaspora 2010-09-27 11:09:14 -07:00
Raphael
ce0accafbb Don't depend on user => person delagation so we can eventually get rid of that, thanks astronouth7303 2010-09-27 11:03:48 -07:00
ilya
98bc2df841 removed the encryption key= method, and user with private key factory 2010-09-27 10:10:54 -07:00
ilya
cf0df90dae moved the private key into user where it belongs, two failing cucumber tests 2010-09-26 22:08:42 -07:00
Sarah Mei
4bb4602762 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-26 13:14:50 -07:00
Stephen Caudill
43fa70f90b Label error notification as such. 2010-09-26 16:10:13 -04:00
Sarah Mei
68a8ecb05f Merge branch 'master' of github.com:diaspora/diaspora 2010-09-26 13:08:56 -07:00
Sarah Mei
0ec074be6d Remove annoying deprecation warning from spec runs 
Add spec for validation hook
 2010-09-26 10:00:29 -07:00
Dorian
e792344c0e Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
Stephen Caudill
fd69f0201f User creates an aspect 2010-09-26 12:05:39 -04:00
Guillermo
86cbce288b Isn't necessary prepare URL if file is saved in S3 2010-09-26 11:05:17 -05:00
Guillermo
8a92f15948 storage isn't required here since is set in initializer 2010-09-26 11:04:19 -05:00
Uiri
151a57cc93 well, that explains why it was adding the url variable. Fixed so that now new pictures work too. 2010-09-26 11:47:34 -04:00
Sarah Mei
17757a2e2d Merging upstream changes 2010-09-25 15:57:59 -07:00
Uiri
e8d6fb26e7 Merge branch 'master' of git://github.com/diaspora/diaspora 2010-09-25 18:30:15 -04:00
Uiri
0b19b77b5f A fix for the image breaking if you don't change anything on the edit profile page but hit update profile instead of cancel 2010-09-25 17:34:13 -04:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Sarah Mei
e3ec00595d Cleaned up file path joining in some of the dev utilties. 
Backfilled tests where necessary to make sure changes didn't break existing code.
 2010-09-25 04:34:48 -07:00
Chiggins
f74b0a6f2c Added "shadow text" to caption text field while editing a photo, since about every other text field has "shadow text". 2010-09-25 08:13:16 +08:00
Raphael
f4d18ce9bc don't use request.host as data 2010-09-24 17:12:18 -07:00
ilya
f38bcc9eb3 tiny change in view 2010-09-24 15:54:53 -07:00
ilya
e414558f79 passing the right things to the partial 2010-09-24 15:52:29 -07:00
Raphael
999d229225 Post photos in either 1.8.7 or 1.9.2 2010-09-24 15:18:30 -07:00
Raphael
004e659ee1 fix album posting 2010-09-24 15:10:49 -07:00
ilya
c7757a302c typo 2010-09-24 15:06:48 -07:00
ilya
ac9854596f fb_status partial rendered in public 2010-09-24 15:04:31 -07:00
ilya
bb58678556 added a fb_status model & parser method 2010-09-24 14:41:31 -07:00
Raphael
950c6a7cab Merge branch '1.9.2' into HEAD 
Conflicts:
	app/models/photo.rb
 2010-09-24 14:36:00 -07:00
Raphael
40120bb441 Moving to activemodel validations 2010-09-24 11:15:39 -07:00
ilya
82b99decbb putting the token in the warden session 2010-09-24 10:45:27 -07:00
Raphael
b9bff76054 Initial 1.9.2, specs fail (possibly validatable), need to pull in aredridel photo fixes 2010-09-24 09:49:42 -07:00
Raphael
70a22ae839 Merge branch 'master' into HEAD 
Conflicts:
	app/models/post.rb
	app/models/user.rb
	config/initializers/socket.rb
 2010-09-24 09:15:10 -07:00
danielvincent
4f17eb4e02 stray aspect name removed from publisher 2010-09-23 20:33:34 -07:00
ilya
a594c9a34f friends in the public bucket 2010-09-23 20:19:02 -07:00
danielvincent
265753b5fe user edit is now divided into real sections 2010-09-23 20:13:07 -07:00
ilya
eaea26e58d the public aspect is now set in application controller 2010-09-23 19:33:33 -07:00
ilya
796f198d8c notification only on user page 2010-09-23 17:20:55 -07:00
ilya
11dc225311 removed the old publish box 2010-09-23 17:19:43 -07:00
Raphael
16b6fc6cdc Don't give exception on webfinger with no query 2010-09-23 17:18:34 -07:00
ilya
75e1ddf9d2 saying going to FB in public aspect 2010-09-23 17:17:18 -07:00
ilya
0d71a1896c posting to FB from public now works 2010-09-23 17:11:42 -07:00
ilya
107fb58917 added a logger statement 2010-09-23 17:04:27 -07:00
ilya
d7833c66b2 typo 2010-09-23 16:48:58 -07:00
ilya
4d2bd52310 public aspect param on statusMessage create and in the partial 2010-09-23 16:41:05 -07:00
Raphael
d748d456b5 Revert "fix in person partial" 
This reverts commit 8c0bc4b9e6.
 2010-09-23 16:21:08 -07:00
ilya
be10681945 IZ tying the publisher to fb in public aspect 2010-09-23 16:06:55 -07:00
ilya
fc2cf4fde6 typo 2010-09-23 15:21:15 -07:00
ilya
1fdbc637d1 trying profile pictures on remote 2010-09-23 15:18:29 -07:00
ilya
19c3a5ce4b fetching friend data 2010-09-23 15:07:07 -07:00
ilya
f0999628ae trying to get friends from fb 2010-09-23 14:43:08 -07:00
ilya
5857838a0a adding the new files 2010-09-23 12:29:00 -07:00
ilya
48c212c1ab made a public view, copied the fb publisher there 2010-09-23 12:18:26 -07:00
danielvincent
af91eb51b4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:49:41 -07:00
danielvincent
8c0bc4b9e6 fix in person partial 2010-09-23 10:49:35 -07:00
maxwell
40d736d233 MS changed the session page to show APP_CONFIG[:terse_pod_url] 2010-09-23 10:39:47 -07:00
maxwell
457be4385b Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:39:04 -07:00
danielvincent
5d0f4dd587 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:29:50 -07:00
Raphael
95396cd9b2 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:24:17 -07:00
Raphael
ed6df7d1bf Delete user.terse_url 2010-09-23 10:24:10 -07:00
danielvincent
6025bee819 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:17:21 -07:00
danielvincent
c000b31ffb query for post through user 2010-09-23 10:17:13 -07:00
uiri
c711e85c89 adding gif support 2010-09-24 01:10:46 +08:00
Raphael
cc3819c256 Forgot a merge conflict 2010-09-22 21:39:22 -07:00
Raphael
2489f8503f Merge branch 'master' into HEAD 
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
 2010-09-22 21:32:03 -07:00
danielvincent
7303212784 DG IZ; haml typo 2010-09-22 17:50:47 -07:00
danielvincent
fc0350e4e1 DG IZ; user can post a status update from user edit page to facebook. 2010-09-22 17:49:11 -07:00
danielvincent
bc70ebdb95 DG IZ; quick form in user edit 2010-09-22 17:33:57 -07:00
danielvincent
ae58120deb another typo... 2010-09-22 17:18:46 -07:00
danielvincent
ddbde60e8c another indent... 2010-09-22 17:17:24 -07:00
danielvincent
aef3c8d7bb indent, whoops 2010-09-22 17:16:16 -07:00
danielvincent
26478403e2 DG IZ; connecting/disconnecting from fb 2010-09-22 17:14:58 -07:00
danielvincent
159d72c04c DG IZ; logged in as? 2010-09-22 16:56:39 -07:00
danielvincent
fcc681df71 DG IZ moved to be APP_CONFIG for host 2010-09-22 16:32:52 -07:00
danielvincent
8ed98270a6 Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	config/routes.rb
 2010-09-22 16:09:25 -07:00
danielvincent
81250c0e9d Merge branch 'master' of github.com:diaspora/diaspora into reposting 2010-09-22 15:49:13 -07:00
danielvincent
e9d16cc09b DG IZ; cleanup 2010-09-22 15:48:50 -07:00
danielvincent
b9be543ef6 DG IZ; reshare redirects to specific page 2010-09-22 15:32:11 -07:00
Thomas Krehbiel
10e6ff9df8 Fix for sending unlimited duplicate friend requests 2010-09-22 18:16:10 -04:00
danielvincent
474cf77708 DG IZ; reposting now works. redirects to a template missing page, though. 2010-09-22 15:05:51 -07:00
root
aaa4d75a5e Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-22 16:41:43 -04:00
danielvincent
5ef32b7d55 DG IZ; a user can repost. aspects are not sent through the websocket. post does not show where it curently is going in its partial 2010-09-22 12:03:25 -07:00
maxwell
23e9520a9e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-22 11:33:26 -07:00
danielvincent
6dd7911c8c DG IZ; update_or_repost 2010-09-22 10:52:29 -07:00
Raphael
7049cb3ca4 A less efficient, but simpler way of checking whether the photo is the profile photo 2010-09-22 10:31:40 -07:00
ilya
6bd22034b7 typo in user 2010-09-21 21:45:29 -07:00
maxwell
63ed6a3a95 MS DG made async webfingering controller. need to call it from javascript to prevent seeds from blocking. remember to update your gems 2010-09-21 21:31:53 -07:00
ilya
dc0bd363a1 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 20:02:13 -07:00
ilya
6d6ca3d8bc added terse_pod_url to the APP_CONFIG hash 2010-09-21 20:01:56 -07:00
danielvincent
df5b7d6d84 DG MS; new function in post 2010-09-21 18:14:46 -07:00
ilya
76f140aa8b Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 16:59:16 -07:00
ilya
020ff603bd terse_url in user, db seeds are fixed, config/app_config.yml is now in gitignore, copy over config/app_config_example.yml. 2010-09-21 16:59:06 -07:00
danielvincent
03638ee68e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 16:35:25 -07:00
danielvincent
107c05ef6f DG MS; validate_aspect_permissions broken out of post method 2010-09-21 16:35:18 -07:00
root
fe2be748a0 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-21 19:21:40 -04:00
ilya
d26e7850ac RS, IZ; removed url from user and views 2010-09-21 15:52:26 -07:00
ilya
efd901dcd9 RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG 2010-09-21 15:46:57 -07:00
danielvincent
44db21ffd4 DG MS; cleaned up spec 2010-09-21 15:41:29 -07:00
Raphael
95d852b181 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 14:00:12 -07:00
Raphael
11d31901e4 IZ, RS, Pulled receiving out of user file, refactored receive method to be clearer 2010-09-21 13:59:52 -07:00
root
03f8cbc249 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-21 16:59:26 -04:00
danielvincent
0a99b82bd3 Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-21 13:40:17 -07:00
ilya
4d00a0e99e IZ posting to all albums should now work, needed to check for all in user.post 2010-09-21 12:35:48 -07:00
danielvincent
9571ade89c basic setup 2010-09-21 12:29:39 -07:00
ilya
e4ac3afc3e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 11:59:17 -07:00
ilya
1882509a0b removed the auto_link seems to fix HTML injection, no more autolinking 2010-09-21 11:59:04 -07:00
Dorian
003a8b454f Some refactoring again (define code rules would be good) 2010-09-22 02:55:54 +08:00
danielvincent
4d200fea87 removed view all link from status_message#show 2010-09-20 20:17:18 -07:00
Thomas Krehbiel
bdd752f07b Fix for 'Local variable hides method' 2010-09-20 21:49:14 -04:00
Raphael
441f75203a Add autolink and sanitize to show page 2010-09-20 17:33:05 -07:00
danielvincent
9c334e24e4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 17:26:35 -07:00
danielvincent
e588d7ab6a DG IZ moving friends is now ajaxy 2010-09-20 17:26:20 -07:00
maxwell
24ca139241 MS remove some stray puts 2010-09-20 17:11:07 -07:00
maxwell
2be0cca2cd MS adding downcase to webfinger lookup 2010-09-20 16:51:02 -07:00
maxwell
e2fc48c9ff MS being slightly more proper with application helper, and fixing the person search page 2010-09-20 16:44:35 -07:00
danielvincent
b80d75c382 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 15:54:07 -07:00
danielvincent
40c96fc619 DG IZ; click to edit rollover text on aspect manage page 2010-09-20 15:53:56 -07:00
maxwell
d8c5541e12 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 15:32:26 -07:00
maxwell
cb0f0b72eb MS removed a log and trying to be slightly more pedantic 2010-09-20 15:32:18 -07:00
danielvincent
fb2f027b24 DG IZ; escape regex characters in Person.search 2010-09-20 15:25:19 -07:00
danielvincent
9787c45159 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 15:15:53 -07:00
danielvincent
5bb4ee5d36 DG IZ; posting now ensures aspect ownership. 2010-09-20 15:15:37 -07:00
maxwell
5e2fdedf8b MS removed another logging of encrypted data.... 2010-09-20 15:07:30 -07:00
danielvincent
4fe4326ed1 DG IZ photo uploading now works 2010-09-20 15:00:02 -07:00
danielvincent
aa2ea3f300 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 13:18:21 -07:00
danielvincent
af9cda52af DG IZ; always query through the current_user in the controllers. 2010-09-20 13:18:11 -07:00
Arnaud Delcasse
eeb132d825 Writing "Already friends" instead of proposing to add people that we already added successfully or accepted in the search results. 2010-09-21 03:20:06 +08:00
danielvincent
b097f93bf5 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 11:39:17 -07:00
maxwell
5d1fdcaf3a MS fixing bug #67. stripping whitespace from search 2010-09-20 11:38:24 -07:00
danielvincent
fe306b37ab DG IZ; mass-assignment quick-fix in controllers 2010-09-20 11:30:27 -07:00
maxwell
64d371d9d6 MS added a warning for account 2010-09-20 11:30:08 -07:00
Ariel Zavala
db7ad16503 Added localization to comments views 2010-09-21 02:03:51 +08:00
Ariel Zavala
6501974f30 added more translations missing on views 2010-09-21 01:43:54 +08:00
TJ Peden
e6c8cf20d3 Fixed receive_url problem 2010-09-21 01:26:51 +08:00
maxwell
5bf6d358a4 MS added small log for when user is found from webfinger 2010-09-19 20:40:03 -07:00
maxwell
07d2de6646 removed an annoying log of encrypted salmon. 2010-09-19 20:36:39 -07:00
danielvincent
14ad24ba7e visual tweaks on header. moved upload a file button to header on album#show 2010-09-19 14:27:20 -07:00
danielvincent
b40b81e447 aspect manage tab now reads 'manage aspects' 2010-09-19 10:11:41 -07:00
Ariel Zavala
e9f74675e9 Merged with diaspora; fixed conflicts; only 2 red 2010-09-19 11:16:00 -04:00
danielvincent
cc4e9f8d39 description text for all boxes in manage page. search box text defaults to query on people#index. 2010-09-18 17:56:26 -07:00
danielvincent
b5a2971302 search results for people now look like the stream 2010-09-18 17:49:52 -07:00
danielvincent
08f833ba7a case insensitivity on search 2010-09-18 17:21:18 -07:00
danielvincent
e9a3f46fbd fixed query function to go through mongomapper instead of custom 2010-09-18 16:42:07 -07:00
Aria Stewart
45b6ff53f1 Ruby 1.9 fixes 2010-09-18 16:35:48 -06:00
mishudark
c46ad0d7fa photo description with ajax request 2010-09-18 12:33:22 -05:00
mishudark
b7bc4b8615 prevent next prev when youre add writting 2010-09-18 04:14:44 -05:00
mishudark
910bd71c78 prevent photho redirect next,prev if textarea has focus 2010-09-18 03:32:37 -05:00
Ariel Zavala
58c2d0dd28 merged with diaspora master; this fork has spanish, german and french translations (need some help with the last two) 2010-09-18 02:21:45 -04:00
Don Park
2d16289e46 use photos_path to generate the correct POST destination for photo uploads 2010-09-18 07:50:12 +08:00
Patrick Aljord
182c6228f3 show comments ordered by created_at, they are showing up at random order without that 2010-09-18 07:36:21 +08:00
Ariel Zavala
4558f9901e Added translations to photos and registrations controllers 2010-09-17 18:25:36 -04:00
Raphael
84789f64c9 scope album queries through user 2010-09-17 14:57:14 -07:00
Ariel Zavala
ce3284f1a1 Merge branch 'master' into i18n 2010-09-17 17:28:55 -04:00
Ariel Zavala
7bb3d9c87a Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-17 17:21:29 -04:00
Ariel Zavala
c1c20e14f7 Added translations to requests controller 2010-09-17 17:05:54 -04:00
Ariel Zavala
f95cebcb8b Added translations to new requests view and aspects controller 2010-09-17 16:38:50 -04:00
Raphael
b3549c79f4 Give slightly more specific error message 2010-09-17 12:49:49 -07:00
Ariel Zavala
cb145c346a Added I18n translations to helpers 2010-09-17 15:30:02 -04:00
Ariel Zavala
0014024870 Added I18n translations to helpers 2010-09-17 15:26:31 -04:00
Raphael
ce2260b747 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-17 11:57:36 -07:00
Raphael
5df33a6fd0 Take out users/show, use current_user in update 2010-09-17 10:50:18 -07:00
Raphael
be26794e4a only write to your own profile 2010-09-17 10:46:14 -07:00
Raphael
99ad001d28 Fix websocket spec, take out puts in by_webfinger 2010-09-17 09:52:31 -07:00
Ariel Zavala
271925a7f6 added photo view translations 2010-09-17 11:34:45 -04:00
Ariel Zavala
c6b34be63d Added people views translations 2010-09-17 11:27:08 -04:00
Ariel Zavala
375f4f6808 added more translations missing on views 2010-09-17 10:43:59 -04:00
Raphael
2e8ecceaf7 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 21:53:34 -07:00
Raphael
b45906f902 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 21:35:48 -07:00
Raphael
c520fb71a7 Moved socket out to separate process. Multiple thins should now be possible 2010-09-16 21:34:15 -07:00
Ariel Zavala
d7e9744e84 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 23:53:18 -04:00
Ariel Zavala
07138041b0 Fixed album controller errors 2010-09-16 23:35:57 -04:00
maxwell
e668071ea5 README.md 2010-09-16 18:48:18 -07:00
Ariel Zavala
db41bcc144 Merge branch 'locale-de' of http://github.com/ccoenen/diaspora 2010-09-16 21:09:11 -04:00
Ariel Zavala
0be3314e0a merge with diaspora and resolved a conflict 2010-09-16 20:42:45 -04:00
danielvincent
95a4120e57 DG IZ; dropzones on left back on aspect manage page. 2010-09-16 17:22:42 -07:00
danielvincent
ae83dae1ca added git info (branch,date,author) to debug partial 2010-09-16 17:03:14 -07:00
danielvincent
25b4b409be Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 16:19:48 -07:00
danielvincent
cbb692b6a3 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 16:06:28 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
Ariel Zavala
b727fe42f5 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 18:56:02 -04:00
Claudius Coenen
64b07fca55 Merge branch 'master' of http://github.com/diaspora/diaspora into locale-de 2010-09-17 00:23:43 +02:00
Claudius Coenen
5197c1b3ec adding localisation for controller's flash messages' 2010-09-17 00:23:35 +02:00
Ariel Zavala
f430961672 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 18:15:32 -04:00
maxwell
e7afebece8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 15:07:02 -07:00
maxwell
2e8785b596 applying this change from wiki, thanks astronouth7303 2010-09-16 15:04:29 -07:00
Raphael
0eb2c97aef object_path shouldn't create links to users 2010-09-16 14:51:27 -07:00
maxwell
b155d07abd Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 14:38:32 -07:00
maxwell
6f867d60c4 MS fixed the nil hostname on user 2010-09-16 14:38:24 -07:00
Raphael
d8460ed37b Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 14:21:51 -07:00
Ariel Zavala
be9ae343cc Added localizations that I had missed 2010-09-16 15:55:54 -04:00
Ariel Zavala
6a967e7fe9 Added localization to status message views 2010-09-16 15:47:12 -04:00
Ariel Zavala
ec9affb849 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 15:14:38 -04:00
Raphael
feb4cbfd29 Merge branch 'master' of http://github.com/fbrubacher/diaspora 2010-09-16 12:14:11 -07:00
Ariel Zavala
51b6ce9dfb Added localization to layouts and shared views 2010-09-16 15:11:58 -04:00
Ariel Zavala
a673257eef Added localization to photos views 2010-09-16 15:11:21 -04:00
Michael Nutt
cd9639cf29 websocket js should honor app socket port configuration 2010-09-17 03:11:11 +08:00
Ariel Zavala
5078830785 Added localization to comments views 2010-09-16 15:00:21 -04:00
Ariel Zavala
9bdd11b383 Added localization to album views 2010-09-16 14:58:42 -04:00
Ariel Zavala
443b5af4ce Added localization to aspect views 2010-09-16 14:57:56 -04:00
maxwell
649839567d MS added pagination to the search page 2010-09-16 11:47:34 -07:00
Daniel Vincent Grippi
07a8fa8bb6 fixed xss bug in comment view partial. 2010-09-16 08:32:19 -07:00
Federico Brubacher
05808456d8 fixed small issue in albums#update anad added corressponding controller test 2010-09-16 12:21:08 -03:00
Raphael
1e646fb0a9 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 23:54:57 -07:00
Raphael
32fc6212ab Put only the hostname in diaspora_handle 2010-09-15 23:49:55 -07:00
Michael Fellinger
35c9922c61 And fix some more requires 2010-09-16 15:24:26 +09:00
Raphael
d124686723 Need more stack traces! 2010-09-15 23:22:02 -07:00
Raphael
d760725145 Don't webfinger another server on receiving a webfinger request 2010-09-15 23:01:13 -07:00
Michael Fellinger
ba058a39a8 Replace require_relative with compatible version 2010-09-16 14:50:30 +09:00
Michael Fellinger
c6f5b4ed16 Basic 1.9.2 port 2010-09-16 14:41:33 +09:00
Raphael
c67a8ea100 Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	config/deploy.rb
	config/environments/production.rb
	spec/models/request_spec.rb
 2010-09-15 22:37:05 -07:00
Stephen Caudill
5595dc5f48 Retab the project 2010-09-16 13:16:10 +08:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Jamie Wilkinson
eb0f011236 Show the signup link 2010-09-16 10:07:58 +08:00
Jamie Wilkinson
5d87ca0904 Use /signup instead of /an_excellent_meme_reference, and don't use hardcoded paths when redirecting 2010-09-16 10:07:57 +08:00
Raphael
e9009ea609 Downcase username only if it is there 2010-09-15 18:23:54 -07:00
Raphael
de93fd2818 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 18:10:13 -07:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
04594d7ac5 Merge branch 'production' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
 2010-09-15 17:25:14 -07:00
Raphael
33048fe6db Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	spec/models/aspect_spec.rb
 2010-09-15 17:24:00 -07:00
Raphael
0e0df7fb22 downcase before validation 2010-09-15 17:21:23 -07:00
Raphael
bf33313bf9 take out index, change backer seed, no puts 2010-09-15 17:13:17 -07:00
Raphael
02dda4f0a7 change the name of instantiate back 2010-09-15 17:08:56 -07:00
Raphael
d2f5d3c4c1 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-15 17:05:36 -07:00
Raphael
01d26f6d0e Using custom registrations controller 2010-09-15 17:05:21 -07:00
Daniel Vincent Grippi
3681ae62c7 remove google analytics 2010-09-15 16:43:38 -07:00
Raphael
e0ffc8bba0 First pass at having a custom registrationsController 2010-09-15 16:40:03 -07:00
Daniel Vincent Grippi
ee89bfaf8f removed do bad things 2010-09-15 16:18:33 -07:00
maxwell
b8bbc58d30 save person after changing handle 2010-09-15 16:02:23 -07:00
Daniel Vincent Grippi
f0dad8c16a Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 15:55:45 -07:00
maxwell
77bd68e7c7 MS the deploy config is wrong 2010-09-15 15:55:26 -07:00
Daniel Vincent Grippi
e94b48e19a Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
 2010-09-15 15:55:18 -07:00
maxwell
6e29a66e09 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/models/user.rb
 2010-09-15 15:46:15 -07:00
maxwell
3a4eb294f8 MS made it two callbacks for handles and keys 2010-09-15 15:45:26 -07:00
Daniel Vincent Grippi
b2b2748fea seed aspects on user create 2010-09-15 15:39:04 -07:00
Daniel Vincent Grippi
82ada7d2d6 Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-15 15:36:59 -07:00
Daniel Vincent Grippi
cd21ee8652 just seed family and work 2010-09-15 15:36:41 -07:00
maxwell
7741951a42 MS removing production stuff from master... yowch 2010-09-15 15:26:06 -07:00
maxwell
8828707c45 MS fixed the login bug, deploying to master 2010-09-15 15:15:15 -07:00
maxwell
c1077b3eed Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-15 14:11:24 -07:00
maxwell
55c1530c9f MS DG fixing an edit profile bug 2010-09-15 14:09:05 -07:00
maxwell
b68ec3a5b8 MS DG setting diaspora handle in a unclean way 2010-09-15 13:53:36 -07:00
maxwell
84c60e5f2e DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -07:00
Daniel Vincent Grippi
aad24fdfcc Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 12:22:16 -07:00
Daniel Vincent Grippi
57bd052c5b user edit bug 2010-09-15 12:22:03 -07:00
Daniel Vincent Grippi
97b0b7b322 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:59:51 -07:00
Daniel Vincent Grippi
deac53f178 see yourself in aspect sidebar, because you're going to post to yourself anyway 2010-09-15 11:59:39 -07:00
Daniel Vincent Grippi
10bbf367ad Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-15 11:55:52 -07:00
Daniel Vincent Grippi
fe35d60b13 hack on aspect nav for ff & chrome compatability 2010-09-15 11:44:56 -07:00
Daniel Vincent Grippi
ea3e372474 fixed 500 error with @photos 2010-09-15 11:24:23 -07:00
Raphael
1006e8a680 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
Raphael
d9eb3abd9d Merge branch 'master' of github.com:diaspora/diaspora 2010-09-15 10:59:00 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
a38a354065 moving things around for consistency. consistency isn't pretty right now. 2010-09-15 10:26:57 -07:00
Raphael
8c8eb02316 Reset albumscontroller 2010-09-15 10:20:46 -07:00
Daniel Vincent Grippi
73dab4b3ef fixed stream elements 2010-09-15 10:17:37 -07:00
Raphael
5d303518c2 Adding in COPYRIGHT, AUTHORS, and blueprint attribution 2010-09-15 10:09:42 -07:00
Raphael
d63cc358c5 Remerging master and production 2010-09-15 09:48:06 -07:00
Daniel Vincent Grippi
4a86632cf3 show default user photos for requests 2010-09-14 20:47:21 -07:00
Daniel Vincent Grippi
8647220328 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-14 20:44:47 -07:00
Daniel Vincent Grippi
f2c6e7b820 made group manage a little nicer 2010-09-14 20:35:30 -07:00
Daniel Vincent Grippi
d0c8f9ccd6 silent comments on views 2010-09-14 19:54:48 -07:00
Daniel Vincent Grippi
fc3fb817c8 profile photo doesn't change to null if not changed on profile update 2010-09-14 19:48:11 -07:00
Daniel Vincent Grippi
f256d433fd nevermind 2010-09-14 19:34:26 -07:00
Daniel Vincent Grippi
02e1ed82a3 making profiles socket 2010-09-14 19:07:23 -07:00
maxwell
0d37f065dc MS RS fixed a small group adding bug 2010-09-14 15:13:55 -07:00
ilya
8aa39c5f08 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:58:55 -07:00
ilya
0560b46080 MS IZ added friend redirect, and moved the webfinger responces to fixture directory 2010-09-14 11:58:40 -07:00
Daniel Vincent Grippi
3a468a9f1b Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-14 11:45:33 -07:00
Daniel Vincent Grippi
be7c3f28a9 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:43:03 -07:00
Daniel Vincent Grippi
71ef54dbcc spelling mistake, broken links on search page 2010-09-14 11:42:47 -07:00
Daniel Vincent Grippi
426d038aaf Remove email based filter 2010-09-14 11:22:32 -07:00
Daniel Vincent Grippi
7643fb4125 remember that aspects are seeded 2010-09-14 11:15:10 -07:00
ilya
cb12e497f6 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-14 11:14:10 -07:00
ilya
2311c33626 MS IZ mocked all the webrequest tests 2010-09-14 11:13:58 -07:00
Daniel Vincent Grippi
c1a9a89be7 Merge branch 'production' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	config/deploy.rb
	spec/factories.rb
	spec/models/request_spec.rb
	spec/spec_helper.rb
 2010-09-14 11:08:18 -07:00
Daniel Vincent Grippi
24cd518f11 DG, RS; Album creation no longer ejects you from context 2010-09-14 11:00:16 -07:00
Daniel Vincent Grippi
da8ec589b7 RS, DG; display the correct tab on manage, change edit to manage 2010-09-14 10:05:59 -07:00
Daniel Vincent Grippi
a7c6e22e01 DG RS; passing around params[:aspect]. querying in application controller for current aspect. 2010-09-14 09:44:09 -07:00
Daniel Vincent Grippi
01b14a66e8 fixed photo show header 2010-09-13 22:51:51 -07:00
Daniel Vincent Grippi
b49eaa1ceb minor visual tweaks 2010-09-13 20:51:27 -07:00
Daniel Vincent Grippi
0782e0b199 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 19:54:56 -07:00
Daniel Vincent Grippi
fe57a698d3 minor cleanup on album flow 2010-09-13 19:54:30 -07:00
Daniel Vincent Grippi
aa5447f553 Albums are now created within a context 2010-09-13 19:39:51 -07:00
maxwell
15651a7bb6 IZ MS group manage page can now add friends to groups 2010-09-13 18:10:07 -07:00
Daniel Vincent Grippi
5ecbb28dc7 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 17:57:59 -07:00
Daniel Vincent Grippi
c059069144 albums don't show publisher, refactored css 2010-09-13 17:57:30 -07:00
Daniel Vincent Grippi
b2b60af8aa Albums_by_aspect now takes :all 2010-09-13 17:32:29 -07:00
Daniel Vincent Grippi
1b92bcd17c Add albums_by_aspect method to user 2010-09-13 17:26:24 -07:00
maxwell
650a502404 MS IZ removed a bunch of unused request stuff 2010-09-13 16:58:23 -07:00
maxwell
63b3513a12 MS IZ removed the links to the requests index 2010-09-13 16:53:33 -07:00
Daniel Vincent Grippi
84b29770fe Put raise back in webfinger fail 2010-09-13 16:05:43 -07:00
maxwell
3b1223c9dd Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 15:48:50 -07:00
maxwell
6f75a81a9d IZ MS trying again on fixing remote profile images 2010-09-13 15:48:30 -07:00
Daniel Vincent Grippi
26e4e088d7 flash messages are now being set. 2010-09-13 15:44:26 -07:00
Raphael
35a4e0aaa1 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 15:21:38 -07:00
Raphael
ff348eb944 Add flashes back in to aspect and albums 2010-09-13 15:20:57 -07:00
Daniel Vincent Grippi
48403996f0 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 15:11:38 -07:00
Daniel Vincent Grippi
2fae1049d9 silent comments in all views except the layout and session wall 2010-09-13 15:11:14 -07:00
maxwell
a7231d041e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 15:09:20 -07:00
maxwell
c098be99bc MS IZ attempt one to fix remote profile images 2010-09-13 15:08:39 -07:00
Raphael
34a4804b9f Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:49:01 -07:00
Raphael
fd31e9aeeb Force downcase on usernames 2010-09-13 14:48:55 -07:00
Daniel Vincent Grippi
a87925b359 missing license on layout 2010-09-13 14:39:18 -07:00
Daniel Vincent Grippi
40ecf176e8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
maxwell
0b33e6b3eb MS IZ album page is now not completely wonky, but still kind of pointless... 2010-09-13 14:23:38 -07:00
maxwell
a9b64232df Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 12:21:04 -07:00
maxwell
24d957cb32 MS IZ removed the views and redirected the edit route 2010-09-13 12:20:47 -07:00
Raphael
f6b6720349 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 12:16:49 -07:00
Raphael
b05d106aed Remove user_refs from Person, put pendings in the broken photo specs 2010-09-13 12:16:43 -07:00
maxwell
27f1b29581 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 11:54:50 -07:00
maxwell
812f2550aa removed status message webfinger link 2010-09-13 11:52:47 -07:00
Daniel Vincent Grippi
3c893454e9 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 11:43:00 -07:00
Daniel Vincent Grippi
6aeaea1b7d removed some things. also, comment buttons are now css-ified when they come through the socket 2010-09-13 11:42:41 -07:00
Raphael
e33d6d8123 Don't create 500s on comment posting 2010-09-13 11:30:10 -07:00
Raphael
1312728b88 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
 2010-09-13 11:16:45 -07:00
Raphael
aa0a00d9cb Finish moving to aspects, DB reset required 2010-09-13 11:15:08 -07:00
Daniel Vincent Grippi
7579c0ec50 more cleanup 2010-09-13 11:05:10 -07:00
Raphael
9837340eb2 Rename files from group to aspect 2010-09-13 10:43:15 -07:00
Daniel Vincent Grippi
a74e00c159 removed hover user menu 2010-09-13 10:40:09 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
ilya
a738807cf4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-12 22:56:29 -07:00
ilya
0896efa5d6 now requests are called requested people, same css but less hacky selection 2010-09-12 22:54:53 -07:00
Daniel Vincent Grippi
897074c869 replace in comment websocket action replaces one or more number instead of just the first 2010-09-12 22:33:51 -07:00
Daniel Vincent Grippi
4bf8bc9c0b wrong key being sent in recieve method for posts (group_id => group_ids) 2010-09-12 22:17:39 -07:00
Daniel Vincent Grippi
945a6ffbeb added a logger in post 2010-09-12 22:11:01 -07:00
Daniel Vincent Grippi
31a746db2f group_ids to string in post 2010-09-12 22:05:07 -07:00
Daniel Vincent Grippi
1ee78c28b7 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-12 21:47:11 -07:00
Daniel Vincent Grippi
cf48079446 group_ids must be converted to strings 2010-09-12 21:47:03 -07:00
ilya
94ce3b3666 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-12 21:34:52 -07:00
Daniel Vincent Grippi
1874ebe51d forgot to map to group ids in retraction 2010-09-12 21:33:39 -07:00
ilya
370e2ef688 not displaying requests in the remove 2010-09-12 21:31:03 -07:00
Daniel Vincent Grippi
a3ec81add0 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-12 21:24:49 -07:00
Daniel Vincent Grippi
62994f1660 retractions should now actually websocket again 2010-09-12 21:24:22 -07:00
ilya
1e74acd9b0 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-12 19:56:47 -07:00
ilya
6b7f0888d0 Testing ignore friend request on remote 2010-09-12 19:56:23 -07:00
Daniel Vincent Grippi
31df3cea11 friend pictures on group edit page should now display the default person image if friend's picture isn't present 2010-09-12 18:11:05 -07:00
maxwell
08233a74c5 MS added anohter logger so i can debug friend requests 2010-09-11 14:39:09 -07:00
Daniel Vincent Grippi
db5d000757 made a sticky request link on the bottom of every page 2010-09-11 12:09:55 -07:00
Daniel Vincent Grippi
1092c7b8d1 moved manage to be its own tab on right 2010-09-11 07:53:45 -07:00
Daniel Vincent Grippi
266a896bde mtweaking comments in stream 2010-09-10 23:55:33 -07:00
Daniel Vincent Grippi
9c7e0e3bcb minor sass tweaks 2010-09-10 23:16:46 -07:00
Raphael
ebd4bea5de Adding a log statement to zombiefriends 2010-09-10 18:57:08 -07:00
Raphael
d9bb850b5b pass group not id into send_friend_request 2010-09-10 17:00:27 -07:00
Raphael
17be027738 redirect to root instead of search 2010-09-10 16:52:28 -07:00
Raphael
b704704334 People index now works when there is a non-friend on the page 2010-09-10 16:49:09 -07:00
Raphael
ab6d631a27 White space in user file, deleting net/curl as unused 2010-09-10 16:25:19 -07:00
Raphael
4922ebd84c Finish removing encryption from retractions 2010-09-10 16:14:37 -07:00
Raphael
c170726f6c Merge branch 'master' of github.com:diaspora/diaspora into salmon 2010-09-10 16:04:30 -07:00
Raphael
a44d40168a Encryption removed from everything other than comments, most irrelevant specs removed 2010-09-10 16:04:09 -07:00
Daniel Vincent Grippi
d3a8e27833 DG IZ; selector fix 2010-09-10 15:37:59 -07:00
Daniel Vincent Grippi
b4e3ea3937 another little fix 2010-09-10 15:33:16 -07:00
Daniel Vincent Grippi
9fd8cfcc99 DG IZ added the same structure as groups 2010-09-10 15:31:00 -07:00
Daniel Vincent Grippi
8afb590128 small fix 2010-09-10 15:28:11 -07:00
Daniel Vincent Grippi
4770616a26 DG IZ; small fix 2010-09-10 15:19:04 -07:00
Daniel Vincent Grippi
82a31228fa DG IZ; requests bar added to group/edit 2010-09-10 15:07:55 -07:00
Daniel Vincent Grippi
136eb61b02 DG IZ; groups = relations. now you can rename groups in the manage relation page 2010-09-10 14:52:11 -07:00
Daniel Vincent Grippi
f70ade6705 DG IZ; moved info on the person show page 2010-09-10 13:52:12 -07:00
Raphael
cab8610bea Actually use salmon to push comments 2010-09-10 10:38:16 -07:00
Raphael
aa1f3c6438 Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file 2010-09-10 10:31:23 -07:00
Raphael
68dc74e0b7 Tests pass again, use id => in retraction.perform 2010-09-09 18:15:30 -07:00
Raphael
7448684358 Return results of queries 2010-09-09 17:56:21 -07:00
Raphael
222847ca92 Using methods that exist can be helpful 2010-09-09 17:54:33 -07:00
Raphael
e9377a681c Don't use push_to_groups for retractions 2010-09-09 17:52:35 -07:00
Raphael
2b1724c42f Pass id to groups_with_post 2010-09-09 17:44:33 -07:00
Raphael
8b09d8107c Add encryptable to profiles 2010-09-09 17:43:07 -07:00
Raphael
87bef90932 Salmon for retractions and profiles 2010-09-09 17:28:32 -07:00
Raphael
6b4501c342 Move generate key back into user 2010-09-09 16:23:08 -07:00
Raphael
c73ce3ff99 RS IZ added a logger statement and a guid in the webfinger profile 2010-09-09 16:20:27 -07:00
Raphael
522450c9d3 RS IZ added a logger statement and a guid in the webfinger profile 2010-09-09 16:19:34 -07:00
Raphael
86d9a41d25 send_friend_request_to now takes a person and group, rather than a receive url and a group id 2010-09-09 16:06:42 -07:00
Raphael
d0de8b4988 Merge branch 'master' of github.com:diaspora/diaspora into salmon 2010-09-09 15:43:20 -07:00
Raphael
fd61535e11 Hcards working 2010-09-09 15:43:16 -07:00
Raphael
67f9d9dab5 Add hcard, add id for pod_location 2010-09-09 15:34:20 -07:00
Raphael
59006e657f Hcard done manually 2010-09-09 15:15:37 -07:00
Raphael
3e9a36e1f1 Layout false on all publics controller routes 2010-09-09 14:15:20 -07:00
Raphael
c6aff4a562 making the hcard work 2010-09-09 13:02:59 -07:00