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

1417 commits

Author SHA1 Message Date
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
MrZYX
879aa9eb4a updated locales 2011-03-15 16:03:45 +01:00
MrZYX
09ba0c8d00 made catalan translation usable again 2011-03-15 15:52:42 +01:00
Ritchie Wilson
81661d61fc changes the 'You are not sharing with...' button to static text instead of inserting the persons name 2011-03-15 10:00:15 -04:00
maxwell
2e72fc09c6 made 3+ plus collapse in notifications index 2011-03-14 18:09:51 -07:00
Raphael Sofaer
4b4654a408 Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
MrZYX
01e3b3cc26 updated locales 2011-03-14 18:43:45 +01:00
MrZYX
a544a189ff updated locales 2011-03-13 21:21:27 +01:00
MrZYX
2a5d41cc82 fixed translations for comments 2011-03-13 21:16:43 +01:00
MrZYX
5cae971ba1 added some languages 2011-03-13 13:20:20 +01:00
MrZYX
6ba0083337 updated locales 2011-03-13 13:19:12 +01:00
MrZYX
63caff1f40 updated locales 2011-03-12 12:55:37 +01:00
MrZYX
ed8d4db3a8 some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones 2011-03-12 03:27:28 +01:00
Jordi Mallach
59820d1994 Update Catalan translation to fd6545b. 2011-03-12 01:37:13 +01:00
Jordi Mallach
fd6545b609 Fix typos. 2011-03-12 01:30:07 +01:00
Jordi Mallach
2d5dc81854 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-12 01:07:58 +01:00
Jordi Mallach
0745a5ed7c Catalan translation update. 2011-03-12 01:07:31 +01:00
maxwell
50d9d76562 update translations for email settings, and missing translation for aspect#new 2011-03-11 16:02:24 -08:00
Jordi Mallach
00b0edcd39 Fix typo. 2011-03-12 00:53:44 +01:00
MrZYX
b93084e04f updated locales 2011-03-11 17:28:14 +01:00
Raphael Sofaer
b86098055e Add tag search on public page 2011-03-10 18:37:45 -08:00
Raphael Sofaer
8f929d2b85 Show local public posts in /p 2011-03-10 14:41:03 -08:00
MrZYX
dd97f1b985 updated locales 2011-03-10 15:50:43 +01:00
MrZYX
1e3533b1b1 made zh-TW as language available. Thanks to iongchun 2011-03-10 14:45:46 +01:00
Raphael Sofaer
9324aceefc typo 2011-03-09 18:04:09 -08:00