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

877 commits

Author SHA1 Message Date
danielvincent
8f1973815e DG MS; added route for exported xml 2010-10-07 14:21:53 -07:00
ilya
2451ac4957 moved the SMTP setting into app_config.yml 2010-10-07 14:20:31 -07:00
Raphael
9912769b5b Merge remote branch 'guillei/s3_upload' 2010-10-07 14:17:43 -07:00
ilya
8352a7cf95 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	config/routes.rb
 2010-10-07 14:04:31 -07:00
ilya
7ecc94d7b2 added the password route to make email reset password work 2010-10-07 14:03:18 -07:00
minilibra
ae6f39a0d0 Localization file for Indonesian added. Change "en" at the top of both files to "id". Thanks to rsofaer. 2010-10-08 02:09:13 +07:00
Raphael
e47aa90b15 Merge remote branch 'Stigjb/master' 2010-10-07 11:06:27 -07:00
Raphael
6ae6d20e4f Merge remote branch 'crimer/master' 2010-10-07 10:57:51 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
Raphael
0831812e97 Merge remote branch 'kashif/master' 2010-10-07 10:41:50 -07:00
Raphael
f078bd0a54 Merge remote branch 'leamas/perm-fix' 2010-10-07 10:09:29 -07:00
Raphael
b6a3549693 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 09:37:00 -07:00
Crimer
56ed245db0 MongoMapper now not overrides database name in MONGOHQ_URL configuration if provided. It also works on Heroku. 2010-10-07 14:29:17 +00:00
Alec Leamas
0d51af0a13 Removing shebang on non-script. 2010-10-07 16:11:43 +02:00
ilya
131e905322 fixed the public route 2010-10-06 19:05:43 -07:00
Raphael
a315b489f1 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-06 18:19:38 -07:00
danielvincent
66b356b5fe moved public route 2010-10-06 18:14:37 -07:00
Raphael
caffd8f9ff Don't check for servers that aren't there 2010-10-05 17:58:48 -07:00
Raphael
79f19b6870 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-05 17:46:25 -07:00
Raphael
de9cdfbe7b Always set the FACEBOOK constant 2010-10-05 17:46:14 -07:00
Yaron Shahrabani
77d5b68e15 Fixed some typos 2010-10-06 08:29:58 +08:00
Daniele Di Sarli
5074d2f8f2 Updated Italian translation 2010-10-06 08:25:29 +08: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
1d0a4579f6 Add missing localization for aspect managment 2010-10-06 07:56:23 +08:00
UserAd
e7c153df4e Add translation support in profile ('or' between buttons). Fix Russian locale 2010-10-06 07:56:23 +08: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
45d40f27d9 changed the deploy config back to master 2010-10-05 13:06:55 -07:00
ilya
85f71aa4aa added the deploy task to symlink the fb_config 2010-10-05 12:38:20 -07:00
ilya
82455981b8 added fb_config to gitignore 2010-10-05 12:21:33 -07:00
Raphael
1fa732498b Update sprinkle script 2010-10-05 11:55:47 -07:00
Raphael
bb88a6fb8c Merge branch 'salmon-refactor' 2010-10-05 09:47:10 -07:00
Raphael
be909e27d6 Deleting adams 2010-10-04 14:49:27 -04:00
Raphael
2cd8cf0621 Remove a bunch of deleted backer servers 2010-10-02 20:30:37 -04:00
ilya
88dafbf5cc changed deploy branch 2010-10-02 13:29:36 -07:00
Stig Johan Berggren
ff7c8c7a50 Added locale files for Norwegian (bokmål) 
Localization files for Norwegian bokmål (nm) inserted. They have been
tested a little locally and do not produce any errors.
 2010-09-29 17:58:25 +02:00
