Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
ilya
|
720d1daa9e
|
moved the mailer settings back into env
|
2010-10-07 15:40:18 -07:00 |
|
ilya
|
8fae836b65
|
isolating the problem
|
2010-10-07 15:28:58 -07:00 |
|
ilya
|
e174722315
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 15:06:03 -07:00 |
|
ilya
|
43600905dc
|
trying making the port an int
|
2010-10-07 15:05:52 -07:00 |
|
Raphael
|
a01a059293
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:47:32 -07:00 |
|
ilya
|
7aa49b277c
|
moved the smtp setting to intializers
|
2010-10-07 14:36:08 -07:00 |
|
Raphael
|
9912769b5b
|
Merge remote branch 'guillei/s3_upload'
|
2010-10-07 14:17:43 -07:00 |
|
Crimer
|
56ed245db0
|
MongoMapper now not overrides database name in MONGOHQ_URL configuration if provided. It also works on Heroku.
|
2010-10-07 14:29:17 +00:00 |
|
ilya
|
b823213c0d
|
added a generate:secret_token task, and added an initializer to generate one if the file does not exist
|
2010-09-27 15:29:55 -07:00 |
|
Dorian
|
6ffc03a4c9
|
Big clean up: delete trailing whitespace
|
2010-09-26 12:48:40 -04:00 |
|
Guillermo
|
6e0082da9e
|
Files are uploaded to S3 if the ENV variables are set (Heroku-friendly)
|
2010-09-26 11:03:47 -05:00 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
Raphael
|
beda67aca6
|
Shorten git show stuff
|
2010-09-24 17:51:51 -07:00 |
|
Raphael
|
2489f8503f
|
Merge branch 'master' into HEAD
Conflicts:
app/controllers/albums_controller.rb
app/controllers/aspects_controller.rb
app/controllers/photos_controller.rb
app/controllers/registrations_controller.rb
app/controllers/requests_controller.rb
app/helpers/dashboards_helper.rb
app/views/albums/show.html.haml
app/views/aspects/manage.html.haml
app/views/shared/_aspect_nav.haml
app/views/shared/_sub_header.haml
app/views/status_messages/_status_message.html.haml
app/views/status_messages/show.html.haml
config/locales/de.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
|
2010-09-22 21:32:03 -07:00 |
|
danielvincent
|
8941975224
|
DG IZ; example extension convention for app_config
|
2010-09-22 10:59:23 -07:00 |
|
ilya
|
6d6ca3d8bc
|
added terse_pod_url to the APP_CONFIG hash
|
2010-09-21 20:01:56 -07:00 |
|
ilya
|
96aaf3093c
|
Make load_app_config more robust, point to the right folder in db seed
|
2010-09-21 18:04:36 -07:00 |
|
ilya
|
b01928af4b
|
RS IZ if yaml fails to load (empty config) file load the example
|
2010-09-21 17:52:23 -07:00 |
|
ilya
|
efd901dcd9
|
RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG
|
2010-09-21 15:46:57 -07:00 |
|
Raphael
|
60e29f6572
|
Magent should use the same settings as mongomapper, app config should load first, websocket spec is a little better.
|
2010-09-19 16:37:34 -07:00 |
|
Ariel Zavala
|
0b91a2c186
|
Added I18n initializer
|
2010-09-18 08:08:32 +08:00 |
|
Ariel Zavala
|
7bb3d9c87a
|
Merge branch 'master' of http://github.com/diaspora/diaspora
|
2010-09-17 17:21:29 -04:00 |
|
Ariel Zavala
|
c6cdf65fc8
|
updated local configuration
|
2010-09-17 10:26:57 -04:00 |
|
Raphael
|
c520fb71a7
|
Moved socket out to separate process. Multiple thins should now be possible
|
2010-09-16 21:34:15 -07:00 |
|
Ariel Zavala
|
0be3314e0a
|
merge with diaspora and resolved a conflict
|
2010-09-16 20:42:45 -04:00 |
|
danielvincent
|
ae83dae1ca
|
added git info (branch,date,author) to debug partial
|
2010-09-16 17:03:14 -07:00 |
|
cryptix
|
c80a79dea5
|
Unified require quotes
|
2010-09-17 07:44:47 +08:00 |
|
Ariel Zavala
|
ab5e7319ee
|
Added I18n initializer
|
2010-09-16 11:46:34 -04:00 |
|
Jamie Wilkinson
|
fbdd50172d
|
Cleanup stray whitespace
|
2010-09-16 10:07:59 +08:00 |
|
Jesse Kriss
|
30e655fd6c
|
adding heroku-friendly mongo config
|
2010-09-16 09:46:09 +08:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
Daniel Vincent Grippi
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -07:00 |
|
Raphael
|
960d40278c
|
Add username, login with username or email
|
2010-09-08 10:59:08 -07:00 |
|
Raphael
|
efb4100e01
|
Split up socket debug and app debug
|
2010-08-23 13:58:09 -07:00 |
|
Raphael
|
7ed31ab96a
|
Moving to file store
|
2010-08-18 16:37:05 -07:00 |
|
ilya
|
5dff3369ad
|
DG IZ; removed puts statements.
|
2010-08-17 10:48:40 -07:00 |
|
Raphael
|
599d1da620
|
Moved socket code out to lib, unsocketing from view should now work again
|
2010-08-11 12:03:26 -07:00 |
|
Raphael
|
c14bb5a4f8
|
Changed info logging to debug logging almost everywhere
|
2010-08-09 14:39:37 -07:00 |
|
Raphael
|
614c8c72ba
|
RS, DG; Log files should now rotate
|
2010-08-09 14:27:17 -07:00 |
|
Raphael
|
088da2544b
|
RS, DG; We now delete channels when there is nobody subscribed to them
|
2010-08-09 14:11:46 -07:00 |
|
Raphael
|
33a827c33a
|
RS, DG; Websocket is now working again, users have a channel
|
2010-08-09 13:02:08 -07:00 |
|
Raphael
|
0a40efdaf7
|
Removing unused messages
|
2010-08-09 10:47:45 -07:00 |
|
Raphael
|
e3c28c4fee
|
Fixed Photos, and Carrierwave initializer
|
2010-08-02 21:31:14 -07:00 |
|
Raphael
|
6b1f020839
|
Moved utilities out to special controller, took pound sign out of database name
|
2010-08-02 18:03:16 -07:00 |
|
ilya
|
1b32afc78f
|
Switching to Grid_FS, correctly
|
2010-07-23 14:53:12 -07:00 |
|
ilya
|
e75cb8e8d2
|
Changing back to gridfs
|
2010-07-22 11:47:44 -07:00 |
|
maxwell
|
695a93ddad
|
DG MS added basic album traversal
|
2010-07-21 14:29:58 -07:00 |
|
Raphael
|
fa46fb31f4
|
Added photos, profile editing
|
2010-07-16 17:26:06 -07:00 |
|