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
MrZYX
e12c7a0eb0 updated locales 2011-04-17 22:22:56 +02:00
MrZYX
2eaf5abf32 updated locales 2011-04-16 00:59:12 +02:00
MrZYX
30c30e0d3e remove unused contact_of_contacts translation 2011-04-13 16:03:48 +02:00
Raphael Sofaer
5afe5f667e Move js out of notifications index, fix reference to notifications badge 2011-04-12 17:15:02 -07:00
Raphael Sofaer
07ba9b98df Typo 2011-04-12 11:50:11 -07:00
Raphael Sofaer
d5ecce7ca6 Merge branch 'limit_similar_contacts' 
Conflicts:
	app/controllers/people_controller.rb
 2011-04-12 11:48:41 -07:00
MrZYX
7362c8f79f updated locales 2011-04-12 16:24:59 +02:00
danielgrippi
106ae983d5 Merge branch 'master' into follow. all specs green. 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
 2011-04-11 17:48:37 -07:00
MrZYX
93be252b59 Merge branch 'css-rtl' 
Conflicts:
	public/javascripts/application.js
	public/javascripts/inbox.js
 2011-04-11 21:52:01 +02:00
MrZYX
71f7fcf22f updated locales 2011-04-10 22:25:54 +02:00
MrZYX
d59a1f1233 updated locales 2011-04-10 00:25:19 +02:00
danielgrippi
1c9ca738ae green everywhere. 2011-04-08 17:10:43 -07:00
Raphael Sofaer
0b9575af5d JS cleanup 2011-04-08 16:11:13 -07:00
Raphael Sofaer
c7dc6ce817 Fix jasmine specs 2011-04-07 18:30:29 -07:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
maxwell
d7c4e15835 let admin give a user 10 ma user 10 more invites 2011-04-07 17:54:22 -07:00
Raphael Sofaer
75d514c448 Fix infieldLabels on new aspect box 2011-04-07 17:53:07 -07:00
maxwell
48cfa49582 change the mention notification wording to be less akward 2011-04-07 17:45:03 -07:00
MrZYX
bea1f26c14 updated locales 2011-04-07 22:43:54 +02:00
Raphael Sofaer
52eac27a43 Add infinite scroll to mobile 2011-04-07 11:38:38 -07:00
Jamie Wilkinson
4a3cc59df9 Fix crazy slow dev-mode exception pages using targeted .inspect monkeypatches 2011-04-06 17:45:52 -07:00
Raphael Sofaer
847a66735a Increase time between thin restarts, rescue jasmine load failure for deploying without test gems 2011-04-06 14:32:46 -07:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
MrZYX
1b2abce5e1 updated locales 2011-04-06 22:06:32 +02:00
Raphael Sofaer
9454c3a1b9 Working on fixing infinite scroll, in particular for aspects with the number 2 in their id. 2011-04-05 19:28:40 -07:00
Raphael Sofaer
59334dfaf5 Remove extra js, fix mobile view 2011-04-05 16:18:04 -07:00
MrZYX
3df419a081 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-04-05 22:26:14 +02:00
MrZYX
50b1846710 updated locales 2011-04-05 22:26:03 +02:00
Jordi Mallach
dc55b3137d Update Catalan translation to 87c48b0. 2011-04-05 21:00:23 +02:00
MrZYX
3a1094dee8 fixed #859 2011-04-05 18:12:08 +02:00
MrZYX
8b00ca2861 fixed #678 2011-04-05 17:38:53 +02:00
maxwell
87c48b003a make inviter say find your friends, because thats what it helps you do 2011-04-04 15:48:10 -07:00
danielgrippi
590e1fd93f All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
MrZYX
bef8377610 added Breton 2011-04-04 20:51:19 +02:00
MrZYX
a34d7f5a83 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-04-04 20:50:01 +02:00
MrZYX
8cccdaf75c updated locales 2011-04-04 20:49:58 +02:00
Jordi Mallach
b21fd0e9ca Update Catalan translation to b776bb5. 2011-04-03 23:26:20 +02:00
MrZYX
b776bb52db made string on mobile page translatable 2011-04-03 13:17:09 +02:00
MrZYX
92bf8444a7 added spec; rtl? -> direction_for 2011-04-03 04:20:08 +02:00
MrZYX
a7a8da2f75 added detection of rtl languages on every user based input 2011-04-03 02:14:35 +02:00
MrZYX
e4db8c7a36 fixed #589, no CSS! 2011-04-03 02:10:41 +02:00
maxwell
f3a62bf76b update jquery to latest 2011-04-02 15:03:41 -07:00
MrZYX
1a1a06118f Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-04-02 15:15:45 +02:00
MrZYX
4a044d6f1e updated locales 2011-04-02 15:15:31 +02:00
Jordi Mallach
c28131c7e0 Updated Catalan to f2ca2c2. 2011-04-01 23:45:50 +02:00
maxwell
f2ca2c2357 fix up translations, and remote on publisher" 2011-03-31 23:52:29 -07:00
maxwell
569fb66e9e bunch of small mobile ui fixes 2011-03-31 23:38:38 -07:00
maxwell
bb59df46f9 updating jquery mobile, fix the menu page a bit 2011-03-31 18:19:51 -07:00
zhitomirskiyi
f99b724e0b ms iz, can now undo hiding a post, fixed a bunch of jamine specs 2011-03-31 17:23:54 -07:00
MrZYX
bd8c9af122 updated locales 2011-03-31 21:31:17 +02:00
zhitomirskiyi
bb4c2ee85d added a character count to the publisher 2011-03-30 19:11:24 -07:00
zhitomirskiyi
5a9ec82597 can now hide posts 2011-03-30 16:43:28 -07:00
MrZYX
183ea42d54 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-30 22:44:53 +02:00
MrZYX
45c13d3a7d updated locales 2011-03-30 22:44:49 +02:00
Jordi Mallach
f09e06c56b Update Catalan translation to a3b2c60. 2011-03-30 18:24:47 +02:00
Jordi Mallach
a3b2c60c3b Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-30 18:18:45 +02:00
Jordi Mallach
313704cb9a Update Catalan translation to 0aaaefe. 2011-03-30 17:32:36 +02:00
Jordi Mallach
8b4d17a65a Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-30 17:29:33 +02:00
MrZYX
699264e7a3 made flash messages for conversations translatable 2011-03-30 16:52:43 +02:00
zhitomirskiyi
cd7cced9c0 renamed the js to indicate custom 2011-03-29 17:25:35 -07:00
zhitomirskiyi
0aaaefeba2 fix tag plugin 2011-03-29 16:53:48 -07:00
Jordi Mallach
4129bb105a Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-30 00:04:11 +02:00
zhitomirskiyi
a5bb26a3c4 almost done 2011-03-29 15:03:09 -07:00
MrZYX
4dabfdad2b Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-29 21:53:37 +02:00
MrZYX
2027655316 updated locales 2011-03-29 21:53:29 +02:00
Jordi Mallach
d759f97c9f Update Catalan translation to aa478ddd. 2011-03-29 20:56:11 +02:00
Jordi Mallach
8a222e2991 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-29 20:40:43 +02:00
MrZYX
aa478ddd5c string concatenation with translations is bad, especially if you leave on part of it untranslated :P 2011-03-29 15:39:57 +02:00
maxwell
ccbba9b52e fix translations 2011-03-28 20:09:09 -07:00
maxwell
8b7dc0a2cc translated bookmarklet, added post to main page 2011-03-28 19:57:06 -07:00
maxwell
f08b5dfafe basic functionality done, fixing rough edges 2011-03-28 18:11:59 -07:00
Jordi Mallach
9d04f36a38 Update Catalan translation to 40810741. 2011-03-28 20:55:13 +02:00
MrZYX
40810741f3 fixed cucumber 2011-03-27 22:04:36 +02:00
adonix
b71bfdf583 972-issue:all-aspects-spelling 2011-03-27 12:14:09 -07:00
MrZYX
a9e3511c19 updated locales 2011-03-27 18:50:01 +02:00
MrZYX
52fee96bfc whoops, recieve is a post route, not a get, thanks mb-log 2011-03-27 16:11:38 +02:00
MrZYX
55417cf9e3 AspectsController#move_contact -> AspectMembershipsController#update 2011-03-27 13:29:36 +02:00
MrZYX
d50cfe8d5d updated locales 2011-03-27 00:40:34 +01:00
MrZYX
b689d4695b refactor of routes.rb done so far; further refactor needs design decisions 2011-03-27 00:05:35 +01:00
MrZYX
985d79acb5 some more refactoring to routes.rb 2011-03-26 17:38:49 +01:00
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
danielgrippi
f5a03fd6ed Make public timeline of a user publicly accessible 2011-03-25 15:06:22 -07:00
danielgrippi
5dbbc79f65 added users_profile_image, home_timeline, fixed public_timeline 2011-03-25 15:06:22 -07:00
danielgrippi
517f3fd802 statuses/ and users/ GET routes 2011-03-25 15:06:22 -07:00
maxwell
ea3d839e1c initial public api' 2011-03-25 15:06:22 -07:00
MrZYX
2d366bcf71 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-25 21:13:02 +01:00
MrZYX
467b85f7ba updated locales 2011-03-25 21:13:00 +01:00
Jordi Mallach
cf99c19e2c Update Catalan translation to 7a315312. 2011-03-25 15:25:48 +01:00
MrZYX
82e08ef5d0 updated locales 2011-03-24 18:05:56 +01:00
MrZYX
56a6f0e43b cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
Raphael Sofaer
555a774668 Initial contacts_of_contact page 2011-03-23 16:42:53 -07:00
zhitomirskiyi
7a31531258 added location to the profile 2011-03-23 15:56:46 -07:00
zhitomirskiyi
24db7a3b87 added tooltips to the service icons 2011-03-23 14:13:54 -07:00
zhitomirskiyi
8a9a95d854 added a flash notice 2011-03-23 11:45:06 -07:00
danielgrippi
b9b9d7e07d renamed home to all aspects in header, made clicking aspect names on right trigger filtering 2011-03-23 10:29:34 -07:00
danielgrippi
fe44ee8230 fix tab order in publisher; removed 'to mention...' text 2011-03-22 17:29:03 -07:00
danielgrippi
a44ca157e6 added text to private message notification; user picture in popup 2011-03-22 17:14:37 -07:00
MrZYX
c483246ac7 updated locales 2011-03-22 22:48:08 +01:00
MrZYX
643a066691 moar translatable 2011-03-22 22:45:36 +01:00
maxwell
a036a8035f add a plaintext layout for emails, and include a link to change your email settings in the emails 2011-03-22 12:26:38 -07:00
Raphael Sofaer
8c6afbb912 Oops. 2011-03-22 10:21:31 -07:00
MrZYX
deff67f486 fixed a translation 2011-03-22 13:47:44 +01:00
Raphael Sofaer
2b997e70c2 Refactor image processing to use 2 uploaders. Federation and s3 need testing 2011-03-21 16:40:53 -07:00
Raphael Sofaer
a45103d0ef Make post not found redirect clearer 2011-03-21 16:40:53 -07:00
zhitomirskiyi
058b74846a removed the bring your friends message from the stream 2011-03-21 15:23:34 -07:00
zhitomirskiyi
dcc80d5b43 almost done, need to figure out how whats the deal with the controller not being called 2011-03-21 14:56:50 -07:00
MrZYX
87dafeb67b Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-21 21:37:28 +01:00
MrZYX
e0b176ee2c updated locales 2011-03-21 21:37:13 +01:00
Jordi Mallach
9ffa7ac03d Updated Catalan translation to a2715ca. 2011-03-21 15:02:56 +01:00
MrZYX
a2715ca963 fixed migration naming, fixed translation 2011-03-20 23:00:56 +01:00
MrZYX
4b7a4686db updated locales 2011-03-20 18:53:29 +01:00
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
Sarah Mei
0b1fa4d014 You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files. 2011-03-19 20:53:55 -07:00
Sarah Mei
c1bf68068f Pull relationship action button from search results out into a partial. 
Copyedit messages.
 2011-03-19 15:59:56 -07:00
