Alec Leamas
97f7b4d2ad
Symlink tmp-dir to /var/lib,leaving other files to root.
...
Turns the overall installation to being write-protected.
2010-10-10 16:38:01 +02:00
Alec Leamas
0c30f544d9
Fallback to static version data if git unavailable.
...
Uses the file config/gitversion if git is unavailable. This is to
support deployment without git (which will be necessary). Installation
script will generate the file config/gitversion when app is shipped.
2010-10-10 16:38:01 +02:00
Alec Leamas
4d58a39647
Add a global tmp directory, according to rails spec.
...
The rails specification mandates that there should be a tmp directory,
add this.
2010-10-10 16:38:01 +02:00
Alec Leamas
4aa851c5a8
Ignore stgit files all over the place
2010-10-10 16:38:01 +02:00
Sarah Mei
ebef212079
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 14:14:48 -06:00
Sarah Mei
564217684f
Fail CI if exitstatus isn't 0. *sigh*
2010-10-08 14:14:39 -06:00
Raphael
662492b8e6
Merge remote branch 'crimer/master'
2010-10-08 13:12:50 -07:00
Crimer
3754b519a7
Solved issue #79 'Email Label in Forgot Password Appears Outside of Textbox'.
2010-10-08 21:51:59 +00:00
Raphael
76e77c2bf1
refactor hcard for faster testing
2010-10-08 13:06:21 -07:00
danielvincent
d13f8e12c8
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 12:26:15 -07:00
danielvincent
a3aab92212
fixed photo partial
2010-10-08 12:25:42 -07:00
Raphael
e18466e4fa
Merge remote branch 'nickvdb/master'
2010-10-08 10:56:48 -07:00
Raphael
9c9fe7042d
Merge remote branch 'leamas/fedora-pkg'
2010-10-08 10:55:46 -07:00
danielvincent
b70cf713ec
removed old pending spec
2010-10-08 09:16:11 -07:00
Alec Leamas
8b190eb1b4
Updating spec files to new versions, make-dist.sh update, some typos.
2010-10-08 18:12:24 +02:00
Alec Leamas
40dabffacc
Formatting & comments
2010-10-08 12:15:30 +02:00
Alec Leamas
93a43e09b7
A bunch of typos & such
2010-10-08 12:00:26 +02:00
Sarah Mei
4a88ac22c2
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 02:15:17 -06:00
Sarah Mei
899d82b766
Fix 1 of 2 pending photo specs.
2010-10-08 02:15:07 -06:00
danielvincent
4bb26cfce4
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 00:46:41 -07:00
danielvincent
fab9e8b6eb
cleaned request spec
2010-10-08 00:46:24 -07:00
Sarah Mei
36c6043e8e
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 01:42:58 -06:00
Sarah Mei
ce9aa3600d
Refactor user friending spec
2010-10-08 01:42:48 -06:00
danielvincent
fc2eda7adf
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 00:37:10 -07:00
danielvincent
3a876770f3
minor tweaks
2010-10-08 00:36:55 -07:00
Sarah Mei
511cd8fa1c
Clean up reloading in user friending spec.
2010-10-08 01:23:33 -06:00
Nick van der Burgt
09b38bb726
Added dutch locale
2010-10-08 09:11:04 +02:00
Sarah Mei
b02e266130
Don't need a bundle install in the ci task
2010-10-08 01:07:07 -06:00
Sarah Mei
e44eec4a9e
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 00:39:41 -06:00
Sarah Mei
c0bf7ab5cd
Rake task for CI that includes a bundle install
2010-10-08 00:39:30 -06:00
Sarah Mei
03a0031ddd
.gitignore capybara output
2010-10-08 00:38:53 -06:00
danielvincent
894d6654b2
only selected nav element should be a tab on aspect_nav, preventing tab overload.
2010-10-07 23:35:55 -07:00
danielvincent
8f741795fb
aspect manage margin fix
2010-10-07 23:27:31 -07:00
danielvincent
5b66a191cd
more stream tweaks
2010-10-07 23:25:49 -07:00
danielvincent
b314ee22ec
intermediate misc ui polish
2010-10-07 22:51:08 -07:00
danielvincent
14ae1e8e6d
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 18:52:53 -07:00
danielvincent
ed1cb5a0e7
DG MS; moved change password to account page; fixed the styling on password inputs
2010-10-07 18:52:46 -07:00
Raphael
41c6f8d377
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 18:39:52 -07:00
Raphael
fef09b9c2f
Merge remote branch 'leamas/pkg-fix'
2010-10-07 18:39:37 -07:00
danielvincent
75aadc5c57
DG MS; cleaned up routes, killed all deprication warnings in everything. totally legit.
2010-10-07 18:25:59 -07:00
danielvincent
c756e1a331
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 18:17:38 -07:00
danielvincent
2e73104d6f
DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2
2010-10-07 18:17:26 -07:00
Alec Leamas
dd1a488be1
Bringing in some very old stuff lost in patch mgmmt.
2010-10-08 03:00:36 +02:00
Raphael
3632143959
Take out pending on spec that exposes issue 150
2010-10-07 17:54:26 -07:00
Raphael
399e437655
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 17:34:03 -07:00
Raphael
2bb36a266a
Merge remote branch 'minilibra/master'
2010-10-07 17:32:20 -07:00
ilya
c75a2ebd66
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 17:00:52 -07:00
ilya
97f058c625
moving to app config yml
2010-10-07 17:00:38 -07:00
danielvincent
7a56d82873
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 16:56:22 -07:00
danielvincent
4deea95057
DG MS; export photos button in users#edit
2010-10-07 16:56:10 -07:00
