Dan Hansen
|
a9ab842242
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-02-25 18:56:21 -06:00 |
|
Dan Hansen
|
c1e679ff8d
|
fix syntax error and spec
|
2011-02-25 18:56:03 -06:00 |
|
maxwell
|
e6f11a39b5
|
remove puts, fix admins controller test
|
2011-02-25 15:28:32 -08:00 |
|
Dan Hansen
|
3538bda06d
|
fix email subject wording
|
2011-02-25 16:56:21 -06:00 |
|
maxwell
|
b95c9b2e66
|
actually send email from admin interface inviter
|
2011-02-25 14:54:07 -08:00 |
|
Dan Hansen
|
c9af2e87aa
|
service icons and public icon use pointer cursor
|
2011-02-25 16:48:13 -06:00 |
|
Raphael Sofaer
|
22d83ec502
|
update http_multi to adjust urls when you get a redirect
|
2011-02-25 14:46:21 -08:00 |
|
Raphael Sofaer
|
f3202e15d6
|
add follow_location to typhoeus default jobs
|
2011-02-25 13:38:24 -08: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 |
|
Raphael Sofaer
|
d8d89cb6c2
|
actually put in the cert bundle
|
2011-02-25 12:23:38 -08:00 |
|
Raphael Sofaer
|
62b164458b
|
Adding recipe for putting startcom bundle in centos ca bundle
|
2011-02-25 12:18:22 -08:00 |
|
Raphael Sofaer
|
7693c162c2
|
LOG MORE, better logging in http_multi failures
|
2011-02-25 12:16:17 -08: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 |
|
Sarah Mei
|
40fa91ead9
|
Start refactor of comment_spec.
|
2011-02-24 20:46:05 -08:00 |
|
zhitomirskiyi
|
83576d75ef
|
stubbing the httpmulti in the test, now you can post to services individually
|
2011-02-24 17:50:01 -08:00 |
|
zhitomirskiyi
|
c27e2de478
|
removed pending test
|
2011-02-24 17:31:54 -08:00 |
|
zhitomirskiyi
|
ec93faa2c4
|
added the post to services icon on every page added a manage icon and moved the RSS link to the public explain
|
2011-02-24 17:31:54 -08:00 |
|
zhitomirskiyi
|
adfcc59631
|
can now select individual services to be added
|
2011-02-24 17:31:54 -08:00 |
|
zhitomirskiyi
|
e61cc2fd34
|
made the postzord take the services in individually
|
2011-02-24 17:31:54 -08:00 |
|
zhitomirskiyi
|
126925f28f
|
wip
|
2011-02-24 17:31:54 -08:00 |
|
zhitomirskiyi
|
78b242b110
|
removed post to services since we are not using it
|
2011-02-24 17:31:54 -08:00 |
|
Raphael Sofaer
|
50cd06129a
|
Adjust expected string in mention spec'
|
2011-02-24 16:01:36 -08:00 |
|
Raphael Sofaer
|
c030e8b21e
|
Move the @ inside the mention links
|
2011-02-24 15:52:47 -08:00 |
|
Raphael Sofaer
|
40dea1f625
|
LOG MORE, when http to another pod fails
|
2011-02-24 15:52:37 -08:00 |
|
Raphael Sofaer
|
126a4b2547
|
LOG MORE, on resque job errors
|
2011-02-24 13:11:57 -08: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 |
|
Raphael Sofaer
|
22c4ebd6de
|
return a string from a stub
|
2011-02-24 10:36:06 -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 |
|
Raphael Sofaer
|
e964490a9a
|
Escape xml before dispatch
|
2011-02-23 16:06:55 -08:00 |
|
Raphael Sofaer
|
faf026dec6
|
Update dispatcher to use HttpMulti job
|
2011-02-23 16:06:55 -08:00 |
|
Raphael Sofaer
|
69a98a2f5a
|
Make curl script more idempotent, make mysql run script use mysqld directly so it responds to -d
|
2011-02-23 16:06:55 -08:00 |
|
Raphael Sofaer
|
2c5fc1bdd9
|
Add some idempotency stuff
|
2011-02-23 16:06:55 -08:00 |
|
Raphael Sofaer
|
d75bc10ac0
|
Working on curl chef script
|
2011-02-23 16:06:55 -08:00 |
|
maxwell
|
936b997dff
|
fixed curl cookbook
|
2011-02-23 16:06:55 -08:00 |
|
maxwell
|
bb5d5fc2c0
|
typhoeus fixes and a few changes to the chef scripts
|
2011-02-23 16:06:55 -08:00 |
|
maxwell
|
638311125f
|
typhoeus should now be in. there is a new dependancy on curl and the curl dev headers, so install
|
2011-02-23 16:06:55 -08:00 |
|
maxwell
|
c9dd2d5b50
|
add files
|
2011-02-23 16:06:54 -08:00 |
|
maxwell
|
8f6922bcf9
|
multihttp job and spec
|
2011-02-23 16:06:54 -08:00 |
|
MrZYX
|
ea6dc0eb9a
|
updated locales
|
2011-02-24 00:39:00 +01:00 |
|
MrZYX
|
d32fe1ea08
|
updated Gemfile.lock
|
2011-02-24 00:34:18 +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 |
|
zhitomirskiyi
|
97e00f9ee3
|
changed the delete to a destroy on retraction, also removed a puts
|
2011-02-23 12:00:42 -08:00 |
|
maxwell
|
16e8ecc72c
|
fixing debugging statement in smcontroller, also fix the spec
|
2011-02-22 22:38:23 -08:00 |
|
maxwell
|
e446dcaeb5
|
make sm_controller show the error in the js
|
2011-02-22 22:21:48 -08:00 |
|
maxwell
|
5bce2d1615
|
remove mongomapper error handler in photos_controller#create
|
2011-02-22 22:02:58 -08:00 |
|
maxwell
|
ec21230756
|
make status_message_controller#create return the error message
|
2011-02-22 22:01:08 -08:00 |
|