Raphael Sofaer
|
1666843aa9
|
Fix 500 in publicsController
|
2011-03-14 16:48:07 -07:00 |
|
MrZYX
|
e4be5db881
|
there can be no reason to not set the locale
|
2011-03-11 15:37:33 +01:00 |
|
maxwell
|
1baafac84b
|
added content to rss feed
|
2011-03-09 19:11:09 -08:00 |
|
Raphael Sofaer
|
e6836c46a7
|
Remove unnecessary includes, finish renaming set_header_data, only run set_header_data on html requests
|
2011-03-09 17:50:46 -08:00 |
|
danielgrippi
|
78e30ff459
|
update unread count in conversation visibility when hitting conversationscontroller#show
|
2011-03-08 11:43:58 -08: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 |
|
danielvincent
|
ae8686ef25
|
add which_action_and_user to application_controller
|
2011-01-28 16:15:50 -08:00 |
|
maxwell
|
e7a065a521
|
make jobs have a base class, which will verify the activerecord connection before trying the job
|
2011-01-19 14:10:42 -08:00 |
|
danielvincent
|
511a48adde
|
fixed publicscontroller specs
|
2011-01-18 16:52:11 -08:00 |
|
Raphael
|
85bae12a00
|
Query on guid, not id
|
2011-01-18 16:07:58 -08:00 |
|
Raphael
|
738e8c65c8
|
Merge almost complete, 4 failures
|
2011-01-14 16:00:10 -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
|
f509367a40
|
fix the 404 page to show the dun goofed guy
|
2011-01-13 17:31:18 -08:00 |
|
maxwell
|
cff387d651
|
make sure receive unescapes the payload before sending it to the job
|
2011-01-06 16:30:22 -08:00 |
|
Raphael
|
319452537e
|
Below 70 failures, GUIDs are next
|
2010-12-21 15:46:15 -08:00 |
|
maxwell
|
1451db6cd8
|
fixed rspec build
|
2010-12-16 10:15:16 -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
|
6cfa6577a5
|
Add first resque job
|
2010-12-02 12:35:26 -08:00 |
|
danielvincent
|
aa9966ea26
|
removed the word friend everywhere minus translation files
|
2010-11-12 20:22:55 -08:00 |
|
danielvincent
|
b4679c9041
|
Take application_controller before filters out of publicscontroller
|
2010-11-04 15:33:16 -07:00 |
|
danielvincent
|
da8124f8a7
|
hcard has searchable field, and is taken in to account when building Person from webfinger
|
2010-11-02 16:12:43 -07:00 |
|
maxwell
|
1b48572674
|
MS tests are now green
|
2010-10-29 11:16:50 -07:00 |
|
maxwell
|
fddec49655
|
adding nexttick
|
2010-10-29 11:15:14 -07:00 |
|
maxwell
|
8fe339b03b
|
EM websocket cleanly merged with master. webfingering is now async
|
2010-10-29 11:05:17 -07:00 |
|
Raphael
|
8cf72441b4
|
Make intended behavior on hcard action clearer, return 404 on nonexistent person
|
2010-10-11 10:13:52 -07:00 |
|
maxwell
|
0541833c18
|
stop the file include madness. using File.join and Rails.root for includes everywhere I could
|
2010-10-10 11:54:08 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
Raphael
|
d7bbb66d27
|
Run whitespace:cleanup
|
2010-10-07 10:47:37 -07:00 |
|
danielvincent
|
f3c34692d8
|
pubsub support
|
2010-10-05 13:39:56 -07:00 |
|
danielvincent
|
15a4609c14
|
moved user's public route to user controller. changed person.public_url to reflect change.
|
2010-09-27 22:30:16 -07:00 |
|
danielvincent
|
eac6b8a63b
|
builder is now a class initialized with a user. added director class.
|
2010-09-27 21:54:01 -07:00 |
|
danielvincent
|
3b8ddf76a3
|
temp route for atom feed. also, public atom currently displays all posts.
|
2010-09-27 18:34:47 -07:00 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
Raphael
|
70a22ae839
|
Merge branch 'master' into HEAD
Conflicts:
app/models/post.rb
app/models/user.rb
config/initializers/socket.rb
|
2010-09-24 09:15:10 -07:00 |
|
Raphael
|
16b6fc6cdc
|
Don't give exception on webfinger with no query
|
2010-09-23 17:18:34 -07:00 |
|
maxwell
|
24ca139241
|
MS remove some stray puts
|
2010-09-20 17:11:07 -07:00 |
|
maxwell
|
cb0f0b72eb
|
MS removed a log and trying to be slightly more pedantic
|
2010-09-20 15:32:18 -07:00 |
|
maxwell
|
5e2fdedf8b
|
MS removed another logging of encrypted data....
|
2010-09-20 15:07:30 -07:00 |
|
Michael Fellinger
|
35c9922c61
|
And fix some more requires
|
2010-09-16 15:24:26 +09:00 |
|
Raphael
|
d760725145
|
Don't webfinger another server on receiving a webfinger request
|
2010-09-15 23:01:13 -07:00 |
|
Jamie Wilkinson
|
fbdd50172d
|
Cleanup stray whitespace
|
2010-09-16 10:07:59 +08:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
Daniel Vincent Grippi
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -07:00 |
|
Raphael
|
aa1f3c6438
|
Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file
|
2010-09-10 10:31:23 -07:00 |
|
Raphael
|
86d9a41d25
|
send_friend_request_to now takes a person and group, rather than a receive url and a group id
|
2010-09-09 16:06:42 -07:00 |
|
Raphael
|
3e9a36e1f1
|
Layout false on all publics controller routes
|
2010-09-09 14:15:20 -07:00 |
|
Raphael
|
240dda4eab
|
Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished
|
2010-09-09 12:21:36 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
7984756aa7
|
controller cleanup: using respond_to and respond_with.
|
2010-08-29 22:49:13 -07:00 |
|