Commit graph

859 commits

Author SHA1 Message Date
Raphael Sofaer
97ca10ddda Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
manuels
30b2a6fe88 Corrected german translation (from noun to verb for 'mention') 2011-07-09 07:12:04 -07:00
MrZYX
ed23406f57 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-08 01:36:18 +02:00
MrZYX
7a7cfbf33f updated locales 2011-07-08 01:32:57 +02:00
Jordi Mallach
2e67549dc7 Updated Catalan translation to 738487b. 2011-07-07 14:43:52 +02:00
Jordi Mallach
84072305c5 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-07 14:34:41 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
738487b381 moved the are you sure dialog into a translation 2011-07-06 16:34:51 -07:00
Jordi Mallach
355e29c237 Better messages for following. 2011-07-07 00:34:19 +02:00
Jordi Mallach
fcb3d843e5 Fix names and indentation of some keys. Oops. 2011-07-06 23:47:24 +02:00
Jordi Mallach
5cac35ed27 Updated Catalan translation to c3e477f2. 2011-07-06 23:47:24 +02:00
MrZYX
78ba1590e5 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-06 15:44:46 +02:00
MrZYX
b7e86673e8 updated locales 2011-07-06 15:41:29 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3e477f2c5 Color the follow tag button 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2d8b5bd54c refactored the controller, moved flash message into translations 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7 WIP you can now follow a tag, needs a clean up, and ajax love 2011-07-05 15:03:26 -07:00
danielgrippi
47aab723bd fix message focus bug 2011-07-05 12:17:23 -07:00
Jordi Mallach
10f40043cc Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-05 10:28:49 +02:00
Jordi Mallach
99abd474c1 Updated Catalan translation to ecd7976. 2011-07-05 10:28:26 +02:00
danielgrippi
ecd79766ce remove aspect badges 2011-07-04 22:36:21 -07:00
Jordi Mallach
9248a34c89 Updated Catalan translation to 85d6eb70. 2011-07-05 02:06:57 +02:00
Jordi Mallach
035b8893c9 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-07-05 01:56:51 +02:00
danielgrippi
85d6eb70e7 fix cubbies info page (removed reference to token, changed infographic) 2011-07-04 16:14:05 -07:00
Maxwell Salzberg
b645a77be9 translate a string in services#index view 2011-07-04 13:59:44 -07:00
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
Jordi Mallach
c4c0846ed3 Updated Catalan translation to 9ec9055. 2011-07-04 19:02:20 +02: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
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
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
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
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