Kashif Rasul
330cf63599 Arabic locale fixes. 2010-09-29 17:13:27 +02:00
Kashif Rasul
08ddae0894 Added devise Arabic locales and moved locale to correct folder. 2010-09-29 16:54:33 +02:00
Kashif Rasul
0fed72d505 Added Arabic locales. 2010-09-28 13:57:40 +02: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
44c29cf8e6 deploy_config back to master 2010-09-27 21:57:52 -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
a8f05244ba localization should be fixed 2010-09-27 16:07:24 -07:00
ilya
50234b095b had to move translation around slightly, now the profile edit will be missing a template 2010-09-27 16:02:08 -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
ilya
b823213c0d added a generate:secret_token task, and added an initializer to generate one if the file does not exist 2010-09-27 15:29:55 -07:00
Guillermo
1a876355d5 Some fixes in spanish locale 2010-09-28 03:02:47 +08:00
Daniele Di Sarli
6b9bcfda63 Corrected Italian translation 2010-09-28 02:41:59 +08:00
Raphael
2f31e036e3 Merge branch 'cz' of http://github.com/koo5/diaspora 2010-09-27 11:36:04 -07:00
Raphael
ef2647c188 Merge branch 'master' of http://github.com/yarons/diaspora 2010-09-27 10:52:32 -07:00
Raphael
1e495c676c Merge branch 'master' of github.com:diaspora/diaspora 2010-09-27 10:39:41 -07:00
Raphael
139102e488 Merge branch 'master' of http://github.com/bastos/diaspora 2010-09-27 10:11:28 -07:00
Yaron Shahrabani
08c0c345f5 Updated Hebrew translation 2010-09-27 09:49:38 +02:00
ilya
f36b99b03c changed the deploy_config to play on remote 2010-09-26 22:13:28 -07:00
Dorian
611852bb74 Use rake whitespace:cleanup 2010-09-26 12:53:22 -04: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
6e0082da9e Files are uploaded to S3 if the ENV variables are set (Heroku-friendly) 2010-09-26 11:03:47 -05:00
Stephen Caudill
05c2da81e5 Add cucumber and run the generator 2010-09-26 11:35:50 -04:00
koo5
28e925e40a More czech translation goodness. I've added distance_in_words translations, feel free to delete it if it belongs somewhere/sometime else. 2010-09-26 06:01:39 +02:00
Yuval Adam
f2ddb8a39c added Hebrew (he) locale files 2010-09-26 04:49:39 +08:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Tiago Bastos
5a4f40591d Added missing translations. 2010-09-25 11:25:45 -03:00
Raphael
beda67aca6 Shorten git show stuff 2010-09-24 17:51:51 -07:00
danielvincent
d59330264d fixed syntax error in italian locale 2010-09-24 16:18:41 -07:00
sennewood
dcedc5d505 Added the missing lines of code and translated them. 2010-09-25 06:39:59 +08:00
sennewood
16e5f972d1 Translation correction 2010-09-25 06:39:59 +08:00
sennewood
e2db21d7b0 Use double quotes in locale files 2010-09-25 06:39:59 +08:00
Daniele Di Sarli
8323e7dcb2 Added Italian translation 2010-09-25 06:35:43 +08: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
ilya
deea03bf82 deploy restart after db:reset since we need the new app_config.yml 2010-09-23 20:38:39 -07:00
Raphael
8690967509 defaults doesn't really make sense when there's nothing else 2010-09-23 14:58:17 -07:00
Raphael
972cb54828 Move locale files, fix syntax error in fr-informal 2010-09-23 14:52:06 -07:00
Raphael
82bc5b097d Use double quotes in locale files 2010-09-23 14:43:38 -07:00
UserAd
cfd3523030 Stupid error fix 2010-09-24 05:02:30 +08:00
UserAd
7a9e347b28 Improved russian locale 2010-09-24 05:02:30 +08:00
Maël Soucaze
49162a6ead The underscore (fr_informal) is replaced by the hyphen (fr-informal). 2010-09-24 04:51:49 +08:00
Maël Soucaze
4cd83f9ae9 Change the file organization, and Casual Honorifics is now Informal Honorifics. 2010-09-24 04:51:49 +08:00
Maël Soucaze
d7eb828064 Language fix. 2010-09-24 04:51:48 +08:00
Maël Soucaze
c243304c97 Welcome to the French Casual Honorifics localization thanks to the brainchild of michael-k! 2010-09-24 04:51:03 +08:00
ilya
c31489b42b Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 12:31:40 -07:00
ilya
04e670f0d0 deploy script now uses public url 2010-09-23 12:31:19 -07:00
ilya
5857838a0a adding the new files 2010-09-23 12:29:00 -07:00
Raphael
cfe019d7a9 Take out async controller until we actually put it in the app 2010-09-23 12:19:28 -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
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
danielvincent
e6d1b8b808 fixed syntax in welsch translation 2010-09-23 10:29:36 -07:00
Dan Cirnat
4be2fdef8f Removed "sample" message from Romanian locale 2010-09-24 01:26:31 +08:00
Dan Cirnat
3d1ca6adc8 Romanian locale added 2010-09-24 01:26:31 +08:00
Alec Leamas
c1242a0984 typo fix 2010-09-24 01:16:08 +08:00
mousey
b1dd054fdb More Welsh Localization 2010-09-24 01:14:33 +08:00
mousey
1625f6b131 Welsh Language Localization. 2010-09-24 01:14:33 +08:00
Raphael
1964bd5ecf Hit the right thing in aspects move friend 2010-09-22 21:57:00 -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
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
53c0aff23d deploy from the right branch 2010-09-22 16:34:42 -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
Raphael
695e5fe396 Don't log huge encrypted params 2010-09-22 15:19:26 -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
maxwell
23e9520a9e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-22 11:33:26 -07:00
danielvincent
8941975224 DG IZ; example extension convention for app_config 2010-09-22 10:59:23 -07:00
Diógenes
c87ad060ab Add translation (from English locale) to Brazilian Portuguese 2010-09-23 01:15:10 +08: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
6d6ca3d8bc added terse_pod_url to the APP_CONFIG hash 2010-09-21 20:01:56 -07:00
ilya
d60dc03d35 removed app_config from repo 2010-09-21 18:10:26 -07:00
ilya
96aaf3093c Make load_app_config more robust, point to the right folder in db seed 2010-09-21 18:04:36 -07:00
ilya
b01928af4b RS IZ if yaml fails to load (empty config) file load the example 2010-09-21 17:52:23 -07:00
ilya
74a92a2637 tiny typo 2010-09-21 17:40:43 -07:00
ilya
e3d52bb467 putting the config file in a shared directory for in the deploy scripts 2010-09-21 17:39:44 -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
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
0a99b82bd3 Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-21 13:40:17 -07:00
danielvincent
9571ade89c basic setup 2010-09-21 12:29:39 -07:00
ilya
5ffb5adb65 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-21 10:05:33 -07:00
danielvincent
e588d7ab6a DG IZ moving friends is now ajaxy 2010-09-20 17:26:20 -07:00
Michael Kaeufl
3b59175f43 fix in header 2010-09-21 04:17:04 +08:00
Michael Kaeufl
12f667e1b6 de: Ausloggen -> Abmelden 2010-09-21 04:17:04 +08:00
Michael Kaeufl
3f12b8b675 de translation: abgemeldet -> gekündigt 2010-09-21 04:16:19 +08:00
Michael Kaeufl
782373cc51 de translation: wieder -> erneut 2010-09-21 04:16:18 +08:00
Michael Kaeufl
f28a96e356 fix in header 2010-09-20 22:00:44 +02:00
Raphael
747f7d11a0 Move thin yml back to development mode 2010-09-20 12:51:47 -07:00
Michael Kaeufl
c78538fedf Merge branch 'arielo-i18n' of github.com:michael-k/diaspora into arielo-i18n 2010-09-20 21:40:38 +02:00
Michael Kaeufl
ac667e6ec9 de: Ausloggen -> Abmelden 2010-09-20 21:39:56 +02:00
Michael Kaeufl
1c79677c7c some more german translations 2010-09-20 21:38:13 +02:00
Michael Kaeufl
54c137fd6b Merge branch 'felgru-locale-de' into arielo-i18n 2010-09-20 20:36:20 +02:00
gattytto
813dfae059 just a few 's' missing. :) 2010-09-21 02:01:48 +08:00
Alec Leamas
5e69292954 Typo fix 2010-09-21 01:50:56 +08:00
Alec Leamas
d1822d3dc8 Swedish translation 2010-09-21 01:50:46 +08:00
Ariel Zavala
1f78c3400b Started Spanish Locale 2010-09-21 01:48:54 +08:00
MrBison
1e5fc556a3 oops, a stupid error fixed 2010-09-21 01:48:13 +08:00
MrBison
6294cf502d oops, a stupid error. 2010-09-21 01:48:13 +08:00
Felix Gruber
88bb50660a better translation from sennewood 2010-09-21 01:47:46 +08:00
Felix Gruber
83520f593c some corrections from sennewood 2010-09-21 01:46:50 +08:00
Felix Gruber
852022ca79 change 'en' to 'de' in devise.de.yml 2010-09-21 01:46:50 +08:00
Felix Gruber
4c9ac0e5f6 initial german translation 2010-09-21 01:46:15 +08:00
Claudius Coenen
b8dc20e4bb adding german translation 2010-09-21 01:42:16 +08:00
Michael Kaeufl
5533f30840 de translation: abgemeldet -> gekündigt 2010-09-20 19:41:14 +02:00
Mikhail Zubrov
718b0715b3 add a Russian translation 2010-09-21 01:41:01 +08:00
Michael Kaeufl
c8d3ceae61 de translation: wieder -> erneut 2010-09-20 19:40:37 +02:00
Maël Soucaze
c884a25da6 French localization updated with arielo's changes. 2010-09-21 01:40:25 +08:00
Maël Soucaze
77acb6268e English localization updated with arielo's changes. 2010-09-21 01:40:25 +08:00
Maël Soucaze
aff4d783a6 French localisation. 2010-09-21 01:39:25 +08:00
Marcin Karpezo
a0a7d28e6d fixed translation 2010-09-21 01:22:05 +08:00
Marcin Karpezo
9130c85718 Translated en.yml 2010-09-21 01:21:37 +08:00
Marcin Karpezo
445c6784eb Translated devise.en.yml 2010-09-21 01:21:37 +08:00
moziz
850961f22e Corrected a typo and switched a few words so that the it sounds more 'official' and not slang. 2010-09-21 01:20:20 +08:00
Daniele Di Sarli
5b75c1634d corrected some Italian phrases 2010-09-21 01:04:49 +08:00
Felix Gruber
0203b9317b better translation from sennewood 2010-09-20 14:04:09 +02:00
Raphael
60e29f6572 Magent should use the same settings as mongomapper, app config should load first, websocket spec is a little better. 2010-09-19 16:37:34 -07:00
Pedro Silva
230865aaa2 Added Portuguese Portugal locale 2010-09-20 00:58:57 +08:00
Felix Gruber
c4f420ec59 some corrections from sennewood 2010-09-19 18:15:36 +02:00
Ariel Zavala
e9f74675e9 Merged with diaspora; fixed conflicts; only 2 red 2010-09-19 11:16:00 -04:00
kook
6c6c7be1e5 oopsie 2010-09-19 10:28:33 +08:00
kook
c34e4caafa czech translation 2010-09-19 10:28:20 +08:00
MrZYX
5740c72804 made websocket server host configurable 2010-09-19 09:57:57 +08:00
danielvincent
2efde8a841 added missing quote in finnish locale 2010-09-18 15:50:35 -07:00
Danillo César
ac09f48cf8 Added locales files for portuguese brazilian. 2010-09-19 06:42:36 +08:00
’Jarkko
6cf5f6c8c7 Finnish locales 2010-09-19 06:39:32 +08:00
danielvincent
f034b180c2 quotation fix in italian locale 2010-09-18 15:36:42 -07:00
Otacon
34c0c3c89f Added italian translation (it) 2010-09-19 06:28:35 +08:00
Ariel Zavala
f48b8a4748 Moved devise.it to devise locale folder 2010-09-18 11:20:57 -04:00
Ariel Zavala
a77575bb6e Merge branch 'master' of http://github.com/Darkmagister/diaspora into i18n 2010-09-18 11:18:45 -04:00
Ariel Zavala
216cf8ccd7 Moved devise.ru to devise locale folder 2010-09-18 11:14:39 -04:00
Ariel Zavala
d84e33390a Merge branch 'master' of http://github.com/MrBison/diaspora into i18n 2010-09-18 11:12:24 -04:00
Ariel Zavala
bf98ec38d0 Moved devise.pl to devise locale folder 2010-09-18 11:09:21 -04:00
Ariel Zavala
8ab5aeb6fb Merge branch 'production' of http://github.com/sirmacik/diaspora into i18n 2010-09-18 11:08:40 -04:00
Marcin Karpezo
ecadeac86c fixed translation 2010-09-18 14:27:52 +02:00
Marcin Karpezo
0ce90b4b71 Translated en.yml 2010-09-18 13:34:02 +02:00
Marcin Karpezo
9965140874 Translated devise.en.yml 2010-09-18 13:32:17 +02:00
Darkmagister
32957658ba adding Italian locale 2010-09-18 12:04:35 +02:00
MrBison
a049cabc2d oops, a stupid error fixed 2010-09-18 02:18:35 -07:00
MrBison
7e20f42422 oops, a stupid error. 2010-09-18 02:18:07 -07: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
ilya
01e3bdaa29 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-17 23:02:45 -07:00
Mikhail Zubrov
08bdaf7340 add a Russian translation 2010-09-18 09:58:29 +04:00
ZTurtleMan
7d0db11444 Lithuanian local should use 'lt' not 'en' 2010-09-18 13:07:34 +08:00
Vytautas Jakutis
211bc1b59a adding Lithuanian locale, thanks to my friends and typewith.me :) 2010-09-18 08:14:51 +08:00
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
Ariel Zavala
4558f9901e Added translations to photos and registrations controllers 2010-09-17 18:25:36 -04: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
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
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
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
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
1384b65565 added more translations missing on views 2010-09-17 10:46:03 -04:00
Ariel Zavala
c6cdf65fc8 updated local configuration 2010-09-17 10:26:57 -04: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
Ariel Zavala
9adcb3a48d French locale included 2010-09-16 23:53:09 -04:00
Ariel Zavala
07138041b0 Fixed album controller errors 2010-09-16 23:35:57 -04:00
ilya
fc234390c3 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 19:44:29 -07:00
Ariel Zavala
34d784bbbc Merge branch 'master' of http://github.com/maelsoucaze/diaspora 2010-09-16 21:18:50 -04: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
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
Claudius Coenen
5197c1b3ec adding localisation for controller's flash messages' 2010-09-17 00:23:35 +02:00
Etienne Membrives
1c16f80c04 Merge branch 'locale-de' of http://github.com/ccoenen/diaspora 2010-09-16 15:16:57 -07:00
Etienne Membrives
ed54c50f48 French localization done 2010-09-16 15:14:05 -07:00
Claudius Coenen
aeedf2fc22 adding german translation 2010-09-16 23:55:57 +02:00
Etienne Membrives
541eb5cb95 Beggining of French localization 2010-09-16 14:45:00 -07:00
Claudius Coenen
80f2880329 Merge branch 'locale-de' of http://github.com/felgru/diaspora 2010-09-16 23:43:22 +02:00
Ariel Zavala
8f56178bd2 added diaspora site specific localization files 2010-09-16 17:29:25 -04:00
Ariel Zavala
d7ca279fa9 Revert "Moved diaspora specific locales to diaspora.en.yml and diaspora.es.yml" 
This reverts commit b7cfbd6fd7.
 2010-09-16 17:27:26 -04:00
