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

78 commits

Author SHA1 Message Date
danielgrippi
6113b62161 rvmrc can be overridden by .rvm.local as well as .rvm_custom [ci skip] 2012-02-01 09:41:01 -08:00
Jonne Haß
6befd552d0 gitignore page caches [ci skip] 2012-01-23 12:20:42 +01:00
Maxwell Salzberg
467f3b0bda MS TT; Add heroku_san to gemfile, adjust custom heroku rake tasks 2012-01-16 20:25:56 -08:00
Maxwell Salzberg
cedc49bf09 MS DC; oauth keys are now pulled out of application.yml to be simplier. incldue newrelic as heroku expects it, without affecting people who do not use newrelic. If you do use new relic in production, you have to put your newrelic api key in application.yml 2012-01-05 17:31:38 -08:00
buddhamagnet
8e3809929a added vendor/cache to gitignore file 2011-09-13 10:03:13 +01:00
Jonne Hass
0aed97599f --amend; note to self: no moar pushing after 3 am [ci skip] 2011-09-07 04:34:01 +02:00
Jonne Hass
bc9c71349e gitignore config/script_server.yml [ci skip] 2011-09-07 04:31:40 +02:00
MrZYX
4dc4c67edd added scripts to export/import locales to/from xml 2011-08-25 14:51:06 +02:00
Raphael Sofaer
3d88095ba2 Updating batch inviter 2011-08-01 14:49:21 -07:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
 2011-06-28 17:13:38 -07:00
Raphael Sofaer
e4476702d4 Take documentation out of the repo, just generate it with yard 2011-06-14 10:15:13 -07:00
Maxwell Salzberg
4b13c83de7 Chubbies now uses sqlite to have tables of pods and users 2011-06-03 16:24:12 -07:00
danielgrippi
918284a8f8 include newrelic if the newrelic config file is present. profiling ftw. 2011-06-02 12:10:03 -07:00
Sarah Mei
31a5ef19de Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE. 
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
 2011-05-28 19:44:40 -07:00
Maxwell Salzberg
160d34dd98 add sasscache to gitignore 2011-05-22 15:45:44 -07:00
MrZYX
6ee85bb626 add a .rvmrc_custom if you want to overide the one in the repo 2011-05-21 00:26:37 +02:00
Shane Becker
910cc52387 rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011 2011-05-18 11:46:45 -07:00
Vikram Verma
5d0ab2cff9 Typo in .gitignore 2011-04-28 05:55:59 +08:00
Raphael Sofaer
68f0f7ec21 Add rcov task 2011-03-01 18:12:42 -08:00
Raphael Sofaer
15a1eb8afc Add Rubinius's generated files 2011-02-22 18:08:45 -08:00
MrZYX
ece7cddc51 added license to javascripts.en.yml; better langcodes_alias_map.yml; .gitignore users.yaml fixture 2011-02-18 17:22:19 +01:00
Raphael
06a6cf7fac Adjust autocomplete options and css 2011-02-01 15:07:03 -08:00
Sarah Mei
c0bb1e8c7c Adding config/deploy_config.yml to gitignore 2011-01-30 21:53:50 -08:00
Raphael
f892a00b99 Fix data conversion, fixture generation in publicscontroller 2011-01-26 18:39:09 -08:00
Raphael
bad7399eeb Remove yml files from git 2011-01-18 15:18:58 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
Raphael
6bb132b25e Revert 'Create a separate webfinger service.' We'll come back to it when we figure out the error. 2011-01-11 14:18:25 -08:00
Sarah Mei
b865c20b2d Backing out sub-uri changes 2011-01-09 18:29:43 -08:00
Alec Leamas
e09771d9b4 Create a separate webfinger service. 2011-01-09 23:38:36 +01:00
Alec Leamas
e01fb62eeb Expose and refer to assets on the sub_uri. 
When using sub-uri, create a symlink in public/ making the assets
available at the sub-uri. Modify environment.rb so that asset paths
refers to this sub-uri path. Closes http://bugs.joindiaspora.com/issues/391
and http://bugs.joindiaspora.com/issues/737 when application mounted
on suburi (i. e., prev patch)
 2011-01-09 23:38:03 +01:00
Sarah Mei
f6dcb6b993 gitignoring database.yml 2010-12-20 20:13:27 -08:00
maxwell
081e85f224 Revert "Extended sub-uri support." for now.... 
This reverts commit 9cd08bac67.
 2010-12-20 18:12:12 -08:00
Alec Leamas
9cd08bac67 Extended sub-uri support. 
Adds new routing in routes.rb based on pod_uri. Assets are handled by a symlink
in public when using sub-uri. Various clean-up, removing thin and socket port
settings from server.sh (these are now taken from pod_uri and socket_port).

Basic functionality when setting a sub_uri like http://example.org/diaspora
now seems OK. Closes .http://joindiaspora.com/issues/737, and partially
http://joindiaspora.com/issues/391. Ports are yet to be defined and handled
in this context.

Conflicts:

	app/views/layouts/application.html.haml
	config/routes.rb
 2010-12-21 01:13:15 +01:00
maxwell
d5edc9b477 CGI::escaping for proper, good juju activity streams 2010-12-15 12:27:52 -08:00
maxwell
8eb9ab1781 making image names more generic 2010-12-13 14:02:11 -08:00
maxwell
4fe42044ac removed homepage detail into a partial, which you should redefine 2010-12-13 12:52:08 -08:00
Alec Leamas
23a5db1013 Creates and maintains a local redis.conf. 
Creates config/redis.conf using mater copy in etc. FTM, disables
daemonizing, which doesn't fit script/server (or upstart/systemd).
 2010-12-07 19:06:25 +01:00
Sarah Mei
06cc99b19e git ignores mobile.css 2010-12-04 19:16:14 -08:00
Raphael
a85f47041a This file is generated by rake fixtures:users 2010-11-24 14:07:00 -05:00
Raphael
7db1da935a Stream is a class 2010-11-21 13:21:42 -05:00
maxwell
31d33054ef added jammit, now js and css compress for production 2010-11-17 21:51:59 -08:00
Sarah Mei
e0c0d2036c add .redcar to .gitignore 2010-11-14 21:48:10 -08:00
maxwell
d66e986971 removing oauth keys 2010-10-25 17:41:58 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
Raphael
ea36790e21 Add gzipped source.tar to gitignore 2010-10-19 14:06:57 -07:00
Raphael
a8e8480e94 Add vendor/bundle to gitignore 2010-10-15 14:14:32 -07:00
Raphael
fc8dc3f041 Add generated CSS to gitignore 2010-10-14 13:15:01 -07:00
Raphael
3274f109e5 Reorganize gitignore 2010-10-13 11:30:22 -07:00
Alec Leamas
6177362c4a Adding the ubuntu install package, initial version. 
T
 2010-10-12 21:22:49 +02:00