danielgrippi
934a91e47e
no need to run the websocket server if redis isn't running (in single_process_mode)
2011-05-17 10:10:20 -07:00
MrZYX
18859a2fba
fixed #1073 , websocket should now work again for some people at least
2011-05-17 17:52:59 +02:00
MrZYX
401b198bbf
--amend
2011-05-17 16:02:37 +02:00
MrZYX
00c6631f11
replaced SOCKET_PORT in config/server.sh with the setting from config/app_config.yml; respect single_process_mode setting in app_config.yml in script/server
2011-05-17 16:00:47 +02:00
danielgrippi
4875d6557d
update nokogiri, require false on sod
2011-05-16 22:30:25 -07:00
danielgrippi
7542d36abc
Merge branch 'master' of github.com:diaspora/diaspora
2011-05-16 18:57:02 -07:00
danielgrippi
2ab39013fd
Merge branch 'work-in-process'. yo dawg, RUN YO' PROCESS IN YO' PROCESS.
2011-05-16 18:56:01 -07:00
danielgrippi
7042b43799
use appconfig instead of config
2011-05-16 18:54:50 -07:00
Raphael Sofaer
164226a3d7
Replace ServiceUser with fakes in ServicesController
2011-05-16 18:48:03 -07:00
danielgrippi
55d39521c4
rescue redis connection attempts in websocket
2011-05-16 18:34:37 -07:00
danielgrippi
8821043ed7
work in process
2011-05-16 18:27:12 -07:00
danielgrippi
8d7b0b2c4c
take out animations in inf scroll.
2011-05-16 16:55:24 -07:00
Raphael Sofaer
a357cf9217
Fix build... damn question marks.
2011-05-16 16:33:05 -07:00
danielgrippi
d70f10b609
made dropdown selectors sexi
2011-05-16 16:29:13 -07:00
Raphael Sofaer
495dd89dd2
Fix password reset, add cucumber feature
2011-05-16 15:54:18 -07:00
danielgrippi
7eaca0346c
Merge branch 'master' into follow
...
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
MrZYX
8c1e64a080
updated locales
2011-05-16 21:02:15 +02:00
MrZYX
956f0044a9
set @contacts_of_contact_count in photos#index, thanks LPrelle
2011-05-16 16:21:13 +02:00
MrZYX
e338886910
fixes to login page: removed not needed login.sass; removed fixed string length assumption; fixed login button not showing up in Chrome when the form is pre-filled
2011-05-16 15:16:01 +02:00
Jerin Philip
946896da1f
Edited config/locales/diaspora/ml.yml via GitHub
2011-05-16 16:27:48 +05:30
Jerin Philip
6cc798de77
Edited config/locales/diaspora/ml.yml via GitHub
2011-05-16 16:27:48 +05:30
Anish A
f56da67b0b
Added rest of jerrinphilip's translations
2011-05-16 16:27:48 +05:30
Anish A
d87c1f3ff0
Translations of jerrinphilip
2011-05-16 16:27:48 +05:30
Anish A
d8426fe6d3
Added rest of jerrinphilip's translations
2011-05-16 16:27:48 +05:30
Anish A
577f0338be
Translations of jerrinphilip
2011-05-16 16:27:48 +05:30
Jerin Philip
4d31a69a20
Edited config/locales/diaspora/ml.yml via GitHub
2011-05-16 16:27:48 +05:30
Jerin Philip
fc1cddf03e
Edited config/locales/diaspora/ml.yml via GitHub
2011-05-16 16:27:26 +05:30
Anish A
9003db10d1
Added rest of jerrinphilip's translations
2011-05-16 16:26:59 +05:30
Anish A
91423c7d09
Translations of jerrinphilip
2011-05-16 16:25:48 +05:30
Ilya Zhitomirskiy
709ac44da3
fixed the incrementing aspect ids on the contacts#sharing modal window, showing 'Add to Aspect' button only on the tags and profile pages
2011-05-16 02:16:46 -07:00
MrZYX
20231891d2
updated locales
2011-05-15 22:57:08 +02:00
Sarah Mei
983b83ac68
osx installer updates to the voice
2011-05-15 12:27:44 -07:00
Sarah Mei
a9292df275
OSX installer tweaks: everyone does brew update, add link to irc when rvm install fails
2011-05-15 11:47:29 -07:00
Maxwell Salzberg
0fd15107ab
set up database files in osx script
2011-05-15 02:01:08 -07:00
Maxwell Salzberg
5b5fb7c599
check for gcc as xcode test
2011-05-15 01:59:34 -07:00
Sarah Mei
8a6b9796dd
OSX installer has friendlier instructions at the beginning
2011-05-14 22:31:59 -07:00
Sarah Mei
e41c8f5887
OSX installer now does not assume mysql will always be v5.5.10.
2011-05-14 22:17:23 -07:00
Sarah Mei
e9b4257a22
Various fixes for OS X installer: always remove rvm installer file. Better instructions at the end.
2011-05-14 22:00:01 -07:00
Sarah Mei
ce290211c6
Various fixes for OS X installer: now installs ree the right way, adds mysql to launchctl, creates & migrates the db, and copies app_config.yml
2011-05-14 20:37:38 -07:00
Sarah Mei
3986a0d6d7
OS X installer installs homebrew & rvm & ree.
2011-05-14 18:42:15 -07:00
Sarah Mei
00d89b0207
Small updates to infinite scroll feature
2011-05-14 16:58:37 -07:00
MrZYX
7e6cae9f96
updated locales
2011-05-15 01:32:06 +02:00
Maxwell Salzberg
d59e44f906
first crack at OSX newb rake task. wip
2011-05-14 16:25:39 -07:00
MrZYX
bd80b32142
Merge branch 'master' of github.com:diaspora/diaspora
2011-05-15 00:50:02 +02:00
MrZYX
f916f3a3e0
remove the width from the share button, thanks artem
2011-05-15 00:49:35 +02:00
Sarah Mei
0bbce0295b
Merge branch 'master' of github.com:diaspora/diaspora
2011-05-14 15:48:45 -07:00
Sarah Mei
43ab8cfcfa
Tell devise that :mobile is a navigational format.
2011-05-14 15:46:56 -07:00
Ilya Zhitomirskiy
832fcc891f
Edited README.md via GitHub
2011-05-14 15:37:57 -07:00
Ilya Zhitomirskiy
4b21585231
Moved the public key
2011-05-14 15:35:41 -07:00
Sarah Mei
fbf486dae6
Users can log in on their phones again.
...
Something in devise broke for the :mobile format. More investigation needed; we're having this same issue on log out and incorrect password on mobile (though those pages are at least still usable).
2011-05-14 14:58:52 -07:00
