Code

Appengine 1.4#58

Code

Open

dragonx wants to merge 66 commits intodjango-nonrel:appengine-1.4django-nonrel/djangoappengine:appengine-1.4from dragonx:appengine-1.4dragonx/djangoappengine:appengine-1.4Copy head branch name to clipboard

+1,045-79

Commits

Commits on Nov 26, 2011

• git ignore

  aburgel

  committed
  fbcecf5

  Copy full SHA for fbcecf5

• appengine key and ancestor support

  aburgel

  committed
  f265731

  Copy full SHA for f265731

• fixes for non-primary GAEKeys

  aburgel

  committed
  decfc12

  Copy full SHA for decfc12

Commits on Nov 29, 2011

• use id_or_name as string value

  aburgel

  committed
  87a9f85

  Copy full SHA for 87a9f85

• better value conversion to match str from GAEKey

  aburgel

  committed
  fd234e6

  Copy full SHA for fd234e6

• test cases for different kinds of pk representations

  aburgel

  committed
  150c915

  Copy full SHA for 150c915

Commits on Dec 6, 2011

• fix cmp for GAEKey

  aburgel

  committed
  29a1c62

  Copy full SHA for 29a1c62

Commits on Dec 27, 2011

• merge upstream/develop

  aburgel

  committed
  1a1456a

  Copy full SHA for 1a1456a

Commits on Dec 29, 2011

• use methods instead of properties for GAEKey fields

  aburgel

  committed
  091b12c

  Copy full SHA for 091b12c

• Merge branch 'develop' of git://github.com/django-nonrel/djangoappengine into ancestor

  aburgel

  committed
  b5f126a

  Copy full SHA for b5f126a

• remove missed @Property, update unit tests

  aburgel

  committed
  902c363

  Copy full SHA for 902c363

Commits on Jan 25, 2012

• use real_key for serialization

  aburgel

  committed
  6aa66b7

  Copy full SHA for 6aa66b7

Commits on Mar 17, 2012

• modify SqlInsertCompiler to handle bulk inserts

  aburgel

  committed
  216aa48

  Copy full SHA for 216aa48

• remove usage of XMLField

  aburgel

  committed
  7df916e

  Copy full SHA for 7df916e

• repr method for GAEKey

  aburgel

  committed
  8208067

  Copy full SHA for 8208067

• do not encode cursor if it doesnt exist

  aburgel

  committed
  2fc14a5

  Copy full SHA for 2fc14a5

Commits on Mar 18, 2012

• do not allow null primary keys, check for empty strings when creating keys

  aburgel

  committed
  b23cc69

  Copy full SHA for b23cc69

Commits on Mar 23, 2012

• merge develop branch

  aburgel

  committed
  cc73be7

  Copy full SHA for cc73be7

• merge develop branch

  aburgel

  committed
  60e62a7

  Copy full SHA for 60e62a7

• rewrite ancestor queries for type-conversion-refactor

  aburgel

  committed
  6a10a9d

  Copy full SHA for 6a10a9d

• django 1.4 updates

  aburgel

  committed
  d38742e

  Copy full SHA for d38742e

Commits on Apr 20, 2012

• DBKeyField is a special case for conversion

  aburgel

  committed
  7407854

  Copy full SHA for 7407854

• add missing import

  aburgel

  committed
  b77c183

  Copy full SHA for b77c183

• dbkeyfield should not be forced to nullable

  aburgel

  committed
  9be9b5f

  Copy full SHA for 9be9b5f

• added make_key function to simplify created DbKeys from models

  aburgel

  committed
  4c6ebdf

  Copy full SHA for 4c6ebdf

Commits on May 22, 2012

• Merge commit '257e3390ab4768abbb6d82af6c16438cb9ede3cb' into django-1.4

  

  User

  committed
  32d2e17

  Copy full SHA for 32d2e17

Commits on May 23, 2012

• Merge branch 'feature/ancestor-query-1.4' of git://github.com/django-nonrel/djangoappengine into develop

  Show description for 13c8b64
  

  User

  committed
  13c8b64

  Copy full SHA for 13c8b64

Commits on May 25, 2012

• Add some syntactic sugar classes for doing ancestor queries.

  

  User

  committed
  a417ac0

  Copy full SHA for a417ac0

Commits on May 26, 2012

• Put datastore persistence patch back in, it's still necessary for 1.6.5

  

  User

  committed
  e900212

  Copy full SHA for e900212

Commits on May 30, 2012

• Also fix db/utils.py so it works in python 2.5

  Show description for dd03270
  

  User

  committed
  dd03270

  Copy full SHA for dd03270

Commits on Jun 29, 2012

• db_type may be marked "date"/"time", as long as it's derived from DateField or TimeField, but may not necessarily be stored as a datetime.

  

  User

  committed
  b38cb39

  Copy full SHA for b38cb39

• Merge commit 'b38cb39733b6b142c130a081f85503b8c1160d01' into django-1.4

  

  User

  committed
  9c84c29

  Copy full SHA for 9c84c29

Commits on Jul 13, 2012

• Add dev_appserver compatible version of LiveServerTestCase.

  Show description for f592f4e
  

  User

  committed
  f592f4e

  Copy full SHA for f592f4e

Commits on Jul 14, 2012

• Hack around two threading issues with the LiveServerTestCase

  Show description for 8abaf2a
  

  User

  committed
  8abaf2a

  Copy full SHA for 8abaf2a

Commits on Jul 16, 2012

• Make logout url work for LiveServerTest

  

  User

  committed
  637d8e1

  Copy full SHA for 637d8e1

Commits on Aug 30, 2012

• Switch to WSGI for python 2.7

  

  User

  committed
  05afb8c

  Copy full SHA for 05afb8c

