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 |
|
Dan Hansen
|
e4ba498d70
|
whoops
|
2011-02-22 23:21:50 -06:00 |
|
Dan Hansen
|
f41bc0c14d
|
<3z
|
2011-02-22 23:19:57 -06:00 |
|
Sarah Mei
|
06a992a088
|
Modify REE garbage collection settings for speedier tests.
|
2011-02-22 21:00:08 -08:00 |
|
Raphael Sofaer
|
74b8921c09
|
make video urls have correct href
|
2011-02-22 18:51:40 -08:00 |
|
Raphael Sofaer
|
17f41f1291
|
Make login-error shadow more readable
|
2011-02-22 18:08:46 -08:00 |
|
Raphael Sofaer
|
efd95df029
|
Don't install ruby-debug in rubinius, wtf why does rubiniues declare 1.8?
|
2011-02-22 18:08:46 -08:00 |
|
Raphael Sofaer
|
15a1eb8afc
|
Add Rubinius's generated files
|
2011-02-22 18:08:45 -08:00 |
|
maxwell
|
eb9a943724
|
parinoid checks for admin page thx dangold
|
2011-02-22 15:43:10 -08:00 |
|
Dan Hansen
|
801382714a
|
remove jquery 1.4.2, we never use it
|
2011-02-22 13:59:10 -06: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 |
|
Dan Hansen
|
e04685e7ab
|
remove unused javascript that's in a view
|
2011-02-21 23:25:38 -06:00 |
|
Sarah Mei
|
33c7400919
|
clean up fixture builder
|
2011-02-21 20:06:54 -08:00 |
|
Sarah Mei
|
dcf7e57a1d
|
Use standard carrierwave gem instead of deleted git repo. This may break photo uploading, but better that than breaking bundle install.
|
2011-02-21 13:54:08 -08:00 |
|
Sarah Mei
|
814ef38fa9
|
Don't actually need 36 notifications.
|
2011-02-21 13:20:39 -08: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 |
|
MrZYX
|
e02c3eafc0
|
Merge branch 'xheader' of https://github.com/diasporg/diaspora into xheader
|
2011-02-21 16:12:24 +01:00 |
|
MrZYX
|
e4ae0ddf67
|
updated locales
|
2011-02-21 15:32:32 +01:00 |
|
Sarah Mei
|
49adf5034f
|
Revert javascript move
|
2011-02-20 20:05:40 -08:00 |
|
Sarah Mei
|
fe3c67a662
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-02-20 14:56:03 -08:00 |
|
Sarah Mei
|
26779889d0
|
To run specs without perf tests: rake spec SPEC_OPTS="--tag ~performance"
|
2011-02-20 14:40:51 -08:00 |
|
danielvincent
|
3d6d742def
|
move js to body bottom
|
2011-02-20 16:31:06 -05:00 |
|