yetangitu/photo-front
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:photo/frontend

Browse source 
Conflicts:
	documentation/api/Authentication.markdown
	documentation/contribute/Readme.markdown
	documentation/faq/Faq.markdown
This commit is contained in:
Jaisen Mathai 2013-03-14 16:19:18 -07:00
commit 110f77eaa7
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Readme.markdown
View file

@ -1,4 +1,4 @@
<img src="frontend/raw/master/files/creative/logo.png" style="width:234px; height:43px; margin:auto;">
<img src="https://raw.github.com/photo/frontend/master/files/creative/logo.png" style="width:234px; height:43px; margin:auto;">
[![Build Status](https://secure.travis-ci.org/openphoto/frontend.png)](http://travis-ci.org/openphoto/frontend)

4
documentation/api/Authentication.markdown
View file

@ -3,8 +3,8 @@ Authentication using OAuth 1.0a
### Using OAuth (1.0a)
A full introduction to OAuth is beyond the scope of the Trovebox documentation.
In all reality you probably don't need to understand the ins and outs of OAuth, just grab one of our libraries.
A full introduction to OAuth is beyond the scope of the OpenPhoto documentation.
In all reality you probably don't need to understand all the ins and outs of OAuth; just grab one of our libraries and start building.
* <a href="https://github.com/photo/openphoto-php">openphoto/openphoto-php</a> - Our PHP language binding.
* <a href="https://github.com/photo/openphoto-ruby">openphoto/openphoto-ruby</a> - Our Ruby language binding.

4
documentation/contribute/Readme.markdown
View file

@ -32,7 +32,7 @@ Now you're ready to <a href="http://help.github.com/send-pull-requests/">send a
## There's a spot for everyone to be a part of something BIG
Hear ye, hear ye! <a href="#developers">Developers</a>, <a href="designers">designers</a>, <a href="#copywriters">copywriters</a>, <a href="#community">community managers</a>, <a href="#translators">translators</a>, and anyone else who wants to help. If you want to contribute to The Photo Project, the good news is that there's probably a place where we could use your help!
Hear ye, hear ye! <a href="#developers">Developers</a>, <a href="#designers">designers</a>, <a name="#powerusers">power users</a>, <a href="#copywriters">copywriters</a>, <a href="#community">community managers</a>, <a href="#translators">translators</a>, and anyone else who wants to help. If you want to contribute to The OpenPhoto Project, the good news is that there's probably a place where we could use your help!
It's easy to get in touch with us, as many of us hang out in #openphoto on Freenode. Come in and <a href="http://webchat.freenode.net/">chat with us</a>. We're happy to answer any questions you might have.
@ -65,7 +65,7 @@ That being said, the largest part of the code base is the <a href="https://githu
If you've got a gift with words we're in desperate need of your help. Much of the community consists of engineers and well, we suck at taking complex ideas and distilling them into small and easy to understand sentences.
The best way to get started is to read the copy at the <a href="http://theopenphotoproject.org">The Photo Project</a> website. Some of it is technical, like the documentation, but much of it is also trying to explain why users should care about what we're building. Wherever your passion lies, we will definitely appreciate the help.
The best way to get started is to read the copy at <a href="http://theopenphotoproject.org">The OpenPhoto Project</a>'s website. Some of it is technical, like the documentation, but much of it is also trying to explain why users should care about what we're building. Wherever your passion lies, we will definitely appreciate the help.
Everything can be found in the <a href="https://github.com/photo/community">community</a> repository for the non-technical bits or the <a href="https://github.com/photo/frontend">frontend</a> repository for the documentation.

7
documentation/faq/Faq.markdown
View file

@ -1,8 +1,7 @@
Frequently Asked Questions
=======================
This is a list of common questions that people have about The Photo Project.
If you have one which is not on this list send us a message via <a href="http://twitter.com/photo">Twitter</a> or <a href="mailto:hello@openphoto.me">email</a>.
Here are some questions that people have about The OpenPhoto Project. If you have one that's not on this list send us a message via <a href="https://twitter.com/OpenPhoto">Twitter</a> or <a href="mailto:support@openphoto.me">email</a>.
### What is OpenPhoto?
OpenPhoto is a photo hosting service that puts you in control. It lets you import, archive, and organize your photos on OpenPhoto's servers or your personal cloud accounts such as Dropbox or Amazon S3. Your choice.
@ -50,8 +49,8 @@ Not directly through OpenPhoto, but you can use sites like ifttt or Pi.pe that w
## Photo Management
If you'd rather not install the software yourself you can <a href="http://trovebox.com">sign up for a hosted account</a>.
The hosted account may or may not be free depending on the service and what features you use.
### How do I upload a photo?
Go to your OpenPhoto site (it'll look like yourusername.openphoto.me) and click Upload. Click Add Photos and add the photos you'd like to upload. You can also add attributes that'll apply to all the photos uploaded in that batch, such as a tag, an album, a privacy setting, or a license.
### How do I delete a photo?
Visit Photos under the Manage dropdown menu at your OpenPhoto site while logged in. From there, hover over the photo(s) you want to delete and click the checkmark that appears. Click Batch Edit and select Delete.