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

204 commits

Author SHA1 Message Date
zhitomirskiyi
da6e16b3a4 WIP 2011-02-05 15:01:04 -08:00
maxwell
ee02a073cd toggle mobile site, when mobile device 2011-02-03 18:43:56 -08:00
Dan Hansen
3078156dbb javascript i18n wip 2011-01-29 13:28:43 -08:00
MrZYX
087e0389bb Merge branch '712-route-for-login' of https://github.com/TomK32/diaspora 2011-01-27 18:38:51 +01:00
zhitomirskiyi
b3467b5d17 pending specs for facebook inviter 2011-01-26 12:16:47 -08:00
zhitomirskiyi
8bc52cdb55 facebook friend finder gathers fb friends. 2011-01-26 12:16:46 -08:00
zhitomirskiyi
41993fe5da use highcharts.js for stats 2011-01-21 12:19:05 -08:00
zhitomirskiyi
69d6de2fe7 added views and graph generation for statistics 2011-01-21 10:29:07 -08:00
Raphael
85bae12a00 Query on guid, not id 2011-01-18 16:07:58 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
zhitomirskiyi
9b6faa5644 added a notificaions read button 2011-01-12 16:24:14 -08:00
danielvincent
b029475421 aspects now have edit pages accessible through the top nav 2011-01-08 13:11:52 -08:00
Thomas R. Koll
6ea9b36cc9 Applying fix as suggested by duke 2010-12-30 00:07:29 +01:00
maxwell
081e85f224 Revert "Extended sub-uri support." for now.... 
This reverts commit 9cd08bac67.
 2010-12-20 18:12:12 -08:00
Alec Leamas
9cd08bac67 Extended sub-uri support. 
Adds new routing in routes.rb based on pod_uri. Assets are handled by a symlink
in public when using sub-uri. Various clean-up, removing thin and socket port
settings from server.sh (these are now taken from pod_uri and socket_port).

Basic functionality when setting a sub_uri like http://example.org/diaspora
now seems OK. Closes .http://joindiaspora.com/issues/737, and partially
http://joindiaspora.com/issues/391. Ports are yet to be defined and handled
in this context.

Conflicts:

	app/views/layouts/application.html.haml
	config/routes.rb
 2010-12-21 01:13:15 +01:00
Raphael
d44e76a6aa Down to 250 failures in mysql 2010-12-20 00:36:48 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d profile_spec is passing with mysql... baby steps. 2010-12-18 18:45:55 -08:00
maxwell
2e85a9fe66 notifications now can be read 2010-12-17 17:06:49 -08:00
maxwell
d5ba34f245 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 18:05:54 -08:00
Raphael
3b727dc887 Add share_with fancybox on search page, fix a couple of queries 2010-12-15 17:45:12 -08:00
maxwell
8ec85d3b12 basic notifications 2010-12-15 17:31:36 -08:00
danielvincent
34a1a35bf1 skip getting started is not ajaxy 2010-12-04 12:06:08 -08:00
maxwell
579a288351 public posts are now accessible by your friends, and facebook and twitter include a permalink. we prob want to link shorten these bad boys(and it has a max length of 140 chars, with a permalink), also, facebook and twitter posting are sync, but that will make it more reliable 2010-12-02 18:48:50 -08:00
maxwell
b9131c0e46 pushing to my website for further debugging 2010-12-02 18:47:48 -08:00
maxwell
38d9d75162 posts now have public permalinks 2010-12-02 18:47:48 -08:00
Raphael
8d853a88a3 Remove some old views, clean up routes, clean up. 2010-12-01 15:38:56 -08:00
Raphael
f0df1ec8df Remove dev utilities controller 2010-12-01 15:38:56 -08:00
danielvincent
601284a171 make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo. 2010-11-30 15:58:26 -08:00
zhitomirskiyi
8ed1865de8 removing dev util routes 2010-11-23 13:38:05 -08:00
danielvincent
056dc7d3ba DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state. 2010-11-17 19:37:08 -08:00
Raphael
c0414b8184 Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts 2010-11-16 16:18:16 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
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