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

1248 commits

Author SHA1 Message Date
zhitomirskiyi
2c1c2a4a8a WIP 2011-02-05 15:01:04 -08:00
zhitomirskiyi
83a9e916e4 resending of invitation in resque and works 2011-02-05 15:01:04 -08:00
zhitomirskiyi
da6e16b3a4 WIP 2011-02-05 15:01:04 -08:00
Dan Hansen
8039ab312a publisher is now a hot widget 2011-02-05 16:47:43 -06:00
MrZYX
5b1737b817 updated locales 2011-02-04 19:11:39 +01:00
maxwell
ce010c24ec update jquery mobile to a3 2011-02-03 20:41:38 -08:00
maxwell
ee02a073cd toggle mobile site, when mobile device 2011-02-03 18:43:56 -08:00
danielvincent
8269e4b300 touched up photo show and status message show pages 2011-02-03 13:05:25 -08:00
MrZYX
9ae6ba4d66 updated locales 2011-02-03 15:35:59 +01:00
MrZYX
99cf9904f9 put jquery-ui back in as we need it for /aspects/manage at least 2011-02-02 16:56:50 +01:00
MrZYX
5ed587ddcd updated locales 2011-02-02 16:23:12 +01:00
MrZYX
423cd7807b Merge branch 'master' of github.com:diaspora/diaspora 2011-02-01 22:45:28 +01:00
MrZYX
15329af94d made "Search for" translatable 2011-02-01 21:55:28 +01:00
zhitomirskiyi
bc058332d3 commented on post email now includes the comment 2011-02-01 12:54:05 -08:00
Raphael
7d18e2bcd8 Finish autocomplete 2011-02-01 11:56:56 -08:00
Raphael
7be232e33e autocomplete wip 2011-02-01 11:56:56 -08:00
Raphael
9080649180 Starting work on an autocomplete feature 2011-02-01 11:56:56 -08:00
MrZYX
d8f5607509 updated locales 2011-02-01 16:56:29 +01:00
Raphael
c56eaadfa0 Make person profile a little bit aware of an incoming request 2011-01-31 15:47:01 -08:00
Raphael
0e2243e620 use capture and captures to detect thins in /service 2011-01-31 15:28:43 -08:00
Raphael
a2bb8515f9 Update cap scripts to have separate staging and production environments, use bundler 2011-01-31 15:28:43 -08:00
MrZYX
0c802677c4 updated locales 2011-01-31 14:33:10 +01:00
Sarah Mei
c40a266910 Deploy with capistrano. 2011-01-30 22:00:32 -08:00
Sarah Mei
25dc3bab8f removing config/deploy_config.yml from git 2011-01-30 21:52:38 -08:00
MrZYX
3b3807e8df updated locales 2011-01-30 10:10:53 +01:00
MrZYX
f487df2961 added javascripts:timeago to the master file 2011-01-30 09:27:12 +01:00
MrZYX
9e457f30ae moved javascript translations to their own files 2011-01-30 09:24:57 +01:00
Dan Hansen
099e0a6e24 i18n is the first widget to be loaded, add video locales, embedder uses i18n, only render mustache template with i18n if the views are passed 2011-01-29 16:40:10 -06:00
Dan Hansen
a6530f4db1 fix yaml structure 2011-01-29 16:09:19 -06:00
Dan Hansen
4b1b7591a6 load diaspora.js and widgets right after vendor/*, return empty string if the value is not found 2011-01-29 16:07:12 -06:00
Dan Hansen
b89a59ca55 update timeago usages 2011-01-29 13:30:32 -08:00
Dan Hansen
3078156dbb javascript i18n wip 2011-01-29 13:28:43 -08:00
Dan Hansen
d03119f7e9 Embedder is now a widget, show videos before comments 2011-01-29 13:22:34 -06:00
MrZYX
8150cd4317 remove mongodb from app_config.yml.example 2011-01-29 15:38:26 +01:00
MrZYX
f371ac9c74 updated locales 2011-01-29 15:07:10 +01:00
Raphael
7302a54710 Fix translation missing error 2011-01-28 17:50:34 -08:00
Raphael
ac4880cb0d scope translations correctly 2011-01-28 17:39:41 -08:00
zhitomirskiyi
dcf6469ded visible contacts option on aspect edit pane 2011-01-27 13:41:22 -08:00
Raphael
94ae7a678b Placeholder views for contacts_visible in aspects 2011-01-27 13:41:22 -08:00
MrZYX
cbfefc8fc3 fixed some untranslatable strings, thanks to Nygu 2011-01-27 21:04:03 +01:00
MrZYX
087e0389bb Merge branch '712-route-for-login' of https://github.com/TomK32/diaspora 2011-01-27 18:38:51 +01:00
MrZYX
45c590a3bf Merge branch 'fix_typo_at_default_language' of https://github.com/jairodiaz/diaspora 2011-01-27 18:27:23 +01:00
MrZYX
14f4e1aa57 some fixes to the translations of the mobile site 2011-01-27 18:20:25 +01:00
MrZYX
eba99c84ba made 'mark all as read' translatable 2011-01-27 17:13:27 +01:00
MrZYX
e9dddca86d updated locales 2011-01-27 17:04:39 +01:00
zhitomirskiyi
bc81154c46 consolidated invite/invite friends sections on aspect/index 2011-01-26 18:05:42 -08:00
zhitomirskiyi
9bd6b11ddf made facebox wider, remove disable with, added default profile photo for those not connected to diaspora 2011-01-26 17:50:49 -08:00
zhitomirskiyi
8941448866 placed friend finder in facebox. added translations 2011-01-26 17:44:40 -08:00
zhitomirskiyi
a610618057 display resend link if already sent invitation in friend finder 2011-01-26 16:57:39 -08:00
zhitomirskiyi
1a911a8b99 translation of invitation message, better checking of existing users and unique index on user(invitation_service and invitation_identifier) 2011-01-26 16:01:57 -08:00
zhitomirskiyi
b3467b5d17 pending specs for facebook inviter 2011-01-26 12:16:47 -08:00
zhitomirskiyi
8bc52cdb55 facebook friend finder gathers fb friends. 2011-01-26 12:16:46 -08:00
zhitomirskiyi
2314c08265 current password requirement to change password 2011-01-24 22:39:57 -08:00
maxwell
8b3beba93f adding login page to mobile, and adding timeago WIP 2011-01-24 17:36:47 -08:00
maxwell
1b3c58c2c2 Use a fake to not allocate an AR model for every reference to a person 2011-01-24 15:13:52 -08:00
Dan Hansen
b533d31fad make the footer not so useless 2011-01-24 12:23:51 -08:00
danielvincent
39c5189c1f everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge. 2011-01-24 12:22:17 -08:00
Dan Hansen
8293016348 make the footer not so useless 2011-01-23 23:53:17 -06:00
danielvincent
c96098540b ask a question in the publisher. (not removing previous translation & method just yet). 2011-01-23 11:06:08 -08:00
Dan Hansen
bdf559bb2b remove video embedding from stream.js, use embedder.js 2011-01-22 23:40:08 -06:00
danielvincent
77042f9d47 publisher always shows textarea. outline publisher textarea in blue 2011-01-22 18:49:50 -08:00
MrZYX
8bb257d4db updated locales 2011-01-22 18:11:35 +01:00
MrZYX
852be182f5 made 'start sharing' translatable 2011-01-22 16:29:39 +01:00
zhitomirskiyi
41993fe5da use highcharts.js for stats 2011-01-21 12:19:05 -08:00
zhitomirskiyi
46cb9dd346 before auth filter 2011-01-21 10:39:10 -08:00
zhitomirskiyi
69d6de2fe7 added views and graph generation for statistics 2011-01-21 10:29:07 -08:00
MrZYX
4eb31f1fd2 updated locales 2011-01-21 16:11:47 +01:00
maxwell
c6a3cff644 make the recover password error message slightly more informitive for people who signed up for invites but have not yet received them yet 2011-01-20 12:48:28 -08:00
MrZYX
4886dbe035 replaced user with username in the database.yml example 2011-01-20 15:19:14 +01:00
danielvincent
3d89e1f203 login page cleanup. totally simple. changed link color to something less jarring 2011-01-19 23:06:54 -08:00
zhitomirskiyi
fc6d641643 correct requires 2011-01-19 14:30:34 -08:00
MrZYX
3dcb3d3e2c updated locales 2011-01-19 21:41:43 +01:00
Raphael
85bae12a00 Query on guid, not id 2011-01-18 16:07:58 -08:00
Raphael
d0fb37e264 fix database yml example 2011-01-17 20:04:50 -08:00
Raphael
a6ff90ad20 removing database.yml 2011-01-17 16:17:08 -08:00
zhitomirskiyi
995d285fdd ssl s3, attrs 2011-01-17 15:56:06 -08:00
zhitomirskiyi
0f9dc4954a added a task to upload 2011-01-17 15:56:06 -08:00
danielvincent
2eb1901073 s3 support minus rake migration. 2011-01-17 15:56:06 -08:00
Raphael
68f2528f23 production in database yml example 2011-01-17 14:38:06 -08:00
Raphael
36781481bb Pulling in changes from master 2011-01-17 11:41:15 -08:00
Jairo Diaz
133828edeb fixed typo for default_language at environment.rb 2011-01-16 16:14:24 -05:00
MrZYX
f17ba7b4eb updated locales 2011-01-16 19:52:11 +01:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
Dan Hansen
d4f30ded1b Diaspora.js 2.0, added an official widget, don't use native alerts anymore 2011-01-14 14:54:44 -06:00
Raphael
d76121b147 Add charset to example database.yml 2011-01-14 10:54:02 -08:00
maxwell
c8dd16b60c make english translation ffor also commented on less akward 2011-01-14 09:49:29 -08:00
Paweł Wilk
ee59f36b77 Added grammatical inflection support using I18n Inflector with Rails plug-in 2011-01-14 18:33:15 +01:00
maxwell
f97a9fa017 added timeago jquery plugin. we now need to figure out a js translation scheme 2011-01-13 16:29:13 -08:00
zhitomirskiyi
9b6faa5644 added a notificaions read button 2011-01-12 16:24:14 -08:00
MrZYX
1319099cf3 made some strings translatable 2011-01-12 15:58:10 +01:00
MrZYX
40fc8efec9 updated locales 2011-01-12 15:57:07 +01:00
Sarah Mei
38102ebda7 Revert "Mount application on proper location" - changes cause app to fail when there's no trailing / on the pod_url. 
This reverts commit 18827b40d1.
 2011-01-09 18:32:01 -08:00
Sarah Mei
b865c20b2d Backing out sub-uri changes 2011-01-09 18:29:43 -08:00
Alec Leamas
e01fb62eeb Expose and refer to assets on the sub_uri. 
When using sub-uri, create a symlink in public/ making the assets
available at the sub-uri. Modify environment.rb so that asset paths
refers to this sub-uri path. Closes http://bugs.joindiaspora.com/issues/391
and http://bugs.joindiaspora.com/issues/737 when application mounted
on suburi (i. e., prev patch)
 2011-01-09 23:38:03 +01:00
Alec Leamas
18827b40d1 Mount application on proper location 
Uses mapping in config.ru to respect sub-uri settings in pod_uri.
 2011-01-09 23:37:47 +01:00
danielvincent
71ca93720b contact lists functional on aspects/index. edit panes facebox in from header 2011-01-08 13:11:53 -08:00
danielvincent
422f17a648 switched out fancybox for facebox (THANK GOD). added aspect edit panes to aspects/index. removed some partials. 2011-01-08 13:11:53 -08:00
danielvincent
8c82a5974a aspect badge links work across all pages, ajax stream on index. aspect info lightbox placeholder 2011-01-08 13:11:53 -08:00
danielvincent
b029475421 aspects now have edit pages accessible through the top nav 2011-01-08 13:11:52 -08:00
danielvincent
d0b25814b1 publisher retains text when filtering stream 2011-01-08 13:11:52 -08:00
danielvincent
e6ae5e13e2 publisher works through ajax filters 2011-01-08 13:11:52 -08:00
danielvincent
a9195d7730 aspect filters now functional on aspects/index 2011-01-08 13:11:51 -08:00
Andreas Schneider
0c58d9814b mailer: Added support for /usr/sbin/sendmail. 
This fixes bug #788.
 2011-01-08 18:57:24 +01:00
MrZYX
d3eb463896 updated locales 2011-01-08 16:54:53 +01:00
zhitomirskiyi
3fae950905 also commented notification and sending ids into resque so that it works 2011-01-06 15:56:03 -08:00
maxwell
3fe30cde12 removed message handler, postzord::dispatch is almost done, now i need to rip a bunch of methods out 2011-01-05 17:43:25 -08:00
zhitomirskiyi
7254db5cbc Revert "Revert "added comment on post mail method"" 
This reverts commit c9b3066599.
 2011-01-05 14:59:15 -08:00
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