nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2365 commits 4 branches 0 tags 121 MiB
Commit graph

2365 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sarah Mei
e3ec00595d Cleaned up file path joining in some of the dev utilties. 
Backfilled tests where necessary to make sure changes didn't break existing code.
 2010-09-25 04:34:48 -07:00
Raphael
beda67aca6 Shorten git show stuff 2010-09-24 17:51:51 -07:00
Chiggins
f74b0a6f2c Added "shadow text" to caption text field while editing a photo, since about every other text field has "shadow text". 2010-09-25 08:13:16 +08:00
Raphael
f4d18ce9bc don't use request.host as data 2010-09-24 17:12:18 -07:00
danielvincent
d59330264d fixed syntax error in italian locale 2010-09-24 16:18:41 -07:00
Raphael
791fb5b120 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-24 15:51:18 -07:00
Raphael
9d2ee2f961 Merge branch 'master' into HEAD 2010-09-24 15:50:48 -07:00
sennewood
dcedc5d505 Added the missing lines of code and translated them. 2010-09-25 06:39:59 +08:00
sennewood
16e5f972d1 Translation correction 2010-09-25 06:39:59 +08:00
sennewood
e2db21d7b0 Use double quotes in locale files 2010-09-25 06:39:59 +08:00
maco
ea2739e892 ubuntu-setup.bash: fix s/blunder/bundler/ and s/elsif/elif/ 2010-09-25 06:38:20 +08:00
maco
c5aa22fd28 ubuntu-setup.bash: for rubygems, use maverick's repo or if lucid use ppa or if old use tarball. create /var/lib/gems/1.8/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games-friendly symlink if using debs 2010-09-25 06:38:19 +08:00
Daniel Thomas
8a30a287af Make ubuntu-setup.bash executable 
So that it can run directly when checked out without needing to have
chmod +x ubuntu-setup.bash run first.

Signed-off-by: Daniel Thomas <drt24@srcf.ucam.org>
 2010-09-25 06:38:07 +08:00
Daniel Thomas
043dadf0ea Update copyright information on ubuntu-setup.bash 
Adding Diaspora Inc. copyright and reference to the AGPL and noting that
Mackenzie Morgan (maco) and I have made contributions to the file.

Signed-off-by: Daniel Thomas <drt24@srcf.ucam.org>
 2010-09-25 06:38:06 +08:00
hemanth
585cc7a480 Check if universal repository is enabled or not. 2010-09-25 06:36:25 +08:00
hemanth
dc0fc1f445 set -e removed as the rules change from one Bash version to another, as Bash attempts to track the extremely slippery POSIX definition of this "feature". When a SubShell is involved, it gets worse still -- the behavior changes depending on whether Bash is invoked in POSIX mode. 2010-09-25 06:36:25 +08:00
hemanth
5682cf59ab Added a check on if the user has already cloned and also a set -e to exit immediately if a command exits with a non-zero status. 2010-09-25 06:36:25 +08:00
hemanth
d4ad943699 Check on universe repository, if enabled or not. 2010-09-25 06:36:02 +08:00
hemanth
1add029421 Check for wget added 2010-09-25 06:36:02 +08:00
hemanth
d66eedaf00 Fixed a major issue with sudo user check\! 2010-09-25 06:36:01 +08:00
Daniele Di Sarli
8323e7dcb2 Added Italian translation 2010-09-25 06:35:43 +08:00
Raphael
3b4b4f4ed3 Add a couple things to gitignore 2010-09-24 15:35:18 -07:00
Raphael
be623a0c3a Merge branch 'master' into 1.9.2 2010-09-24 15:18:59 -07:00
Raphael
999d229225 Post photos in either 1.8.7 or 1.9.2 2010-09-24 15:18:30 -07:00
Raphael
004e659ee1 fix album posting 2010-09-24 15:10:49 -07:00
Raphael
ae7c869bc3 Add specs for album controller failure 2010-09-24 15:01:36 -07:00
Raphael
1f62f910e3 fix requires in db seeds 2010-09-24 14:43:23 -07:00
Raphael
5c32cbaee8 Fix requires in rake task 2010-09-24 14:40:30 -07:00
Raphael
950c6a7cab Merge branch '1.9.2' into HEAD 
Conflicts:
	app/models/photo.rb
 2010-09-24 14:36:00 -07:00
Raphael
19199dabfe fix spec_helper for 1.9.2 2010-09-24 11:49:30 -07:00
Raphael
40120bb441 Moving to activemodel validations 2010-09-24 11:15:39 -07:00
Raphael
b9bff76054 Initial 1.9.2, specs fail (possibly validatable), need to pull in aredridel photo fixes 2010-09-24 09:49:42 -07:00
Raphael
70a22ae839 Merge branch 'master' into HEAD 
Conflicts:
	app/models/post.rb
	app/models/user.rb
	config/initializers/socket.rb
 2010-09-24 09:15:10 -07:00
Pistos
7dc813a15a Added a newline before a list, so that the list can be properly interpreted as a list (Markdown syntax). 2010-09-24 11:48:34 +08:00
Pistos
86f462cc42 Strip trailing whitespace. 2010-09-24 11:48:34 +08:00
Raphael
16b6fc6cdc Don't give exception on webfinger with no query 2010-09-23 17:18:34 -07:00
Raphael
d748d456b5 Revert "fix in person partial" 
This reverts commit 8c0bc4b9e6.
 2010-09-23 16:21:08 -07:00
Raphael
264555e63b Update css 2010-09-23 15:15:19 -07:00
Raphael
c6c361b5e6 Add lucida sans, thanks danieleds 2010-09-23 15:14:44 -07:00
Raphael
8690967509 defaults doesn't really make sense when there's nothing else 2010-09-23 14:58:17 -07:00
Raphael
972cb54828 Move locale files, fix syntax error in fr-informal 2010-09-23 14:52:06 -07:00
Raphael
82bc5b097d Use double quotes in locale files 2010-09-23 14:43:38 -07:00
Guido Serra aka Zeph
d9688324f8 Merge branch 'master' of git://github.com/diaspora/diaspora 2010-09-23 23:30:22 +02:00
Raphael
efedac7e32 Punctuate 2010-09-23 14:27:23 -07:00
Raphael
86c70b9698 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 14:26:37 -07:00
Raphael
e3c6926cf7 Moving installation instructions to a wiki page 2010-09-23 14:26:23 -07:00
UserAd
cfd3523030 Stupid error fix 2010-09-24 05:02:30 +08:00
UserAd
7a9e347b28 Improved russian locale 2010-09-24 05:02:30 +08:00
Maël Soucaze
49162a6ead The underscore (fr_informal) is replaced by the hyphen (fr-informal). 2010-09-24 04:51:49 +08:00
Maël Soucaze
4cd83f9ae9 Change the file organization, and Casual Honorifics is now Informal Honorifics. 2010-09-24 04:51:49 +08:00