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

1741 commits

Author SHA1 Message Date
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
Raphael Sofaer
93be5497a7 Small controller for generating an auth token, if you are an authable user 2011-05-19 18:29:53 -07:00
danielgrippi
f2259e5e25 put link in via link translation, add via link to mobile site 2011-05-19 16:06:29 -07:00
danielgrippi
d7899d10e3 Fix various links in to cubbi.es objects 2011-05-19 15:17:42 -07:00
Maxwell Salzberg
3c4c62abd5 moved auth token to admins page, and added a link in the dropdown 2011-05-19 14:23:04 -07:00
danielgrippi
177061d1c5 added via links 2011-05-19 13:13:08 -07:00
danielgrippi
c8e31825c5 Bookmark -> ActivitiyStreams::Photo 2011-05-19 11:57:06 -07:00
danielgrippi
9b941e6520 Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed. 2011-05-19 11:57:06 -07:00
danielgrippi
be662a65c6 added token authenticatable to user model 2011-05-19 11:57:06 -07:00
Jonne Hass
01796fb7be Merge pull request #641 from aneesh/malayalam-localization 
Malayalam localization
 2011-05-19 11:13:19 -07:00
MrZYX
331aa1ff60 you know the facepalm smiley? Here it is: m( 2011-05-19 20:10:35 +02:00
Anish A
174c5772af Malayalam translation, final touchups 2011-05-19 23:25:58 +05:30
Anish A
626733b9f9 Malayalam translation, updated translations from me and siddique pk 2011-05-19 23:22:04 +05:30
Anish A
15fc0dd3ae Malayalam translation, updated translations suggested from diaspora 2011-05-19 23:22:04 +05:30
MrZYX
e592e1b06e updated locales 2011-05-18 23:33:21 +02:00
Shane Becker
910cc52387 rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011 2011-05-18 11:46:45 -07:00
Ilya Zhitomirskiy
6cda0bf9ea Revert "added a podwide email preference" 
This reverts commit 60c0a9839b.
 2011-05-18 10:38:45 -07:00
MrZYX
2a449aa8c4 uncomment the new s3_region setting so that nobody needs to update his app_config.yml when he's using S3 2011-05-18 16:21:54 +02:00
Jonne Hass
ee1c394aa2 Merge pull request #639 from cyberkov/add-region-selection-for-s3 
Added region config to carrierwave to select other regions than US
 2011-05-18 07:20:16 -07:00
MrZYX
e79a6597e6 eliminate config/server.sh; use config/app_config.yml.example as base for configuration, config/app_config.yml is now just an overider. This way we can add new configuration options without checking in the application if it's set and the user has to update his app_config.yml only when he want to change something 2011-05-18 16:11:20 +02:00
cyberkov
eb615c3e7e Added region config to carrierwave to select other regions than US 2011-05-18 15:57:02 +02:00
MrZYX
66380fd33f fixed some translations 2011-05-18 13:55:50 +02:00
Jonne Hass
4bd266e9f0 Merge pull request #638 from aneesh/malayalam-localization 
Malayalam localization
 2011-05-18 02:18:53 -07:00
Anish A
ddfb1f00f4 Malayalam translation, completed devise and javascript directory 2011-05-18 07:55:13 +05:30
Anish A
3837d3b1f8 Malayalam translation, nearing completion 2011-05-18 07:27:40 +05:30
Ilya Zhitomirskiy
60c0a9839b added a podwide email preference 2011-05-17 18:19:47 -07:00
Raphael Sofaer
0bb349ff08 Merge branch 'evant_log_post_merge' 2011-05-17 18:17:14 -07:00
Raphael Sofaer
f409ace067 Merge remote branch 'evant/354-long-post' into evant_log_post_merge 
Conflicts:
	config/assets.yml
 2011-05-17 18:02:36 -07:00
MrZYX
2edec3c6ae updated locales 2011-05-18 02:58:58 +02:00
MrZYX
f752b5a71b change infinitescroll in mobile too, thanks @dmorley 2011-05-18 01:01:36 +02:00
MrZYX
c47c9ef069 fix untranslated string; fix two translations; don't mess routes.rb again 2011-05-18 00:53:48 +02:00
Raphael Sofaer
2953cc8497 Move infinite scroll out of vendor, because it has been edited 2011-05-17 15:06:21 -07:00
danielgrippi
775e7b6b2b Merge branch 'master' into follow 
Conflicts:
	features/step_definitions/user_steps.rb
 2011-05-17 11:33:35 -07: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
7042b43799 use appconfig instead of config 2011-05-16 18:54:50 -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
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
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
MrZYX
20231891d2 updated locales 2011-05-15 22:57:08 +02:00
MrZYX
7e6cae9f96 updated locales 2011-05-15 01:32:06 +02:00
Sarah Mei
43ab8cfcfa Tell devise that :mobile is a navigational format. 2011-05-14 15:46:56 -07:00
Sarah Mei
c8e9225dfb For the love of god, normal Rails logs in test & development. 
There's now a setting in app_config.yml, :enable_splunk_logging, which if true outputs godawful machine-readable splunk logs. It's false in test and development, and true elsewhere.
 2011-05-14 13:29:54 -07:00
danielgrippi
666fb76bfc login as its own js file. accounted for the autofil state 2011-05-13 22:27:08 -07:00
Raphael Sofaer
32ceb278bf Restore deploy.rb 2011-05-13 16:35:55 -07:00
Raphael Sofaer
a4f81c6410 Finish fixing password changing and keeping emails downcased 2011-05-13 16:32:07 -07:00
Raphael Sofaer
f8b7307441 Downcase emails upon inviting 2011-05-13 16:32:07 -07:00
Raphael Sofaer
a46ff394b1 update devise_invitable and devise 2011-05-13 16:32:07 -07:00
danielgrippi
402e84708b ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug 2011-05-13 16:05:37 -07:00
MrZYX
b7540ba6ab updated locales 2011-05-14 00:04:43 +02:00
danielgrippi
c200c386fb pulled new aspect into modal window 2011-05-13 11:58:18 -07:00
Evan Tatarka
5f406b18d5 Updated code to work with lastest master. Tests should now pass. 2011-05-12 20:38:05 -04:00
danielgrippi
60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
 2011-05-12 15:49:51 -07:00
danielgrippi
4280417e41 broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed 2011-05-11 18:33:17 -07:00
Jerin Philip
ae2a0528b7 Edited config/locales/diaspora/ml.yml via GitHub 2011-05-12 05:43:30 +05:30
Jerin Philip
0a84f3d011 Edited config/locales/diaspora/ml.yml via GitHub 2011-05-12 05:43:30 +05:30
Jerin Philip
ca1f148094 Edited config/locales/diaspora/ml.yml via GitHub 2011-05-12 05:43:30 +05:30
Anish A
ae5e37a3c2 Added rest of jerrinphilip's translations 2011-05-12 05:43:30 +05:30
Anish A
bd4aa14a3c Translations of jerrinphilip 2011-05-12 05:42:28 +05:30
danielgrippi
7893129435 prevent user from hitting aspectmemberships controller before response on dropdowns 2011-05-11 17:07:58 -07:00
Raphael Sofaer
cb49d1f4ea fixed the formatting on emails 2011-05-11 17:02:05 -07:00
danielgrippi
9f3044838d Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started 2011-05-11 14:53:43 -07:00
Raphael Sofaer
b8d9610877 added translation to the likes popup, made the notification models a little clearer 2011-05-11 13:50:26 -07:00
danielgrippi
ebb17ff70c few cucumber steps failing. wip. 2011-05-11 11:08:30 -07:00
danielgrippi
dfeb4f3a13 use .js response convention for remote likeke behavior 2011-05-11 11:08:30 -07:00
danielgrippi
8b081a48b4 likes controller now has destroy method. commented out dislikes from views. unlike links not functional. 2011-05-11 11:08:29 -07:00
MrZYX
4a24e90671 updated locales 2011-05-11 17:04:47 +02:00
zhitomirskiyi
469d5b99a2 WIP added a share view, tests are red 2011-05-09 16:55:22 -07:00
MrZYX
35d929c217 updated locales 2011-05-09 13:40:28 +02:00
Raphael Sofaer
ffd96d989c Update publisher callback to use ContentUpdater 2011-05-08 20:31:13 -07:00
Dan Hansen
fc25c9bedb Flash message handling is now a widget 2011-05-08 10:53:09 -05:00
MrZYX
8261547ed9 added arabic 2011-05-08 01:02:33 +02:00
MrZYX
3ee6fc0403 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-05-08 01:00:16 +02:00
MrZYX
92089f97e9 updated locales 2011-05-08 01:00:09 +02:00
Jordi Mallach
0e23434542 Updated Catalan translation to 2c4954b. 2011-05-07 15:20:35 +02:00
MrZYX
989d178987 updated locales 2011-05-07 00:39:24 +02:00
Arzumy MD
2c4954bac8 spec for application_helper#page_title, with default text 2011-05-06 00:14:18 +08:00
Anish A
cb9901d18b Added rest of jerrinphilip's translations 2011-05-05 10:19:17 +05:30
Anish A
63e334c2f0 Translations of jerrinphilip 2011-05-05 10:19:17 +05:30
danielgrippi
648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
 2011-05-04 11:35:35 -07:00
MrZYX
a71c4b3f69 added japanese 2011-05-04 15:47:02 +02:00
MrZYX
c59ef78a99 updated locales 2011-05-04 15:44:29 +02:00
MrZYX
1b9f5f8709 updated locales 2011-05-03 23:13:13 +02:00
MrZYX
c13b5a0628 pulled in plural definitions from CLDR; adjusted READMEs in locales subdirs 2011-05-03 23:08:32 +02:00
Maxwell Salzberg
c41acbabd6 grammer on notifications#index 2011-05-02 17:48:51 -07:00
Raphael Sofaer
94bc18e467 Make websocket closed message less disruptive 2011-05-02 17:12:18 -07:00
MrZYX
75234a511d in most configuration example I've seen the cert comes before the key ;) 2011-05-02 22:35:37 +02:00
MrZYX
034033f743 updated locales 2011-05-01 23:28:12 +02:00
Adrián Chaves Fernández (Gallaecio)
e7e9ef3ad5 Some translations reviewed. 2011-04-30 23:51:36 +08:00
MrZYX
ff58d63191 minor cleanup to routes.rb 2011-04-30 16:28:39 +02:00
Jonne Hass
84412863dc (minor change) move bookmarklet route to the right place 2011-04-30 06:51:37 -07:00
MrZYX
12557e7e84 updated locales 2011-04-30 13:51:02 +02:00
MrZYX
f7c7ea33b6 improved database.yml.example 2011-04-30 00:56:35 +02:00
Maxwell Salzberg
62696c3e42 logout is also not a word 2011-04-28 12:25:50 -07:00
Maxwell Salzberg
2ac277adaf www.loginisnotaverb.com thx @starkness 2011-04-28 12:21:15 -07:00
MrZYX
4e88225d10 updated locales 2011-04-28 19:55:10 +02:00
Dan Hansen
d28a2cdb1e Show the user that the websocket connection has been closed and posts will no longer socket in 2011-04-27 16:50:23 -05:00
Dan Hansen
4a101f25d9 Notifications.js refactor, add specs 2011-04-27 16:22:56 -05:00
MrZYX
670d4d91bf changed name for korean 2011-04-25 16:03:16 +02:00
MrZYX
a11e16b9fb updated locales 2011-04-25 16:02:20 +02:00
MrZYX
74ca01ecad added korean 2011-04-25 02:00:34 +02:00
MrZYX
7b6e6b4a02 updated locales 2011-04-25 01:48:04 +02:00
MrZYX
512874a338 moved zh to zh-CN 2011-04-23 13:39:02 +02:00
MrZYX
ca2a48eb58 updated locales 2011-04-23 13:29:54 +02:00
Dan Hansen
3d11b402e0 Infinite scroll is now a widget, remove InfiniteScroll#postScroll, use DiasporaJS pub/sub instead, remove timeago.js hacks 2011-04-22 20:33:21 -05:00
MrZYX
605382a478 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-04-23 01:18:27 +02:00
MrZYX
2324f0797d updated locales 2011-04-23 01:18:15 +02:00
Raphael Sofaer
804b6cc490 Clean up some JS 2011-04-21 12:48:31 -07:00
Jordi Mallach
2f6ed0b303 Updated Catalan translation to 9850a3f. 2011-04-21 13:48:56 +02:00
MrZYX
fc526ff315 updated locales 2011-04-21 01:47:27 +02:00
MrZYX
931b85fe62 added bulgarian 2011-04-20 01:05:57 +02:00
MrZYX
1813b248c6 updated locales 2011-04-20 01:04:33 +02:00
maxwell
9850a3f124 change text on manage services popup 2011-04-18 18:38:03 -07:00
MrZYX
7a48d7accf added readme for inflection definitions 2011-04-18 22:37:24 +02:00
MrZYX
e12c7a0eb0 updated locales 2011-04-17 22:22:56 +02:00
MrZYX
2eaf5abf32 updated locales 2011-04-16 00:59:12 +02:00
MrZYX
30c30e0d3e remove unused contact_of_contacts translation 2011-04-13 16:03:48 +02:00
Raphael Sofaer
5afe5f667e Move js out of notifications index, fix reference to notifications badge 2011-04-12 17:15:02 -07:00
Raphael Sofaer
07ba9b98df Typo 2011-04-12 11:50:11 -07:00
Raphael Sofaer
d5ecce7ca6 Merge branch 'limit_similar_contacts' 
Conflicts:
	app/controllers/people_controller.rb
 2011-04-12 11:48:41 -07:00
MrZYX
7362c8f79f updated locales 2011-04-12 16:24:59 +02:00
danielgrippi
106ae983d5 Merge branch 'master' into follow. all specs green. 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
 2011-04-11 17:48:37 -07:00
MrZYX
93be252b59 Merge branch 'css-rtl' 
Conflicts:
	public/javascripts/application.js
	public/javascripts/inbox.js
 2011-04-11 21:52:01 +02:00
MrZYX
71f7fcf22f updated locales 2011-04-10 22:25:54 +02:00
MrZYX
d59a1f1233 updated locales 2011-04-10 00:25:19 +02:00
danielgrippi
1c9ca738ae green everywhere. 2011-04-08 17:10:43 -07:00
Raphael Sofaer
0b9575af5d JS cleanup 2011-04-08 16:11:13 -07:00
Raphael Sofaer
c7dc6ce817 Fix jasmine specs 2011-04-07 18:30:29 -07:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
maxwell
d7c4e15835 let admin give a user 10 ma user 10 more invites 2011-04-07 17:54:22 -07:00
Raphael Sofaer
75d514c448 Fix infieldLabels on new aspect box 2011-04-07 17:53:07 -07:00
maxwell
48cfa49582 change the mention notification wording to be less akward 2011-04-07 17:45:03 -07:00
MrZYX
bea1f26c14 updated locales 2011-04-07 22:43:54 +02:00
Raphael Sofaer
52eac27a43 Add infinite scroll to mobile 2011-04-07 11:38:38 -07:00
Jamie Wilkinson
4a3cc59df9 Fix crazy slow dev-mode exception pages using targeted .inspect monkeypatches 2011-04-06 17:45:52 -07:00
Raphael Sofaer
847a66735a Increase time between thin restarts, rescue jasmine load failure for deploying without test gems 2011-04-06 14:32:46 -07:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
MrZYX
1b2abce5e1 updated locales 2011-04-06 22:06:32 +02:00
Raphael Sofaer
9454c3a1b9 Working on fixing infinite scroll, in particular for aspects with the number 2 in their id. 2011-04-05 19:28:40 -07:00
Raphael Sofaer
59334dfaf5 Remove extra js, fix mobile view 2011-04-05 16:18:04 -07:00
MrZYX
3df419a081 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-04-05 22:26:14 +02:00
MrZYX
50b1846710 updated locales 2011-04-05 22:26:03 +02:00
Jordi Mallach
dc55b3137d Update Catalan translation to 87c48b0. 2011-04-05 21:00:23 +02:00
MrZYX
3a1094dee8 fixed #859 2011-04-05 18:12:08 +02:00
MrZYX
8b00ca2861 fixed #678 2011-04-05 17:38:53 +02:00
maxwell
87c48b003a make inviter say find your friends, because thats what it helps you do 2011-04-04 15:48:10 -07:00
danielgrippi
590e1fd93f All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
MrZYX
bef8377610 added Breton 2011-04-04 20:51:19 +02:00
MrZYX
a34d7f5a83 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-04-04 20:50:01 +02:00
MrZYX
8cccdaf75c updated locales 2011-04-04 20:49:58 +02:00
Jordi Mallach
b21fd0e9ca Update Catalan translation to b776bb5. 2011-04-03 23:26:20 +02:00
MrZYX
b776bb52db made string on mobile page translatable 2011-04-03 13:17:09 +02:00
MrZYX
92bf8444a7 added spec; rtl? -> direction_for 2011-04-03 04:20:08 +02:00
MrZYX
a7a8da2f75 added detection of rtl languages on every user based input 2011-04-03 02:14:35 +02:00
MrZYX
e4db8c7a36 fixed #589, no CSS! 2011-04-03 02:10:41 +02:00
maxwell
f3a62bf76b update jquery to latest 2011-04-02 15:03:41 -07:00
MrZYX
1a1a06118f Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-04-02 15:15:45 +02:00
MrZYX
4a044d6f1e updated locales 2011-04-02 15:15:31 +02:00
Jordi Mallach
c28131c7e0 Updated Catalan to f2ca2c2. 2011-04-01 23:45:50 +02:00
maxwell
f2ca2c2357 fix up translations, and remote on publisher" 2011-03-31 23:52:29 -07:00
maxwell
569fb66e9e bunch of small mobile ui fixes 2011-03-31 23:38:38 -07:00
maxwell
bb59df46f9 updating jquery mobile, fix the menu page a bit 2011-03-31 18:19:51 -07:00
zhitomirskiyi
f99b724e0b ms iz, can now undo hiding a post, fixed a bunch of jamine specs 2011-03-31 17:23:54 -07:00
MrZYX
bd8c9af122 updated locales 2011-03-31 21:31:17 +02:00
zhitomirskiyi
bb4c2ee85d added a character count to the publisher 2011-03-30 19:11:24 -07:00
zhitomirskiyi
5a9ec82597 can now hide posts 2011-03-30 16:43:28 -07:00
MrZYX
183ea42d54 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-30 22:44:53 +02:00
MrZYX
45c13d3a7d updated locales 2011-03-30 22:44:49 +02:00
Jordi Mallach
f09e06c56b Update Catalan translation to a3b2c60. 2011-03-30 18:24:47 +02:00
Jordi Mallach
a3b2c60c3b Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-30 18:18:45 +02:00
Jordi Mallach
313704cb9a Update Catalan translation to 0aaaefe. 2011-03-30 17:32:36 +02:00
Jordi Mallach
8b4d17a65a Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-30 17:29:33 +02:00
MrZYX
699264e7a3 made flash messages for conversations translatable 2011-03-30 16:52:43 +02:00
zhitomirskiyi
cd7cced9c0 renamed the js to indicate custom 2011-03-29 17:25:35 -07:00
zhitomirskiyi
0aaaefeba2 fix tag plugin 2011-03-29 16:53:48 -07:00
Jordi Mallach
4129bb105a Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-30 00:04:11 +02:00
zhitomirskiyi
a5bb26a3c4 almost done 2011-03-29 15:03:09 -07:00
MrZYX
4dabfdad2b Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-29 21:53:37 +02:00
MrZYX
2027655316 updated locales 2011-03-29 21:53:29 +02:00
Jordi Mallach
d759f97c9f Update Catalan translation to aa478ddd. 2011-03-29 20:56:11 +02:00
Jordi Mallach
8a222e2991 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-29 20:40:43 +02:00
MrZYX
aa478ddd5c string concatenation with translations is bad, especially if you leave on part of it untranslated :P 2011-03-29 15:39:57 +02:00
maxwell
ccbba9b52e fix translations 2011-03-28 20:09:09 -07:00
maxwell
8b7dc0a2cc translated bookmarklet, added post to main page 2011-03-28 19:57:06 -07:00
maxwell
f08b5dfafe basic functionality done, fixing rough edges 2011-03-28 18:11:59 -07:00
Jordi Mallach
9d04f36a38 Update Catalan translation to 40810741. 2011-03-28 20:55:13 +02:00
MrZYX
40810741f3 fixed cucumber 2011-03-27 22:04:36 +02:00
adonix
b71bfdf583 972-issue:all-aspects-spelling 2011-03-27 12:14:09 -07:00
MrZYX
a9e3511c19 updated locales 2011-03-27 18:50:01 +02:00
MrZYX
52fee96bfc whoops, recieve is a post route, not a get, thanks mb-log 2011-03-27 16:11:38 +02:00
MrZYX
55417cf9e3 AspectsController#move_contact -> AspectMembershipsController#update 2011-03-27 13:29:36 +02:00
MrZYX
d50cfe8d5d updated locales 2011-03-27 00:40:34 +01:00
MrZYX
b689d4695b refactor of routes.rb done so far; further refactor needs design decisions 2011-03-27 00:05:35 +01:00
MrZYX
985d79acb5 some more refactoring to routes.rb 2011-03-26 17:38:49 +01:00
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
danielgrippi
f5a03fd6ed Make public timeline of a user publicly accessible 2011-03-25 15:06:22 -07:00
danielgrippi
5dbbc79f65 added users_profile_image, home_timeline, fixed public_timeline 2011-03-25 15:06:22 -07:00
danielgrippi
517f3fd802 statuses/ and users/ GET routes 2011-03-25 15:06:22 -07:00
maxwell
ea3d839e1c initial public api' 2011-03-25 15:06:22 -07:00
MrZYX
2d366bcf71 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-25 21:13:02 +01:00
MrZYX
467b85f7ba updated locales 2011-03-25 21:13:00 +01:00
Jordi Mallach
cf99c19e2c Update Catalan translation to 7a315312. 2011-03-25 15:25:48 +01:00
MrZYX
82e08ef5d0 updated locales 2011-03-24 18:05:56 +01:00
MrZYX
56a6f0e43b cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
Raphael Sofaer
555a774668 Initial contacts_of_contact page 2011-03-23 16:42:53 -07:00
zhitomirskiyi
7a31531258 added location to the profile 2011-03-23 15:56:46 -07:00
zhitomirskiyi
24db7a3b87 added tooltips to the service icons 2011-03-23 14:13:54 -07:00
zhitomirskiyi
8a9a95d854 added a flash notice 2011-03-23 11:45:06 -07:00
danielgrippi
b9b9d7e07d renamed home to all aspects in header, made clicking aspect names on right trigger filtering 2011-03-23 10:29:34 -07:00
danielgrippi
fe44ee8230 fix tab order in publisher; removed 'to mention...' text 2011-03-22 17:29:03 -07:00
danielgrippi
a44ca157e6 added text to private message notification; user picture in popup 2011-03-22 17:14:37 -07:00
MrZYX
c483246ac7 updated locales 2011-03-22 22:48:08 +01:00
MrZYX
643a066691 moar translatable 2011-03-22 22:45:36 +01:00
maxwell
a036a8035f add a plaintext layout for emails, and include a link to change your email settings in the emails 2011-03-22 12:26:38 -07:00
Raphael Sofaer
8c6afbb912 Oops. 2011-03-22 10:21:31 -07:00
MrZYX
deff67f486 fixed a translation 2011-03-22 13:47:44 +01:00
Raphael Sofaer
2b997e70c2 Refactor image processing to use 2 uploaders. Federation and s3 need testing 2011-03-21 16:40:53 -07:00
Raphael Sofaer
a45103d0ef Make post not found redirect clearer 2011-03-21 16:40:53 -07:00
zhitomirskiyi
058b74846a removed the bring your friends message from the stream 2011-03-21 15:23:34 -07:00
zhitomirskiyi
dcc80d5b43 almost done, need to figure out how whats the deal with the controller not being called 2011-03-21 14:56:50 -07:00
MrZYX
87dafeb67b Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-21 21:37:28 +01:00
MrZYX
e0b176ee2c updated locales 2011-03-21 21:37:13 +01:00
Jordi Mallach
9ffa7ac03d Updated Catalan translation to a2715ca. 2011-03-21 15:02:56 +01:00
MrZYX
a2715ca963 fixed migration naming, fixed translation 2011-03-20 23:00:56 +01:00
MrZYX
4b7a4686db updated locales 2011-03-20 18:53:29 +01:00
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
Sarah Mei
0b1fa4d014 You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files. 2011-03-19 20:53:55 -07:00
Sarah Mei
c1bf68068f Pull relationship action button from search results out into a partial. 
Copyedit messages.
 2011-03-19 15:59:56 -07:00
MrZYX
73905e6831 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-03-19 14:15:37 +01:00
MrZYX
a29b3ba5e8 updated locales 2011-03-19 14:15:32 +01:00
Jordi Mallach
c1bcb421ce Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-19 14:10:29 +01:00
Jordi Mallach
6bfdcb0583 Updated Catalan to a05c9b0. 2011-03-19 14:09:58 +01:00
MrZYX
a05c9b0010 fixed a translation, keep up the new format in en.yml, set pagination labels in application controller 2011-03-19 14:04:11 +01:00
Jordi Mallach
4274e977cb Update Catalan translation to 3db11cf. 2011-03-19 13:43:03 +01:00
Jordi Mallach
dc8e9565e9 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-19 13:35:41 +01:00
danielgrippi
3db11cf38d PostsController#index -> TagsController#show 2011-03-18 20:57:39 -07:00
Jordi Mallach
db04092b8c Correct translation. 2011-03-18 14:39:10 +01:00
Jordi Mallach
7d739a5071 Update Catalan translation to 574a3b4. 2011-03-18 14:37:34 +01:00
MrZYX
24335aa5bf updated locales 2011-03-18 14:01:18 +01:00
zhitomirskiyi
2b6165d8ea wip 2011-03-17 14:32:07 -07:00
zhitomirskiyi
574a3b45b1 made it flash the sm on the profile page 2011-03-17 11:54:13 -07:00
Jordi Mallach
57aa8e71bf Updated Catalan translation to a787106. 2011-03-17 15:57:12 +01:00
Jordi Mallach
25691ac8b2 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-17 15:45:27 +01:00
Jordi Mallach
f7391ca7ae Fix some leftovers thanks to MrZYX's diff-yml-keys.py. 2011-03-17 15:42:14 +01:00
MrZYX
c661bce988 updated locales 2011-03-17 15:23:34 +01:00
MrZYX
a78710690a moar translations 2011-03-17 15:11:24 +01:00
Jordi Mallach
4ee9642d02 Correct indentation and re-add requests & message_inbox tags. 2011-03-17 14:44:10 +01:00
Jordi Mallach
a2da1240b8 Adding "1" to notification message. 2011-03-17 14:34:53 +01:00
MrZYX
5a8ba0e805 fixed syntax errors in ca.yml 2011-03-17 14:31:14 +01:00
Jordi Mallach
5c9370f2e0 Two of the keys are verb, not noun. Adapt accordingly. 2011-03-17 14:16:25 +01:00
Jordi Mallach
a03238ec40 Fix typo. 2011-03-17 13:45:02 +01:00
Jordi Mallach
e8a3537520 Updated Catalan translations to 6a33ae7. 2011-03-17 13:44:13 +01:00
Jordi Mallach
7b93c0a64b Adapt Catalan translation to the reformatting of ed8d4db. Hopefully 
everything is correct, but it wouldn't be surprising if something has been
overlooked.
 2011-03-17 13:04:37 +01:00
zhitomirskiyi
6a33ae7795 fixed the css, added a space 2011-03-16 19:20:24 -07:00
zhitomirskiyi
b0ec5a0b2e moved the fixture to the right place 2011-03-16 18:10:50 -07:00
danielgrippi
a85b5bb70f add a people count on tag page 2011-03-16 17:27:27 -07:00
zhitomirskiyi
abbf949fe1 publishing from a person profile page wip 
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one

a tiny sass add

publishing from the profile works, need js translation

added the translation

made the hover state consistant

need to fix the cucumber spec

specs are green need to add a button

added the buttion to mention people

moved the publisher to the facebox

fixed the cucumbers for the modal window
 2011-03-16 16:35:30 -07:00
MrZYX
5457f48c2a updated locales 2011-03-16 16:11:51 +01:00
danielgrippi
09756c17c1 change tags to #tags in translations 2011-03-15 22:19:31 -07:00
danielgrippi
20b5ca7570 added tag helper text on profile, edit on hover 2011-03-15 22:10:20 -07:00
danielgrippi
be42ccfa16 Be less glib 2011-03-15 15:03:20 -07:00
MrZYX
4e4e4d763a fixed translations 2011-03-15 21:58:15 +01:00
danielgrippi
c608c70ca7 tagging profiles complete 2011-03-15 13:21:36 -07:00
danielgrippi
20f5105e5d breaking out Diaspora::Taggable wip 2011-03-15 13:21:36 -07:00