Age | Commit message (Collapse) | Author | |
---|---|---|---|
2011-06-29 | Merge branch 'master' into oauth | Raphael Sofaer | |
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-14 | Take documentation out of the repo, just generate it with yard | Raphael Sofaer | |
2011-06-04 | Chubbies now uses sqlite to have tables of pods and users | Maxwell Salzberg | |
2011-06-02 | include newrelic if the newrelic config file is present. profiling ftw. | danielgrippi | |
2011-05-29 | Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS ↵ | Sarah Mei | |
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-23 | add sasscache to gitignore | Maxwell Salzberg | |
2011-05-21 | add a .rvmrc_custom if you want to overide the one in the repo | MrZYX | |
2011-05-18 | rename config/app_config.yml to config/app.yml in accordance to The ↵ | Shane Becker | |
Redundant Rendundacy Act of 2011 | |||
2011-04-28 | Typo in .gitignore | Vikram Verma | |
2011-03-02 | Add rcov task | Raphael Sofaer | |
2011-02-23 | Add Rubinius's generated files | Raphael Sofaer | |
2011-02-18 | added license to javascripts.en.yml; better langcodes_alias_map.yml; ↵ | MrZYX | |
.gitignore users.yaml fixture | |||
2011-02-02 | Adjust autocomplete options and css | Raphael | |
2011-01-31 | Adding config/deploy_config.yml to gitignore | Sarah Mei | |
2011-01-27 | Fix data conversion, fixture generation in publicscontroller | Raphael | |
2011-01-19 | Remove yml files from git | Raphael | |
2011-01-15 | Merge almost complete, 4 failures | Raphael | |
2011-01-12 | Revert 'Create a separate webfinger service.' We'll come back to it when we ↵ | Raphael | |
figure out the error. | |||
2011-01-10 | Backing out sub-uri changes | Sarah Mei | |
2011-01-10 | Create a separate webfinger service. | Alec Leamas | |
2011-01-10 | Expose and refer to assets on the sub_uri. | Alec Leamas | |
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) | |||
2010-12-21 | gitignoring database.yml | Sarah Mei | |
2010-12-21 | Revert "Extended sub-uri support." for now.... | maxwell | |
This reverts commit 9cd08bac67e268f6c0a0361c2bcaeb41b03055c9. | |||
2010-12-21 | Extended sub-uri support. | Alec Leamas | |
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-15 | CGI::escaping for proper, good juju activity streams | maxwell | |
2010-12-14 | making image names more generic | maxwell | |
2010-12-13 | removed homepage detail into a partial, which you should redefine | maxwell | |
2010-12-07 | Creates and maintains a local redis.conf. | Alec Leamas | |
Creates config/redis.conf using mater copy in etc. FTM, disables daemonizing, which doesn't fit script/server (or upstart/systemd). | |||
2010-12-05 | git ignores mobile.css | Sarah Mei | |
2010-11-24 | This file is generated by rake fixtures:users | Raphael | |
2010-11-21 | Stream is a class | Raphael | |
2010-11-18 | added jammit, now js and css compress for production | maxwell | |
2010-11-15 | add .redcar to .gitignore | Sarah Mei | |
2010-10-26 | removing oauth keys | maxwell | |
2010-10-20 | Revert "Revert "Merge remote branch 'upstream/master'"" | Raphael | |
This reverts commit 1481056af23ed7dd70eed73a847d40fbe2d3ba2d. | |||
2010-10-20 | Revert "Merge remote branch 'upstream/master'" | Alec Leamas | |
This reverts commit fb70dc8c99a1bc7a8a3595b9cdd9d53d1ff81bab, reversing changes made to 53fef63a9a555a083ac9237f872a70e2b2a7115b. Conflicts: pkg/fedora/diaspora-setup pkg/ubuntu/diaspora-setup public/stylesheets/sass/application.sass spec/models/user/attack_vectors_spec.rb | |||
2010-10-20 | Add gzipped source.tar to gitignore | Raphael | |
2010-10-16 | Add vendor/bundle to gitignore | Raphael | |
2010-10-15 | Add generated CSS to gitignore | Raphael | |
2010-10-13 | Reorganize gitignore | Raphael | |
2010-10-12 | Adding the ubuntu install package, initial version. | Alec Leamas | |
T | |||
2010-10-10 | Ignore stgit files all over the place | Alec Leamas | |
2010-10-08 | .gitignore capybara output | Sarah Mei | |
2010-10-07 | MongoMapper now not overrides database name in MONGOHQ_URL configuration if ↵ | Crimer | |
provided. It also works on Heroku. | |||
2010-10-05 | added fb_config to gitignore | ilya | |
2010-09-30 | update gitignore | danielvincent | |
2010-09-28 | added a generate:secret_token task, and added an initializer to generate one ↵ | ilya | |
if the file does not exist | |||
2010-09-25 | Merge branch 'master' into HEAD | Raphael | |
2010-09-25 | Add a couple things to gitignore | Raphael | |
2010-09-23 | merged | Guido Serra aka Zeph | |