MrZYX
63a5fdb000
made a bunch of strings translatable
2010-11-04 20:49:50 +01:00
MrZYX
f84b14bd19
unscope are_you_sure in photos/show.html.haml
2010-11-04 20:49:50 +01:00
danielvincent
b33aa9a0fb
retracting on a non existant post does not raise a permissions error.
2010-11-04 12:43:26 -07:00
danielvincent
82c82b8ccc
killed albums
2010-11-04 10:17:19 -07:00
zhitomirskiyi
9389d99ba8
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-03 23:05:47 -07:00
zhitomirskiyi
a55878f2a3
invitations controller test, tnx coyote
2010-11-03 22:58:42 -07:00
Sarah Mei
dbdd6884a7
SM MS jasmine specs for aspect edit
2010-11-03 22:19:20 -07:00
Sarah Mei
bfb6abd71e
try require => false on chef instead
2010-11-03 22:18:48 -07:00
zhitomirskiyi
96b44faed5
commenting chef out of bundle saved 5 secs off server start
2010-11-03 19:57:21 -07:00
zhitomirskiyi
2da1f860cd
validate user ownership on status message destroy
2010-11-03 18:04:10 -07:00
zhitomirskiyi
6a6cedbc62
oops did not save the pending
2010-11-03 16:43:10 -07:00
zhitomirskiyi
8246882067
MS IZ fixed some permissions in photo controller
2010-11-03 16:42:33 -07:00
Raphael
03b272db60
Requests are no longer tracked by id across servers, DELETED USELESS PUTS IN EM-WEBFINGER SPEC
2010-11-03 15:26:58 -07:00
Raphael
2eef9f7ad1
Refactor ostatus builder spec
2010-11-03 15:26:58 -07:00
zhitomirskiyi
7771219a0a
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-03 13:16:57 -07:00
zhitomirskiyi
0ac4c5b04f
IZ MS refactored invites to use user.build
2010-11-03 13:16:45 -07:00
zhitomirskiyi
3578daa14e
IZ MS more photo controller specs
2010-11-03 12:21:32 -07:00
danielvincent
3e001c74d6
Albums#index hidden from views. Photos must be accessed through a person.
2010-11-03 12:21:14 -07:00
zhitomirskiyi
5e9d70f88c
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-03 11:00:04 -07:00
zhitomirskiyi
c6e9b94f4f
IZ MS moved contact_for to querying and added tests
2010-11-03 10:59:56 -07:00
maxwell
62c25057e6
adding photocontroller spec for IZ
2010-11-03 10:43:27 -07:00
Raphael
5c6c43ca4e
Too many things in diaspora repo! Moving pkg/ out to a seperate
...
diaspora-packages repo. We should have a bash (curl (script_url))
install like rvm does. I think the ubuntu install script needs to have
'clone' added to the line which is supposed to clone.
2010-11-03 10:23:45 -07:00
Raphael
c8a8849518
Move to build_post and dispatch_post in most controllers
2010-11-03 09:30:41 -07:00
Alec Leamas
a08fa76975
Updating Gemfile.lock
2010-11-03 12:58:06 +01:00
Alec Leamas
879ab6cb9a
Use public http url in setup scripts, bugfixes
...
Use public http url so script can be run w/o registering w the github
2010-11-03 11:11:26 +01:00
Alec Leamas
cf58d3cbab
raw fedora14 in place
2010-11-03 10:11:40 +01:00
Alec Leamas
4f6f4bc7ec
Build breakage point fixes, new user feedback
...
New user korth is also created when setting up db. Jasmine
handled, for now by disabling rake task. Various fixes
2010-11-03 10:11:39 +01:00
Alec Leamas
b205cb84a5
Merge remote branch 'upstream/master'
2010-11-03 10:11:27 +01:00
maxwell
0343e7a226
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-03 00:10:11 -07:00
Sarah Mei
034d566564
CI has decided it wants a proper shell to launch the virtual display. So FINE. It can have one.
2010-11-02 21:49:24 -07:00
maxwell
545577a950
em-webfinger ssl should work
2010-11-02 19:16:08 -07:00
Raphael
d5a4de58b3
User#post is now like a future controller, Photo#instantiate no longer saves
2010-11-02 19:16:02 -07:00
Raphael
1c67211ebc
Move post dispatching to dispatch_post
2010-11-02 19:16:02 -07:00
maxwell
8f5052fe61
Revert "Revert "making emwebfinger not try ssl first, for now""
...
This reverts commit 0db30bb221
2010-11-02 18:59:42 -07:00
maxwell
d482334ca2
Revert "Revert "IZ MS webfinger now trys ssl first, then http""
...
This reverts commit 153265aae8
2010-11-02 18:59:18 -07:00
maxwell
0ecc27a935
MS IZ posts should now update
2010-11-02 18:56:00 -07:00
Alec Leamas
230b07a93e
Merge remote branch 'upstream/master'
2010-11-03 02:45:40 +01:00
maxwell
4de89df4dc
MS IZ setting the diaspora handle in photo instantiate
2010-11-02 18:32:02 -07:00
Raphael
ab4e3a9f7f
add a couple specs to album_spec
2010-11-02 18:16:14 -07:00
danielvincent
a31c22adb3
mailer doesn't break everything anymore. attachments are also inlined.
2010-11-02 17:59:50 -07:00
maxwell
8c350282d3
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-02 17:52:22 -07:00
maxwell
2f1fbaf686
temp. logging statement
2010-11-02 17:52:04 -07:00
danielvincent
bf12dc6bc7
fix spec
2010-11-02 17:44:13 -07:00
Raphael
ae039442c3
Websocket now uses cookie to authenticate
2010-11-02 17:39:50 -07:00
maxwell
153265aae8
Revert "IZ MS webfinger now trys ssl first, then http"
...
This reverts commit af3247b62f
2010-11-02 17:37:45 -07:00
maxwell
0db30bb221
Revert "making emwebfinger not try ssl first, for now"
...
This reverts commit cc2766a0ea
2010-11-02 17:36:58 -07:00
danielvincent
a79d1f5240
tabbing on publisher to everyone focuses submit button
2010-11-02 17:35:12 -07:00
maxwell
7e1ee9f371
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-02 17:33:18 -07:00
maxwell
cc2766a0ea
making emwebfinger not try ssl first, for now
2010-11-02 17:33:10 -07:00
danielvincent
a995d250f1
added white text on grey asset to mailer
2010-11-02 17:19:49 -07:00
