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

1741 commits

Author SHA1 Message Date
zhitomirskiyi
c9b3066599 Revert "added comment on post mail method" 
This reverts commit c00226238b.
 2011-01-05 14:56:04 -08:00
zhitomirskiyi
c00226238b added comment on post mail method 2011-01-05 14:55:17 -08:00
MrZYX
ae623f03a7 updated locales 2011-01-05 16:53:32 +01:00
Raphael
8d5dc5d27b Merge remote branch 'tomk/ui-cosmetics' 2011-01-04 16:02:11 -08:00
MrZYX
b528802dc8 updated locales 2011-01-03 15:32:03 +01:00
Alec Leamas
22a696bcf8 Print warnings on stderr, where they belong. 2011-01-02 16:07:19 +01:00
MrZYX
9db2d8854f fixed #781 2011-01-01 23:55:12 +01:00
MrZYX
cdf1722247 updated locales 2011-01-01 17:14:26 +01:00
MrZYX
a71b81eacd renamed en-shaw to en_shaw 2011-01-01 02:22:35 +01:00
MrZYX
3338397822 added en-shaw to languages.yml 2010-12-31 13:11:34 +01:00
MrZYX
0faeb70ec3 updated locales 2010-12-31 13:06:35 +01:00
MrZYX
4596759628 added ga to languages.yml 2010-12-30 14:41:08 +01:00
MrZYX
3133ade245 fixed indentation error in devise.ga.yml 2010-12-30 14:38:14 +01:00
MrZYX
892bc2bc1a Merge branch '99translations' of ../diaspora-fork 2010-12-30 14:29:39 +01:00
MrZYX
a7467dedb8 updated locales 2010-12-30 14:29:36 +01:00
MrZYX
c7458f107a fixed syntax error in devise.ga.yml 2010-12-30 14:28:13 +01:00
MrZYX
37964892ce Merge branch 'irish-language' of https://github.com/joedavis/diaspora 2010-12-30 14:24:24 +01:00
Joe Davis
cca1b207bd finished translating 2010-12-30 12:58:27 +00:00
Thomas R. Koll
6ea9b36cc9 Applying fix as suggested by duke 2010-12-30 00:07:29 +01:00
Thomas R. Koll
869cbdf9e9 * Localizeable "Rename aspect" button 
* Don't list emails_delivered if there are none yet
* Don't show drag_to_add button if there are no @remote_requests
 2010-12-29 17:00:08 +01:00
MrZYX
154fa77bd6 updated locales 2010-12-29 12:49:30 +01:00
Alec Leamas
6a90646eaa Nullifying test garbage in last patch 2010-12-29 10:46:29 +01:00
Alec Leamas
8d218e7871 suburi cucumber test. 
Adds the features/uri-features test directory, testing sub-uri
deployment. These tests uses script/server since much of this code is
about configuring the server.  They are not run by "rake cucumber", to
run them use "bundle exec rake cucumber features/uri-test".

Tests requires a working app_config.yml setup with pod_url =
"http://localhost:3000/diaspora"

