| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2011-07-12 | rails-i18n is now a gem | MrZYX | |
| 2011-05-29 | I always forget that space… | MrZYX | |
| 2011-05-29 | user can now disable thin and use ./script/server to fire up resque and ↵ | MrZYX | |
| websocket only | |||
| 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-18 | rename config/app_config.yml to config/app.yml in accordance to The ↵ | Shane Becker | |
| Redundant Rendundacy Act of 2011 | |||
| 2011-05-18 | whoops lets do a deep merge | MrZYX | |
| 2011-05-18 | eliminate config/server.sh; use config/app_config.yml.example as base for ↵ | MrZYX | |
| configuration, config/app_config.yml is now just an overider. This way we can add new configuration options without checking in the application if it's set and the user has to update his app_config.yml only when he want to change something | |||
| 2011-05-17 | check for redis only if not in single process mode | danielgrippi | |
| 2011-05-17 | no need to run the websocket server if redis isn't running (in ↵ | danielgrippi | |
| single_process_mode) | |||
| 2011-05-17 | fixed #1073, websocket should now work again for some people at least | MrZYX | |
| 2011-05-17 | replaced SOCKET_PORT in config/server.sh with the setting from ↵ | MrZYX | |
| config/app_config.yml; respect single_process_mode setting in app_config.yml in script/server | |||
| 2011-05-17 | work in process | danielgrippi | |
| 2011-03-26 | typo in script/server | MrZYX | |
| 2011-03-26 | comment out init_public in script server for now as it's buggy and confuses ↵ | MrZYX | |
| users | |||
| 2011-03-14 | Changing message to text, partway done, deleted data conversion | Raphael Sofaer | |
| 2011-01-27 | Merge branch '819-checks-for-redis-conf-in-usr-local-etc' of ↵ | MrZYX | |
| https://github.com/Dorian/diaspora Conflicts: script/server | |||
| 2011-01-26 | Fix require in ws server | Raphael | |
| 2011-01-23 | Updated the server script to support Redis when it has been installed via ↵ | Adam McDonald | |
| MacPorts. Also, fixed an echo error with it not being displayed correctly. | |||
| 2011-01-23 | Standardize how we're requiring config/environment | Sarah Mei | |
| 2011-01-22 | we don't need to exit if jammit fails | MrZYX | |
| 2011-01-22 | some untested improvments to script/server | MrZYX | |
| 2011-01-20 | Checks for redis.conf in /usr/local (by justthisguy) | Dorian | |
| 2011-01-18 | no more mongo check in script server | zhitomirskiyi | |
| 2011-01-18 | Typo in script/server : redis.cont → redis.conf | Dorian | |
| 2011-01-14 | Commit horrifying db cleanup script | 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-24 | Replace APP_CONFIG with lib/app_config.rb so that it's testable. | 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-16 | Trying to cope with #722 for the moment. | Alec Leamas | |
| Issue warning if there already is a running redis server, typically the system server installed with the redis[-server] package. See http://bugs.joindiaspora.com/issues/722 | |||
| 2010-12-10 | Websocket now uses redis | Raphael | |
| 2010-12-09 | Fixing also logfile in redis.conf | Alec Leamas | |
| Not tested on BSD/Darwin, might need polish for these. | |||
| 2010-12-08 | Merge branch '676-bsd-sed' of https://github.com/flah00/diaspora into ↵ | MrZYX | |
| flah00-676-bsd-sed | |||
| 2010-12-08 | Redis.conf: handling read-only install... | Alec Leamas | |
| 2010-12-08 | Issue 676: allow for correct calling of bsd sed | Philip Champon | |
| 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-06 | Bugfix (only visible on Ubuntu) | Alec Leamas | |
| 2010-12-06 | Making jammit tests in server consistent | Alec Leamas | |
| 2010-12-06 | Create publiuc/source.tar.gz from current branch. | Alec Leamas | |
| Also, give slow starters some more time. | |||
| 2010-12-06 | Revert "Fixing server when no git files, not on master" | Alec Leamas | |
| Wrong usecase. The real problem is always using the master branch. There is no point using a files list, distributions will just create the tar archive in advance. This reverts commit 05410828048f02c37729f38758efd255dfd85255. | |||
| 2010-12-06 | Route redis output to log file, | Alec Leamas | |
| On Fedora, logfile/loglevel in configuration file seems to be ignored as of now. | |||
| 2010-12-06 | Fixing server when no git files, not on master | Alec Leamas | |
| Allows server to run even if on another branch than master and/or in a production scenario without git files available. | |||
| 2010-12-05 | Issue #650: this closes the netstat on mac problem ↵ | Philip Champon | |
| http://bugs.joindiaspora.com/issues/650 | |||
| 2010-12-05 | fixed bsd netstat issue | Philip Champon | |
| 2010-12-03 | start redis in script/server. removed magent. redis-server does not close ↵ | danielvincent | |
| on script/server kill | |||
| 2010-12-03 | Revert "Revert redis merge to fix bugs on master" | Raphael | |
| This reverts commit 30698d674bf53ee9f0b0b9b28e65d976a514c304. | |||
| 2010-12-03 | Revert redis merge to fix bugs on master | Raphael | |
Welcome to mirror list, hosted at ThFree Co, Russian Federation.
 |
index : github.com/diaspora/diaspora.git | |
| Unnamed repository; edit this file 'description' to name the repository. | www-data |
| summaryrefslogtreecommitdiff |