Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* temporary workaround for inability to wait for index completiont/versionsSascha Silbe2011-03-061-0/+4
|
* fix incorrect mergeSascha Silbe2011-03-061-1/+1
|
* Merge commit 'e8fcefe' into t/versionsSascha Silbe2011-03-067-76/+253
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e8fcefe': Release 0.92.0 don't choke if timestamp property is missing fix some _very_ long lines Cleanup AUTHORS file Conflicts: src/carquinyol/datastore.py tests/test_massops.py tests/test_migration_v2_v3.py
| * Merge remote branch 'refs/remotes/origin/t/versions' into HEADSascha Silbe2011-03-0618-394/+1329
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/remotes/origin/t/versions: (53 commits) Add gconf setting /desktop/sugar/datastore/max_versions Allow specifying the version_id of a new version. add missing pieces for last commit add compatibility with the old (unversioned) API New TopGit dependency: t/rainbow-0.8 fix 0.82 migration typos fix typos New TopGit dependency: t/migration-rebuild-index add metadata to Saved signal adjust wording to new API test suite: expect/filter out parent_id save(): ensure parent_id is set correctly in metadata index store: replace document if already in database (for change_metadata) change_metadata(): make sure timestamp is set, like we do for save() fix test suite failure fix migration of checksum entries work around Xapian returning incorrect match counts if offset/limit are used fix sort order in ambiguous cases, fix obscure test suite breakage due to overlapping timestamp values fix FileStore.retrieve() broken by last merge test_massops.py: test ordering of find() results (for all supported orders) and offset/limit (for default order) ... Conflicts: tests/basic_api_v2.txt tests/runalltests.py tests/test_massops.py tests/test_migration_v2_v3.py
| | * Merge remote branch 'refs/remotes/origin/t/versions' into HEADSascha Silbe2011-03-0418-432/+1191
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/remotes/origin/t/versions: (53 commits) Add gconf setting /desktop/sugar/datastore/max_versions Allow specifying the version_id of a new version. add missing pieces for last commit add compatibility with the old (unversioned) API New TopGit dependency: t/rainbow-0.8 fix 0.82 migration typos fix typos New TopGit dependency: t/migration-rebuild-index add metadata to Saved signal adjust wording to new API test suite: expect/filter out parent_id save(): ensure parent_id is set correctly in metadata index store: replace document if already in database (for change_metadata) change_metadata(): make sure timestamp is set, like we do for save() fix test suite failure fix migration of checksum entries work around Xapian returning incorrect match counts if offset/limit are used fix sort order in ambiguous cases, fix obscure test suite breakage due to overlapping timestamp values fix FileStore.retrieve() broken by last merge test_massops.py: test ordering of find() results (for all supported orders) and offset/limit (for default order) ...
| * | \ Merge branch 't/rainbow-0.8' into refs/top-bases/t/versionsrefs/top-bases/t/versionsSascha Silbe2011-03-060-0/+0
| |\ \ \ | | | | | | | | | | | | | | | * t/rainbow-0.8:
| | * \ \ Merge commit 'c8be67a348bb399af666f29a798deba2b84a0016' into t/rainbow-0.8t/rainbow-0.8Sascha Silbe2011-03-063-2/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8be67a348bb399af666f29a798deba2b84a0016': Release 0.92.0 don't choke if timestamp property is missing Cleanup AUTHORS file
| * | \ \ \ Merge branch 't/migration-rebuild-index' into refs/top-bases/t/versionsSascha Silbe2011-03-060-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | * t/migration-rebuild-index:
| | * \ \ \ \