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

993 commits

Author SHA1 Message Date
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
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