summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | am db99a10b: Fix NPE in PhotoPageBobby Georgescu2012-12-051-1/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Fix NPE in PhotoPageBobby Georgescu2012-12-041-1/+3
* | | | am 870e62ac: Handle the case where the orientation column is not here...nicolasroard2012-12-041-0/+2
|\| | |
| * | | Handle the case where the orientation column is not here...nicolasroard2012-12-041-0/+2
* | | | am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-archesMichael Kolb2012-12-041-1/+3
|\| | |
| * | | Prevent Camera UI in GalleryMichael Kolb2012-12-041-1/+3
* | | | Merge "Fix call to Toast outside UI thread." into gb-ub-photos-bryceRuben Brunk2012-12-032-71/+93
|\ \ \ \
| * | | | Fix call to Toast outside UI thread.Ruben Brunk2012-12-032-71/+93
| | |/ / | |/| |
* / | | Move MenuExecutor operations into ServiceBobby Georgescu2012-12-036-8/+110
|/ / /
* | | Merge "Separate GL calls into GLCanvas in preparation for adding GLES2." into...George Mount2012-11-3013-238/+459
|\ \ \
| * | | Separate GL calls into GLCanvas in preparation for adding GLES2.George Mount2012-11-2013-238/+459
* | | | Improve fling to delete gesture handlingBobby Georgescu2012-11-302-9/+15
* | | | Refactoring crop, made unconstrained.Ruben Brunk2012-11-298-630/+915
* | | | am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align hist...nicolasroard2012-11-292-7/+12
|\ \ \ \ | | |/ / | |/| |
| * | | (re-)add vertical/horizontal lines when moving Curvesnicolasroard2012-11-292-7/+12
* | | | am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-archesNicolas Roard2012-11-293-7/+62
|\| | |
| * | | Merge "Added dashed diagonal for crop." into gb-ub-photos-archesNicolas Roard2012-11-293-7/+62
| |\ \ \
| | * | | Added dashed diagonal for crop.Ruben Brunk2012-11-283-7/+62
* | | | | am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402)nicolasroard2012-11-282-0/+6
|\| | | |
| * | | | Fix potential crashnicolasroard2012-11-282-0/+6
| |/ / /
* | | | am 6d867ce0: Set crop ratio to unconstrained by default.nicolasroard2012-11-282-3/+2
|\| | |
| * | | Set crop ratio to unconstrained by default.nicolasroard2012-11-282-3/+2
* | | | am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-archesnicolasroard2012-11-282-2/+5
|\| | |
| * | | Merge "Fix flashing in geometry panel" into gb-ub-photos-archesnicolasroard2012-11-282-2/+5
| |\ \ \
| | * | | Fix flashing in geometry panelnicolasroard2012-11-282-2/+5
* | | | | am 3507b925: Merge "Add new borders assets" into gb-ub-photos-archesnicolasroard2012-11-281-1/+11
|\| | | |
| * | | | Merge "Add new borders assets" into gb-ub-photos-archesnicolasroard2012-11-281-1/+11
| |\ \ \ \
| | * | | | Add new borders assetsnicolasroard2012-11-281-1/+11
| | |/ / /
* | | | | am cd84d676: Fix history panel overlapnicolasroard2012-11-281-0/+4
|\| | | |
| * | | | Fix history panel overlapnicolasroard2012-11-281-0/+4
| |/ / /
* | | | am 987bc8aa: Fix wrong colors in Curvesnicolasroard2012-11-281-1/+8
|\| | |
| * | | Fix wrong colors in Curvesnicolasroard2012-11-281-1/+8
* | | | am d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos...nicolasroard2012-11-281-1/+5
|\| | |
| * | | Merge "Fix moving points in the Curves editor" into gb-ub-photos-archesnicolasroard2012-11-281-1/+5
| |\ \ \
| | * | | Fix moving points in the Curves editornicolasroard2012-11-281-1/+5
* | | | | am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-archesRuben Brunk2012-11-281-0/+13
|\| | | |
| * | | | Merge "Added locking to ImageLoader." into gb-ub-photos-archesRuben Brunk2012-11-281-0/+13
| |\ \ \ \
| | * | | | Added locking to ImageLoader.Ruben Brunk2012-11-281-0/+13
* | | | | | am e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-ph...John Hoford2012-11-281-3/+22
|\| | | | |
| * | | | | Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-archesJohn Hoford2012-11-281-3/+22
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | reduce size of tiny planet if malloc failsJohn Hoford2012-11-081-3/+22
* | | | | | am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photo...nicolasroard2012-11-282-5/+34
|\| | | | |
| * | | | | Merge "Add a triangle to the popup button view" into gb-ub-photos-archesnicolasroard2012-11-282-5/+34
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add a triangle to the popup button viewnicolasroard2012-10-302-5/+34
* | | | | | am 6a94446d: Minor fix for some FP rounding errors in crop.Ruben Brunk2012-11-283-5/+10
|\| | | | |
| * | | | | Minor fix for some FP rounding errors in crop.Ruben Brunk2012-11-273-5/+10
* | | | | | Merge "AlbumDataLoader.get returns correct value if not in cache" into gb-ub-...Bobby Georgescu2012-11-281-2/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | AlbumDataLoader.get returns correct value if not in cacheBobby Georgescu2012-11-271-2/+1
* | | | | | resolved conflicts for merge of 3c6a0610 to gb-ub-photos-bryceYour Name2012-11-272-89/+20
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Remove orientation compensationYour Name2012-11-272-89/+20