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 |
|