nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7839 commits 4 branches 0 tags 121 MiB
Commit graph

1616 commits

Author SHA1 Message Date
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
MrZYX
04e22c5564 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-06-03 23:04:58 +02:00
MrZYX
bfe38891eb updated locales 2011-06-03 23:04:52 +02:00
Raphael Sofaer
686464c36e move account deletion out of a tranaction and into a job 2011-06-03 12:05:57 -07:00
Dan Hansen
864233eb63 fix status message show page and break out Post to it's own javascript widget 2011-06-02 17:45:45 -05:00
MrZYX
009985169d fixed type in ml.yml 2011-06-03 00:29:23 +02:00
danielgrippi
9f05ac1f33 Newrelic now working in thin 2011-06-02 14:18:38 -07:00
danielgrippi
23dd975551 Don't depend on Rails.root as thin does not have it before app require 2011-06-02 12:18:22 -07:00
danielgrippi
918284a8f8 include newrelic if the newrelic config file is present. profiling ftw. 2011-06-02 12:10:03 -07:00
Jordi Mallach
8d444c0327 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-06-02 19:20:31 +02:00
Jordi Mallach
586c57f694 Update Catalan devise translation to a46ff39. 2011-06-02 19:20:10 +02:00
MrZYX
668c4ddfc5 d'oh 
- just check for existance before accessing in services initializer
- before_validation has no option :post
- dry up routes.rb
 2011-06-02 12:32:21 +02:00
Jordi Mallach
e00586e937 Update Catalan translation to f7181a7. 2011-06-02 12:17:08 +02:00
Maxwell Salzberg
9f7a066a44 since we try and init tumblr, we need to set it as empty...annoying 2011-06-01 23:33:16 -07:00
Maxwell Salzberg
f7181a7123 add tumblr translation 2011-06-01 22:43:23 -07:00
Maxwell Salzberg
5cbbdf2949 initial post to tumblr support 2011-06-01 22:30:22 -07:00
Maxwell Salzberg
1ef9d43262 added pagination for people on tag pages 2011-06-01 18:59:15 -07:00
MrZYX
c8dd8c98ca added es-AR 2011-06-01 23:55:48 +02:00
MrZYX
23cbb2975e Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-06-01 23:50:26 +02:00
MrZYX
f9486acd5e updated locales 2011-06-01 23:50:15 +02:00
Raphael Sofaer
68399be639 Deploy correct symlink for config file 2011-06-01 10:31:11 -07:00
Jordi Mallach
6a39dec635 Updated Catalan javascript to 331aa1f. 2011-06-01 11:50:13 +02:00
Jordi Mallach
191b5f1a28 Update Catalan translation to 05aa73e. 2011-06-01 11:47:16 +02:00
MrZYX
ed33c0b47a updated locales 2011-05-31 22:16:16 +02:00
MrZYX
7dd20a5e8b this hopefully fixes catalan and maybe even malayalam (#1110) 2011-05-31 22:13:47 +02:00
MrZYX
05aa73e93c made everything in the sidebar translatable 2011-05-30 18:06:05 +02:00
MrZYX
61fd8b55af updated locales 2011-05-29 23:28:55 +02:00
MrZYX
dd607fb47d user can now disable thin and use ./script/server to fire up resque and websocket only 2011-05-29 16:11:29 +02:00
Sarah Mei
31a5ef19de Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS 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-28 19:44:40 -07:00
MrZYX
4e5c6f0c97 updated locales 2011-05-29 04:14:25 +02:00
Raphael Sofaer
503de3efe1 Fix facebox close button and loading gif 2011-05-28 18:18:22 -07:00
MrZYX
307b69c7cf Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-05-27 15:34:58 +02:00
MrZYX
0bfb6f01c6 updated locales 2011-05-27 15:34:50 +02:00
cyberkov
ba0cf65b48 fixed typos as mentioned in bug 994 2011-05-27 14:42:17 +02:00
Jordi Mallach
b086d3a2ca Merge branch 'master' of git://github.com/diaspora/diaspora 2011-05-27 01:11:55 +02:00
Jordi Mallach
2c6be3c28e Update Catalan translation to db22be43. Fix some leftovers in the process. 2011-05-27 01:10:51 +02:00
MrZYX
c5630006b6 better compatibillity with old git versions to get the current rev. 2011-05-26 16:27:56 +02:00
Jordi Mallach
89086c2453 Shorter message for one string that was overlapping. 2011-05-26 10:35:09 +02:00
Raphael Sofaer
38289b1a47 Multi-server integration tests are now possible 2011-05-25 15:16:14 -07:00
MrZYX
cf1d83878c fixed #747 2011-05-25 22:50:13 +02:00
Maxwell Salzberg
52487e87de added a very basic page for the stream of all public activity stream photos 2011-05-25 12:57:29 -07:00
Sarah Mei
c6d61c68c0 Backfill some tests for app config, refactor base file name so people copy it instead of moving it 2011-05-25 11:07:29 -07:00
MrZYX
e946600ad4 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-05-24 17:33:40 +02:00
MrZYX
ce9e7c5369 updated locales 2011-05-24 17:33:36 +02:00
MrZYX
db22be43a8 really no string concatenation and proper pluralization in notifications helper AKA THE REASON I DIDN'T WANTED TO TOUCH THIS STUFF 2011-05-24 17:03:48 +02:00
Jordi Mallach
75e7b0e45d Update Catalan translation to fc7b2cf. 2011-05-24 16:17:00 +02:00
Raphael Sofaer
fc7b2cfe3f Take out some of the concatenation from NotificationsHelper. VSO languages will still be impossible, but our Caucasian friends should now be able to have valid sentences here. I don't particularly like passing a translation into a link helper which is passed into a translation. 2011-05-23 23:09:48 -07:00
MrZYX
5dca73e535 updated locales 2011-05-24 00:07:24 +02:00
danielgrippi
8e3149ca01 better page explaining cubbi.es and why we're promoting it on diaspora 2011-05-23 01:14:33 -07:00
Maxwell Salzberg
bb62a3dc61 move double post in notifications 2011-05-22 14:50:50 -07:00
MrZYX
4e94fe46d2 updated locales 2011-05-22 23:49:22 +02:00
Maxwell Salzberg
2f6d079635 added failure test for deleted likes 2011-05-22 14:45:16 -07:00
MrZYX
a68031179b prevent inviting yourself, #515 2011-05-22 14:48:07 +02:00
MrZYX
e6f3adb69f updated locales 2011-05-22 01:06:23 +02:00
danielgrippi
6a108104e8 add spacing 2011-05-21 14:56:11 -07:00
danielgrippi
0391795f80 better right pane sections 2011-05-21 14:52:59 -07:00
Raphael Sofaer
286f1b876d Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions. 2011-05-20 15:14:23 -07:00
MrZYX
a605ed80dd updated locales 2011-05-20 21:40:56 +02:00
danielgrippi
16351227f7 use aspect dropdowns everywhere; updated rake to 0.9.0 2011-05-20 11:50:41 -07:00
Arzumy MD
7c1a2f8d1d add remove_contact to en.yml to fix the build 2011-05-20 11:05:06 +08:00