MrZYX
73905e6831 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-19 14:15:37 +01:00
MrZYX
a29b3ba5e8 updated locales 2011-03-19 14:15:32 +01:00
Jordi Mallach
c1bcb421ce Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-19 14:10:29 +01:00
Jordi Mallach
6bfdcb0583 Updated Catalan to a05c9b0. 2011-03-19 14:09:58 +01:00
MrZYX
a05c9b0010 fixed a translation, keep up the new format in en.yml, set pagination labels in application controller 2011-03-19 14:04:11 +01:00
Jordi Mallach
4274e977cb Update Catalan translation to 3db11cf. 2011-03-19 13:43:03 +01:00
Jordi Mallach
dc8e9565e9 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-19 13:35:41 +01:00
danielgrippi
3db11cf38d PostsController#index -> TagsController#show 2011-03-18 20:57:39 -07:00
Jordi Mallach
db04092b8c Correct translation. 2011-03-18 14:39:10 +01:00
Jordi Mallach
7d739a5071 Update Catalan translation to 574a3b4. 2011-03-18 14:37:34 +01:00
MrZYX
24335aa5bf updated locales 2011-03-18 14:01:18 +01:00
zhitomirskiyi
2b6165d8ea wip 2011-03-17 14:32:07 -07:00
zhitomirskiyi
574a3b45b1 made it flash the sm on the profile page 2011-03-17 11:54:13 -07:00
Jordi Mallach
57aa8e71bf Updated Catalan translation to a787106. 2011-03-17 15:57:12 +01:00
Jordi Mallach
25691ac8b2 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-17 15:45:27 +01:00
Jordi Mallach
f7391ca7ae Fix some leftovers thanks to MrZYX's diff-yml-keys.py. 2011-03-17 15:42:14 +01:00
MrZYX
c661bce988 updated locales 2011-03-17 15:23:34 +01:00
MrZYX
a78710690a moar translations 2011-03-17 15:11:24 +01:00
Jordi Mallach
4ee9642d02 Correct indentation and re-add requests & message_inbox tags. 2011-03-17 14:44:10 +01:00
Jordi Mallach
a2da1240b8 Adding "1" to notification message. 2011-03-17 14:34:53 +01:00
MrZYX
5a8ba0e805 fixed syntax errors in ca.yml 2011-03-17 14:31:14 +01:00
Jordi Mallach
5c9370f2e0 Two of the keys are verb, not noun. Adapt accordingly. 2011-03-17 14:16:25 +01:00
Jordi Mallach
a03238ec40 Fix typo. 2011-03-17 13:45:02 +01:00
Jordi Mallach
e8a3537520 Updated Catalan translations to 6a33ae7. 2011-03-17 13:44:13 +01:00
Jordi Mallach
7b93c0a64b Adapt Catalan translation to the reformatting of ed8d4db. Hopefully 
everything is correct, but it wouldn't be surprising if something has been
overlooked.
 2011-03-17 13:04:37 +01:00