Commits on Oct 4, 2012

• Add synchronization between the LiveServerTestCase and LiveServerThread.

  

  User

  committed
  9f271c2

  Copy full SHA for 9f271c2

• Merge branch 'features/django-1.4' of git://github.com/django-nonrel/djangoappengine into django-1.4

  Show description for 9917952
  

  User

  committed
  9917952

  Copy full SHA for 9917952

• Clean up comments in test utilities.

  

  User

  committed
  e32ed1c

  Copy full SHA for e32ed1c

• Add input reader utility classes for use with the mapreduce API.

  Show description for 69cfd34
  

  User

  committed
  69cfd34

  Copy full SHA for 69cfd34

Commits on Oct 12, 2012

• Fix sync error between threads when loading fixtures.

  Show description for eb29ef3
  

  User

  committed
  eb29ef3

  Copy full SHA for eb29ef3

Commits on Feb 8, 2013

• A bunch of hacks to get django-nonrel serving on devappserver2.

  Show description for 3139a05
  

  projecteat

  committed
  3139a05

  Copy full SHA for 3139a05

Commits on Feb 9, 2013

• Fix a bug that broke backwards compatibility with 1.7.4

  Show description for c2293fe
  

  projecteat

  committed
  c2293fe

  Copy full SHA for c2293fe

Commits on Feb 15, 2013

• Importing Testbed() on production throws some SSL warnings in the log.

  

  projecteat

  committed
  6e94cef

  Copy full SHA for 6e94cef

Commits on Feb 18, 2013

• Manually rebase my own working branch on top of upstream features/django-1.4

  Show description for 9487b33
  

  projecteat

  committed
  9487b33

  Copy full SHA for 9487b33

• Add support for devappserver2.

  Show description for 5eab9de
  

  projecteat

  committed
  5eab9de

  Copy full SHA for 5eab9de

Commits on Mar 12, 2013

• Make 'python manage.py runserver' commands work with either GAE SDK 1.7.5 running dev_appserver, or devappserver2 0.8.

  Show description for 6bca0c5
  

  projecteat

  committed
  6bca0c5

  Copy full SHA for 6bca0c5

Commits on Mar 16, 2013

• Add url property to BlobStoreFile and BlobstoreUploadedFile.

  Show description for 6a472a8
  

  projecteat

  committed
  6a472a8

  Copy full SHA for 6a472a8

Commits on Mar 19, 2013

• Patch manage.py test to enable file uploads to blobstore.

  

  projecteat

  committed
  ff107ca

  Copy full SHA for ff107ca

• Streamline the last checkin a bit by automatically pulling up the blob content-type, blob-key, and name.

  

  projecteat

  committed
  0e49f3f

  Copy full SHA for 0e49f3f

• Add testing of File fields that store BlobstoreFiles

  

  projecteat

  committed
  ec08bb8

  Copy full SHA for ec08bb8

• Update to work on SDK 1.7.6

  Show description for fdc3e17
  

  projecteat

  committed
  fdc3e17

  Copy full SHA for fdc3e17

Commits on Mar 20, 2013

• Make manage.py shell work for datastore accesses on devappserver2

  

  projecteat

  committed
  2a09904

  Copy full SHA for 2a09904

• Add support for devappserver2 to LiveServerTestCase.

  Show description for 4993104
  

  projecteat

  committed
  4993104

  Copy full SHA for 4993104

• Clean up breakpoint.

  

  projecteat

  committed
  29ae1a1

  Copy full SHA for 29ae1a1

Commits on Mar 22, 2013

• Add support for auto_id_policy to the command line.

  

  projecteat

  committed
  ba8122b

  Copy full SHA for ba8122b

Commits on Mar 23, 2013

• Make sure we set up datastore stubs properly in stubs.py, this makes commands like manage.py shell/dumpdat work.

  Show description for d607801
  

  projecteat

  committed
  d607801

  Copy full SHA for d607801

Commits on Mar 25, 2013

• Revert changes to utils.py that were needed for the standalone devapppserver2.

  Show description for 64c4e64
  

  projecteat

  committed
  64c4e64

  Copy full SHA for 64c4e64

Commits on Aug 7, 2013

• Add __str__ and __unicode___ methods to BlobstoreFile so filenames are displayed without the blobkey (ie in form FileField)

  

  projecteat

  committed
  9f059e7

  Copy full SHA for 9f059e7

Commits on Aug 8, 2013

• Merge branch 'appengine-1.4' of github.com:django-nonrel/djangoappengine into appengine-1.4

  Show description for 297e10c
  

  projecteat

  committed
  297e10c

  Copy full SHA for 297e10c

Commits on Aug 19, 2013

• Force dev_appserver datastore consistency when calling loaddata.

  Show description for 7ed1b53
  

  projecteat

  committed
  7ed1b53

  Copy full SHA for 7ed1b53

Commits on Aug 21, 2013

• Fix for last change not working properly on the original dev_appserver. Oops.

  

  projecteat

  committed
  122b1fe

  Copy full SHA for 122b1fe

Commits on Oct 12, 2013

• Update input readers for reading keys and raw entities given Django models.

  

  projecteat

  committed
  ca5cd85

  Copy full SHA for ca5cd85

Commits on Oct 30, 2013

• Patch tests so they don't throw an exception when calling the latest mapreduce library.

  

  projecteat

  committed
  a7a4426

  Copy full SHA for a7a4426

• Attempt to fix django-nonrel Travis-CI test by disabling images stub.

  

  projecteat

  committed
  85f5f15

  Copy full SHA for 85f5f15

• Reinstating the init_images_stub, since it's required for the blobstore APIs.

  Show description for 0376e47
  

  projecteat

  committed
  0376e47

  Copy full SHA for 0376e47