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
danielvincent
b313272ff3
flash messages look nicer
2010-10-09 22:32:39 -07:00
ilya
1ac410b590
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-09 21:44:26 -07:00
ilya
3887712115
slight refactor of receiving spec, wrote a spec that exposed malicious friend attack
...
vector
2010-10-09 21:34:53 -07:00
Sarah Mei
4da2f9cf58
Fix pending spec in SocketsControllerSpec
2010-10-09 21:58:46 -06:00
Crimer
4163ce4544
Solved issue 166# "Clicking 'Photos' for an aspect appears to take you to the 'All Aspects' photo page"
2010-10-09 11:51:42 +00:00
Sarah Mei
c646db956e
CI does a proper export. FINALLY.
2010-10-08 21:13:13 -06:00
ilya
ee4c7c1cb8
Gemfile.lock
2010-10-08 17:05:12 -07:00
Raphael
c5cb38d7f2
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 16:36:36 -07:00
Raphael
d1a4ee0bcb
Roll back em-http-request
2010-10-08 16:36:26 -07:00
danielvincent
49f78c2631
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 16:22:50 -07:00
danielvincent
c5affa07e8
tweaked reshare button
2010-10-08 16:19:51 -07:00
Raphael
d72c4de438
Revert "CGI unescape incoming salmons"
...
This reverts commit 6cbe4075f4 .
2010-10-08 16:08:35 -07:00
Raphael
f09a54b67f
Revert "arguments..."
...
This reverts commit 8049aa20e8 .
2010-10-08 16:08:25 -07:00
Raphael
8049aa20e8
arguments...
2010-10-08 16:01:24 -07:00
ilya
8e61b438ab
setting the username
2010-10-08 16:00:58 -07:00
Raphael
6cbe4075f4
CGI unescape incoming salmons
2010-10-08 15:59:32 -07:00
Raphael
a720694364
Make logging less verbose
2010-10-08 15:51:12 -07:00
Raphael
b7116ca413
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 15:47:43 -07:00
Raphael
b7bf526b91
Make logging message clearer
2010-10-08 15:47:30 -07:00
danielvincent
9ac13ccb3e
fixed reshare a bit
2010-10-08 15:47:06 -07:00
ilya
ef3e627bed
the users are now made with people
2010-10-08 15:40:42 -07:00
danielvincent
edd8f0ba6d
links now have active state
2010-10-08 15:35:22 -07:00
danielvincent
086df28a37
removed connected to facebook text under everyone publisher
2010-10-08 15:21:27 -07:00
maxwell
255901dfab
fixing copypasta
2010-10-08 15:00:04 -07:00
maxwell
d7521cb288
MS trying to not use MiniFB to post since it is barfing
2010-10-08 14:49:09 -07:00
Raphael
b613361855
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 14:47:10 -07:00
Raphael
3729431ccf
don't translate css class to mark request count
2010-10-08 14:46:57 -07:00
danielvincent
44338a9897
removed traces of :public
2010-10-08 14:44:56 -07:00
Raphael
6064b2e022
Add a spec, move another to posting
2010-10-08 14:37:22 -07:00
maxwell
293ccdf3e4
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 14:25:53 -07:00
maxwell
b6b192da01
MS DG trying to move around fb url
2010-10-08 14:25:39 -07:00
Sarah Mei
5862952a40
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 15:22:15 -06:00
Sarah Mei
bc75c4acf5
Let's try putting display in the rake command.
2010-10-08 15:22:02 -06:00
danielvincent
526fbe9a90
fixed error where publisher would cause status_message_controller to error out
2010-10-08 14:19:54 -07:00
danielvincent
7d96c95caf
fixed breaking aspect show pages
2010-10-08 14:15:35 -07:00
danielvincent
48e92c2c33
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 14:07:05 -07:00
danielvincent
154ec95717
killed the public tab. made a broadcast button in everyone tab
2010-10-08 14:06:49 -07:00
Sarah Mei
4e3e6d9562
rake task starts a virtual framebuffer before running tests, stops it after
2010-10-08 14:55:53 -06: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