zhitomirskiyi
6a33ae7795 fixed the css, added a space 2011-03-16 19:20:24 -07:00
zhitomirskiyi
b0ec5a0b2e moved the fixture to the right place 2011-03-16 18:10:50 -07:00
danielgrippi
a85b5bb70f add a people count on tag page 2011-03-16 17:27:27 -07:00
zhitomirskiyi
abbf949fe1 publishing from a person profile page wip 
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one

a tiny sass add

publishing from the profile works, need js translation

added the translation

made the hover state consistant

need to fix the cucumber spec

specs are green need to add a button

added the buttion to mention people

moved the publisher to the facebox

fixed the cucumbers for the modal window
 2011-03-16 16:35:30 -07:00
MrZYX
5457f48c2a updated locales 2011-03-16 16:11:51 +01:00
danielgrippi
09756c17c1 change tags to #tags in translations 2011-03-15 22:19:31 -07:00
danielgrippi
20b5ca7570 added tag helper text on profile, edit on hover 2011-03-15 22:10:20 -07:00
danielgrippi
be42ccfa16 Be less glib 2011-03-15 15:03:20 -07:00
MrZYX
4e4e4d763a fixed translations 2011-03-15 21:58:15 +01:00
danielgrippi
c608c70ca7 tagging profiles complete 2011-03-15 13:21:36 -07:00
danielgrippi
20f5105e5d breaking out Diaspora::Taggable wip 2011-03-15 13:21:36 -07:00
MrZYX
879aa9eb4a updated locales 2011-03-15 16:03:45 +01:00
MrZYX
09ba0c8d00 made catalan translation usable again 2011-03-15 15:52:42 +01:00
Ritchie Wilson
81661d61fc changes the 'You are not sharing with...' button to static text instead of inserting the persons name 2011-03-15 10:00:15 -04:00
maxwell
2e72fc09c6 made 3+ plus collapse in notifications index 2011-03-14 18:09:51 -07:00
Raphael Sofaer
4b4654a408 Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
MrZYX
01e3b3cc26 updated locales 2011-03-14 18:43:45 +01:00
MrZYX
a544a189ff updated locales 2011-03-13 21:21:27 +01:00
MrZYX
2a5d41cc82 fixed translations for comments 2011-03-13 21:16:43 +01:00
MrZYX
5cae971ba1 added some languages 2011-03-13 13:20:20 +01:00
MrZYX
6ba0083337 updated locales 2011-03-13 13:19:12 +01:00
MrZYX
63caff1f40 updated locales 2011-03-12 12:55:37 +01:00
MrZYX
ed8d4db3a8 some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones 2011-03-12 03:27:28 +01:00
Jordi Mallach
59820d1994 Update Catalan translation to fd6545b. 2011-03-12 01:37:13 +01:00
Jordi Mallach
fd6545b609 Fix typos. 2011-03-12 01:30:07 +01:00
Jordi Mallach
2d5dc81854 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-12 01:07:58 +01:00
Jordi Mallach
0745a5ed7c Catalan translation update. 2011-03-12 01:07:31 +01:00
maxwell
50d9d76562 update translations for email settings, and missing translation for aspect#new 2011-03-11 16:02:24 -08:00
Jordi Mallach
00b0edcd39 Fix typo. 2011-03-12 00:53:44 +01:00
MrZYX
b93084e04f updated locales 2011-03-11 17:28:14 +01:00
Raphael Sofaer
b86098055e Add tag search on public page 2011-03-10 18:37:45 -08:00
Raphael Sofaer
8f929d2b85 Show local public posts in /p 2011-03-10 14:41:03 -08:00
MrZYX
dd97f1b985 updated locales 2011-03-10 15:50:43 +01:00
MrZYX
1e3533b1b1 made zh-TW as language available. Thanks to iongchun 2011-03-10 14:45:46 +01:00
Raphael Sofaer
9324aceefc typo 2011-03-09 18:04:09 -08:00
Raphael Sofaer
584684560e Make conversation delete clearer 2011-03-09 17:58:29 -08:00
maxwell
f9279f9bbc fixed public route not fetching posts, also an error in status_message activity markup 2011-03-09 17:08:41 -08:00
MrZYX
dc7a672d9f fixed some translations 2011-03-09 22:46:58 +01:00
danielgrippi
ee6932a3f7 added title to padlock on aspect edit pane 2011-03-09 12:15:23 -08:00
danielgrippi
d0569fb881 simplified functionality on aspect edit faceboxes 2011-03-09 12:00:49 -08:00
Raphael Sofaer
c259fc65f0 You can now pass hashes to the logger 2011-03-09 11:48:29 -08:00
MrZYX
ef58c5f13d fixed #911 2011-03-09 16:12:44 +01:00
MrZYX
a5d170ef1c updated locales 2011-03-09 15:53:52 +01:00
MrZYX
0d1133cd51 fixed some translations 
do not escape html in private_message text only email
 2011-03-09 15:33:46 +01:00
