zhitomirskiyi
|
26c4760e25
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 11:36:50 -08:00 |
|
zhitomirskiyi
|
6544d8235b
|
now running thins through ports since sockets were not working for some reason
|
2010-11-12 11:36:34 -08:00 |
|
Raphael
|
0e8b1efefd
|
Merge remote branch 'MrZYX/en.yml-refactor'
|
2010-11-12 11:28:05 -08:00 |
|
Alec Leamas
|
bbdc22ed35
|
Add log directory
Adding the toplevel log directory, part of standard rails directory layout.
|
2010-11-12 11:21:54 +01:00 |
|
Alec Leamas
|
6888398ba7
|
Removing file \'
|
2010-11-12 11:20:10 +01:00 |
|
Alec Leamas
|
91501dc309
|
Pkg update (re-added)
|
2010-11-12 11:18:28 +01:00 |
|
Alec Leamas
|
c18a3518ac
|
Preparing to re-add pkg
|
2010-11-12 11:16:04 +01:00 |
|
danielvincent
|
716a77f0cc
|
fixing a refactor that broke friend requesting from the ui
|
2010-11-11 21:26:40 -08:00 |
|
Jonne Hass
|
1816b1e4df
|
people.show.add_friend -> people.person.add_friend
|
2010-11-12 06:07:37 +01:00 |
|
MrZYX
|
5ae4248b30
|
some more fixes I overlooked. Sorry
|
2010-11-12 06:07:37 +01:00 |
|
MrZYX
|
f55a973685
|
two small fixes
|
2010-11-12 06:07:37 +01:00 |
|
Hexagon
|
52da9c84ed
|
Update of sv.yml to match latest additions
|
2010-11-12 06:07:37 +01:00 |
|
MrZYX
|
0a363a73b0
|
just found the mailer... :)
|
2010-11-12 06:07:37 +01:00 |
|
MrZYX
|
9ceb3e2fd1
|
found some still untranslatable strings in helpers and stuff
|
2010-11-12 06:07:36 +01:00 |
|
Hexagon
|
a4f5a1e7ae
|
Updated swedish translation
|
2010-11-12 06:07:36 +01:00 |
|
MrZYX
|
748efb1860
|
eliminated senseless duplicates in en.yml
|
2010-11-12 06:07:36 +01:00 |
|
Jonne Hass
|
a957ba3aed
|
so then I remove the newly unused friends_since for you
|
2010-11-12 06:06:16 +01:00 |
|
MrZYX
|
6400dc244f
|
fixing again. it's getting anoying
|
2010-11-12 06:06:16 +01:00 |
|
MrZYX
|
8085a7bcd7
|
fixes to be in sync with latest commits
|
2010-11-12 06:06:15 +01:00 |
|
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 |
|