Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fake pull request #3

Closed
wants to merge 266 commits into from
Closed

fake pull request #3

wants to merge 266 commits into from

Conversation

priyald17
Copy link
Contributor

fake pull request

@BobEvans
removed local config file
f580576
@BobEvans
ignore Shared directories
124330c
@BobEvans
fixed bug in new batch processing
c90e59e
@BobEvans
create batches for uploading events and return individual event save …
1a03819 
…response
@BobEvans
clean up testing and create ant task for running android emulator tests
1db63a2
@BobEvans
cleanup bugs around date formatting
145a59a
@BobEvans
corrected old package name for instrumentation runner
ce96db7
@BobEvans
split tests into android and pojo directories
d580538
@BobEvans
add junit for test project
05b9713
@BobEvans
ignore testbin and junit reports directories
abccc71
@BobEvans
update eclipse classpath files
2f716ea
@BobEvans
scripts for querying localhost server
343cc6c
@BobEvans
added logging for versionchecker service and changed ctor used for pe…
2350349 
…nding notification
@BobEvans
testing that sets up the android emulator first
a63758f
@BobEvans
updating version
5d1e806
@BobEvans
small cleanup
484bfaf
@BobEvans
add a introduction help screen to orient beta users
6648df3
@BobEvans
change layout to orient better for first time users
c54b5db
@BobEvans
small cleanup in create experiment message
55f85b1
@BobEvans
added an account chooser
3a6300d
@BobEvans
increment version #. Move whitelist to shared so gwt client can check…
48ef10d 
… it as well.
@BobEvans
made save button show up at bottom of view so as not to confuse peopl…
997e1c4 
…e on pages longer than one screen width
@BobEvans
added buttons to list items for running experiments
3f6225a
@BobEvans
make the experiment lists more usable. icons for controlling running …
aee8b58 
…experiments. include creator on available experiments
@BobEvans
fixed notification icon
fe60f87
@BobEvans
update help about new ui elements
5e666a6
@BobEvans
add better logging support by intercepting webchrome.onConsoleMessage…
964d63c 
… for webview
@BobEvans
fix nullpointer on maps since we haven't sorted ou the post v.2 maps …
ea89b50 
…problem
@BobEvans
removed intro howto merged it with welcome activity. Cleaned up icons…
ac5240b 
…. incremented to v2.0.69
@BobEvans
added data option to experiment row to see user data
1ef6837
BobEvans and others added 27 commits June 20, 2013 12:31
@BobEvans
classpath munging
a5252c8
@BobEvans
voice recognition mic added on all opentext items
0acd1c3
@BobEvans
trigger notifications cancel old ones
89485dc
@BobEvans
reverting to the old notification for user present
cd1ae58
@BobEvans
merge from unlock_trigger
afd4874
@BobEvans
removed mistake
13adc02
@BobEvans
changing message for the misunderstood case
aa97252
@BobEvans
classpath munging
c7ec892
@BobEvans
Merge branch 'voice_input' into develop
e38350a
@BobEvans
merging paco action trigger
505615e
@BobEvans
fix off-by-one in getListValue
72b910e
@BobEvans
updating versions. Android 2.0.81. Server to 74
76d33bd
@BobEvans
merge from release-android-2.0.81-svr-74 branch
68df7bd
@BobEvans
prevent npe on ringtone failed insertion due to pre-existing on 4.3
5099b8a
@BobEvans
Issue 249. Autocomplete with previous responses on Android
036981d
@BobEvans
Issue 249. Autocomplete with previous responses on Android
0f2804d 
Issue 253. Ringtone media datastore column fix for 4.3
@BobEvans
Merge branch 'release-android-2.0.81-svr-74' of https://code.google.c…
2e1ee04 
…om/p/paco into release-android-2.0.81-svr-74
@priyald17
issue146: resolving Paco-Server classpath conflict
39b54d5
@BobEvans
Merge branch 'release-android-2.0.81-svr-74' into develop
3b8cb27
@BobEvans
code review cleanup for voice recognition comments
ce70caf
@priyald17
issue146: Fixed conflict in server classpath file.
5083c89
@priyald17
Merge branch 'develop' of https://code.google.com/p/paco into issue146
dc3c54c
@priyald17
issue146/167: Cleaned up based on comments from previous code review.
f7d9894 
Most notably, ensured joinDate strings carry a time zone.
@priyald17
issue146/167: removed unnecessary comment
5e2c904
@priyald17
issue146/167: Fixed null pointer issues in scheduling fixed duration and
2e2cc6b 
triggered experiments. Also rewrote migration script so that the id
column in the new table auto-increments.
@priyald17
issue146/167: Refactored server Experiment.java join date methods as
38fbb69 
suggested in code review.
@priyald17
issue146/167: Database migration test done!
834e415
@ghost ghost assigned yimingcheung Jul 16, 2013
@priyald17 priyald17 closed this Jul 16, 2013
@BobEvans BobEvans deleted the issue146 branch January 24, 2015 00:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@priyald17 @yimingcheung @BobEvans