Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/jarabe/journal
Commit message (Collapse)AuthorAgeFilesLines
* Revert copy to "Journal" palette item in journal details view #1831Aleksey Lim2010-03-221-3/+15
|
* Merge branch 'master' of git.sugarlabs.org:sugar/mainlineAleksey Lim2010-03-104-19/+15
|\
| * Minor pylint cleanupsSimon Schampijer2010-03-103-16/+15
| |
| * jarabe.journal.model: remove invalid order_by=-mtime (#1653)Sascha Silbe2010-03-091-3/+0
| | | | | | | | | | | | | | Remove invalid order_by=-mtime from jarabe.journal.model.find(). The intended sort order is the default anyway. Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
* | Clean up some .xoj registry code #1098Aleksey Lim2010-03-101-1/+1
|/
* Do not transfer ownership while copying objects #1688Aleksey Lim2010-03-081-4/+4
|
* Keep preferable activities #1493Aleksey Lim2010-03-081-0/+5
|
* simplify jarabe.journal.model._Cache (#1651)Sascha Silbe2010-02-081-20/+10
| | | | | | | | cache.remove_all(cache) doesn't work as expected as we're iterating over the object we're modifying. cache won't be empty after this call, causing the caching algorithm to break. Signed-off-by: Sascha Silbe <sascha@silbe.org>
* Journal entry bundles shouldn't create a 2nd ds entryDaniel Drake2009-11-262-9/+17
| | | | | | | | | | 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-233-10/+6
| | | | | | | | 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-233-6/+15
| | | | | | | | | | | 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
* Sporadic freezes while scrolling journal #1506Aleksey Lim2009-10-181-1/+1
|
* Remove redundant logging.infoAleksey Lim2009-10-011-2/+0
|
* Starting/resuming an entry from Journal shows wrong colours #1421Aleksey Lim2009-09-301-2/+14
|
* Do not start title editing for non-ds objects #1411Aleksey Lim2009-09-301-1/+4
|
* Present windows in non-active process #1423Aleksey Lim2009-09-291-7/+3
|
*