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

7635 commits

This branch
This branch
All branches
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
Raphael Sofaer
7a800a6462 More rspec tests, maybe. 2011-07-01 23:17:47 -07:00
danielgrippi
922ccd8423 limit contact photos in aspect/index.js 2011-07-01 22:30:21 -07:00
danielgrippi
24483548ec need to grab all contacts on aspect index for autocomplete 2011-07-01 22:26:08 -07:00
danielgrippi
e0816ccc39 author info in stream element should be incased in a div. WHOOPS. 2011-07-01 22:12:43 -07:00
danielgrippi
9bcdb0503f Merge branch 'left-nav9000' 2011-07-01 22:06:19 -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
1a2ba034ab added edit links in aspect_nav; removed ununsed icons; fixed facebox duplication on aspect/index 2011-07-01 17:23:58 -07:00
danielgrippi
f90dc0996a More visual cleanup; top nav; edit aspects 2011-07-01 16:12:14 -07:00
danielgrippi
41773cb29e Almost done with left-nav, added link to aspect edit facebox, colored share button 2011-07-01 14:22:38 -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
238e859dbe add contact images to aspect index, removed comment background color, add vertical rule to people pages 2011-07-01 10:49:20 -07:00
danielgrippi
ca76db4550 DG RS left nav almost there. touched up publisher, among other things 2011-07-01 10:49:19 -07:00
Raphael Sofaer
d68c8a3a03 Merge pull request #657 from ndee/1050-cancel-message 
Issue #1050: Changed cancel-link of a new message to back
 2011-07-01 10:46:27 -07:00
Jonne Hass
0d8f548440 Merge pull request #668 from rekado/master 
correct reference to ./config/app.yml
 2011-07-01 06:18:04 -07:00
Ricardo
24e3617c66 correct reference to application config file 
The page that is initially shown after starting diaspora for the first
time tells the administrator to customize ./config/app.yml.example,
which doesn't exist. The file is actually called
./config/application.yml.example.
 2011-07-01 20:34:56 +08:00
Sarah Mei
1bbfa97e5f DH SM MS pending photo spec for Dan 2011-06-30 21:04:18 -07:00
Sarah Mei
948a7c5d55 DH SM MS Fix showing image in the publisher when it gets uploaded 2011-06-30 20:36:15 -07:00
Sarah Mei
b495e71c77 DH SM MS update schema.rb to reflect edited migration 2011-06-30 20:35:09 -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
MrZYX
05907246e9 use an array of arrays instead of a hash to ensure order, thanks REE! 2011-06-30 23:40:41 +02:00
danielgrippi
4e48db23f0 aspect dropdown shows name of aspect if contact is only in one; green 2011-06-30 12:18:41 -07:00
Jonne Hass
2c4f835998 Merge pull request #667 from gvx/markdown-left-right-arrow 
Adds support for converting <-> to ↔ in markdownify
 2011-06-30 10:54:08 -07:00
Robin Wellner
91dd4f847a Adds support for converting <-> to ↔ in markdownify 2011-06-30 14:27:39 +02:00
Jordi Mallach
dfa0a4eb71 Update Catalan translation to 91f984c. 2011-06-30 14:20:12 +02:00
danielgrippi
3a5f0c9678 proper uniqueness validation in auth model 2011-06-29 17:32:55 -07:00
Raphael Sofaer
63902fd273 Lock oauth2-provider 2011-06-29 17:30:12 -07:00
danielgrippi
38ddb4b744 correctly scoping the uniqueness validation dg iz 2011-06-29 17:24:05 -07:00
danielgrippi
55efe132c5 corrected authorizations_controller_spec to assert on response codes 2011-06-29 17:10:43 -07:00
danielgrippi
144ac82577 only allow https and www.cubbi.es in authorizations controller for now 2011-06-29 16:40:43 -07:00
Raphael Sofaer
3887144db6 I seriously think that this commit is going to fix CI. SRSLY. 2011-06-29 15:34:45 -07:00
Raphael Sofaer
daf52eb21f Put the source back in the second Gemfile... 2011-06-29 15:03:23 -07:00
Raphael Sofaer
91f984c2ad Diaspora handle is really confusing, we should just say ID 2011-06-29 14:59:30 -07:00
Raphael Sofaer
7ee3fcd811 Fix app_config spec 2011-06-29 14:08:25 -07:00
MrZYX
6519ffcd33 updated locales 2011-06-29 21:10:58 +02:00
Raphael Sofaer
02489bb7cf This should fix CI for real 2011-06-29 12:07:10 -07:00
Raphael Sofaer
d1a149f9f6 Some stuff to not need an application.yml in CI 2011-06-29 11:52:13 -07:00
Raphael Sofaer
5243a3203f Fix AS::Photo show page 2011-06-29 11:33:32 -07:00
Raphael Sofaer
f2e3102562 Make the aspect_dropdown_list_item easier to read 2011-06-29 11:21:44 -07:00
Raphael Sofaer
d6321d2327 Bundle in the oauth features, take the source out of the chubbies Gemfile 2011-06-29 11:21:23 -07:00
Raphael Sofaer
1ced4c502d Put as_json back in person 2011-06-29 08:48:34 -07:00
Jonne Hass
d66fb24cdb Merge pull request #666 from protowouter/master 
There is a typo in the oauth2 migration.
 2011-06-29 04:28:04 -07:00
Wouter Timmermans
7de12e7a5a typo in oauth2 migration 2011-06-29 12:39:59 +02:00
danielgrippi
53c87562f4 switch aspect listings and info stuffs on aspect/index 2011-06-28 23:40:57 -07:00
Dan Hansen
eaf7fcd7fe speed up notifications controller index spec 2011-06-28 23:31:34 -07:00
danielgrippi
b8ea8e9e75 start a conversation with an aspect from contact index page 2011-06-28 23:09:11 -07:00
danielgrippi
2c3e403bc0 muted the headers colors a bit, refined buttons 2011-06-28 21:09:15 -07:00
Raphael Sofaer
0eb31e3ba7 added jwt to the chubbies bundle, made the asterisk black 2011-06-28 17:52:38 -07:00