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

172 commits

Author SHA1 Message Date
maxwell
2162a2e3f9 collapse person's photos and status message into their profile; also, made these nested on a person 2010-11-08 15:55:58 -08:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
danielvincent
a3ce5f1cd7 REMOVED IMPORTER 2010-11-02 11:17:47 -07:00
danielvincent
2b4e3e3a41 a person now has a photos#index page. 2010-10-29 10:38:17 -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
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
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
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
278a74f1f9 draft 2010-10-26 13:04:46 -07:00
danielvincent
b2e8ebd0bc OmniauthService -> Service. Cleaned up views. 2010-10-25 17:41:59 -07:00
maxwell
c4ff07b09a twitter oauth dance complete 2010-10-25 17:41:58 -07:00
ilya
6fa82490c9 remove friend from aspect box, with js call to remove the person from the aspect 2010-10-20 17:34:52 -07:00
ilya
94a7a3c6ad IZ MS; deleted move_friends removed 2010-10-20 14:26:45 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -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
maxwell
04f6cdaacf MS DG; basic view support; it works, but it is ugly 2010-10-13 18:42: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
ilya
ef3e627bed the users are now made with people 2010-10-08 15:40:42 -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
75aadc5c57 DG MS; cleaned up routes, killed all deprication warnings in everything. totally legit. 2010-10-07 18:25:59 -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
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
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
danielvincent
8f1973815e DG MS; added route for exported xml 2010-10-07 14:21:53 -07:00
ilya
7ecc94d7b2 added the password route to make email reset password work 2010-10-07 14:03:18 -07:00
ilya
131e905322 fixed the public route 2010-10-06 19:05:43 -07:00
danielvincent
66b356b5fe moved public route 2010-10-06 18:14:37 -07:00
danielvincent
f3c34692d8 pubsub support 2010-10-05 13:39:56 -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
eb7244e07c Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 19:07:01 -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
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
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
ilya
48c212c1ab made a public view, copied the fb publisher there 2010-09-23 12:18:26 -07:00
danielvincent
0c2480c9be DG IZ; quick form in user edit 2010-09-22 17:34:57 -07:00
danielvincent
26478403e2 DG IZ; connecting/disconnecting from fb 2010-09-22 17:14:58 -07:00
danielvincent
e9d16cc09b DG IZ; cleanup 2010-09-22 15:48:50 -07: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
danielvincent
9571ade89c basic setup 2010-09-21 12:29:39 -07:00
danielvincent
e588d7ab6a DG IZ moving friends is now ajaxy 2010-09-20 17:26:20 -07:00
Raphael
5df33a6fd0 Take out users/show, use current_user in update 2010-09-17 10:50:18 -07:00
ilya
81793d236c get_to_the_choppa is back 2010-09-15 22:54:51 -07: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
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
e0ffc8bba0 First pass at having a custom registrationsController 2010-09-15 16:40:03 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -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
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Raphael
c6aff4a562 making the hcard work 2010-09-09 13:02:59 -07:00
Raphael
fad32c12c3 Move routes around for clarity 2010-08-28 13:08:10 -07:00
maxwell
34cb15c423 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-27 13:33:39 -07:00
maxwell
d1bac3e078 MS added a log route for easy access 2010-08-27 13:33:28 -07:00
Raphael
7223d21721 Add singular move friend route, it must be eliminated later 2010-08-27 12:27:16 -07:00
Raphael
5ff1bdae90 Groups can now be batch edited 2010-08-27 12:23:20 -07:00
maxwell
b4174c664e you can now reassign a peson's group 2010-08-25 18:07:31 -07:00
ilya
45f3eb2a9a trying yet again 2010-08-24 15:37:55 -07:00
Raphael
03abd1ac21 Remove statuS MESsages new page. TaKE New OUt OF ROutes 2010-08-24 14:44:32 -07:00
Raphael
6ab6dc1c3a Removing some unused routes 2010-08-24 11:06:56 -07:00
Raphael
97aa8a4dc9 No photos index route 2010-08-23 13:57:33 -07:00
ilya
e277244614 Fixing users routes 2010-08-19 10:38:42 -07:00
maxwell
84cc598017 MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page 2010-08-18 22:58:57 -07:00
Raphael
7ce8f94d58 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 21:10:48 -07:00
Raphael
a23df47dbc Trying to merge in the pivots changes that we want in master 2010-08-18 21:10:42 -07:00
maxwell
d054162bbe more RC updating stuff 2010-08-18 20:51:55 -07:00
Raphael
7ed31ab96a Moving to file store 2010-08-18 16:37:05 -07:00
Raphael
55d84b3288 Broke up user spec, put user update back in routes 2010-08-17 22:03:45 -07:00
Raphael
0f9190cd02 put an only on the users routes 2010-08-17 19:41:44 -07:00
Raphael
86afa7a987 Remove bookmarks and blogs 2010-08-17 18:56:42 -07:00
ilya
7e377fc292 RS, IZ; adding set backer number to routes, not authenticating it 2010-08-13 12:37:49 -07:00
Raphael
bd7ce5250f renamed the route for signup. also, removed the link from the login page: get_to_the_choppa 2010-08-10 17:14:58 -07:00
maxwell
0ffe893f8a MS IZ merging diffs 2010-08-10 12:37:04 -07:00
maxwell
71612ba33d changing some webfinger resources 2010-08-10 12:36:00 -07:00
Raphael
9947a2abb8 RS, DG; latest_status thing now works, started putting signup back in 2010-08-10 12:26:43 -07:00
Raphael
a48fbaaf59 RS, DG; DashboardsController has been eliminated. 2010-08-10 11:36:00 -07:00
maxwell
d443be35f9 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 
Conflicts:
	app/controllers/publics_controller.rb
	app/models/user.rb
 2010-08-09 17:31:46 -07:00
