Commit graph

1193 commits

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