MrZYX
|
d91c26fb68
|
translated getting started, fixed #508
|
2010-11-12 06:06:15 +01:00 |
|
MrZYX
|
381c53b775
|
found some untranslatable strings
|
2010-11-12 06:04:05 +01:00 |
|
MrZYX
|
eef0901f36
|
unscoped fill_me_out
|
2010-11-12 06:04:05 +01:00 |
|
MrZYX
|
ca72bb40a6
|
refactored en.yml
removed unused keys out of en.yml
replaced some ' with "
|
2010-11-12 06:04:05 +01:00 |
|
danielvincent
|
3b303e1cf2
|
adding fancybox assets back
|
2010-11-11 19:42:11 -08:00 |
|
danielvincent
|
85e2316280
|
Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect
|
2010-11-11 19:41:12 -08:00 |
|
Alec Leamas
|
a9ae262fac
|
Pkg update
|
2010-11-11 09:58:58 +01:00 |
|
Raphael
|
d62a7c4ce2
|
Fix request views, refactor identical forms into partial.
|
2010-11-10 20:12:09 -08:00 |
|
Raphael
|
8232a92ca0
|
Update _person and person show, add specs for those pages
|
2010-11-10 12:41:18 -08:00 |
|
Sarah Mei
|
a39bd2badb
|
AspectsController#manage now works if you have pending friend requests.
|
2010-11-10 12:05:28 -07:00 |
|
Sarah Mei
|
c113ee2b7c
|
Finish specs for AspectEdit#stopDrag.
|
2010-11-10 10:54:12 -07:00 |
|
Sarah Mei
|
72bf683c87
|
Renaming publisher_spec to publisher-spec since js likes dashes. Fix typo in spec.
|
2010-11-10 10:53:23 -07:00 |
|
Sarah Mei
|
ca9331970a
|
Renaming image_picker to image-picker since js likes dashes better than underscores
|
2010-11-10 10:52:33 -07:00 |
|
zhitomirskiyi
|
5e29ab57c6
|
ms/iz iptables fix, install nginx, try to use sockets, but not working yet
|
2010-11-09 21:29:57 -08:00 |
|
zhitomirskiyi
|
d48fde1447
|
ms/iz nginx and secret token recipes
|
2010-11-09 19:28:42 -08:00 |
|
Ilya Zhitomirskiy
|
fce588a5c7
|
ms/iz Clean up the ports we want.
|
2010-11-09 19:16:51 -08:00 |
|
maxwell
|
4037ae9f33
|
fixing controller test
|
2010-11-09 16:55:54 -08:00 |
|
maxwell
|
71da954a76
|
removing deletetion
|
2010-11-09 15:29:43 -08:00 |
|
maxwell
|
f7cc01ceb2
|
more work done. much more to go
|
2010-11-09 15:29:43 -08:00 |
|
maxwell
|
034d7ee2b1
|
first commit
|
2010-11-09 15:29:43 -08:00 |
|
Raphael
|
390fffdee6
|
Fix new request view
|
2010-11-09 15:03:56 -08:00 |
|
Raphael
|
98fe1d357b
|
accept_friend_request no longer takes ids
|
2010-11-09 14:15:02 -08:00 |
|
Raphael
|
bfa0917ce4
|
add a couple specs
|
2010-11-09 14:07:26 -08:00 |
|
Raphael
|
6dd58fe875
|
Specs pass again, invitations moved to Invitation model, refactor possibly complete
|
2010-11-09 14:07:26 -08:00 |
|
Raphael
|
ae28a6f70c
|
Don't pluralize in model spec name
|
2010-11-09 14:07:26 -08:00 |
|
Raphael
|
4818973643
|
Beginning to refactor invitations into an Invitation class
|
2010-11-09 14:07:26 -08:00 |
|
Raphael
|
71ab919ad3
|
Remove urls from requests, invitations are broken
|
2010-11-09 14:07:26 -08:00 |
|
Alec Leamas
|
cf4b810fc8
|
Pkg update
|
2010-11-09 23:03:12 +01:00 |
|
maxwell
|
39c9c19648
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-09 12:15:06 -08:00 |
|
maxwell
|
bc0263f16e
|
added white background for search box, so at least it shows up in opera. thx Pistos
|
2010-11-09 12:14:46 -08:00 |
|
Sarah Mei
|
4040ebfafa
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-09 06:54:02 -08:00 |
|
Sarah Mei
|
16e2ccc614
|
Specs for aspect edit during and stop drag.
|
2010-11-09 06:53:55 -08:00 |
|
maxwell
|
18505bf23c
|
resubmmiting object path bug. not sure how it got overwritten
|
2010-11-09 00:24:27 -08:00 |
|
Alec Leamas
|
61e2f6501f
|
Pkg update
|
2010-11-09 09:14:34 +01:00 |
|
Sarah Mei
|
16ea7a321b
|
specs for AspectEdit#animateImage
|
2010-11-08 21:19:49 -08:00 |
|
maxwell
|
56c152ac6a
|
fixed a bug in the stream partial to use object_path
|
2010-11-08 21:16:46 -08:00 |
|
zhitomirskiyi
|
77fe7a1462
|
Revert "IZ local comment destroy"
This reverts commit cb9fb0ad94.
|
2010-11-08 19:32:43 -08:00 |
|
zhitomirskiyi
|
34179d60db
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-08 18:21:02 -08:00 |
|
zhitomirskiyi
|
cb9fb0ad94
|
IZ local comment destroy
|
2010-11-08 18:19:55 -08:00 |
|
maxwell
|
091d98ea15
|
invite friends actually calls up the invite friends pane on all aspects
|
2010-11-08 18:00:36 -08:00 |
|
maxwell
|
7d6be51cfb
|
making photos#show be in no aspect
|
2010-11-08 17:53:47 -08:00 |
|
maxwell
|
58747df1a8
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
spec/controllers/services_controller_spec.rb
|
2010-11-08 17:47:48 -08:00 |
|
maxwell
|
a84f9437b0
|
trying another thing to get the redirect working
|
2010-11-08 17:43:59 -08:00 |
|
maxwell
|
4164ceaf90
|
trying another thing to get the redirect working
|
2010-11-08 16:30:46 -08:00 |
|
maxwell
|
52908cec1a
|
services controller should now go back to the referer. this might not actually work
|
2010-11-08 16:18:15 -08:00 |
|
maxwell
|
3fd5852d44
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-08 15:56:18 -08:00 |
|
maxwell
|
2162a2e3f9
|
collapse person's photos and status message into their profile; also, made these nested on a person
|
2010-11-08 15:55:58 -08:00 |
|
zhitomirskiyi
|
7d39f8ae5f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-08 15:36:11 -08:00 |
|
zhitomirskiyi
|
a6dff4f78e
|
removing the posts from the aspect on unfriending
|
2010-11-08 15:35:37 -08:00 |
|
Raphael
|
70af10ee62
|
user#friends is now a many-foreign_key assoc, rather than a many-in
|
2010-11-08 15:19:23 -08:00 |
|