Ariel Zavala
b7cfbd6fd7 Moved diaspora specific locales to diaspora.en.yml and diaspora.es.yml 2010-09-16 17:05:11 -04:00
Ariel Zavala
060ba12376 Started Spanish Locale 2010-09-16 16:30:17 -04:00
Maël Soucaze
f4aeca66f8 French localisation. 2010-09-16 22:17:00 +02:00
Etienne Membrives
aae6c35fa7 Merge branch 'master' of http://github.com/arielo/diaspora 2010-09-16 13:08:11 -07:00
Ariel Zavala
be9ae343cc Added localizations that I had missed 2010-09-16 15:55:54 -04:00
Etienne Membrives
9157f72e01 French localization 2010-09-16 12:31:24 -07:00
Ariel Zavala
a673257eef Added localization to photos views 2010-09-16 15:11:21 -04:00
Ariel Zavala
443b5af4ce Added localization to aspect views 2010-09-16 14:57:56 -04: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
Felix Gruber
61ab7726b5 change 'en' to 'de' in devise.de.yml 2010-09-16 19:15:36 +02:00
Felix Gruber
c940955261 initial german translation 2010-09-16 19:05:14 +02:00
Ariel Zavala
53b05e7fb3 Added devise spanish locale 2010-09-16 11:47:54 -04:00
Ariel Zavala
ab5e7319ee Added I18n initializer 2010-09-16 11:46:34 -04: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
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
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
Raphael
29e3fa4d04 sprinkle role 2010-08-17 11:04:34 -07:00
Raphael
453cb06691 changing settings and deploy scripts, validating email 2010-08-17 11:01:30 -07:00
ilya
5dff3369ad DG IZ; removed puts statements. 2010-08-17 10:48:40 -07:00
ilya
7e377fc292 RS, IZ; adding set backer number to routes, not authenticating it 2010-08-13 12:37:49 -07:00
Raphael
599d1da620 Moved socket code out to lib, unsocketing from view should now work again 2010-08-11 12:03:26 -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
c14bb5a4f8 Changed info logging to debug logging almost everywhere 2010-08-09 14:39:37 -07:00
Raphael
614c8c72ba RS, DG; Log files should now rotate 2010-08-09 14:27:17 -07:00
Raphael
088da2544b RS, DG; We now delete channels when there is nobody subscribed to them 2010-08-09 14:11:46 -07:00
Raphael
33a827c33a RS, DG; Websocket is now working again, users have a channel 2010-08-09 13:02:08 -07:00
Raphael
0a40efdaf7 Removing unused messages 2010-08-09 10:47:45 -07:00
ilya
27b4c19337 Getting the deployment changes from master 2010-08-08 21:24:34 -07:00
Raphael
8356126f8d Added deploy key 2010-08-05 15:44:18 -07:00
ilya
5dfc097c88 replaced the functionality with openssl, didn't do the encryption spec 2010-08-04 20:32:15 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
Raphael
e3c28c4fee Fixed Photos, and Carrierwave initializer 2010-08-02 21:31:14 -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
ilya
1b32afc78f Switching to Grid_FS, correctly 2010-07-23 14:53:12 -07:00
Raphael
84b4d12e18 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-23 11:06:19 -07:00
Raphael
61ffda6bf4 re-enabling sprinkle script 2010-07-23 11:05:29 -07:00
ilya
8f70fb89c0 RS IZ Switching to production 2010-07-23 10:41:57 -07:00
maxwell
0fdce91756 DG MS added views for ostatus following 2010-07-22 21:27:43 -07:00
ilya
e75cb8e8d2 Changing back to gridfs 2010-07-22 11:47:44 -07:00
ilya
9686aad842 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-21 15:26:39 -07:00
ilya
d7e546c3b3 RS IZ Vim in sprinkle, not too nice 2010-07-21 15:26:08 -07:00
maxwell
695a93ddad DG MS added basic album traversal 2010-07-21 14:29:58 -07:00
ilya
cb67a7fa1b RS IZ sprinkle editing 2010-07-21 10:04:55 -07:00
maxwell
301343ae01 DG MS added basic album support 2010-07-20 21:28:24 -07:00
Raphael
de3a08d031 Took out putses 2010-07-20 10:23:19 -07:00
maxwell
ec3f6e6765 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-17 19:22:26 -07:00
Raphael
1b2024f5bb Adding imagemagick to sprinkle 2010-07-17 18:50:46 -07:00
maxwell
917d58acbb MS found one more duplicate in the Gemfile 2010-07-17 14:10:31 -07:00
ilya
5a6fd7c6a0 hopefully imagemagic take 2 2010-07-16 23:19:33 -07:00
ilya
a34a458ba5 hopefully imagemagic will work 2010-07-16 23:15:42 -07:00
maxwell
5d0c5dbd86 MS kinda hacky webfinger email fix 2010-07-16 23:03:59 -07:00
Raphael
bb4d5cad59 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-16 17:26:22 -07:00
Raphael
fa46fb31f4 Added photos, profile editing 2010-07-16 17:26:06 -07:00
maxwell
99f7e938fd made a pubsubhub constant 2010-07-16 12:42:36 -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
ilya
3dfb55ee85 IZ MS pulled in master: this is now the authoritative branch; waiting for dan to fix gpg so we can move on 2010-07-11 00:04:08 -04:00
maxwell
603fc15120 MS IZ added the env setting line to factories 2010-07-10 23:54:25 -07:00
maxwell
a02a833625 updated rails for kicks, run bundle install, and run gem install bundler --pre rspec-rails --pre too 2010-07-10 00:32:58 -07:00
ilya
eb9c6814d6 screen in tools, keyring clearing disabled 2010-07-09 13:36:24 -04:00
maxwell
6cc9deaa65 merging with head 2010-07-08 21:44:14 -07:00
ilya
cdd6e2034e Updated deploy scripts 2010-07-09 00:23:37 -04: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
ilya
895742824d Sped up specs, fixed env 2010-07-08 21:23:08 -04:00
ilya
122bbf0cd2 Merging dashboards 2010-07-08 20:56:25 -04:00
ilya
a5db2cd231 Added keyrings to gitignore, symlinked to shared dir in cap scripts 2010-07-08 20:54:20 -04:00
ilya
9e8426ceb4 RS, IZ; Users now have keys, keyring now in db folder 2010-07-08 19:57:10 -04:00
maxwell
db1811eb61 DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket 2010-07-08 14:14:03 -07:00
maxwell
11d4a9e2c7 rolled back some message handler nonsense 2010-07-08 11:16:38 -07:00
maxwell
6293f9f585 socket is now a controller 2010-07-08 10:17:41 -07:00
maxwell
58ed75a289 MS socket now works in the server, but I can't figure out how to mock this stuff 2010-07-07 22:20:15 -07:00
maxwell
a35892428c Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo 2010-07-07 20:09:27 -07:00
danielvincent
3d105e7c1e DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket. 2010-07-07 16:53:52 -07:00
maxwell
5350b40e3c broken autotest for rafi 2010-07-07 15:27:22 -07:00
Raphael
5e78163df3 added bundler to gemfile 2010-07-06 19:23:34 -07:00
ilya
0587688d18 DG IZ; friend requests pass through the webhook, need to refactor the parser because now the XML does not make sense, no big deal. P.S. WTF is send_to_seed in message_handler 2010-07-06 02:15:49 -04:00
Raphael
ad5c8ba548 dev env 2010-07-01 20:30:19 -07:00
Raphael
d211d23637 Thin now should stop 2010-07-01 19:35:31 -07:00
maxwell
2b2864b78d now its just a message for ie 6, 7 2010-07-01 17:12:21 -07:00
maxwell
8e94fc5b4f added mean message 2010-07-01 17:05:14 -07:00
ilya
5285753486 IZ warzombie route, the method is in the dsashboard controller 2010-07-01 13:28:17 -04:00
maxwell
dc5b321b62 sorry for the monster commit.... 4 small chores...1) moved tons of dynamic javascript to haml partials in the new js view folder, and moved some of the js that got put in the application layout into view.js 2. set up a static config prefrence loader in initializers, loaded from yaml 3) fixed the top right login text from being pushed over. 4) fixed a bug when no user is on the node and someone hits the landing page.... you still cant create a new user from there, but now at least it doesnt blow up. 2010-06-30 00:27:11 -07:00
maxwell
1b2745e788 added socket renderer spec and slight refactor 2010-06-29 11:50:15 -07:00
maxwell
a683a2c1aa RS MS added goog analytics 2010-06-29 11:45:41 -07:00
maxwell
46ab63de36 added will pagination action. 2010-06-28 21:56:58 -07:00
maxwell
36b5a90d34 MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works 2010-06-28 17:35:38 -07:00
maxwell
f4a8671854 fixed the remote socket updating bug? we will see 2010-06-28 16:15:30 -07:00
maxwell
d9a6bb7ba2 merged my socket changes 2010-06-28 14:52:43 -07:00
maxwell
5cf2e3c3ea commiting so i can pull 2010-06-28 14:47:23 -07:00
ilya
3d76fa26ba RS IZ testing GUID 2010-06-28 14:28:01 -04:00
maxwell
2b5cf0d265 my websocket works. wut up 2010-06-28 10:11:47 -07:00
maxwell
60091012bf on client connect, websockets now tell the server where the user is. nothing more 2010-06-28 01:12:21 -07:00
maxwell
ec01e2c016 Comments now working, but no AJAX, need to refresh to see them 2010-06-25 22:15:41 -07:00
maxwell
f9879752d3 MS meh i have 17 failures if I run bundle exec autotest 2010-06-24 22:24:59 -07:00
maxwell
e558d4833f DG MS fixing tests 2010-06-24 20:45:49 -07:00
maxwell
5f3a6a7aa0 MS mongomapper works kinda 2010-06-24 17:22:49 -07:00
maxwell
60fa7e3ac4 view stuffs 2010-06-23 01:26:00 -07:00
maxwell
fd5d7c63ad messy application.haml file i know, but now the sockets only update pages which want their data 2010-06-22 18:59:11 -07:00
maxwell
4cd90a16a1 pushing updated socket.rb... 2010-06-22 16:55:59 -07:00
maxwell
aa7a2da3d1 put debug back into websocket 2010-06-22 16:23:15 -07:00
maxwell
56e940131f Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-22 16:12:56 -07:00
maxwell
cc89cd5cda reload object before send to websocket 2010-06-22 16:12:15 -07:00
Raphael
65f4a7f378 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-22 15:47:32 -07:00
Raphael
bfe5769fcb rolled back to development environment 2010-06-22 15:47:18 -07:00
maxwell
3064d208eb added firefox websocket stuffs, only loads if it is not safari or chrome 2010-06-22 14:31:16 -07:00
maxwell
9c1619059b Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-22 10:42:45 -07:00
Raphael
76c5c0ce5e Changed environment in thin.yml to production 2010-06-22 10:37:25 -07:00
maxwell
cf80aa4010 merging master in.... now I am going to go back to 187 2010-06-22 10:32:13 -07:00
maxwell
531ab3ab83 turned off mutex in dev 2010-06-22 10:19:36 -07:00
maxwell
51279cd519 turned on mutex in dev. totally my bad 2010-06-22 10:12:13 -07:00
maxwell
f696ffc3a6 fixed up some views, but some stuff feels like it broke 2010-06-21 16:46:19 -07:00
maxwell
655dd64a54 websockets work 2010-06-21 14:12:05 -07:00
maxwell
3581f7a7d6 merged in socket 2010-06-20 22:13:24 -07:00
maxwell
5b02597a05 added socket to initializers 2010-06-20 22:04:49 -07:00
maxwell
1610e72de9 fixed merge 2010-06-20 11:13:21 -07:00
maxwell
da9bcb8bec just kidding. needed that test config, but pulled out some deprecated curl stuff hanging around statusmessages and checked tests accordingly 2010-06-19 15:53:37 -07:00
maxwell
5637fa4e4c update em-http-request, removed the mutex because we are thin. also removed some uneeded config for database cleaner in the test setup env 2010-06-19 15:48:50 -07:00
maxwell
1fcd758bd4 removed the mutex, added rack fiber pool. this thing screams 2010-06-19 15:07:12 -07:00
maxwell
8019fc8d31 working websocket 2010-06-19 00:09:58 -07:00
Raphael Sofaer
807314d469 added htop to sprinkle 2010-06-18 23:54:32 -07:00
maxwell
63866a8128 playing 2010-06-18 23:47:42 -07:00
Raphael Sofaer
acfa7df1c5 Merge Capistrano into master 2010-06-18 23:41:02 -07:00
Raphael Sofaer
fbe8915250 IZ uncommented the lines for the rackspace deploy 2010-06-18 22:08:17 -07:00
Raphael Sofaer
cd1ed1d164 Hopefully final conf changes 2010-06-18 19:02:59 -07:00
Raphael Sofaer
c435ba28f9 changing configures... 2010-06-18 18:09:57 -07:00