danielgrippi
1f5edb1d92 Merge branch 'private_messages' 
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
 2011-03-08 21:23:41 -08:00
danielgrippi
81f0cd7f07 fixed double-javascript loading on people/show 2011-03-08 20:42:56 -08:00
danielgrippi
ac738df8f5 added missing translation 2011-03-08 19:22:49 -08:00
zhitomirskiyi
c252cfa025 added the email notification, the notification is not persisted, fixed the receive callback spec 2011-03-08 18:24:56 -08:00
danielgrippi
d38e3a6b29 added translations to all conversation/message views. tweaked css 2011-03-08 15:51:46 -08:00
zhitomirskiyi
84198e4750 Merge branch 'private_messages' of github.com:diaspora/diaspora into private_messages 2011-03-08 11:57:49 -08:00
danielgrippi
78e30ff459 update unread count in conversation visibility when hitting conversationscontroller#show 2011-03-08 11:43:58 -08:00
MrZYX
7b5b980095 link to public feed of the person on the profile person show page instead of to the one of current_user 
fixed #700
fixed #864
fixed #774
 2011-03-08 20:30:48 +01:00
zhitomirskiyi
8bcf1b49c7 notifier for the messages, we're so close 2011-03-08 10:53:49 -08:00
MrZYX
fd0bc8a09a updated locales 2011-03-08 15:38:18 +01:00
danielgrippi
97aff09140 added autocomplete on message 'to' field, minor css tweaks to inbox 2011-03-07 11:22:59 -08:00
Raphael Sofaer
e00a033e9e Update rspec-instafail, test git headers 2011-03-06 10:18:37 -08:00
MrZYX
c79b55f520 updated locales 2011-03-05 16:32:01 +01:00
MrZYX
06ff32d8d5 updated locales 2011-03-04 14:43:44 +01:00
danielgrippi
5f55dfa1bc private message inbox wip 2011-03-03 17:32:26 -08:00
Raphael Sofaer
3d0831f2b2 Merge remote branch 'mnutt/photo_upload_status' 2011-03-03 11:43:16 -08:00
MrZYX
8ab54076f8 updated locales 2011-03-02 22:45:31 +01:00
zhitomirskiyi
3812612c86 added a validation of participant, as well as messages controller spec wip 2011-03-01 19:24:07 -08:00
Raphael Sofaer
0cb218bba0 Delete statistic and data point models 2011-03-01 16:54:12 -08:00
danielvincent
1072806d8f PrivateMessage -> Conversation, Message. 2011-03-01 12:25:55 -08:00
danielvincent
979d9d7fb4 added delete actions for private messages 2011-03-01 12:14:31 -08:00
danielvincent
090c412690 touched up AspectMembership resource 2011-03-01 12:14:31 -08:00
danielvincent
9fe0320881 added PrivateMessage and PrivateMessageVisibility models and migrations 2011-03-01 12:14:31 -08:00
MrZYX
31f5500b11 removed RAILS_ENV=test example from config/server.sh 2011-03-01 17:28:35 +01:00
Michael Nutt
ac2c50b33f denote that fileuploader has been modified 2011-02-28 20:37:41 -05:00
Raphael Sofaer
d8956a7cd5 Add foreign key constraints 2011-02-28 15:18:35 -08:00
MrZYX
98999b1703 updated locales 2011-02-28 22:15:15 +01:00
MrZYX
a42c1225d1 updated locales 2011-02-26 14:31:54 +01:00
MrZYX
afecfe5e93 save the correct url on redirect in http_multi job; be tolerant about messed up urls in the db 2011-02-26 14:22:14 +01:00
Dan Hansen
3538bda06d fix email subject wording 2011-02-25 16:56:21 -06:00
Paweł Wilk
c5e0bc40bb Inflection aliases updated 2011-02-25 22:09:54 +01:00
MrZYX
ee96dea398 update i18n-inflector to 2.5.1; correct Polski to polski; fixed locales; thanks siefca 2011-02-25 21:41:32 +01:00
MrZYX
9fdf1e599f updated locales 2011-02-25 15:58:34 +01:00
MrZYX
d4fb1d8af6 added README to rails-i18n directory 2011-02-25 14:35:18 +01:00
Raphael Sofaer
736783abd7 You can't call post.person when post is nil. We should probably just reject and delete the invalid notifications in the controller, keeping them in the view is aggravating 2011-02-24 11:13:25 -08:00
MrZYX
ff796efce0 updated locales 2011-02-24 16:25:43 +01:00
MrZYX
62badaa0df updated catalan locale 2011-02-24 16:24:05 +01:00
MrZYX
ea6dc0eb9a updated locales 2011-02-24 00:39:00 +01:00
MrZYX
98cdee97c0 Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections 
Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/controllers/posts_controller.rb
	app/controllers/publics_controller.rb
 2011-02-24 00:33:34 +01:00
