Raphael
978643be97
Merge remote branch 'leamas/orvar'
2010-10-11 10:25:35 -07:00
Raphael
8cf72441b4
Make intended behavior on hcard action clearer, return 404 on nonexistent person
2010-10-11 10:13:52 -07:00
Raphael
04d5271530
Merge remote branch 'crimer/master'
2010-10-11 10:03:09 -07:00
Raphael
9f877d7dc8
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-11 10:02:06 -07:00
danielvincent
884d7b7dd7
flash message should slide in
2010-10-10 23:13:03 -07:00
Volkan Unsal
6d00b2ca8a
correct some spelling errors in Turkish translation
2010-10-10 23:49:36 -04:00
Volkan Unsal
c26c244185
remove tmproj file.
2010-10-10 23:24:39 -04:00
Volkan Unsal
35ad703a5b
Merge branch 'master' of http://github.com/diaspora/diaspora
2010-10-10 23:09:19 -04:00
Volkan Unsal
633048fbed
finished Turkish translation
2010-10-10 23:06:56 -04:00
Raphael
c30155e9a1
Remove outdated photo spec
2010-10-10 15:04:57 -07:00
Sarah Mei
2a24de2ba7
Changing spec to pending because it hasn't been implemented yet
2010-10-10 13:29:03 -07:00
maxwell
fd0902abb4
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-10 11:54:16 -07:00
maxwell
0541833c18
stop the file include madness. using File.join and Rails.root for includes everywhere I could
2010-10-10 11:54:08 -07:00
Sarah Mei
ac85fbcc64
DevUtilitiesControllerSpec runs under 1.9.2.
...
FileUtils.mv with the :force option works under 1.8.7 if the source file doesn't exist, but fails under 1.9.2.
2010-10-10 11:52:19 -07:00
rmaskey
94f20ba684
resolution for issue #151 - search with multiple words
2010-10-10 08:43:43 -07:00
Alec Leamas
30b24a1079
Use make_relative_symlink scripts to avoid %post ln commands.
...
Patching .bundle/config to use /usr/lib/diaspora-bundle, to avoid
inter-package linking from diaspora to diaspora-bundle. This also
leaves the content under vendor/bundle untouched. Uses kitchen
script to create relative links within diaspora package.
2010-10-10 16:38:02 +02:00
Alec Leamas
1c00fc232e
Allow make-dist.sh to use an alternative repo.
...
Adds the -u switch, allowing use of another repository than
http://github.com/diaspora/diaspora.git . This is a dogfood patch.
Renames diaspora-ws->diaspora-wsd; this is indeed a daemon.
Moves all Fedora-related stuff in make-dist.sh to subcommand
'prepare'. The source tarballs are now usable on any OS
2010-10-10 16:38:01 +02:00
Alec Leamas
075a39cfce
A little discipline: locals, better redirect etc.
2010-10-10 16:38:01 +02:00
Alec Leamas
0b305a03e9
Pack static version info and w tarball, remove Fedora stuff.
...
make-dist now packs config/gitversion info and public/source.tar.
with the tarball. All Fedora specific files moved out of the
tarball's install area. 'links' command warns for non-existing
targets. Minor bugfixes.
Overall, at this point the application could be seen as
"packageable". The two main problem has been the included git
files, and that root could not own the files. These are now resolved.
In other words, the overall structure in comptatible with Fedora,
and thus also with most other repos like Ubuntu et al.
The bundle package is another issue. It's a long way before it can
be accepted into Fedora. First step would be to use already packaged
gems instead of providing our own copy for each and every gem.
2010-10-10 16:38:01 +02:00
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
