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

980 commits

Author SHA1 Message Date
MrZYX
a9e3511c19 updated locales 2011-03-27 18:50:01 +02:00
MrZYX
d50cfe8d5d updated locales 2011-03-27 00:40:34 +01: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
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
MrZYX
deff67f486 fixed a translation 2011-03-22 13:47:44 +01: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
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
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
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
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
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
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
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
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
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
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
MrZYX
c79b55f520 updated locales 2011-03-05 16:32:01 +01:00
MrZYX
06ff32d8d5 updated locales 2011-03-04 14:43:44 +01:00
MrZYX
8ab54076f8 updated locales 2011-03-02 22:45:31 +01: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
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
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
e4ae0ddf67 updated locales 2011-02-21 15:32:32 +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
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
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
MrZYX
026ced5276 updated locales 2011-02-17 15:46:53 +01: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
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
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
David Morley
9b88eef832 add photos.show.original_post 2011-02-12 16:11:37 -08: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
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
MrZYX
4997fbdbd9 updated locales 2011-02-10 15:41:43 +01: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
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
MrZYX
5b1737b817 updated locales 2011-02-04 19:11:39 +01: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
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
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
MrZYX
0c802677c4 updated locales 2011-01-31 14:33:10 +01: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
3078156dbb javascript i18n wip 2011-01-29 13:28:43 -08: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
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
2314c08265 current password requirement to change password 2011-01-24 22:39:57 -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
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
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
danielvincent
3d89e1f203 login page cleanup. totally simple. changed link color to something less jarring 2011-01-19 23:06:54 -08:00
MrZYX
3dcb3d3e2c updated locales 2011-01-19 21:41:43 +01:00
MrZYX
f17ba7b4eb updated locales 2011-01-16 19:52:11 +01: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
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
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
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
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
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
0faeb70ec3 updated locales 2010-12-31 13:06:35 +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
Joe Davis
eb84561dcd almost finished 2010-12-28 21:59:34 +00: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
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
maxwell
152670a72b notification badge now in header 2010-12-20 18:05:31 -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
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
b3c63a3cc0 you can now unset the year of your birthday" 2010-12-17 18:05:13 -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
f821f49db1 added similar contacts to contact pages 2010-12-16 11:49:08 -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
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
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
c774685d52 users can now disable email notfications 2010-12-10 11:47:10 -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
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
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
Iuri Kothe
7d847e16d0 Added missing translations 2010-12-04 18:16:56 -02:00
Iuri Kothe
f22289ae0a Added missing translations 2010-12-04 13:49:59 -02: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
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
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
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
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
maxwell
17a890676e added a link in footer to this instances code. obey the agpl yo. 2010-11-29 16:46:43 -08:00
MrZYX
f94e079006 updated locales - finish is at 100% - thanks to all contributors 2010-11-29 21:53:52 +01:00
MrZYX
673fd38a2c updated locales - big thank you to all people at 99translations 2010-11-28 15:33:17 +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
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
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
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
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
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
Sarah Mei
aa4a61870c you can click on photos in manage aspects to see profiles 2010-11-24 22:09:14 -08: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
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
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
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
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
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
Hexagon
93b0f3fd81 Updating rails-i18n 2010-11-21 01:52:59 +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
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
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
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
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
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
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
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
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