summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix LUT3D information lost after re-edit" into gb-ub-photos-carlsbadztenghui2013-06-191-0/+1
|\
| * Fix LUT3D information lost after re-editztenghui2013-06-191-0/+1
* | Switch over to use new camera activityDoris Liu2013-06-182-475/+81
* | Add more metrics to EditorBobby Georgescu2013-06-171-0/+4
* | Added serialization IDs for frames, adds frames to analytics.Ruben Brunk2013-06-171-1/+1
* | Fix IDs for analytics, unlocalize serialization IDs.Ruben Brunk2013-06-172-3/+1
|/
* Merge "Disable zoom when camera does not support zoom" into gb-ub-photos-carl...Doris Liu2013-06-111-1/+10
|\
| * Disable zoom when camera does not support zoomDoris Liu2013-06-111-1/+10
* | Fix warningsnicolasroard2013-06-101-3/+3
|/
* Removing unused UI fields in FilterRepresentation.Ruben Brunk2013-06-0510-70/+22
* Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbadztenghui2013-06-031-3/+5
|\
| * Add LUT3D filter state savingztenghui2013-05-311-3/+5
* | Improve gesture handlingDoris Liu2013-05-311-175/+71
* | Mirroring google3 for CL 47368174.Ruben Brunk2013-05-301-0/+5
|/
* functionality added to transport filter parameter values to following filters...Christian Wichner2013-05-241-0/+24
* Add new camera activity back and fix build errorsDoris Liu2013-05-161-0/+358
* resolved conflicts for merge of 9a4fb2dc to gb-ub-photos-carlsbadztenghui2013-05-091-3/+8
|\
| * Fix the verbose logztenghui2013-05-081-3/+8
* | Remove new camera activity to avoid build breakageDoris Liu2013-05-081-358/+0
* | am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." in...Sascha Haeberling2013-05-071-1/+1
|\|
| * Avoid rounding errors from cropping uncropped images.Sascha Haeberling2013-05-071-1/+1
* | am 00259461: Fix UInicolasroard2013-05-012-6/+10
|\|
| * Fix UInicolasroard2013-05-012-6/+10
* | resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbadJohn Hoford2013-05-012-2/+3
|\|
| * small ui changes based on UX/PM feedbackJohn Hoford2013-04-292-2/+3
* | Modifications for simple editnicolasroard2013-04-294-17/+47
* | am 45377ce9: Merge "Log name of borders and filters of saved images" into gb-...Bobby Georgescu2013-04-261-0/+9
|\|
| * Log name of borders and filters of saved imagesBobby Georgescu2013-04-261-0/+9
| * Remove new camera activity code from BryceDoris Liu2013-04-251-358/+0
* | resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbadnicolasroard2013-04-252-2/+20
|\|
| * Merge "UI changes" into gb-ub-photos-brycenicolasroard2013-04-251-0/+19
| |\
| | * UI changesnicolasroard2013-04-241-0/+19
* | | am 2e85f988: Merge "Fix for popuping being hard to dismiss" into gb-ub-photos...Doris Liu2013-04-241-0/+5
|\| |
| * | Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryceDoris Liu2013-04-241-0/+5
| |\ \ | | |/ | |/|
| | * Fix for popuping being hard to dismissDoris Liu2013-04-231-0/+5
* | | am cc7bcd07: Merge "Fix Curves" into gb-ub-photos-bryceJohn Hoford2013-04-241-3/+30
|\| |
| * | Fix CurvesJohn Hoford2013-04-241-3/+30
* | | am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryceJohn Hoford2013-04-232-0/+13
|\| |
| * | interruptible rendererJohn Hoford2013-04-232-0/+13
| |/
* | am d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryceDoris Liu2013-04-221-0/+8
|\|
| * Fix for camera switcher hard to hitDoris Liu2013-04-201-0/+8
* | am 91d26f6c: tiny planet fixJohn Hoford2013-04-222-0/+43
|\|
| * tiny planet fixJohn Hoford2013-04-192-0/+43
* | am 14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-p...Doris Liu2013-04-221-3/+34
|\|
| * Allow swiping to filmstrip from blocker barDoris Liu2013-04-181-3/+34
* | Merge "Support for save state in images" into gb-ub-photos-carlsbadJohn Hoford2013-04-1810-5/+375
|\ \
| * | Support for save state in imagesJohn Hoford2013-04-1710-5/+375
| |/
* / Fix border apply if no filter appliednicolasroard2013-04-171-4/+14
|/
* New state panelnicolasroard2013-04-151-6/+2
* support for simplified parameters in filterJohn Hoford2013-04-151-0/+11