Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/jarabe/journal/journalentrybundle.py
Commit message (Collapse)AuthorAgeFilesLines
* refactoring based on lasted commits upstreamWalter Bender2013-06-091-3/+3
|
* Run sugar-convert.sh for automatic conversion from sugar.* to sugar3.* importsSimon Schampijer2012-09-071-1/+1
| | | | | | | | | | | | | | Run sugar-convert.sh [1] for automatic conversion from sugar.* imports to sugar3.* imports. This is only on a best-effort basis; the code will be in a broken state after this patch and need to be fixed manually. The purpose of committing the intermediate, non-working output is to make it reproducible. It's impractical to manually review the changes. [1] http://dev.laptop.org/~manuq/sugar-convert.sh Signed-off-by: Simon Schampijer <simon@laptop.org> Acked-by: Manuel QuiƱones <manuq@laptop.org>
* PEP8 cleanup: don't use has_key()Sascha Silbe2010-11-241-1/+1
| | | | | | | | has_key() has been deprecated for quite some time now. Reviewed-by: James Cameron <quozl@laptop.org> Reviewed-by: Simon Schampijer <simon@laptop.org> CC: Aleksey Lim <alsroot@member.fsf.org>
* pep8 cleanup: fix number of blank linesSascha Silbe2010-11-241-1/+1
| | | | | | Reviewed-by: James Cameron <quozl@laptop.org> Reviewed-by: Simon Schampijer <simon@laptop.org> CC: Aleksey Lim <alsroot@member.fsf.org>
* Clean up some .xoj registry code #1098Aleksey Lim2010-03-101-1/+1
|
* Journal entry bundles shouldn't create a 2nd ds entryDaniel Drake2009-11-261-5/+5
| | | | | | | | | | This fixes a problem where "Show in Journal" from a Browse download was broken. This is because the JEB installation code would extract the content from the bundle entry, install it as a new datastore entry, and then delete the bundle entry. This is fixed by making the journal entry from the bundle take over the datastore entry that belonged to the bundle.
* Switch entirely to simplejsonDaniel Drake2009-11-231-2/+2
| | | | | | | | I misunderstood the state of affairs with the numerous json parsers. Whatever we used to have as 'json' isn't really available on Py2.6. Move to simplejson which seems to be the most functional implementation, available on both old and new setups.
* Revert "Move to cjson and drop pyjson and simplejson"Daniel Drake2009-11-231-2/+7
| | | | | | | | | | | This reverts commit ee4535c98ae74347e7072909d49dcf8a5e16ca7b. cjson has a big bug dealing with slashes, this is a significant long-term bug and upstream has not been responsive other than acknowledging it. This bug breaks journal entry bundles. http://dev.sugarlabs.org/ticket/1553 Thanks to Martin Langhoff for identifying and researching this issue
* Fix .xoj support #1098Aleksey Lim2009-07-271-1/+4
|
* First try at restoring removable devices support in the journalTomeu Vizoso2008-11-281-16/+11
|
* Move to cjson and drop pyjson and simplejsonTomeu Vizoso2008-10-081-7/+2
|
* Move the shell code into site-packages.Marco Pesenti Gritti2008-09-281-0/+96