Commit graph

1575 commits

Author SHA1 Message Date
Maxwell Salzberg
2f1118f95f refactor AppConfig to guess what services are configured, and clean up the services view for a user. also, add a box so people can realize what they can connect 2011-07-04 13:54:05 -07:00
MrZYX
b8ff203af8 updated locales 2011-07-04 01:19:17 +02:00
danielgrippi
8a8f8db9ad Merge branch 'notifications' 2011-07-02 17:53:55 -07:00
danielgrippi
9ec905560c visual touchups, show loading gif right away 2011-07-02 17:53:07 -07:00
Maxwell Salzberg
f4ca8898f6 adding old school resque inline send. confusion b/c Resque.inline is a newer feature 2011-07-02 12:10:25 -07:00
Maxwell Salzberg
2d9d9bd1a1 Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same""
This reverts commit 696779d589.
2011-07-02 12:05:26 -07:00
Maxwell Salzberg
696779d589 Revert "remove perform delegate: use a gem that unobtrusivly does the same"
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
2011-07-02 12:01:31 -07:00
Maxwell Salzberg
dd752d7dd9 remove perform delegate: use a gem that unobtrusivly does the same
thing. use built in resque inline method for single process mode
2011-07-02 11:57:10 -07:00
Raphael Sofaer
ac832f160c Trying to figure out the travis-ci database configuration 2011-07-02 00:15:35 -07:00
Raphael Sofaer
49d905c719 Some more translation stuff. @MrZYX the content thing in the Diaspora ID explanation is messed up, what's the best way to get bold text into the translation string? 2011-07-01 23:27:53 -07:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -07:00
danielgrippi
f90dc0996a More visual cleanup; top nav; edit aspects 2011-07-01 16:12:14 -07:00
danielgrippi
cd9be3904b publisher rework 2011-07-01 10:51:45 -07:00
danielgrippi
60077bd70a minor visual changes, more or less. facebox headers are now white. 2011-07-01 10:51:45 -07:00
danielgrippi
ca76db4550 DG RS left nav almost there. touched up publisher, among other things 2011-07-01 10:49:19 -07:00
MrZYX
84ae3e6b96 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-01 00:11:06 +02:00
MrZYX
705dec4e02 updated locales 2011-07-01 00:11:01 +02:00
Jordi Mallach
dfa0a4eb71 Update Catalan translation to 91f984c. 2011-06-30 14:20:12 +02:00
Raphael Sofaer
91f984c2ad Diaspora handle is really confusing, we should just say ID 2011-06-29 14:59:30 -07:00
MrZYX
6519ffcd33 updated locales 2011-06-29 21:10:58 +02: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
parimbra
47512db147 better description for #tags 2011-06-28 19:47:19 +05:30
Raphael Sofaer
a0214a0a35 MIIIIIIIIIIKE 2011-06-27 23:22:08 -07:00
Dan Hansen & Maxwell Salzberg
37aeb2fa36 add CSS and refactor to new file 2011-06-27 19:51:35 -07:00
danielgrippi
73fe74c834 updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber 2011-06-27 18:58:29 -07:00
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
danielgrippi
a9b7cd1254 nicer auth prompt. wip. 2011-06-23 12:40:47 -07:00
MrZYX
c6f045dfb7 updated locales 2011-06-23 14:06:54 +02:00
Raphael Sofaer
a987b198fd Fix search in PG 2011-06-22 15:09:00 -07:00
Raphael Sofaer
e8552fc417 Fix direct query execution issues in PG by using select_values/select_rows instead of execute. 2011-06-22 14:47:59 -07:00
Raphael Sofaer
04b0705733 Faraday follows redirects 2011-06-22 12:53:18 -07:00
MrZYX
cb59930749 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-06-18 23:18:15 +02:00
MrZYX
d34d623b62 updated locales 2011-06-18 23:18:04 +02:00
Jordi Mallach
9a6c175dbd Better message for what's on your mind. 2011-06-17 21:14:50 +02:00
Ilya Zhitomirskiy
ef0e48a7ff A user can now revoke an application's token iz ms 2011-06-13 16:48:52 -07:00
Ilya Zhitomirskiy
3d77186d35 added authorizations page where a user can see all of their authorized applications 2011-06-13 15:40:55 -07:00
MrZYX
abedcc1cc3 updated locales 2011-06-10 02:15:03 +02:00
Ilya Zhitomirskiy
a03423309d fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png 2011-06-09 15:12:35 -07:00
Ilya Zhitomirskiy
808754f8bd added the cert bundle for facebook http things 2011-06-08 18:20:47 -07:00
Raphael Sofaer
d9d66a5c31 WIP auth form and more oauth stuff 2011-06-08 11:55:11 -07:00
MrZYX
69efeb0179 updated locales 2011-06-08 19:13:20 +02:00
danielgrippi
67eaafe3a9 Chubbies no longer saves diaspora_handle from the browser 2011-06-06 15:42:58 -07:00
MrZYX
10b8f88e97 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-06-06 23:06:51 +02:00
MrZYX
be8e61ec1d updated locales 2011-06-06 23:06:32 +02:00
Jordi Mallach
cd2c37a19f Updated Catalan translation to 686464c. 2011-06-06 14:39:57 +02:00
Sarah Mei
ba9df59977 Fix migration for ruby 1.9. Move YAML check into application.rb, and add guard for ruby 1.8.x. 2011-06-04 20:12:34 -07:00
vidkun
b0879dd880 Changed yaml parser to work around bug #1120 2011-06-04 19:50:09 -07:00
MrZYX
158223319e updated locales 2011-06-05 00:59:58 +02:00
danielgrippi
e121b0fe6d Chubbies now sees that it has no secret and registers itself. 2011-06-03 16:22:38 -07:00
Raphael Sofaer
381b85189d Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow 2011-06-03 16:22:38 -07:00