zhitomirskiyi
e106ec6a79 added post author to the subject of the also commented email as well as the notification 2011-02-23 13:03:11 -08:00
Dan Hansen
9ef6606f80 load jquery from google only if local copy fails 2011-02-22 13:41:05 -06:00
MrZYX
e943d6ae5e updated locales 2011-02-22 16:12:06 +01:00
MrZYX
3d034668fd Revert "updated locales" 
This reverts commit 85c346b520.
 2011-02-22 16:07:31 +01:00
MrZYX
85c346b520 updated locales 2011-02-22 13:59:23 +01:00
MrZYX
65447e63ec Catalan locale update from Jordi Mallach 2011-02-22 13:51:38 +01:00
MrZYX
feb47df97e total refactor of version header. X-Git-Update: ISO 8601 formated date of the last commit, X-Git-Revision: sha1 hash of the last commit 2011-02-21 17:13:11 +01:00
MrZYX
e02c3eafc0 Merge branch 'xheader' of https://github.com/diasporg/diaspora into xheader 2011-02-21 16:12:24 +01:00
MrZYX
e4ae0ddf67 updated locales 2011-02-21 15:32:32 +01:00
MrZYX
ab706f4127 fixed sort by css for languages different from english 2011-02-20 19:00:13 +01:00
MrZYX
abf385d79d collapsed langcodes_alias_map.yml and languages.yml into locale_settings.yml 2011-02-20 14:35:24 +01:00
MrZYX
47d2b752c2 updated locales 2011-02-20 13:14:35 +01:00
MrZYX
096e5e577b updated locales 2011-02-19 12:00:07 +01:00
MrZYX
124ac738ea 'sort by:'translatable 2011-02-19 11:39:28 +01:00
maxwell
43f17b3ed8 made toggle for post time on aspects#index 2011-02-18 16:47:44 -08:00
maxwell
0bf3cae54a MS IZ added spec from admin page, moved it to its own controller where it belongs 2011-02-18 11:35:24 -08:00
maxwell
c3e101112d add missing translation 2011-02-18 10:32:21 -08:00
MrZYX
ece7cddc51 added license to javascripts.en.yml; better langcodes_alias_map.yml; .gitignore users.yaml fixture 2011-02-18 17:22:19 +01:00
MrZYX
666c040c1d updated locales 2011-02-18 17:21:11 +01:00
zhitomirskiyi
a68dfbcabc removed the share_with route 2011-02-17 18:05:21 -08:00
zhitomirskiyi
16b7ec3990 pulled out share_with to be contact new and contact show 2011-02-17 18:05:21 -08:00
maxwell
7ace73b84b iz ms wip fixing contactController destroy 2011-02-17 18:05:21 -08:00
maxwell
17a801394e work in progress. need to update the views for the controller changes 2011-02-17 18:05:21 -08:00
maxwell
6858e2e543 crazy ugly admin interface so an admin can invite people, and search for user accounts for basic debugging 2011-02-17 18:00:59 -08:00
MrZYX
026ced5276 updated locales 2011-02-17 15:46:53 +01:00
Raphael Sofaer
6cf8de94a7 take secret token stuff out of chef scripts 2011-02-16 22:46:43 -05:00
MrZYX
2161c1dd72 updated locales 2011-02-16 15:42:23 +01:00
maxwell
d1b91e1eac wip, profiles controller and specs, with cucumber failures 2011-02-15 14:17:25 -08:00
David Morley
151b23f77b remove modulization part 2011-02-15 11:11:40 -08:00
David Morley
e3df222d0e move file 2011-02-15 10:42:02 -08:00
MrZYX
f7de3a216a fixed a translation 2011-02-15 15:02:36 +01:00
MrZYX
7fb6c5bcb9 updated locales 2011-02-15 13:43:45 +01:00
MrZYX
614aa3056a updated locales 2011-02-14 17:46:13 +01:00
danielvincent
164fe1c1b5 adjust column width, leading, serifs, etc. in stream for better readability. 2011-02-13 15:27:14 -08:00
zhitomirskiyi
50ea657cd2 put it back for reference 2011-02-13 15:14:27 -08:00
zhitomirskiyi
9f78156206 broke out the en activerecord validations translations to their respective file 2011-02-13 15:09:05 -08:00
MrZYX
86cc7a0d35 added some languages 2011-02-13 13:36:06 +01:00
MrZYX
654be58a87 moved gl-ES to gl and added it to languages.yml 2011-02-13 13:18:58 +01:00
MrZYX
81369176f1 updated locales 2011-02-13 12:02:03 +01:00
MrZYX
935b934b7a Merge branch 'pubphoto' of https://github.com/diasporg/diaspora 2011-02-13 11:56:20 +01:00
David Morley
9b88eef832 add photos.show.original_post 2011-02-12 16:11:37 -08:00
David Morley
d030343048 turn off gzip on jammit 2011-02-12 15:08:45 -08:00
MrZYX
cd2d7db7b2 workaround from https://rails.lighthouseapp.com/projects/8994/tickets/5329-using-i18nwith_locale-in-actionmailer-raises-systemstackerror 2011-02-12 21:31:14 +01:00
MrZYX
a572637e4c fix a translation 2011-02-12 18:06:56 +01:00
MrZYX
8639e08920 updated locales 2011-02-12 14:41:13 +01:00
Raphael Sofaer
d202200a88 tweak copy 2011-02-11 18:04:00 -08:00
zhitomirskiyi
ea3afa6720 added the mention explanation text 2011-02-11 17:31:23 -08:00
MrZYX
3dbfc85aa9 updated locales 2011-02-11 17:20:07 +01:00
Raphael Sofaer
bb58544a70 Add logging for GC (slight slowdown, but worth it for the data) 2011-02-10 15:52:00 -08:00
maxwell
c6e0379a00 fixing engrish in translation 2011-02-10 14:02:36 -08:00
zhitomirskiyi
717d2e09c9 fixed the translation in the email 2011-02-10 12:39:05 -08:00
zhitomirskiyi
d1771bbe17 notifications for mentions 2011-02-10 12:39:05 -08:00
Raphael Sofaer
f1c63939f9 Revert "added sliding animation to stream elements, shadow on autocomplete box." 
This reverts commit dc760f9583.
 2011-02-10 10:36:30 -08:00
