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

3023 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ilya
f38bcc9eb3 tiny change in view 2010-09-24 15:54:53 -07:00
ilya
e414558f79 passing the right things to the partial 2010-09-24 15:52:29 -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
ilya
c7757a302c typo 2010-09-24 15:06:48 -07:00
ilya
ac9854596f fb_status partial rendered in public 2010-09-24 15:04:31 -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
ilya
bb58678556 added a fb_status model & parser method 2010-09-24 14:41:31 -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
ilya
82b99decbb putting the token in the warden session 2010-09-24 10:45:27 -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
ilya
755ccc084f Merge branch 'fb' of github.com:diaspora/diaspora into fb 2010-09-23 20:38:59 -07:00
ilya
deea03bf82 deploy restart after db:reset since we need the new app_config.yml 2010-09-23 20:38:39 -07:00
danielvincent
4f17eb4e02 stray aspect name removed from publisher 2010-09-23 20:33:34 -07:00
ilya
a6c1ff8ce2 fixed the deploy scripts 2010-09-23 20:21:17 -07:00
ilya
a594c9a34f friends in the public bucket 2010-09-23 20:19:02 -07:00
danielvincent
265753b5fe user edit is now divided into real sections 2010-09-23 20:13:07 -07:00
ilya
eaea26e58d the public aspect is now set in application controller 2010-09-23 19:33:33 -07:00
ilya
796f198d8c notification only on user page 2010-09-23 17:20:55 -07:00
ilya
11dc225311 removed the old publish box 2010-09-23 17:19:43 -07:00
Raphael
16b6fc6cdc Don't give exception on webfinger with no query 2010-09-23 17:18:34 -07:00
ilya
75e1ddf9d2 saying going to FB in public aspect 2010-09-23 17:17:18 -07:00