Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Version 5HEADmasterGonzalo Odiard2013-05-101-2/+2
|
* Add computer-xo iconGonzalo Odiard2013-05-101-0/+7
|
* More css changes - description textGonzalo Odiard2013-05-102-3/+8
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Improve cssGonzalo Odiard2013-05-092-7/+8
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Show icons with the users colorsGonzalo Odiard2013-05-092-4/+69
| | | | | | | The implementation create a png at server side. Can be improved usinga svg and changing the colors at the client side. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Remove unused filesGonzalo Odiard2013-05-0912-69/+0
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Update the view when one download finishGonzalo Odiard2013-05-081-7/+24
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Notify to the server when one object was successfully downloadedGonzalo Odiard2013-05-085-27/+107
| | | | | | | | After download a object and save it in the Journal, the client send a message and the server update the metadata to include downloader information. The view is not updated yet. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Remove old code to manage upload of objectsGonzalo Odiard2013-05-081-38/+1
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Add information about who shared the objectGonzalo Odiard2013-05-083-4/+40
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Implement upload of files from the client using websocketsGonzalo Odiard2013-05-075-31/+875
| | | | | | | | Now the upload from all sides is done with the add button in the toolbar. The ui is not blocked, only a watch cursor is shown, while the file is uploaded. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Use a free port instead of using 2500 fixedGonzalo Odiard2013-05-071-1/+10
| | | | | | | This allow have more than one instance running at the same time and improve reliability, if for any reason the port is in use. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Fix accidentally changed indentGonzalo Odiard2013-04-291-1/+1
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Set +x permission on setup.pyGonzalo Odiard2013-04-261-0/+0
|
* Version 4v4Gonzalo Odiard2013-04-261-1/+1
|
* Basic implementation of communication using websocketsGonzalo Odiard2013-04-263-45/+101
| | | | | | | Only one message is sent, when the shared items list is updated This is a proof of concept. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Use tornado trick to cache preview images on the clientGonzalo Odiard2013-04-251-1/+1
| | | | | | | | | If you add the argument "v" StaticFileHandler will set the header to be cached on the client for ever. http://www.tornadoweb.org/en/stable/web.html?highlight=staticfilehandler#tornado.web.StaticFileHandler Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Use tornado as web serverGonzalo Odiard2013-04-2521-142/+7620
| | | | | | | | | | In preparation to use websockets to notify the clients of changes, changed the server to use tornado instead of BasicHttpServer. The code is simplified and works fast. I added the needed tornado files to the activity until we decide if will be used as a global solution for web activities. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Add a timeout after upload a fileGonzalo Odiard2013-04-242-13/+25
| | | | | | | | When a file is uploaded, the client need reload the index page, but need wait until the server prepared the files. Now reply with a page to reload the index page after a 3 secs timeout. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Pep8 fixesGonzalo Odiard2013-04-234-36/+41
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Upload & download the journal objects packagedGonzalo Odiard2013-04-236-266/+131
| | | | | | | | | | | | | | To upload or download a journal object, is zipped with a file with the preview and another with the metadata in json format. The save methods are used to package/unpackage when download or upload. This solve a few issues: * metadata & preview transference. * simplify the code because only one file is transfered. * the downloadmanager is always used, because webkit don't know how manage the mime type used (solve error with images captured by webkit) Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Version 3v3Gonzalo Odiard2013-04-051-1/+1
|
* Fix upload of files from other usersGonzalo Odiard2013-04-052-6/+21
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Clean up & add color entities to activity iconGonzalo Odiard2013-04-051-84/+45
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Implement read_file and write_file methodsGonzalo Odiard2013-04-052-3/+16
| | | | | | The list of shared items is saved Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Show a msg if no items are selectedGonzalo Odiard2013-04-052-1/+16
| | | | | | | | The msg is not localizable. We need look at a away to use gettext on html pages or any other solution to display a translated msg. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Implement selection of items to shareGonzalo Odiard2013-04-051-11/+43
| | | | | | | | A button add items to share from the journal, another add all the fevorite items, but should be selected explicitly by the user. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Prepare files to be servedGonzalo Odiard2013-04-043-146/+184
| | | | | | | | | | | As the web ask is tserver can't read the datastore because is in another thread the activity prepare the files to be served in thier /instance/ directory before the server starts. Later we need implement updating the files when the selection is changed. A pending task is test uploading a file from another client. The JournalManager class was moved from server.py to activity.py Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Run the server in a threadGonzalo Odiard2013-04-042-45/+88
| | | | | | | | While the activity is not frozen, now the activity crash at random mostly by the use of dbus. Tryed different solutions but without success. This change is committed as a intermadiate stage. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Version 2Gonzalo Odiard2013-03-221-1/+1
|
* Show download and upload links only in the remote instancesGonzalo Odiard2013-03-221-21/+32
| | | | | | This is done in the index.html with javascript. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Inhibit suspend if you are sharingGonzalo Odiard2013-03-221-0/+27
| | | | | | Until wake up on lan works. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Don't try to connect to himselfGonzalo Odiard2013-03-221-0/+4
| | | | | | | If the activity is started sharing, should not try to connect to the local server. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Reorganize codeGonzalo Odiard2013-03-221-14/+18
| | | | | | | Move the save of uploaded file to the journal to the JournalManager class. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Decode preview image if neededGonzalo Odiard2013-03-201-1/+9
| | | | | | This is needed due to Record activity (SL #4470) Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Start server only if does not join a shared instanceGonzalo Odiard2013-03-191-7/+15
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Add information about the journal ownerGonzalo Odiard2013-03-193-8/+41
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Upload metadata and previewGonzalo Odiard2013-03-183-30/+62
| | | | | | | | | | | The filepicker is modified to create two files more, one with the preview, and another with the metadata as a json dump. The activity upload the 3 files, and the server put all the info in the new object created in the journal. One downside in this implementation is webkit show a message "3 files selected", while the user selected one. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Upload a file from the joining instance to the serverGonzalo Odiard2013-03-184-6/+258
| | | | | | | | Basic implementation. Have some limitations, as not be able to upload all the metadata at the moment. Metadata will be uploaded in annother commit. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Basic style applied to htmlGonzalo Odiard2013-03-152-18/+39
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Add a scroled windowGonzalo Odiard2013-03-151-1/+4
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Removed unused codeGonzalo Odiard2013-03-151-19/+0
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Initial implementation of collaborationGonzalo Odiard2013-03-152-6/+117
| | | | | | | Used code from Read activity to share the server trough a telepathy stream tube. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Display the previewGonzalo Odiard2013-03-142-2/+17
| | | | Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Add downloadmanagerGonzalo Odiard2013-03-143-4/+324
| | | | Stolen from Browse activity.
* Display a list of starred items in the journalGonzalo Odiard2013-03-145-81/+111
| | | | | | | | | | | | The server creates a json file with data about starred items in the journal. The webkit display a html file with a javascript to put the data in a table. Css is not working. A download link allows download the file, but the client code to download it is not included yet. Is possible see the page to debug and download the file pointing a browser to http://localhost:2500/web/index.html Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Simple modification to html & css filesGonzalo Odiard2013-03-132-7/+10
|
* Use a simple server to create content and transfer filesGonzalo Odiard2013-03-132-65/+86
| | | | | | | | | | Afte trying run the server in a thread and having problems due to webkit bloking the ui, I implemented the server in another package and start it in another process with subproces. This solution solves the problem, and provide separation, but can complicate other parts in the code, like collaboration. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* First version of the activity displaying a webviewGonzalo Odiard2013-03-131-4/+71
| | | | | | With code copied from Read and Wikipedia, just to start. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
* Using png instead of svg to support more browsersAgustin Zubiaga2013-02-2725-329/+30
|
[next]
generated by cgit v0.9.1 at 2024-05-04 19:53:41 (GMT)