maxwell
56d7c67bbb Going toward pending requests 2010-08-09 17:21:41 -07:00
Raphael
aebe7b97c0 DG RS; added groups. can't delete, but can make new ones 2010-08-09 15:58:53 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
Raphael
6b1f020839 Moved utilities out to special controller, took pound sign out of database name 2010-08-02 18:03:16 -07:00
maxwell
0fdce91756 DG MS added views for ostatus following 2010-07-22 21:27:43 -07:00
maxwell
301343ae01 DG MS added basic album support 2010-07-20 21:28:24 -07:00
maxwell
917d58acbb MS found one more duplicate in the Gemfile 2010-07-17 14:10:31 -07:00
Raphael
fa46fb31f4 Added photos, profile editing 2010-07-16 17:26:06 -07:00
Raphael
9165ac413a image uploading started 2010-07-16 12:31:24 -07:00
Raphael
05e6dada58 Fixing deploy friending 2010-07-16 09:59:06 -07:00
maxwell
65deaba558 MS IZ hcard, emptyfiles, routesw 2010-07-15 18:36:07 -07:00
Raphael
89cf2db10e fixing db seed 2010-07-15 15:47:27 -07:00
Raphael
fd18ac6c4b Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption 2010-07-15 13:06:46 -07:00
maxwell
99446d82c4 MS IZ more fixes 2010-07-15 10:30:51 -07:00
maxwell
f97218c005 MS IZ cleanup of pubsub stuff 2010-07-15 10:24:41 -07:00
maxwell
892eec1959 MS fixed the websocket bug pushing out all updates to single clients. we should get selenium so we can actually test it :( 2010-07-15 09:32:13 -07:00
Raphael
c82f41e740 Merging in master 2010-07-14 12:16:24 -07:00
maxwell
1b63fbbec7 DG MS added pubsub gem, added hub to message queue 2010-07-14 11:01:28 -07:00
ilya
8d525f2d4f fixed warzombie 2010-07-13 11:27:05 -07:00
maxwell
06eec9204a DG MS; person request is now request. refactoring as well. user verbiage for request actions 2010-07-08 18:28:39 -07:00
maxwell
db1811eb61 DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket 2010-07-08 14:14:03 -07:00