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

302 commits

Author SHA1 Message Date
Ariel Zavala
6c3882ce57 Added devise spanish locale 2010-09-18 08:08:32 +08:00
Ariel Zavala
0b91a2c186 Added I18n initializer 2010-09-18 08:08:32 +08:00
ilya
2b70317677 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-17 15:33:51 -07:00
Raphael
5b29c2700a Restore thin yml 2010-09-17 15:03:16 -07:00
Raphael
f5c10bb24c Put master deploy info back in master 2010-09-17 14:39:15 -07:00
Raphael
a96a52def7 Run 3 thins 2010-09-17 11:58:34 -07: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
ilya
659c06d0cf Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 23:04:03 -07:00
Raphael
2e8ecceaf7 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 21:53:34 -07:00
Raphael
7c02200a67 Finish moving out websocket server, add task to start it 2010-09-16 21:42:16 -07:00
Raphael
c520fb71a7 Moved socket out to separate process. Multiple thins should now be possible 2010-09-16 21:34:15 -07:00
ilya
fc234390c3 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 19:44:29 -07:00
danielvincent
ae83dae1ca added git info (branch,date,author) to debug partial 2010-09-16 17:03:14 -07:00
cryptix
c80a79dea5 Unified require quotes 2010-09-17 07:44:47 +08:00
Steve Klabnik
22edec5776 Adding Haml html escaping. 
Haml's HTML escaping option was not on, leaving the site open for xss
attacks. This would seem to fix it.
 2010-09-17 07:44:23 +08:00
ilya
41f46c47b1 removed the deploy key, not needed now that the repo is public, thx for the heads up Juha @ Enemy & Sons Ltd 2010-09-16 11:48:24 -07:00
Raphael
1e646fb0a9 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 23:54:57 -07:00
ilya
81793d236c get_to_the_choppa is back 2010-09-15 22:54:51 -07: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
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
Jesse Kriss
969779a60d adding deprecation setting 2010-09-16 09:46:09 +08:00
Jesse Kriss
30e655fd6c adding heroku-friendly mongo config 2010-09-16 09:46:09 +08: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
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
e0ffc8bba0 First pass at having a custom registrationsController 2010-09-15 16:40:03 -07:00
Raphael
1006e8a680 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Raphael
d63cc358c5 Remerging master and production 2010-09-15 09:48:06 -07:00
Raphael
6dff249c73 Check for the presence of a password in the deploy config 2010-09-15 09:43:59 -07:00
Raphael
a9b587ca06 Adding in deploy config for production 2010-09-14 22:31:57 -07:00
Raphael
1d94039684 put in deploy configs 2010-09-14 22:28:13 -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
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
960d40278c Add username, login with username or email 2010-09-08 10:59:08 -07:00
maxwell
baa048c579 MS changed some bundler stuff 2010-09-07 17:17:57 -07:00
maxwell
804777f9ae MS; updated to released rails 2010-09-07 16:47:53 -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
a26229223c Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 18:07:49 -07:00
maxwell
b4174c664e you can now reassign a peson's group 2010-08-25 18:07:31 -07:00
Raphael
00f8a3e628 removed ensure_bson in user. added to_id method to String and ObjectID classes 2010-08-25 17:11:57 -07:00
maxwell
68bd5bf5f5 MS merging in master again 2010-08-24 16:21:20 -07:00
ilya
45f3eb2a9a trying yet again 2010-08-24 15:37:55 -07:00
maxwell
46f062a5f3 fixing merge confilts 2010-08-24 14:50:01 -07:00
maxwell
00be2a6c40 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-08-24 14:46:02 -07:00
Raphael
143db96d7e No more socket debug 2010-08-24 14:45:50 -07:00
maxwell
f5316fb3c1 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-08-24 14:45:04 -07:00
Raphael
03abd1ac21 Remove statuS MESsages new page. TaKE New OUt OF ROutes 2010-08-24 14:44:32 -07:00
Raphael
db33d94f07 Render nothing on status_messages create, Websockets now honestly 
support multiple groups.
 2010-08-24 14:36:03 -07:00