MrZYX
4997fbdbd9 updated locales 2011-02-10 15:41:43 +01:00
danielvincent
dc760f9583 added sliding animation to stream elements, shadow on autocomplete box. 2011-02-09 20:07:25 -08:00
maxwell
b24272474d document s3 in app_config.yml.example 2011-02-09 17:42:21 -08:00
Raphael Sofaer
cb67c14a51 Make cap deploy follow a branch in deploy_config.yml 2011-02-09 16:07:24 -08:00
Raphael Sofaer
0ec2d918bb adding keycodes file, moving keyup stuff to keydown 2011-02-09 16:07:24 -08:00
MrZYX
f0650a6135 updated locales 2011-02-09 17:05:47 +01:00
zhitomirskiyi
eecf1d5d82 fixed cucumber, localization, and css 2011-02-08 17:14:37 -08:00
zhitomirskiyi
4e96d11cd0 Revert "refactored local person person friend finder functionality to use the partial" 
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.

Conflicts:

	app/views/services/_remote_friend.html.haml
	app/views/users/getting_started/_step_3.html.haml

refactored invitations, added them to the last page

fixed styling on adding an aspect to the aspect list

added a facebook for person edit aspect memberships

touched up and simplified sign-up flow

fix styling on step 3
 2011-02-08 16:40:33 -08:00
