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

1162 commits

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