Patches cucumber.yml to always load step definitions from features/**, see
http://thoughtsincomputation.com/posts/cucumber-step-definitions-and-autorequire-hell
 2010-12-29 10:31:25 +01:00
Sarah Mei
6f1aee990c Database is cleaned between scenarios. Progress? 2010-12-28 20:03:58 -08:00
Joe Davis
eb84561dcd almost finished 2010-12-28 21:59:34 +00:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
MrZYX
dbccb6d0de updated locales 2010-12-26 22:26:55 +01:00
Jonne Hass
647c02d38d updated danish locale - thanks Halfdan Mouritzen & friends 2010-12-26 22:13:40 +01:00
MrZYX
8b29e99cf8 updated locales 2010-12-25 15:22:43 +01:00
Sarah Mei
1f67cc2485 Replace APP_CONFIG with lib/app_config.rb so that it's testable. 2010-12-24 12:31:09 -08:00
MrZYX
2f135f2579 updated locales 2010-12-24 15:41:54 +01:00
MrZYX
07a074edb6 updated locales 2010-12-23 14:50:20 +01:00
maxwell
c2c6c00db8 a bad fix for a 500 on notification show when the post is deleted 2010-12-21 12:55:07 -08:00
danielvincent
a0e85dfea2 added missing translations to photo#show 2010-12-21 12:49:40 -08:00
MrZYX
e10af7fc8a made "Notifications" translatable 2010-12-21 19:18:29 +01:00
Sarah Mei
a4764e87e0 Moving database.yml to database.yml.example 2010-12-20 20:12:38 -08:00
maxwell
081e85f224 Revert "Extended sub-uri support." for now.... 
This reverts commit 9cd08bac67.
 2010-12-20 18:12:12 -08:00
maxwell
152670a72b notification badge now in header 2010-12-20 18:05:31 -08:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -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
4c47d8334c Add PostVisibility model, some more specs working 2010-12-20 13:23:05 -08:00
Raphael
d44e76a6aa Down to 250 failures in mysql 2010-12-20 00:36:48 -08:00
zhitomirskiyi
e3f7bd319b 25 more passing tests 2010-12-19 21:41:46 -08:00
MrZYX
6357cd3b95 updated locales - added slovenian and hungarian to languages.yml 2010-12-19 15:01:59 +01:00
MrZYX
b52718e913 small translation fix 2010-12-19 14:41:47 +01:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff post_spec now passes with mysql 2010-12-18 20:23:16 -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
MrZYX
6afba8fb7b updated locales 2010-12-18 16:07:49 +01:00
MrZYX
c3a79f7298 some fixes to translations 2010-12-18 15:25:21 +01:00
maxwell
bcca61af6b infinate scroll 2010-12-18 01:33:33 -08:00
maxwell
84c041ba6a aspects streams now ajax 2010-12-17 19:41:42 -08:00
danielvincent
f6701f2262 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-17 19:29:17 -08:00
maxwell
b3c63a3cc0 you can now unset the year of your birthday" 2010-12-17 18:05:13 -08:00
maxwell
2e85a9fe66 notifications now can be read 2010-12-17 17:06:49 -08:00
Raphael
2545de6470 Revert "i can haz right timezone?" 
This reverts commit 6d233e5eed.
 2010-12-17 16:44:57 -08:00
danielvincent
6afb7a6bd5 Revert "added configuration for cloudfile cdn" 
This reverts commit 0d5ac3bd36.
 2010-12-17 14:30:02 -08:00
danielvincent
0d5ac3bd36 added configuration for cloudfile cdn 2010-12-17 12:26:20 -08:00
maxwell
6d233e5eed i can haz right timezone? 2010-12-17 11:52:52 -08:00
maxwell
3c3e03993a make the two links on comment notifications clearer 2010-12-17 11:48:08 -08:00
maxwell
92bbe4cd4c added link to changelog, updated notifications 2010-12-16 18:28:22 -08:00
maxwell
b8a0abd122 updating notification views 2010-12-16 18:07:43 -08:00
danielvincent
28a22d9fc3 increase session timeout from 10 minutes to 1 day 2010-12-16 17:24:25 -08:00
danielvincent
b4b6189321 time out a user session via devise after 10 minutes of inactivity 2010-12-16 15:50:00 -08:00
danielvincent
f821f49db1 added similar contacts to contact pages 2010-12-16 11:49:08 -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
Raphael
b22398951e Send requests from the aspect list on the person show page 2010-12-15 14:48:14 -08:00
MrZYX
14f2341ae1 updated locales 2010-12-15 21:26:27 +01:00
Dan Hansen & Sarah Mei
82e2f23f91 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 14:29:33 -05:00
Raphael
bd31ff3ee3 Fix request validations, build. 2010-12-15 10:48:29 -08:00
Dan Hansen & Sarah Mei
fbfe28bcfa added vimeo method, still needs support from lib/youtube_titles.rb. updated locales 2010-12-15 01:20:53 -05:00
maxwell
0119de4afc adding task to fix users with periods 2010-12-14 18:45:10 -08:00
maxwell
5d336d20e8 spelling fix 2010-12-14 17:36:27 -08:00
danielvincent
b1c0facfe6 initiating a request now just creates a pending contact instead of persisting a request 2010-12-14 17:11:43 -08:00
maxwell
2bc849fa90 only show permalink if the post is infact public. also, make destroy delete 2010-12-13 18:45:54 -08:00
danielvincent
d6bb5291bc Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email" 
This reverts commit 2ac54eeffe, reversing
changes made to 3a13657087.
 2010-12-13 17:16:56 -08:00
maxwell
bcaeabdb87 remove some fields from our log that I dont want to see and dont help with managing a seed 2010-12-13 15:50:01 -08:00
mblog
d0355fdd43 Feature #348: Change Email 2010-12-13 22:14:52 +01:00
MrZYX
c97af9cd03 pulled locals from 99translations 2010-12-13 16:20:05 +01:00
MrZYX
8c234fbaa4 forgot to add a new file 2010-12-13 15:19:16 +01:00
MrZYX
a8d0d50173 pulled locales from rails-i18n. This overides the fix made to en-US.yml, please send it upstream 2010-12-13 15:11:22 +01:00
MrZYX
f2719e4c94 updated locales - as always all the honor goes to the people at 99translations 2010-12-12 17:11:31 +01:00
MrZYX
6cacfde6a6 two fixes to translations 2010-12-12 15:55:51 +01:00
danielvincent
52a3996ad0 textareas auto expand 2010-12-11 22:18:03 -08:00
MrZYX
0d70f78a12 small translation fix 2010-12-11 22:03:06 +01:00
danielvincent
fd2cbc1cf4 added invite link to search page 2010-12-10 18:28:51 -08:00
maxwell
076d0e5edd Merge branch 'master' of github.com:diaspora/diaspora 2010-12-10 11:47:20 -08:00
maxwell
c774685d52 users can now disable email notfications 2010-12-10 11:47:10 -08:00
Raphael
461171f6d6 Take magent out of the initializer 2010-12-10 11:28:55 -08:00
MrZYX
1c306289f1 pulled locales. thank you contributors 2010-12-10 18:31:39 +01:00
MrZYX
0374ee436e fixed untranslatable strings 2010-12-10 16:52:35 +01:00
Alec Leamas
eacee54846 Replace APP_CONFIG[:terse_pod_url] with uri object. 
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684,
using the well-defined semantics of the uri object.

The pod_url is normalized using module URI's functions, always with a
trailing /.

The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
 2010-12-10 14:29:19 +01:00
maxwell
3625a5f2f1 display a basic message for when nothing was searched for 2010-12-09 16:51:58 -08:00
Raphael
3a4caca397 Fix photo uploading in profile photos, style photo upload button better 2010-12-09 13:06:31 -08:00
danielvincent
faf27fe05a Merge branch 'master' of github.com:diaspora/diaspora 2010-12-08 17:06:39 -08:00
danielvincent
46793179db people#show displays shows public posts for non-contacts as well 2010-12-08 16:53:24 -08:00
maxwell
10df61a504 order of birthday is now correct for US english, also, you birthday actually sticks on the getting started page 2010-12-08 16:35:48 -08:00
maxwell
1f8f07f48d added slightly better error message on aspect update failure 2010-12-08 14:21:14 -08:00
MrZYX
806d193f64 updated locales 2010-12-08 19:21:13 +01:00
Hexagon
80c5c5c9f5 Cleaning up revert of #619 pull 2010-12-07 22:20:26 +01:00
MrZYX
b1663a710c updated locales. huge thank you to all contributors at 99translations 2010-12-07 21:32:15 +01:00
Raphael
9442553504 Refactor aspectscontroller and aspect_contacts.haml 2010-12-06 17:20:21 -08:00
Raphael
1f71474f0f Small copy change 2010-12-06 13:36:20 -08:00
MrZYX
4df13d56e1 made that latest change translatable 2010-12-05 16:02:52 +01:00
MrZYX
b84b6ea9e4 some fixes to translations 2010-12-05 16:02:52 +01:00
MrZYX
81fd4b6992 updated locales from the rails i18n project 2010-12-05 14:24:00 +01:00
Sarah Mei
9da69a4b01 Mobile log in form is usable. Also, added mixins for sass. 2010-12-04 20:45:52 -08:00
Sarah Mei
fea6884acc Mobile homepage looks decent. 2010-12-04 19:30:14 -08:00
danielvincent
addbaaeb70 JSON::Pure::Generator::State fix when using resque. huge thanks to this post: http://blog.ethanvizitei.com/2010/11/json-pure-ruins-my-morning.html 2010-12-04 13:16:30 -08:00
Iuri Kothe
7d847e16d0 Added missing translations 2010-12-04 18:16:56 -02:00
danielvincent
34a1a35bf1 skip getting started is not ajaxy 2010-12-04 12:06:08 -08:00
Iuri Kothe
f22289ae0a Added missing translations 2010-12-04 13:49:59 -02:00
maxwell
0a831cfbf4 invites are now on the queue 2010-12-03 19:33:54 -08:00
danielvincent
a7823485c7 made http calls synchronous. messagehandler enqueues POSTs into resque. 2010-12-03 15:26:52 -08:00
maxwell
85a85716c6 made user sign up and invitation accept slightly nicer, w/tipsy tooltips and instructions 2010-12-03 13:57:47 -08:00
maxwell
8e8398fdea change the assets to only package in production mode 2010-12-03 11:39:38 -08:00
Raphael
3cb0064835 Take out server start logging for now, maybe put in a more useful one later" 2010-12-03 11:29:49 -08:00
Raphael
d35badd7ea Remove log rotator, it seems to be disrupting log_overrider 2010-12-03 11:02:28 -08:00
MrZYX
dd326699bd changed back consumer_token to consumer_key as its not only more consistent with twitters website it also causes less support (less users complaining that their twitter integration is broken) :) 2010-12-03 16:04:37 +01:00
MrZYX
a605ab482b made sender address in notifier.rb configurable. This fixes #657 2010-12-03 15:49:34 +01:00
danielvincent
7fdbc9015b swapped new invitation lightbox for a proper page. 2010-12-03 00:57:53 -08:00
Raphael
3ee246d873 Merge branch 'resque-receive' 
Conflicts:
	Gemfile.lock
 2010-12-02 19:42:05 -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
11f04a060e frustrated 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
8798f05ff7 Revert "Revert redis merge to fix bugs on master" 
This reverts commit 30698d674b.
 2010-12-02 15:33:26 -08:00
Raphael
30698d674b Revert redis merge to fix bugs on master 2010-12-02 15:20:27 -08:00
Raphael
236fbc7cc7 Final adjustments to fix resque worker 2010-12-02 12:35:26 -08:00
Raphael
6cfa6577a5 Add first resque job 2010-12-02 12:35:26 -08:00
Raphael
cee5e4c26e Bring in resque recipes and rake tasks 2010-12-02 12:35:26 -08:00
danielvincent
8cb2a3a79a resque init, config, gemfile 2010-12-02 12:35:26 -08:00
Raphael
db0106f13c Rename EMWebfinger to Webfinger, clean up some related things 2010-12-02 12:35:25 -08:00
Sarah Mei
a09f299cfa Revert "Added translation scaffold for inflection of nouns by grammatical gender in some languages." 
This reverts commit 65c796572d.
 2010-12-01 22:29:32 -08:00
Sarah Mei
d5c32b6a56 Revert "Genderize#translate fixed and enhanced (now it accepts User objects to fix the gender)." 
This reverts commit eb2d186a12.
 2010-12-01 22:29:27 -08:00
maxwell
e18b918676 MS DG only show three comments by default 2010-12-01 18:09:41 -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
Raphael
ef083c6770 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-01 11:21:36 -08:00
Raphael
5791ffba79 Add administrative mail method 2010-12-01 11:20:10 -08:00
Paweł Wilk
eb2d186a12 Genderize#translate fixed and enhanced (now it accepts User objects to fix the gender). 2010-12-01 17:29:04 +01:00
Paweł Wilk
65c796572d Added translation scaffold for inflection of nouns by grammatical gender in some languages. 2010-12-01 17:29:04 +01:00
Paweł Wilk
279b08ae4a Added inflection of nouns by the grammatical gender for some languages. 
- New module I18n::Backend::Genderize keeps configuration and adds :gender option to translate().
- Module methods in Genderize allow fast checking if language needs gender and guessing gender.
- jQuery in views/users/edit.html.haml shows and hides grammatical gender select list when needed.
- Span and select list in views/users/edit.html.haml allows to choose grammatical gender.
- Key :grammatical_gender in User model keeps grammatical gender information.
- Added some methods to language_helper.rb.
- UsersController is aware of grammatical gender and is able to guess it when "getting started".
 2010-12-01 17:29:04 +01: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
maxwell
ec05c21472 profile now knows about three images sizes, even in federation case 2010-11-30 13:40:41 -08:00
maxwell
17a890676e added a link in footer to this instances code. obey the agpl yo. 2010-11-29 16:46:43 -08:00
maxwell
808b4af5c7 adding warning to startup about making sure mongo is bound to localhost 2010-11-29 14:50:38 -08:00
Hexagon
d69bca28ef Merge branch 'master' of github.com:diaspora/diaspora 2010-11-29 22:56:01 +01:00
Hexagon
7bb32de899 Fixed #638, forcing trailing slash on pod url 2010-11-29 22:55:43 +01:00
MrZYX
d8bc610adb Merge branch '99translations' of ../diaspora-fork 2010-11-29 22:09:36 +01:00
MrZYX
f94e079006 updated locales - finish is at 100% - thanks to all contributors 2010-11-29 21:53:52 +01:00
masterdot
35feccbb2c added support for tracking via piwik. 
if piwik_id is not set no javascript will be included. it may be both enabled, aganalytics and piwik.
 2010-11-29 10:26:47 +01:00
Hexagon
e05c113e27 Merge branch 'master' of https://github.com/jamiew/diaspora 2010-11-28 20:33:40 +01:00
MrZYX
673fd38a2c updated locales - big thank you to all people at 99translations 2010-11-28 15:33:17 +01:00
danielvincent
d7c5e12d64 move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again. 2010-11-28 02:30:25 -05:00
danielvincent
3ada121d0b contact-js as its own file 2010-11-28 00:29:22 -05:00
Jamie Wilkinson
0906f38f6d Use HAML ugly mode in production 2010-11-27 14:32:57 -08:00
Hexagon
5a90cfd680 Fixed #580 , exception when using phusion passenger, thanks yarishima42 2010-11-27 12:53:37 +01:00
MrZYX
434a4dab67 Merge branch 'more-translatable' of ../diaspora-fork 2010-11-27 02:51:32 +01:00
MrZYX
ad6d6d5efa lib/em-websocket.rb is now even more translatable 2010-11-27 02:43:49 +01:00
MrZYX
d502588fd6 Merge branch '99translations' of ../diaspora-fork 2010-11-27 01:52:12 +01:00
MrZYX
c213b42d10 updated locales - some are at 100% again - as always all the credits are going to the users at 99translations.com 2010-11-27 01:51:27 +01:00
Maxwell Salzberg
0d8488a5f7 set default to false for invites being off 2010-11-26 16:38:49 -08:00
Maxwell Salzberg
8aa37e5e81 pod != seed 2010-11-26 16:37:46 -08:00
maxwell
80f8e4d29a removing invite partial, with a switch, and updated app_config.yml.example 2010-11-26 16:10:42 -08:00
maxwell
a507927bb3 Revert "invitations are not sent from magent queue (a problem in itself)" 
This reverts commit 9e5eb86866.
 2010-11-26 16:02:57 -08:00
maxwell
9e5eb86866 invitations are not sent from magent queue (a problem in itself) 
Revert "Revert "removing the form for user creation thru signup".  Shutting down magent is a less annoying solution."

This reverts commit b9cafc0579.
 2010-11-26 15:52:34 -08:00
Michael Sofaer and Raphael Sofaer
b9cafc0579 Revert "removing the form for user creation thru signup". Shutting down magent is a less annoying solution. 
This reverts commit 4c96e12a31.
 2010-11-26 17:16:11 -05:00
MrZYX
a0f9fb35f3 made pagination translatable 2010-11-26 21:20:28 +01:00
Hexagon
a16f35325c Changing default smtp auth to plain 2010-11-26 20:15:02 +01:00
Hexagon
36415b0c73 Its now possible to use smtp-servers with no authentication 2010-11-26 20:00:22 +01:00
MrZYX
d6f95445c5 made em-webfinger errors translatable 2010-11-26 19:14:07 +01:00
maxwell
4c96e12a31 removing the form for user creation thru signup 2010-11-26 09:56:30 -08:00
Hexagon
63a7496c8b Removing sprinkle 2010-11-26 18:13:53 +01:00
MrZYX
bb49c227cd updated locales, thank you all 2010-11-26 16:56:51 +01:00
MrZYX
57a7a0fe23 fixed some missing translations 2010-11-26 16:26:52 +01:00
MrZYX
e916e33482 pulled and merged request 509, thanks siefca 2010-11-26 15:48:08 +01:00
MrZYX
8cc57aed82 Merge branch '597-add-i18n-to-sign-up-button' of https://github.com/siefca/diaspora into siefca-597-add-i18n-to-sign-up-button 2010-11-26 15:34:46 +01:00
Dan Hansen & Sarah Mei
84face159d Removing unused js 2010-11-25 21:44:57 -08:00
Michael Sofaer and Raphael Sofaer
502b4dde30 Merge branch 'invitation_flow' 2010-11-25 23:18:01 -05:00
Michael Sofaer and Raphael Sofaer
e8a266b6dd Make the getting_started aspects page more like the manage page 2010-11-25 23:17:27 -05:00
danielvincent
7c6d5b8d27 cleaned up right pane on aspects#all. moved edit_contacts_pane out to a partial -- translation locations need updating. 2010-11-25 23:14:45 -05:00
danielvincent
b56af997cb comment streams rendered expanded/collapsed initially by server. 2010-11-25 20:23:33 -05:00
danielvincent
b5dbfc129c touched up aspect contact manage list, removed some unused sass. 2010-11-25 20:22:59 -05:00
Paweł Wilk
c7059a58da Added i18n for "Sign up for invite" button. 2010-11-26 01:38:08 +01:00
Raphael
1fb58c53fb Monkeypatching to change rails default logging to something more useful 2010-11-25 19:37:05 -05:00
Paweł Wilk
8138473b91 Unscoped 'contacts' and 'new_requests' translation keys and modified en.yml accordingly. 2010-11-26 00:47:02 +01:00
John Yani
7f64bf052f Small russian locale fixes 2010-11-25 23:58:56 +02:00
MrZYX
72f8747c51 pulled locales, big thank you all contributors 2010-11-25 22:10:34 +01:00
Alec Leamas
df31de2898 Generate all content in public/ before server starts. 
Introduces a delay first time the server is started, but makes all resources
available to jammit. Can be disabled by flag in config/server.sh. Hopefully
silences jammit's messages about application.css et. al. not found
 2010-11-25 14:22:21 +01:00
Sarah Mei
aa4a61870c you can click on photos in manage aspects to see profiles 2010-11-24 22:09:14 -08:00
Raphael
38a2ea5199 Remove auto-friending in db:reset for dev servers 2010-11-24 17:55:51 -05:00
MrZYX
86914f3f6d swedish is perfect again :D, thanks Hexagon and all the others 2010-11-24 23:42:18 +01:00
MrZYX
64f2ec550d polish is at 100%, thanks jandom 2010-11-24 22:19:14 +01:00
MrZYX
be7d36b7fb updated locales - added macedonian thanks to stojmenovski 2010-11-24 21:31:01 +01:00
MrZYX
cc163b13c6 lithuanian is at 100% now, thanks to tahu, Karolis Parfeniukas, Saulius Žemaitaitis and Evaldas Guogis - also some updates to other locales, as always big thank you to all contributors 2010-11-24 15:37:05 +01:00
Raphael
9bb44e6cac My mom cringed when she saw our front page 2010-11-23 23:57:01 -05:00
MrZYX
3a8c82c7b4 italian is at 100%, thanks silviorelli 2010-11-24 01:09:44 +01:00
zhitomirskiyi
a038b512a0 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-23 15:49:58 -08:00
MrZYX
2d3f0b71e9 fixed issue in he.yml 2010-11-24 00:41:23 +01:00
MrZYX
c2e5b539d8 updated locales from 99translations. big thank you to all contributors 2010-11-24 00:08:59 +01:00
zhitomirskiyi
8ed1865de8 removing dev util routes 2010-11-23 13:38:05 -08:00
danielvincent
efab6449b3 message for closed signups on users#sign_in 2010-11-23 11:14:26 -08:00
MrZYX
4348a9ed6a russian is back at 100%, thanks to all contributors 2010-11-23 16:58:15 +01:00
MrZYX
ed3dc10f79 various fixes to translations - i like downcased keys only :P - made stuff translatable - cleaned up en.yml a bit 2010-11-23 14:02:13 +01:00
danielvincent
c9c84794af fixed build. publisher lights up on hover on aspect#index page. updated login page text. 2010-11-23 03:10:47 -08:00
maxwell
709e348457 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/fixtures/users.yaml
 2010-11-23 00:15:26 -08:00
maxwell
32390933e8 PALINDROME message for multiple emails 2010-11-23 00:14:26 -08:00
maxwell
da16e3ee1e PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once 2010-11-23 00:08:30 -08:00
Dan Goldenberg
bfc1fa4da0 added getting_started text and new press logos 2010-11-22 21:07:01 -08:00
danielvincent
69cac02ade landing page fix 2010-11-22 20:35:30 -08:00
maxwell
0965b45f23 fixing getting started 2 2010-11-22 18:28:04 -08:00
maxwell
ffedd9fa77 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 17:30:00 -08:00
maxwell
b283f5c579 pulling back needed partial 2010-11-22 17:29:51 -08:00
maxwell
173ec5f73b Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar" 
This reverts commit c45893d07d.

Conflicts:

	config/locales/diaspora/en.yml
 2010-11-22 17:11:34 -08:00
danielvincent
c63319f127 aspect#show cleanup. added 3 icons. 2010-11-22 17:03:33 -08:00
maxwell
21a90656fd fixing translations 2010-11-22 16:55:06 -08:00
maxwell
1adf93ace1 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	config/locales/diaspora/en.yml
 2010-11-22 16:40:01 -08:00
maxwell
c45893d07d remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar 2010-11-22 16:38:10 -08:00
Sarah Mei
bedc7ca41b Made landing page and log in views content-type agnostic. 
Added an un-minified version of jquery-mobile for debugging.
 2010-11-22 15:02:25 -08:00
zhitomirskiyi
e84ce5591f The discription in several places 2010-11-22 14:55:30 -08:00
zhitomirskiyi
edbb0bdf07 slightly more discriptive cannot remove the person from the last aspect messagge 2010-11-22 14:52:39 -08:00
Sarah Mei
ab37fd0d98 Fix type-o on front page, copy edit a bit. 2010-11-22 14:11:27 -08:00
MrZYX
e72f4e1da7 translatable status is good again 
made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
 2010-11-22 22:30:37 +01:00
maxwell
5c2d161146 small changes to mobile 2010-11-22 01:19:11 -08:00
Sarah Mei
218aa1c0d6 MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent 2010-11-21 19:56:35 -08:00
danielvincent
bd0c21a634 button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test. 2010-11-21 16:30:46 -08:00
maxwell
9f5ba1a1ea added finished state to sidbar for getting started 2010-11-21 16:13:02 -08:00
danielvincent
6e603bf2af aspect#show does not display search for contacts if user does not have any. aspect#index displays search box where all contact pictures go if user does not haveany contacts. 2010-11-21 16:13:02 -08:00
maxwell
ea7bdfde28 fix validation and order of status message sent 2010-11-21 16:13:01 -08:00
danielvincent
f6491816a3 adding a contact on an aspect page does not produce a fancybox anymore. more ui fixing. 2010-11-21 16:13:00 -08:00
danielvincent
242d0ab9c5 a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box. 2010-11-21 16:11:55 -08:00
Alec Leamas
a3395b6de8 Bugfix (thanks, MrXYZ) 2010-11-21 12:08:52 +01:00
Hexagon
93b0f3fd81 Updating rails-i18n 2010-11-21 01:52:59 +01:00
Alec Leamas
0a3a787ffa Merge branch 'jammit' 2010-11-20 18:35:45 +01:00
Alec Leamas
b6648cb9e2 Handle jammit by precaching in script/server. 
This introduces some jammit warnings in 'rake spec'. These seem
to be just warnings. To get rid of them, take steps as described in
https://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora
in the "Read-only Installation" (sic!) chapter.
 2010-11-20 18:32:40 +01:00
MrZYX
b97abbd251 hebrew is at 100%, thanks yaron 2010-11-20 14:40:57 +01:00
MrZYX
b0f4a871ee dutch is at 100%, thanks Kevin Kleinman 2010-11-20 13:29:55 +01:00
MrZYX
50120878fb updated locales from 99translations 
removed fr-informal
german is at 100%
swedish is at 100%, thanks Hexagon
french is at 100%, thanks ed0h
russian is at almost 90%, thanks rapmon
 2010-11-20 01:16:01 +01:00
Hexagon
d6695501f7 Merge branch 'more-translatable' of https://github.com/MrZYX/diaspora into MrZYX-more-translatable 2010-11-19 22:04:39 +01:00
zhitomirskiyi
481204a157 mongo cloudfiles backup task 2010-11-19 10:57:28 -08:00
MrZYX
6f5c3f3258 made recent changes translatable and cleanup up en.yml a bit 2010-11-19 17:25:45 +01:00
Jonne Hass
f426c08dcc made shared/_contatct_list.html.haml 
and the type after "viewing:" in shared/_author_info.html.haml translatable
 2010-11-19 17:25:05 +01:00
MrZYX
7200c007e5 made file uploader translatable 2010-11-19 15:25:14 +01:00
Raphael
6841ffbecc Disable_with on comment form 2010-11-18 15:41:51 -08:00
Raphael
c7b8c185bd Disable with on publisher form 2010-11-18 15:41:51 -08:00
Alec Leamas
5b8eb2cacd Production/test mode somment in config/server.sh 2010-11-19 00:34:10 +01:00
MrZYX
dcbcaefcbe added language codes map 2010-11-18 15:13:30 -08:00
MrZYX
60375422e7 pulled update for sk.yml from the rails i18n project 2010-11-18 15:13:30 -08:00
MrZYX
3f76699805 pulled update for et.yml from rails i18n 2010-11-18 15:13:30 -08:00
MrZYX
13ca682734 added locales from the rails-i18n project, removed rails-i18n parts from existing locales, added script to update rails-i18n locales 2010-11-18 15:13:30 -08:00
Raphael
61692c1da6 Fix translation missing in inv mailer 2010-11-18 12:50:46 -08:00
Raphael
187e9ac198 Merge remote branch 'jandom/475-Chore-Add-missing-polish-locales' 2010-11-18 11:59:55 -08:00
maxwell
3b88121244 dammit jammit... dont package always dur 2010-11-18 09:24:01 -08:00
maxwell
2ffd2d93e3 made mailchimp form ssl 2010-11-17 23:19:12 -08:00
maxwell
f01fca1877 letting jammit do its default thing 2010-11-17 22:18:15 -08:00
maxwell
5e375a30d8 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 22:06:08 -08:00
danielvincent
558c175c2b resolved translation issue in diaspora.en in user dropdown. second login link on landing page works. 2010-11-17 21:57:27 -08:00
maxwell
31d33054ef added jammit, now js and css compress for production 2010-11-17 21:51:59 -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
maxwell
1ca5e25e53 adding default for google a analytics 2010-11-17 12:35:42 -08:00
Jan
b088e0d685 Added missing polish locales, using all of the previous translations. 2010-11-17 20:50:38 +01: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
Alec Leamas
90b86690d9 Merge branch 'sv-update-4' of https://github.com/Hexagon/diaspora into Hexagon-sv-update-4 2010-11-16 16:25:32 +01:00
maxwell
f6c6030c6d fixing a translation 2010-11-15 23:08:57 -08:00
zhitomirskiyi
c5ae73f96d websocket secure params in app_config 2010-11-15 17:45:52 -08:00
Raphael
de1fed70f0 Add logging statement to server startup 2010-11-15 16:56:30 -08:00
Raphael
1b39b79446 Make invitation view with no inviters sensible 2010-11-15 16:35:00 -08:00
Hexagon
13a2b8ce07 Small fix to devise.sv 2010-11-15 22:28:36 +01:00
Hexagon
1d3d2565df Forgot to change en.yml, here it is 2010-11-15 22:28:36 +01:00
Hexagon
35095f8859 Update of sv.yml to reflect latest changes + small fix to en.yml 2010-11-15 22:28:36 +01:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
Alec Leamas
3abb2c9751 app_config update 
Attempt to close http://bugs.joindiaspora.com/issues/463, establishing a
new style in app_config.yml. Many comments needs to be reviewed.
 2010-11-15 09:10:35 +01:00
danielvincent
969c668518 translation fix on _person.haml. button tweak 2010-11-13 12:10:09 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
livefromthemoon@gmail.com
82f9aefaa8 Updated some french translation strings 2010-11-12 12:26:34 -08:00
livefromthemoon@gmail.com
cdfc406aad Added missing french translations 2010-11-12 12:26:34 -08:00
Raphael
a4d7b25bac Merge branch 'master' of github.com:diaspora/diaspora 2010-11-12 11:54:19 -08:00
danielvincent
4976503c0f let nginx serve static assets. 2010-11-12 11:47:19 -08:00
Jonne Hass
1816b1e4df people.show.add_friend -> people.person.add_friend 2010-11-12 06:07:37 +01:00
MrZYX
5ae4248b30 some more fixes I overlooked. Sorry 2010-11-12 06:07:37 +01:00
MrZYX
f55a973685 two small fixes 2010-11-12 06:07:37 +01:00
Hexagon
52da9c84ed Update of sv.yml to match latest additions 2010-11-12 06:07:37 +01:00
MrZYX
0a363a73b0 just found the mailer... :) 2010-11-12 06:07:37 +01:00
MrZYX
9ceb3e2fd1 found some still untranslatable strings in helpers and stuff 2010-11-12 06:07:36 +01:00
Hexagon
a4f5a1e7ae Updated swedish translation 2010-11-12 06:07:36 +01:00
MrZYX
748efb1860 eliminated senseless duplicates in en.yml 2010-11-12 06:07:36 +01:00
Jonne Hass
a957ba3aed so then I remove the newly unused friends_since for you 2010-11-12 06:06:16 +01:00
MrZYX
6400dc244f fixing again. it's getting anoying 2010-11-12 06:06:16 +01:00
MrZYX
8085a7bcd7 fixes to be in sync with latest commits 2010-11-12 06:06:15 +01:00
MrZYX
d91c26fb68 translated getting started, fixed #508 2010-11-12 06:06:15 +01:00
MrZYX
381c53b775 found some untranslatable strings 2010-11-12 06:04:05 +01:00
MrZYX
eef0901f36 unscoped fill_me_out 2010-11-12 06:04:05 +01:00
MrZYX
ca72bb40a6 refactored en.yml 
removed unused keys out of en.yml
replaced some ' with "
 2010-11-12 06:04:05 +01:00
danielvincent
85e2316280 Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect 2010-11-11 19:41:12 -08:00
maxwell
034d7ee2b1 first commit 2010-11-09 15:29:43 -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
maxwell
21cdbf08b5 we need to ask to publish on peoples wall...this was working because we all installed it with minifb which asked for everything 2010-11-08 01:26:11 -08:00
danielvincent
020cd90341 aspect labels on people#show view 2010-11-06 11:09:11 -07:00
danielvincent
1a481d43d2 Use _stream_element.haml as a wrapper for posts in the stream. 2010-11-05 17:40:28 -07:00
Sarah Mei
a230763879 gender is a text field 2010-11-04 22:02:27 -07:00
Raphael
1bba4c60f7 Merge remote branch 'MrZYX/untranslated-strings' 
Conflicts:
	app/views/aspects/manage.html.haml
	config/locales/diaspora/en.yml
 2010-11-04 20:05:57 -07:00
Raphael
061ec59091 Merge remote branch 'jdeisenberg/511-nonstandard-mongo-port' 2010-11-04 19:55:09 -07:00
Raphael
c1c631d5ed Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg 
Conflicts:
	config/locales/diaspora/en.yml
 2010-11-04 18:56:43 -07:00
Raphael
7d125e68e9 Warn rather than failing if there is no smtp sender address 2010-11-04 16:55:15 -07:00
Raphael
c3a38eaab4 Merge remote branch 'MrZYX/396-smtp-sender-address' 2010-11-04 16:47:57 -07:00
Raphael
229e202a72 Take httponly off of session cookies so that the websocket works in firefox 3.x. XSS attacks would now be easier to exploit if found. A possible replacement for opening this security hole is to set a new cookie value for Firefox users that stores a randomly generated key which would give a websocket with that key access. 2010-11-04 15:17:28 -07:00
MrZYX
1102fcd565 made flash messages translatable 2010-11-04 20:49:50 +01:00
MrZYX
63a5fdb000 made a bunch of strings translatable 2010-11-04 20:49:50 +01:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
J David Eisenberg
c695688c63 Issue #511: Nonstandard mongo port fails 2010-11-03 22:58:39 -07:00
MrZYX
80b8e5e42d updated german locale (informal) to reflect latest changes 2010-11-02 12:12:47 -07:00
MrZYX
7cd6e3a868 updated german locale (informal) with keys from pull request 465 
again with help of michiwend
 2010-11-02 12:12:47 -07:00
MrZYX
b1c9961a72 updated german locale so no keys are missing (informal) 
also added parts for german from the rails i18n project
still some parts missing, unclear or not translatable look at #FIXME's
even added translation that is missing in en.yml :P
thanks to michiwend for help
 2010-11-02 12:12:47 -07:00
danielvincent
fdd3264812 proxy buffering enabled and gzip compression for files other than text/html in nginx.conf 2010-11-02 12:03:10 -07:00
Raphael
bbd8cadc14 Retaining specs and line from robustdj's patch 2010-11-02 11:27:51 -07:00
danielvincent
a3ce5f1cd7 REMOVED IMPORTER 2010-11-02 11:17:47 -07:00
Alec Leamas
fceffba261 Merge branch 'translation-refactor' of http://github.com/Hexagon/diaspora into Hexagon-translation-refactor 2010-11-02 16:34:47 +01:00
Raphael
7244730961 Merge remote branch 'ed0h/fr-update' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 17:36:05 -07:00
maxwell
06445901f8 IZ MS retrations for posts now green 2010-11-01 17:11:06 -07:00
Hexagon
938d146405 Common translations are used without the namespace 2010-11-02 00:07:24 +01:00
Raphael
377cae8cba Merge remote branch 'ed0h/i18n-fallbacks' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 15:57:43 -07:00
Raphael
41d839ecf4 Merge remote branch 'ecleel/master' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 15:39:38 -07:00
maxwell
3c16a46f0e MS IZ updated the backer script to use aspects.create 2010-11-01 14:54:40 -07:00
Hexagon
1acc206fa4 #475: Fixed more untranslated strings 2010-11-01 22:22:13 +01:00
Hexagon
65419e423a Added missing strings to swedish translation 2010-11-01 16:42:47 +01:00
J David Eisenberg
1a32766fb0 Issue #492: Informal, vague description when signing up as a new user 2010-11-01 16:42:47 +01:00
Curtis J Schofield
f693a97bf3 i put in a dash 2010-11-01 16:42:46 +01:00
Sarah Allen
fb145beb9a Rails.env is a string, not a symbol 2010-11-01 16:42:46 +01:00
livefromthemoon@gmail.com
60f6e091d3 Added missing strings to french translation 2010-11-01 00:27:32 +01:00
livefromthemoon@gmail.com
bbd0d35070 Fix some bugs for I18n fallbacks 2010-10-31 22:39:54 +01:00
livefromthemoon@gmail.com
9e27797092 Fallback to default language when a translation is missing for the current language 2010-10-31 22:39:54 +01:00
livefromthemoon@gmail.com
cf82a0a9c8 Better to set the default locale in an initializer than in a before_filter 2010-10-31 22:39:54 +01:00
J David Eisenberg
f54820f456 Issue #496: Eliminate self-links in Getting Started 2010-10-31 12:16:07 -07:00
Abdulaziz Al-Shetwi
96906d9eaf Retranslate arabic localization. 2010-10-31 14:14:48 +03:00
Hexagon
0bef839261 Translating a huge amount of untranslated strings 2010-10-30 15:24:26 +02:00
Alec Leamas
58ead768d6 Small fix 2010-10-30 09:58:01 +02:00
Alec Leamas
68cba5da98 Merge branch 'se-l10n-update-2' of http://github.com/Hexagon/diaspora into Hexagon-se-l10n-update-2 2010-10-30 09:54:28 +02:00
Raphael
555c15dfef Simplify validations on user 2010-10-29 16:56:04 -07:00
Hexagon
99661a3240 Added swedish translations 2010-10-30 01:32:32 +02:00
danielvincent
8ec49e685b going to a non-friend's page contains a way to add them. 2010-10-29 15:43:44 -07:00
zhitomirskiyi
2c0a189df4 removed the session secret from the repo 2010-10-29 12:20:06 -07:00
maxwell
9c2ca15e93 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-29 12:09:32 -07:00
Raphael
d753e31205 Merge remote branch 'ed0h/309-user-choose-language' 
Add explicit language set to spec in users_controller_spec.rb

Conflicts:
	app/models/user.rb
 2010-10-29 12:06:14 -07:00
maxwell
47a9b2d189 switching deploy branch to master 2010-10-29 11:39:28 -07:00
maxwell
1e349e6a61 last time 2010-10-29 11:16:50 -07:00
maxwell
1b48572674 MS tests are now green 2010-10-29 11:16:50 -07:00
maxwell
fdb169558a dont restart servers after db:reset 2010-10-29 11:16:11 -07:00
maxwell
493969e458 trying a timer 2010-10-29 11:16:11 -07:00
maxwell
07b2e7e227 omg i was deploying the wrong branch for the past two hours 2010-10-29 11:15:14 -07:00
maxwell
d89cb53e26 pumping up the zombie sleep to allow for mail to get send out . 2010-10-29 11:13:42 -07:00
maxwell
eddcb71fcb EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:11:05 -07:00
maxwell
53e9df5455 pumping up the zombie sleep to allow for mail to get send out . 2010-10-29 11:05:18 -07:00
maxwell
8fe339b03b EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
danielvincent
2b4e3e3a41 a person now has a photos#index page. 2010-10-29 10:38:17 -07:00
Alec Leamas
94327264d4 Comments on Swedish diaspora terms, trailing blanks killed 2010-10-29 11:11:56 +02:00
Hexagon
09fb02ec9f modified: config/locales/diaspora/sv.yml 2010-10-29 00:55:27 +02: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
danielvincent
1d5b7a87f1 Merge branch 'master' into getting-started 2010-10-27 18:14:08 -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
Raphael
16e455958c Merge remote branch 'hexagon/se-localization' 2010-10-27 11:08:06 -07:00
Raphael
f700eb537a Add activemodel error message for person to en and fr locales 2010-10-27 10:27:30 -07:00
zhitomirskiyi
634538eff3 IZ MS change back deploy config 2010-10-27 10:13:04 -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
zhitomirskiyi
21c75c08bb removed the http inspect 2010-10-26 19:19:34 -07:00
zhitomirskiyi
c4b79aebc0 mongo query profing 2010-10-26 18:42:53 -07:00
zhitomirskiyi
0b2e00b7d6 MS IZ the mailer will not be setup unless turned on in the APP_CONFIG 2010-10-26 17:46:19 -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
Raphael
f975199f19 Merge remote branch 'mael/fr-locales' 2010-10-26 16:40:50 -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
zhitomirskiyi
c0c8c6253c added a logging line for debugging 2010-10-26 15:13:16 -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
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
Sarah Mei
33410899d9 Fix for build breakage 2010-10-25 21:38:53 -07:00
danielvincent
a1d00d41e5 deploys back to master 2010-10-25 19:33:23 -07:00
danielvincent
6ff94e67b3 remove unused fb_config.yml files. removed oauth_keys.yml from git, updated .example" 2010-10-25 17:50:04 -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
c4ff07b09a twitter oauth dance complete 2010-10-25 17:41:58 -07:00
Hexagon
1382bd9d08 Fixed header in swedish translation 2010-10-25 21:45:43 +02:00
Hexagon
d617392108 Added/complemented swedish translation 2010-10-25 21:41:32 +02:00
maelsoucaze
14ac908c3d French localizations updates. 2010-10-25 00:06:05 +02:00
maelsoucaze
294c8849b9 Merge remote branch 'upstream/master' into fr-locales 2010-10-25 00:04:24 +02:00
ilya
b337d5acc9 delivery method test in tests 2010-10-22 16:36:54 -07:00
ilya
47b03c45b2 commented out the email interceptor 2010-10-22 10:37:04 -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
MrZYX
5fa623552d made smtp sender address configurable 2010-10-21 19:47:30 +02: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
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
Alec Leamas
03f637eca9 Polishing up after git mess... 2010-10-20 22:05:42 +02:00
Joseph Method
4b588ccefb Addresses [#380] and [#239] by handling the errors from bad identities 2010-10-19 23:44:43 -04:00
Raphael
9309be2d69 Merge branch 'import' 
Conflicts:
	spec/models/user/invite_spec.rb
 2010-10-19 16:06:48 -07:00
danielvincent
0621aa2f6c fixed no friends/posts message positioning 2010-10-19 12:28:54 -07:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
Alec Leamas
fcd70ce152 Add a configuration file 
Adds a config file with environment and default thin
options
 2010-10-19 08:26:43 +02:00
ilya
d642928268 invite sends friend request if already friends, and raises if already friends 2010-10-18 16:27:02 -07:00
Joseph Method
e3e4a6b319 Continuation of previous commit 2010-10-17 19:07:54 -04:00
Sarah Mei
f688653936 disallow whitespace in username 2010-10-16 23:34:58 -07:00
Sarah Mei
d25847a626 Error message for duplicate email; add email validation spec. 2010-10-16 22:46:13 -07:00
Sarah Mei
83b23a0ffe Error message for duplicate username; refactor User validation specs. 2010-10-16 22:36:26 -07:00
maelsoucaze
34b21e7543 French localization updates. 2010-10-16 17:19:19 +02:00
danielvincent
db31357172 another typo change 2010-10-15 11:16:04 -07:00
danielvincent
d18b59f3d3 typo fix 2010-10-15 11:12:12 -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
Raphael
0680c2b5a6 Merge remote branch 'maelsoucaze/fr-locales' 2010-10-14 17:43:27 -07:00
Raphael
ecc7a55f8b Merge remote branch 'flea/master' 
Conflicts:
	.gitignore
 2010-10-14 17:24:46 -07:00
Raphael
08e629668d I18ning empty_messages 2010-10-14 16:55:00 -07:00
maelsoucaze
9134c4545c Fixes and updates French (Informal Honorifics) localization. 2010-10-15 01:17:33 +02:00
maelsoucaze
753deedc65 Fixes and updates French (Formal Honorifics) localization. 2010-10-15 01:17:17 +02:00
danielvincent
32a0f60a2f moved photos link to the side bar for now 2010-10-14 14:38:19 -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
maxwell
04f6cdaacf MS DG; basic view support; it works, but it is ugly 2010-10-13 18:42:24 -07:00
Volkan Unsal
241d104bc1 change en to tr 2010-10-13 21:10:36 -04: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
ilya
324f14c719 setting the token to nil on accept of invite 2010-10-12 18:23:59 -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
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
Volkan Unsal
73f06bb61b add devise.tr.yml 2010-10-11 15:09:43 -04:00
danielvincent
9bfb213465 Merge branch 'invites' of github.com:diaspora/diaspora into invites 2010-10-11 11:52:57 -07:00
Volkan Unsal
6d00b2ca8a correct some spelling errors in Turkish translation 2010-10-10 23:49:36 -04:00
Volkan Unsal
35ad703a5b Merge branch 'master' of http://github.com/diaspora/diaspora 2010-10-10 23:09:19 -04:00
Volkan Unsal
633048fbed finished Turkish translation 2010-10-10 23:06:56 -04:00
Alec Leamas
0c30f544d9 Fallback to static version data if git unavailable. 
Uses the file config/gitversion if git is unavailable.  This is to
support deployment without git (which will be necessary). Installation
script will generate the file config/gitversion when app is shipped.
 2010-10-10 16:38:01 +02:00
ilya
ef3e627bed the users are now made with people 2010-10-08 15:40:42 -07:00
Nick van der Burgt
09b38bb726 Added dutch locale 2010-10-08 09:11:04 +02: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
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
Raphael
399e437655 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 17:34:03 -07:00
Raphael
2bb36a266a Merge remote branch 'minilibra/master' 2010-10-07 17:32:20 -07:00
ilya
c75a2ebd66 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 17:00:52 -07:00
ilya
97f058c625 moving to app config yml 2010-10-07 17:00:38 -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
ilya
ad348ed24c trying the mailer_condig 2010-10-07 16:54:38 -07:00
ilya
9c59adee51 in dev env as well 2010-10-07 16:48:49 -07:00
ilya
487637d5a3 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 16:42:49 -07:00
ilya
f022c2d8bd correct smtp server 2010-10-07 16:42:39 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
ilya
720d1daa9e moved the mailer settings back into env 2010-10-07 15:40:18 -07:00
ilya
8fae836b65 isolating the problem 2010-10-07 15:28:58 -07:00
ilya
e174722315 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 15:06:03 -07:00
ilya
43600905dc trying making the port an int 2010-10-07 15:05:52 -07:00
Raphael
6dbe429ed1 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 15:02:37 -07:00
Raphael
a01a059293 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:47:32 -07:00
danielvincent
efcd0c418d Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:47:31 -07:00
danielvincent
bd9e9043e0 fixed nb locale 2010-10-07 14:37:38 -07:00
ilya
7aa49b277c moved the smtp setting to intializers 2010-10-07 14:36:08 -07:00
Raphael
9646a453a1 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:34:57 -07:00
ilya
c036e63289 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:27:38 -07:00
ilya
2a104ea622 Revert "moved the SMTP setting into app_config.yml" 
This reverts commit 2451ac4957.
 2010-10-07 14:26:59 -07:00
danielvincent
1a8d4a603f Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:22:10 -07:00
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