zhitomirskiyi
d147da1b4a invitation text 
setting the invites

added requests to the fb hash

finder has options

remove the requester from the list

typo

making a block

another typo

remove the if statement for the notifications

checking on the right field

translations and correct indenting

fixed stuff added

added a temp puts

added a temp puts

now actually referencing the service

not double nesting

remove stream element

updated remote friends to old style

removed it from the h1 block

putting the stream element back
 2011-02-08 16:40:32 -08:00
zhitomirskiyi
a398184081 WIP 2011-02-08 16:35:33 -08:00
zhitomirskiyi
7241177421 translating the warning about removing the person from the last aspect 2011-02-08 15:44:12 -08:00
MrZYX
6e0e46435e localize dates 2011-02-08 16:26:56 +01:00
MrZYX
2c06397fd9 updated locales 2011-02-08 15:06:12 +01:00
danielvincent
bf20e5a9e8 remove some js assets from mobile 2011-02-06 23:09:04 -08:00
danielvincent
42993de739 added back to comments; avatar. 2011-02-06 09:26:24 -08:00
MrZYX
b26e214001 updated locales 2011-02-06 16:04:06 +01:00
zhitomirskiyi
59f0dca7c7 Revert "publisher is now a hot widget" 
This reverts commit 8039ab312a.
 2011-02-05 15:24:20 -08:00
zhitomirskiyi
b49f54144e resending of invitation in resque and works 2011-02-05 15:01:04 -08:00
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