maxwell
4f63f60b03 MS merging, and added a dumb check for the email validating twice 2010-08-24 14:03:57 -07:00
Raphael
b5bb61a135 Merging master into production 2010-08-24 11:18:42 -07:00
Raphael
6ab6dc1c3a Removing some unused routes 2010-08-24 11:06:56 -07:00
Raphael
ed99532a83 memory leak gone for real 2010-08-23 16:52:19 -07:00
Raphael
74be86395b Changing env back to development mode, the memory leak is likely fixed 2010-08-23 16:33:44 -07:00
Raphael
efb4100e01 Split up socket debug and app debug 2010-08-23 13:58:09 -07:00
Raphael
97aa8a4dc9 No photos index route 2010-08-23 13:57:33 -07:00
Raphael
51b07784fe Merge branch 'master' of github.com:diaspora/diaspora into pivots 2010-08-19 16:47:01 -07:00
Raphael
170ef67181 set browser in selenium.yml for linux 2010-08-19 16:43:56 -07:00
Raphael
f66b5f4006 Merge branch 'master' of github.com:diaspora/diaspora into pivots 
Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	config/sprinkle/provision.rb
 2010-08-19 16:09:08 -07:00
maxwell
20678060e7 selenium, ymls, a sample test 2010-08-19 15:44:23 -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
maxwell
ff41277088 one thing beta couldnt handle 2010-08-18 21:34:02 -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
701bec670f Merge branch 'master' of github.com:diaspora/diaspora into pivots 
Conflicts:
	app/views/groups/index.html.haml
	config/deploy_config.yml
 2010-08-18 20:50:28 -07:00
maxwell
6e2c42f8de MS app now works with rc1 2010-08-18 17:42:04 -07:00
Raphael
7ed31ab96a Moving to file store 2010-08-18 16:37:05 -07:00
ilya
55b4d4758f Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb
 2010-08-17 22:58:46 -07:00
Raphael
55d84b3288 Broke up user spec, put user update back in routes 2010-08-17 22:03:45 -07:00
Raphael
d2f50008f7 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	config/routes.rb
 2010-08-17 19:42:30 -07:00
Raphael
0f9190cd02 put an only on the users routes 2010-08-17 19:41:44 -07:00
Raphael
e8e141b24e Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-17 19:04:03 -07:00
Raphael
86afa7a987 Remove bookmarks and blogs 2010-08-17 18:56:42 -07:00
Raphael
8619584834 things mostly working 2010-08-17 18:27:50 -07:00
Raphael
6901b4f83e Devise routes 2010-08-17 17:54:20 -07:00
Raphael
7186f3537a Move back paragraph tag in confirmations view 2010-08-17 17:48:00 -07:00
Raphael
188f555c72 Actionmailer actually working 2010-08-17 15:47:41 -07:00
Raphael
a74ea7e80f Back to config actionmailer, the settings are getting set, try mail.joindiaspora.com 2010-08-17 15:31:14 -07:00
Raphael
46e7dbedac Trying to get actionmailer working 2010-08-17 15:19:41 -07:00
Raphael
f84d7962fc actionmailer config 2010-08-17 14:06:00 -07:00
Raphael
cbb1b550ff Default url 2010-08-17 14:03:30 -07:00
Raphael
2ede5f499f Commas 2010-08-17 13:53:15 -07:00
Raphael
424f576d95 Actionmailer config 2010-08-17 13:48:09 -07:00
Raphael
1d6e132a9f Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-17 13:07:26 -07:00
Raphael
842b321dfa User email checking, routes working again 2010-08-17 13:02:42 -07:00
Raphael
b55a99ec09 conf changes, kill nginx with go_cold 2010-08-17 11:42:59 -07:00
Raphael
2261a0d8a4 nginx... 2010-08-17 11:28:22 -07:00
Raphael
16f53922c5 nginx conf done, comments deleted 2010-08-17 11:22:06 -07:00