labofsahil/github-event-dataset-2012 huggingface dataset:
Added a bit more flexibility in skinning

Can now pass in arrow image, text color, shadow color, and background color. Also added static methods to get the defaults used in the component.
Merge branch 'dateformatting'

Conflicts:
	EGOTableViewPullRefresh/Classes/View/EGORefreshTableHeaderView.m
Merge remote-tracking branch 'upstream/master'
Untracking .DS_Store files
Untracking build/
Created a first implementation of 'Pull to load more'
Made a more generic implementation of the EGORefreshTable.

New:
-> The display properties are easly configurable at runtime.
-> There is a placeholder to create a pull to load more footer.
-> The PullTableView can be added to a view with InterfaceBuilder.
-> The ordinary table footer and table header fields are not affected.
Working implementation. Pull to refresh pull to load more.
Prepared for internationalization, fixed so that if updated over 60 minutes it shows hours, if over 24 hours it shows days.
Added Singular and Plural language to last update text
Moved the new files out of the demo project
Removed the old demo project
Created a new fresh simple demo project
Added a README file
Added a Whats different on this fork section to the README
When refresh/load more are triggered programmatically, the table will animate to show the refreshing/loading view if the the table is scrolled all the way to the top or to the bottom. This also fixes a bug related to incorrect appearance of table header view the first time a view is shown.
Readme file is marked down
Removed code error
Consistent return type
Revert to draft works, but without a confirm button
Conforms to codechecker
Fixed a load of errors that PHPMD showed up, plus added code to suppress warnings in appropriate places.
Refactored to shorten function
Refactored to shorten function
Improved the PHPMD suppressions
Refactored to simplify
More PHPMD improvements
More PHPMD improvements
Removed defunct tests
Compressed function
Compressed function further
Big refactoring to make filters into separate classes.
Fixed workshop nodes that were wrongly showing groups.
Further refactorings - split attach_groups_to_nodes() into two.
Removed dead code
Removed dead code
More refactoring to simplify code
net: wireless: bcmdhd: Update wifi stack ps state if was changed

Change-Id: Ib1ee0b6ee05077d1ed6cfb578b6384dfc9787c81
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

Conflicts:

	drivers/net/wireless/bcmdhd/wl_cfg80211.h
net: wireless: bcmdhd: Add print when power-save mode is OFF

Change-Id: Idc72198b2d59c76dd45ba918cef982bcd7b570ab
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Adjust roaming treshold to -65 dB

Change-Id: I88bb0cf759ee4262f31f054ef2dd5fc6258e8628
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Merge remote-tracking branch 'android/android-3.0' into HEAD
Merge branch 'jb' of http://github.com/CyanogenMod/android_kernel_samsung_tuna into jb
Se agrega el 2column layout a los guides y se modifica el mismo para mostrar los related posts
Merge branch 'master' of https://github.com/mercadolibre/mercadolibre.github.com
bumping master to v0.0.0-4-pre
more sensible postinstall script setup
support custom options/optimizations string passed to compile, and set configurable default string on the JS side of clojure-script instead of hard-coding it w/in ncljs.clj
ncljsc/build modified to support opts argument which is either a string or a clojure hash map
clean up declaration types in node_externs.js (doesn't impact compiled code, but seems more 'correct')
changing default options
by default, the out/ dir is now contained within the npm pkg's support/ dir, though it will be overriden of :output-to is passed in the options; also, the npm pkg and the git repo will house copies of core.js and nodejs.js, so the .cljs don't have to be compiled the first time around (the ncljsc.clj logic checks that they're on disk already, as defined by the original closure.clj)
improved postinstall script -- doesn't run if support/clojure-clojurescript exists, or if it does exist it runs if npm-debug.log exists in the package's root
optimizations should default to :simple, ClojureScript.defaultOptions should be separate (though initially the same) as ClojureScript.options; options instead of defaultOptions should be passed to compile
pushing process.cwd() onto the java classpath is a good first solution for making both nodejs/require and cljs :require both work as dependency loading mechanisms
expose java on ClojureScript exports
using temporary directory instead of support/out/ as fallback in case :output-dir is not specified
releasing v0.0.0-4
Merge tag 'v0.0.0-4' into gh-pages

Version 0.0.0-4 (experimental)
complete QR code for testing
status commit to merge to avoid bit-rot
Merge remote-tracking branch 'upstream/master' into periodic-sync-and-notifs

Conflicts:
	data/lib/mailapi/mailuniverse.js
status commit
Merge remote-tracking branch 'upstream/master' into periodic-sync-and-notifs
synchronization works! some glitches, however.
internaldate debug noodling
address IMAP timezone glitches, fix notification bugs
add some cleanup logic, change constants per review discussion
avoid having two syncs happening at the same time; don't just warn
Merge remote-tracking branch 'upstream/master' into periodic-sync-and-notifs

Conflicts:
	data/lib/mailapi/mailuniverse.js
Merge pull request #53 from asutherland/periodic-sync-and-notifs

Periodic sync and notifs, r=squib
[maven-release-plugin] prepare release mule-module-google-prediction-1.0.1
[maven-release-plugin] prepare for next development iteration
Now have a working insert user.
test branch issue-9999
next commit
changes to formatting of homepage posts; fixed size of featured posts on home and single.php; other minor formatting adjustments
Adding the css and js code for watermarks hint to work
update THMCSimulator
Silex problems playing with beta Symfony.
Add opennic project link
talk about bashmod?
Replace Melbourne City scraper with a new one on scraperwiki
删除libs目录
Added error check for git clone system call.
Small fix to check the correct variable (page.comments instead of page.JB.comments) so that disabling comments works as documented.
Issue #46, theme install fails on msys, permissions.
Improved error text.
Added the wordpress_id value in Disqus code if present in the post

Signed-off-by: Tommaso Visconti <tommaso.visconti@gmail.com>
Merge pull request #47 from tommyblue/jb-development

Added the wordpress_id value in Disqus code if present in the post
Adding Mixpanel as analytics provider
Update to bootstrap 2.0.1
Merge pull request #44 from sstarr/patch-1

Resolved an issue preventing disabling comments for individual pages
Setting google as default analytics provider
Merge remote-tracking branch 'nolith/custom-rake' into jb-development. issue #33
Merge pull request #40 from 3martini/windows-topic

Windows MSYS Support
Merge pull request #49 from koomar/jb-development

Mixpanel as Analytics Provider for JB
Merge remote-tracking branch 'daz/master' into jb-development. issue #50
Merge remote-tracking branch 'philips/tagline-metadata' into jb-development. issue #31
bump to 0.2.7
Added option to specify time when creating posts
Using Time.parse to ensure date format is valid
Forgot including require time
Added exception handling to display a user friendly message when time parse goes wrong
PMO-1963: channel type corrected
Modify installer to support Mac/OS X

Sets PKG_CONFIG_PATH and MONO_PATH environment variables to appropriate
values during execution for compiling the CobraBinding project on a Mac.

Resolves issue #9

Includes additional ehnancements to aid in debugging the installer from
the command line.

Patch courtesy of @charles-esterbrook
Merge branch 'master' into completion
travis: removed ruby 1.9.1
fix 'module'
test wether we actually recreate this ...
updated the Shopp and Contact Form 7 plugins
Test File(Edit)

Uploading the rest of the unfinish code.
cleaned up location controller, abstracted FT functions, updated markup on location changes
Changed the datatype
blog stylin
Merge branch 'master' of github.com:solvingtheweb/nuance_dragonassistant
changed height of iframe in footer'
shorter description.
changed file links to srowley fork
deleted bootstrap min files
changes in meterfile
Merge branch 'master' of github.com:swapnilvathare/webo_freshers_project
Updating repo info in pom
Update README.md: Update Usage.
Split encounter factory's npcs into a trait
Added factories.rb to Guardfile
Wrote Encounter#total_xp
Wrote some spec examples for Encounter#npcs
Rewrote Encounter#npcs a little bit
- add reason display
config details updated
CSS
gg
add post about NERDTree plugin of VIM
Update Customer
New Employee
Updated Admin.CheckProgrammingRights:

 * Added checkboxes
 * Added link to code-view of pages
 * Omit pages that doesn't need any processing from list
 * Check form_token
 * Also add RequiredRight-object with level programming to "known documents" that doesn't have one
 * Also explicitly deny edit rights for XWikiGuest and XWikiAllGroup on the documents
Adding new @rebelinux ZenPacks.

* ZenPacks.community.BrocadeSanSW
* ZenPacks.community.Ibmbladecenter
Fixed bug with multiple annotations in controller action.
Fixed class name detection for compability with JMSDiExtraBundle.
Added tests for multiple Cache annotations.
Drop duplicated pages
Fix "7" bug
Merge branch 'ics' of github.com:7eme-compagnie/packages_apps_Settings into ics
Merge branch 'ics' of github.com:7eme-compagnie/packages_apps_Settings into ics
d2: Remove GPS blobs

Change-Id: I21974f7f508c6f9e8c969f418d8f26f67e82b9b5
d2: Move GPS configuration

Change-Id: I0f2fecdec6c2fa25150dbe996a51a16e4b56d068
d2: Fix vold.fstab

Change-Id: If0db64a970f7f877509116945115d252d3fccd16
reports display was all on one line
added wise-guy irc, google quote
Deleted source/developers/documentation/ac-mobile-build-phonegap/ac-mobile-build/ac-build-plugins/xtify-push-notifications/xtify-android-methods.html.markdown
Updated Portal and MCM dlls
skip assert

Change-Id: Ie8465ec4ec3c63bec2ea41212512b747e8a0d72e
Site updated at 2012-10-25 08:04:12 UTC
Update notes for submitted changes

* Don't build telephony target
Update notes for submitted changes

* zeusc: removed duplicate prop
Backport (read: copied) Feature: Customized Locale table - Wifi driver (BCMDHD)

input : ISO 3166-1 country abbreviation
output: customized cspec

References:
https://github.com/CyanogenMod/android_kernel_samsung_aries
http://www.iso.org/iso/iso-3166-1_decoding_table

Change-Id: I963d5e7b1e3d63ed0581b2e06b4df99e93c5e24c
Update notes for submitted changes

* QuickMessage: Only display template button if templates defined (3 options)
Pre Alpha

Feel free to contribute!
Updated Boolean function
Atualizando projeto no repositório
Updated ReadMe with uppercase/lowercase disclaimer
- fix: fps handling
- use Homer logo as video source in case of "auto" selection
- allow Start() / Stop() of every MediaSink
- allow to (de-)activate video/audio transmission towards a participant
Renamed 'doSampleRequest' to 'doRequest'
Added PublishNuGetPackage target to BuildDependsOn

This allows the NuGet package to be pushed using
/p:PublishNuGetPackage=true /p:PublishNuGetPackageTarget=…
/p:PublishNuGetPackageTargetKey-… MSBuild options rather than
/t:Publish which can conflict with command line applications, web
sites, etc that might be used for testing.
Update mysite/html/index.js

Reestruração para dajax
PowerWidget: Make widgets stationary like everything else in the tray

Before patch: widgets move up with the grab bar (and get smashed a bit)
https://dl.dropbox.com/u/1077120/Android/Screenshot_2012-09-13-18-19-39.png

After patch: widgets disappear behind the grab bar, like everything else
https://dl.dropbox.com/u/1077120/Android/Screenshot_2012-09-13-18-23-52.png
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_frameworks_base into opensensation2
change requirement for switch2bill common
synchronization and project
synchronization and project
renamed to d710 as per other SGSII variants
Fixes for SS 3.0 beta 3
Security patches, disallowed interaction with anything in wp-admin and wp-includes, added Analytics /success tracker
Fixed angle calculation (works even for flipped normals)
Fixed grunt.js
Changed server to thin
Sync with project name
Removed a registation boarder for the old animations and fixed a logic problem.
I put the prototype on git for easy distribution.. dropbox just doesn't
cut it.
Slides, as presented, warts and all
Updating user.identity API doc
First commit x3
added notes about building for xylon
Revisions to the readme.
Compiled a final apk.
Now that the application is live in the Play store, I updated the link in the README.
added get page function
faster enhance process
Added placeholder attribute to textarea

Added 'Placeholder' as valid HTML5 attribute to textarea.
Arreglo de tipografia bebas
Working to get pip requirements.txt to get RTD.org shit running
Update source/security/permissions.rst

Added RoleManager link
Update source/images/content.rst

link was dead. 
Merge pull request #148 from pabo3000/patch-2

Update source/images/content.rst
Ex 6-7,started mistakes txt, and added .swp to .gitignore
Update app/views/twitter-bootstrap/_breadcrumbs.html.erb

active breadcrumb should not be a link
add table parameters to paypal_items schema
extend instatn_payments_notifications schema to collect all necessery data from Adaptive Payments IPN
* merge Config/sql/ipn.php and Config/sql/items.php into one Config/Schema/schema.php file which is by default searched on ./Console/cake schema update -p PaypalIpn command

* remove paypal_ipn.sql - it's not up to date with schema.php
Fixed a misnamed folder
Improve 'documentation'.
updated sample query
Got the signin in Capybara into another method in spec/request/book_new
Documentation and HTML folder for design allocation
Settings: Updated italian translation

	Added some strings related to wi-fi country codes

Change-Id: I0da48bca49c650c844d65f770cda05f8c291436f
Merge remote-tracking branch 'CyanogenMod/jellybean' into jellybean

* CyanogenMod/jellybean:
  Settings: Updated italian translation

Change-Id: I20340c8ab414a54d1603e691c794cbd22776ace7
Correct typo (really - table?)

Change-Id: I2d73e9778aead07c608bd995c9176d810caaba9c
Add stubs for Codex contributions.

New template files added to contain the Codex widget and styling.  They are
modeled exactly after the existing Trac widget, but still broken.  Please
feel free to clean up the code.
Add edit count API call.

MediaWiki allows external applications to query for the total number of
edits by a specific user. We'll use that API for the "View all X Codex
contributions" text.
Fix minor parenthesis typos in WP_Codex.... class
Include Codex contrib's widget in plugin setup file
* Makes the widget visible in WP admin
Codex contributions working in 3.4-alpha[20348]

Major changes include:
* Both contribs & counter XML parsed
* Relevant var name changes from Trac-related code
* Template updated for codex content & values

TO-DO:
# Template needs better frontend text/descriptions
Transients were disabled & broken, fixed.

Also removed whitespace at end of core class file
Merge pull request #5 from mbijon/master

Codex contributions widget working in 3.4-alpha[20348]
Updated algorithm using modulus.
Adds a duration method trace (inspect movieclip size)
Minor additions to the READMEs
fix doctree visibility toggle atom
add blog link to README
README:  initial readme template
Linux instructions should be pretty straight forward,
Xboow needs to fix up windows instructions for git
and batch file installation - documented in file
Adjusted permissions to be more inline with FI27
Adding default note value over finger indicator
change
better logging
fix amqp connection
Correspond prev/next buttons.
added manual link to Never Ending Reddit
switched to comprehensive event info string
Merge pull request #2 from iampersistent/master

use taxonomy library
Adjusted Term & TaxonomyInterface to point to core
updates for mapping taxonomy
update location of taxonomy libs to core
added pretend nonce security
PBR-364 Fix Event Phase errors
Updated chronological list
Update "error" post for elimination of bnf_rule()
New blog post
Work on New blog post
Work on New blog post
Work on New blog post
Update main Marpa page web link
Update main Marpa page web link
Merge branch 'gh-pages' into draft

Update main Marpa web page URL
Update main Marpa page web link
Update main Marpa page web link
Update main Marpa page web link
Merge branch 'gh-pages' into draft
Work on new blog post
Work on new blog post
Work on new blog post
Work on new blog post
Work on new blog post
Work on new blog post
new slicers
new slicers
[maven-release-plugin] prepare release configurationslicing-1.33
[maven-release-plugin] prepare for next development iteration
Fixed disconnect handling issue
Rearranging twitter bootstrap gem and removing from applicationcss
using proper data
Merge branch 'master' of github.com:karlssonper/cs348a-Geometric_Modeling
fix issue #39 (and add tests)
merged upstream/master
white color for links on hover
Removed ids from Smiley (they don't have anything to do there).
Outsourced them to a HashMap (instead of the ArrayList) in SmileyData.
This update was also done for the server (which makes older version of
the app incompatible with the server).
trazendo trabalhos relacionados
S5PC11X : FIMC apply v4l2 standard for asynchronous dequeue/queue

To make framedrop in camera HAL layer, FIMC should support
v4l2 standard

Change-Id: Ib41a4bb0d9f9c5f26f44f444fa620ceee8fad8ac
Signed-off-by: Song Youngmok <ym.song@samsung.com>
Updating ADL1.2 Test Packages, removing window.onerror
documentation-resources
starting to update google apps to create users with new properties that are available from google apps
making this into a package
adding to admin site
adding a GoogleAppsProfile
forgot to update one string
Starting to add some google apps templates and tags
Add task 6: derivative.
Two scripts and sample data
removed windows specific exception handler
added torrent link readme
ADding cache busnter version
Fixed folding of hit corresponding to query, added mirbase data update
Integrated new interface, pending changes
temp
changed the internal class treelistener to work with the new blastgrabber interface
try fix issue with post not displaying
RavenDB Dynamic Session post
Updated version numbers and readme for 1.2.1.1
Added get_paged() method to sales log table. #580
Improved PayPal IPN processing with do_action() hooks for txn_type
agregado de seed para users
Adding flyway files for version 1.7
Removing cmd cause I don't care about windows =P
Adding mysql jdbc driver.
Removing crappy sql folder. Updating shell script.

The one sql folder to rule them all is not suited for multiple projects.
So I removed it and changed the script to use a path relative to the
folder where the script is called.
By default it is db/migration and I call it from the root of my project.
Also hardcoded a location for the flyway installation.
Feel free to change both to suit your needs. ;)
bumping versions for erp_app erp_forms knitkit
Merge branch 'master' into orangelake
- changed "Unique Name" to "Internal ID"
- removed New file option from Knitkit shared and website file trees using showNewFileMenuItem: false
Merge branch 'orangelake' into formbuilder
typo
Merge branch 'orangelake' of github.com:portablemind/compass_agile_enterprise into orangelake
Fixed ig.Notification font issue. Added entity following.
change one img on homepage
304913-32305273  This is the final commit on Hazelcast HBase integration, our final stage for supporting millions and probably millions of users. Integration is ok. The remaining work to be done is 3 fold. First, we have to run a sanity check against the relational database for some time, using most likely .equals(). Secondly, we need to remove nested transactions. This should be done by always returning detached entities (through REQUIRES_NEW or so). Third, we need to make Hazelcast write-through. Right now, the delay is 1, which persists the data given to HC right after. But this is not desirable and breaks the ergonomics, probably crippling integrity as well.

How was the merge issue fixed?

Through adding the DN persistence.xml property datanucleus.allowAttachOfTransient.

Refer to: http://www.datanucleus.org/servlet/forum/viewthread_thread,7265#36044 and http://www.datanucleus.org/products/datanucleus/persistence_properties.html

~ HBase and Hazelcast integration to support large data sets and distributed caching.
removed tests/Main.hs
Rebase from upstream
Trimmed the branch to only the angles sub directory
bochanski testing git
Merge branch 'master' of https://github.com/rossfadely/star-galaxy-classification
ADD: parameters validation for validate_request at AccessTokensController.
ADD: add request validation integration test.
ADD: refactor some tests fixing inverted should.
Merge branch 'master' of github.com:rzilleruelo/authorize-geteway.service

Conflicts:
	spec/integration/access_tokens_controller_spec.rb
add podcast "Wetter im Ersten"
adding license link to readme
Added dynamic question to the quiz playfield. Next to add the results.
Fixed a bug in the sending of custom messages. They weren't called "custom".
Removed a bugus message.
Quiz is pretty much working. Albeit butt ugly! Will need a lot of work.
add exposure config reset mode switch.
Add json rest controller
create an epic
Tests now use mode for determining the rosbag play arguments
Program do wpisywania liczb i liczenia sredniej. Napisany w OOP.
Revert "workaround: enable navbar by default"

This reverts commit a730833bfc6e1cb3e27f72685c2f9fb94620841c.
The IJsonParser interface was introduced.
Error tests were fixed.
Utility classes to transform JSON events to Java objects and vice versa
were added.
getMap(...) and getList(...) methods were introduced.
escaping chars in example files
Removed bg wrapper
Added
Change domains to ignore param name from ref-domains-to-ignore to domains-to-ignore
Exclude linting of JS served from domains to ignore
Renamed some potentially inappropriate players and added methodical player@
Methodical player lus better error handling
Added some demo players
modified setLastModifiedDate()
dropped rtf - needs DISPLAY
msm8660-common: you seemed all alone

Change-Id: I025cc385251e8f34fe61774b3884fa78c7225074
Corrected a couple mistakes in my old post on Ruby.
Correcting indent in audio_hw.c
BUGFIX FINALLY! You shouldn't try to create a ghostpad in a bin with a target element which hasn't been yet added to the bin... It fails silently but it really fails. Thanks to the debugToDotFile I managed to understand this problem...
Found (supposed to be) working files somewhere
tf700t: remove uneeded audio entry

Removed -DICS_AUDIO_BLOB

Change-Id: Ifea4f403b1f5de63a3a33c4fc75d10597b96a4fa
Improved StrongRow Table Aliases

"Row" is now taken out of all StrongRow table aliases. "ForeignKeyRow"
is replaced with "ForeignKey"
liboverlay: set correct flags for external display channel

When external display is connected during video playback, the
flags to overlay was not set properly.
Pass the flags which comes from the hwc, by just changing the
WAIT_FOR_VSYNC(external should not wait for vsync)

(cherry picked from commit 857cfcba2d120d5da4916c7cb4fe119a08d1ce68)

Change-Id: I13100bebd223780eb9c709f384f0e4644e8295dc
Bulk Commit 2.
make more generic for date instead of datetime
Merge pull request #11 from athal7/date-time-fix

make more generic for date instead of datetime
Formatting the number of results and tidying up method names
comments and TODOs
extra stuff to remember to put, and whitespace changes
standardizing notation
alternate q4 and q6
group by started, pipe information for join
sane default runlength, and BigQ run information
Finished GroupBy
get_sort_order for groupby ordermakers
header stuff, default initialization, etc.
query modifications

final q6
constructed q7
attempt at running all queries in one go automatically (not working yet)
Remove navbar widgets mod
added spring orm
Improve navi. Closes #32
Merge branch 'gh-pages' of https://github.com/OpenTechSchool/www2.opentechschool.org into gh-pages
Added some padding for the small screen sizes (thanks @karlwestin). Closes #73
Add batch (icons)
removed theme which was included by default
Update _posts/2011-09-01-Babycare-Systems-Dev.md
Settings: update Simplified Chinese translations

* Some GPS and BT related translations

Change-Id: Ibe80ad556e1bdd01b3ed8a910c68c9ff68800b08
Merge remote-tracking branch 'cyanogenmod/gingerbread' into gingerbread
Screenshot Rotation fix

provision team
Updated backOff()
Atualizando arquivos Jar do exemplo para usar o Java 1.6
Displaying percentiles
changed the presentation, added an extra data set
removed datestamp
added a few files for structure
wording wording wording
Add a10-meminfo tool output.
Changes to the config file
Update src/main/java/com/mycompany/rest/domain/Person.java

Nuevo cambio en la clase Person.java
Merge pull request #9 from atiliotapia/patch-1

Nuevo Cambio
Emblemă Ceata + greșeală url Centeractive
added threat from inbox 14
altered install conf script
Prepare collective.plonetruegallery 2.3.0b2.
Merge branch 'master' of github.com:collective/collective.plonetruegallery
Prepare collective.plonetruegallery 2.3.1.
Merge branch 'master' of github.com:collective/collective.plonetruegallery
Test now passing.
* agregando grok como dependencia
* agregando links al tweet, retweet, reply y fav
* arreglando el estilo
* agregando traducciones
Two additional algorithms
Expanded tabs into spaces.
updated rakefile to new structure
Construction of the widget Update.
Refactoring: twitter->digitaljhelms
Removing GitHub Organizations support
Removing flying Larry refs
Adding Twitter follow button (w/out counter)
Added fork icon
improved styling of fork icon
Adding Google Web Fonts: Open Sans
Defaulting to normal weight headings
Modifying `main` content and adding support styles
Reducing the prominence of dog-ears
Added a predictor for agesexdrug.
fix mvel doc: time is a function
Merge pull request #165 from nlalevee/fix-mvel

fix mvel doc: time is a function
Redesign with bootstrap.
Added .svn to ignored patterns
working color options

options available via vor_category_colors
committing functional but not finished category colors

functional category colors so we can get the colors saved
Chat functional now--but code needs a bit tidying

I'll refactor the code either tomorrow night or tonight, but it IS
operational.
MysqlStatement::FetchAllSync() Use Integer::NewFromUnsigned(uint32_t) if fetched field has UNSIGNED_FLAG
Completed first draft of Proposed Activities section
SWF-2162 : Add crash WAR
SWF-2162 :
* Define context file for all wars to not have to rename them
* Don't put wars under the web app directory to not deploy them twice
SWF-2162 : Add missing tomcat 6.0.36 config files
SWF-2162 : Deactivate upgrades in PLF 4
SWF-2162 : Merge back CATALINA_BASE into CATALINA_HOME
testeing redcarpet2
UpgradeTool pages commit 1.0-SNAPSHOT
initial semc_mogami fork
started complete overhaul of Demangler mechanism
Demangler works
Implemented 1st version of mangling incl selection dialog for the mangler.
Implemented a completely overhauled Demangler.

 * It now creates complete tables and not only single cells.
 * It can also can mangle complete tables as long as the required columns are contained
 * fixed #52
Add sample applications for Splunk adapter
INTEXT-22 - Polishing
Merge pull request #10 from leejianwei/INTEXT-22

# By Gunnar Hillert (1) and Jarred Li (1)
* leejianwei-INTEXT-22:
  INTEXT-22 - Polishing
  Add sample applications for Splunk adapter
new version for comoonics-storage-py
Migrated the hash to SHA256 from MD5
Changed the force notation to not look like an x component.
Merge pull request #1 from KellyBlack/black_dev

Changed the force notation to not look like an x component.
Merge pull request #24 from KellyBlack/black_dev

Black dev - Added images for the phase plane solutions to systems. Made several small changes and added the clicker quizzes.
minor changes on forceoscillations
minor changes on forcedoscillations
minor changes on solvingSystems
fixed the conflict
minor changes on solvingsystemsII
minor changes on SolvingSystemsIO
fix the conflict
minor change on traceDeterminant
minor changes introLaplaceTransforms
Merge pull request #15 from guangmingyao/yao_dev

Yao dev - merged from yao-dev
Merge branch 'yao_dev' into black_dev
added clicker quiz for the partial fractions lecture.
Merge pull request #32 from KellyBlack/black_dev

Black dev added clicker quizzes to the partial fractions lecture and added a couple of page breaks.
corrigido bug no cardAdapter
Specifying translation strings on core and templates/core
Specifying translation strings on core and templates/core
adding the first translations to spanish
adding the first translations to spanish
Doing correctly the setting up of LOCALE_PATHS on settings.py
Putting the setting up of LANGUAGE_CODE to env_settings.py/template and using it on settings.py
Merge branch 'master' into i18n

Conflicts:
	djangoproject/core/views/paypal_views.py
	djangoproject/templates/core/empty_base.html
i18n - no need to i18n these log messages
revert settings change
Ignoring .mo files
Helper scripts for i18n (I have trouble remebering commands :))
Added a string replace when exporting into a XML file to prevent XML corruption
holiday: fix typo
Site updated at 2012-09-15 17:50:42 UTC
Update GUI preview image
published post discussing elisp book
Added compatible since annotation for file reading
Started resource injection work
Merge branch 'resource-injection' into development
simple app
port

-b 0.0.0.0:$PORT
HM: add Getting Started instruction for the readme.md

git-svn-id: https://source.kii.com/servo/platform/sdk-mobile-client/androidV1/KiiCloudStorageAPIDemo@22469 e7cb0379-d053-0e4b-a1ac-43c7dbffadbe
first working functions, many parameters
Corrected a typo and added the missing test methods in part 3.
Rewritten part of the Json Server router.
Config\Php now requires 'php_ini' key.
Various fixes.
removing octopress favicon png
Tweaks
Fjern eventyrere fra hendelser i skogen + nye tanker
Update to using the nuget packages
Make base URL absolute
XML parsing for tours setup
Mise à jour des diapos : moteur de choix
test generation from markdown
add README
Site updated at 2012-05-22 22:35:19 UTC
Site updated at 2012-05-29 18:29:44 UTC
Remove templates from package list
Fixed mms bugs
GPG: add azelphur's helper eauth script for pidgin
ajax add to cart from category and search page (CPK-23)
change location for css and js files (CPK-23)
change path to js and css files in layout (CPK-23)
Atwix Addtocart beta 1
Added Atwix Addtocart extension v0.0.1
Revert "change path to js and css files in layout (CPK-23)"

This reverts commit f87864e44bc2404d08a6b379aa0948d6e0dcdc74.
Revert "change location for css and js files (CPK-23)"

This reverts commit 08e4a9c38821d0305d783983dc0f83d0e9c63691.
Revert "ajax add to cart from category and search page (CPK-23)"

This reverts commit 66cafdada13b010bbf03d792acf18126910364b8.
Merge branch 'atwix_feature/addtocart_v' into atwix_feature/addtocart
Atwix Addtocart: removed confirmation dialog, added onclick hide cart event, mark last added item
Atwix Addtocart: added scroll to top before mini cart block shows up
Class names fix for add to cart forms on product listing
Addtocart: increased show cart time, adjusted styles
Merge branch 'master' into atwix_feature/addtocart

Conflicts:
	app/design/frontend/carpartkings/default/template/catalog/product/list.phtml
addtocart: changed position of mini-cart block, and bg color of top element
Addtocart: changed mini-cart block position
Serve scaled images (MAGENTO-532)
Merge branch 'atwix_feature/addtocart'
Merge branch 'master' of https://github.com/ndap/magento
Merge branch 'atwix_hotfix/serve_scaled_images'

Conflicts:
	media/categories/icons/air-and-fuel-delivery-sm.png
	media/categories/icons/body-sm.png
	media/categories/icons/brake-sm.png
	media/categories/icons/cooling-sm.png
	media/categories/icons/driveline-and-axles-sm.png
	media/categories/icons/electrical-charging-and-starting-sm.png
	media/categories/icons/emission-control-sm.png
	media/categories/icons/engine-sm.png
	media/categories/icons/exhaust-sm.png
	media/categories/icons/hardware-and-service-supplies-sm.png
	media/categories/icons/hvac-sm.png
	media/categories/icons/ignition-sm.png
	media/categories/icons/lighting-sm.png
	media/categories/icons/steering-sm.png
	media/categories/icons/suspension-sm.png
	media/categories/icons/tire-and-wheel-sm.png
	media/categories/icons/tools-and-equipment-sm.png
	media/categories/icons/transfercase-sm.png
	media/categories/icons/transmission-auto-sm.png
	media/categories/icons/transmission-manual-sm.png
	media/categories/icons/wipers-sm.png
	media/cpk/brands/a1_generic_line_transparent.png
	media/cpk/brands/ba_generic_line_transparent.png
	media/cpk/brands/bo_generic_line_transparent.png
	media/cpk/brands/ce_generic_line_transparent.png
	media/cpk/brands/de_generic_line_transparent.png
	media/cpk/brands/ky_generic_line_transparent.png
	media/cpk/brands/me_generic_line_transparent.png
	media/cpk/brands/np_generic_line_transparent.png
	media/cpk/brands/rb_generic_line_transparent.png
	media/cpk/brands/si_generic_line_transparent.png
	media/cpk/brands/tm_generic_line_transparent.png
	media/cpk/brands/wk_generic_line_transparent.png
* config ui * cleanup #16
added clear to bottom of user archive lists
added underline to all links
made menu colors more consistant
got rid of heading conflict
got rid of very_big_font_size
clear works better is display:block
made entry nav styles more clear
got rid of table of contents styles
made .entry-meta not have styles ~ items inside should have styles
New ITR 1.6.0 version without TestFlight.
Redirect to ss subdirectory for ipa listing.
Make buttons visibly disabled during save.
Merge branch 'html5' of github.com:oerpub/oerpub.rhaptoslabs.swordpushweb into html5
fix unicode saving issues
Update package to support isopen status

This is being used partly as a way to detect if the client is running
against an old version of CKAN (< 1.4) but will be compatible
with future CKAN versions.
Provide compatability with CKAN 1.3 and newer versions for RSS feed link

This is a small hack to check for the version of the CKAN
API to determine the correct URL for the package/dataset RSS feed.
Added more description text to map
p4wifi: add in 3.1 kernel and associated changes

-change wlan interface
-amend props
-change tty interface
-disable voice_capable
-remove libarccamera, libseccamera_jni and libseccameracore

Change-Id: If1fa3f63b44b1fba37000cfee1dd0be43d798861
Site updated at 2012-07-17 14:39:40 UTC
Add several indexterm entries after comparing with the ones in http://www.jus.uio.no/sisu/src/free_culture.lawrence_lessig.sst.
Add several indexterm entries after comparing with the ones in http://www.jus.uio.no/sisu/src/free_culture.lawrence_lessig.sst.
Update to current version.
domain name?
nicer
cleanup startup piece
Update experiment descriptions.
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/ehrenwoertlicheErklaerung.tex
Unterschriften
gallery gone
unteraufgaben 1, 2, 3. rest später. jetzt wird gesuchtet.
cast geändert
Merge pull request #16 from Corbomite/master

Aufgaben 4.1 #11, 4.2 #12, 4.3 #13
moved mattizer filter to the correct location
source is a link
Merge pull request #4 from nermin/master

source is a link
zoom out location map
Almost final for today 7, hopefully
Update BoardConfig.mk

bt init
Added module description string to description API
Corrected spelling error in README.txt
Merge pull request #9 from rcordovano/master

Added module description string to description API
mend aboutme - my github
fix device create on OMX offloading remote processor driver
removed rightclick on canvas
initial commit
first commit
test
test
Change History to CHANGELOG markdown
Merge branch 'master' of sk8erwitskil/android_bootable_recovery-cwm6
t
Merge branch 'master' of https://github.com/victormalfait/INSSET-AIRLINES-GROUPE-3.git
installation du poste
Experimental SVG support for IE
RT <references> as well as </references> tag.

* Fixes RT diff in en:Standing Sushi Bar.

Change-Id: Ia05f9d01503e3003260a10663d1dd845a261beab
Merge branch 'master' of git://github.com/yblee85/simple-couch-backbone-examples

Conflicts:
	terminal-installer/attachments/company management/company management.js
transaction tmp change for voucher data
BOEM.
t100k: don't use hostapd
Update notes for submitted changes

* mm-audio: compile for CM and allow build for msm8960
Settings: correct kernel version display for all toolchains

The current regex assumes only one set of parethesis eg. (GCC)
many toolchains including linaro and googles gcc-4.6 eabi contain
two sets of them eg. (prerelease) (GCC) which borks the regex

This patch makes the regex less specific so versions built with any toolchain
should be displayed correctly.

Change-Id: I40de6b729c252e61953dfe1860a660a0e5b06b3c
Add preference for enabling root access (3/3)

 * Root over ADB is now disabled by default on non-eng builds
 * Requires support in su binary and adbd
 * Root access can be configured to use ADB only, apps only, or all

Change-Id: I132a35a31c676511db954ff19120fa6d3c795b23
Merge "Add preference for enabling root access (3/3)" into jellybean
Add an option to change the device hostname (2/2).

This adds an option to modify the device hostname used
in ip resolution. This is useful when connecting to the
android device in a dynamic dhcp environment.

Change-Id: Ibc145b74036617248d4f33c6866cc9c8a8cc8974
Add Modver to Settings.

Change-Id: I596064a80210517ff0dae30401f71b52adabd614

Rename modversion

Change-Id: I6557d5aa68a3ad00166cdd2b8951f425ad7800df
Added build date (ro.build.date from build.prop) to device info.

Change-Id: I5e19ee04de5c26822e171d4af8f4bfc052be9b74
Settings: Added cpu info and memory info to About Phone Settings

This is pulled from gingerbread. No code looked like it needed to
be re-done. This contains code from the following two commits.

shafty023<gameboy45@gmail.com>:
http://review.cyanogenmod.com/#change,1774

Keyan Mobli<persiansown@gmail.com>:
http://review.cyanogenmod.com/#change,1820

Patchset 2: Fix string constants
Patchset 3:
- Moved file paths to string constants
- Check for meminfo and cpuinfo files, if bad don't show preference
Patchset 4:
- Created variables for each operation.
- Wrote Long to print -1.
Patchset 5:
- Simplified and refactored
Patchset 6:
- Fix authorship herp derp
Patchset 7:
- Show only total memory, available memory would probably cause users to
  kill apps en masse.

Change-Id: Ib0550a5af515ae3a48481412c5c9c504cd80b743
Hide preferences not yet ported

Change-Id: I50d097ed4437a683088f2c9241b94a0643e727ca
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_packages_apps_Settings into dvt-wip

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml

Change-Id: I96637df0cc6b2edcfebd845e14b8d5ec0676064e
fix Merge conflicts

Change-Id: Iafb4bf6124e5a7372e5b62e0bf2dee27f515151f
remove branding
dutch translation (by SatKiekerd)
Clarifications for search form
Transition to CodeAuroraForum Camera
Unlock camera AWB lock only when white-balance is changed.

Camera: Add mode in Framework Structure

Move Camera.Sound to a stand-alone class CameraSound.

bug:5640219

Change-Id: Ibc105351e25b9758c451a94d9a5e50942bf0e926

camera: add custom camera parameters to hardware java file.

Camera : Framework changes for camcorder UI menu

Camera: Add support for wavelet denoise

Change-Id: I97be72615fe5909987ac430034bbdc16f2d20509

Camera: Add touch AF/AEC support in ICS framework

In, ICS the old touch AF/AEC functions getTouchIndexAf(),
setTouchIndexAf() etc  are no longer valid. Added new functions  to get
the center of touched area.

Change-Id: I37d00040f895cd8a4de2e2a438971aa2d9c1a045

Camera : Remove unwanted log messages

Change-Id: I14ab9f3a7b75dda7974a79d95d50f89e52c80fd2

Camera : Add support for histogram in frameworks

Change-Id: Ibf751c3b2d488f4be0afaaa3e994372bafeffbe7

Camera: Changes for face detection

Change-Id: I7b2172e8690d6e23762e42f5888fecbfda15ba61

StagefrightRecorder: Set intra-period to 2 seconds for video recording

Sets the video encoder intra period value to 2 seconds in
StagefrightRecorder.

Change-Id: Ic9fa16e75baa9aa8e90876f0558b3f2bdcfaa2b3

Camera: Add support for Red eye reduction

Change-Id: Iada280ac33aee8b1114dc40d8d79e0e47ad5c2fd

Camera: Add ZSL support in framework.

Change-Id: I4e863020d7d407d9c3936beb83dc7abf385c4654

Camera framework: Enable Preview CAF

Camera: Enable streaming texture and YV12 feature

Camera: Add frameworks support for high frame rate

Camera : Remove unwanted video resolution in Framework

- FWVGA, WQVGA resolution UI options are removed for camcorder.

Change-Id: If621140966b01dbc8c30a4d161e6771528b8adda

Camera : Enable FWVGA and WQVGA resolutions in camcorder media profiles

Change-Id: Iad9cc33f7b6d8eb7de21df372c016edeef0b99ba

Camera: Add support for burst count

Change-Id: I4488a5eac1eebb0b5c8e2cc7cbbe7be0c7301be7

Camera: Simplify ASD menu and best mode menu.

Camera : Macro definition change. PIXEL_FORMAT_YV12 to "yuv420p"

Why: CTS testcase is expecting "yuv420p" as the format string for YV12 mode.

CRs-Fixed: 328252
(cherry picked from commit 0a263f67b75497e4b95b9de8c370ed9496ab59ef)

Change-Id: I66f418a52775a969d81bcb332bbe500370e3ab7c

Camera: enable HDR feature

(cherry picked from commit e40770bbdadd925fc1e07a08249a15981b961570)

Change-Id: Ie9ca3066e8e53710bf292d047a3724aefc029854

Camera : Add API to find fullsize liveshot support

Change-Id: I3c2fc3578decbe5cf87fded5362f317df0b40b5e
(cherry picked from commit 65d80f04892776eec1c19c844eacb8c454b4bd1a)
REVERT to fix LED notification: Add ability to select whether the LED will flash
	+ some other stuff to get it working
Emphasis last updated rows and no double events

Fixed #8 making new rows bold; even though I made them in another colour
instead.  To make it work I had to fix #13 double events.
Clean up some properties

Change-Id: If8f09ef342ec29c3656389e5a7d3df770c7d8dd5
Move nesscomputing to debug as well.
Make tabbing consistent.
[maven-release-plugin] prepare release ness-log4j-config-1.0.0
"Clear all" button on recent apps

patch set 2: Add tablet layouts
patch set 3: Add animation :)
patch set 4: whitespaces
patch set 5: Scroll to the top before animating
patch set 6 & 7: Deal with home key

Change-Id: Iceb86eef41160f1c17e51463b37fd97e27acfb2e
code from helen

Signed-off-by: helen <helen@192.168.1.10>
removed

Signed-off-by: helen <helen@192.168.1.10>
last commit - remy
some change ....

Signed-off-by: helen <helen@192.168.1.10>
merge with helen
Removed weird foreign key code that breaks the project, and imho is unnecessary. Also add type to string code from more recent commit
Resolved merge conflict in ColumnModel.java
Removed foreign key cruft
sem start
Ameisenprogramm/.classpath geändert
Added Plugin to the 'New content element'-Wizard.
Updated PHPDoc.
Навіть не памятаю що я тут робив :)
all animations done
Added back since it is needed when pulling vendor files
Revert block change.
Revert "No https"

This reverts commit dfad7a1a868bdeea355c8b804da200c1cf14bbe6.
Switches to singleton triple helper.
update to latest cm7 git

Change-Id: Ibc1b05da6b9c1d223bbc2ece69da07d269a1d473
Updated README
Added explanation for local maven dependency.
Some cleanup.
Make the n-weight computation much easier to follow.
Some clean up.
Normalize image channels.
Allow hiding the strokes.
Tiny tweak to make default font look better on non-OS X systems
Got the debugger to only be active when I want it to and added some html for a few pages
Point to the Latest Shared Repo Commit
Merge pull request #124 from bhariharan/bugfix

Point to the Latest Shared Repo Commit
Fixes: #1153 Scalix plugin must have schema files for LDAP
Fixes: #517 create a plugin to manage puppet node
colocando o nome do model como objeto
Readme
S
Stripped newline at the end of the configurtion lines that made the purge function not to work properly
added synonyms spice plugin
created new branch synonyms
removed comment, explain in pull request
fixed checking existence of nouns/verbs, tweaked perl trigger to match movie.pm
created abstract function to handle all forms. is it me or is it dry in here?
fixed up perl trigger to tell js what mode we're in
added bold to subheadings
forgot to rename abstract function..sorry getty
replaced eval function and added search term to heading
updated ABSTRACT in perl trigger and matched rq term with moollaza's commit
fixed function names to add bighuge
Finished BigHuge Spice Plugin:
  -- BigHuge.pm:
    --> allows for "to" and "for" in query. Eg. 'Synonyms for car'
    --> fixed ENV variable in spice to =>
  -- spice.js
    --> refined _similar and _related functions -- now falls back to synonyms if no related/similar words returned
    --> fixed 'More at' link, properly replaces trigger words from url
fixed merge conflicts
Merge branch 'master' of github.com:duckduckgo/zeroclickinfo-spice into BigHuge
Merge pull request #38 from duckduckgo/BigHuge

Fix Original BigHuge Commit
fixef callback function in spice to =>
Fixed BigHuge.pm -- added {{callback}} to spice to =>
Removed br at the end of abstract -- can accomplish that internally,
Fixed a couple _bighuge_ typos in spice.js, corrected to _big_huge_
Merge branch 'master' of github.com:duckduckgo/zeroclickinfo-spice
added checkbox to tt_overview that enforces the user to toggle between getting "all/bokkable only" TimeLogs shown
Build script I use a lot as it saves time
Branding in my build script
Introduced a Server monad that wraps the server's state
Now handling CallStop and CastStop
Merge pull request #13 from rodlogic/master

Introduced a Server monad to wrap the server state - thanks @rodlogic
Revert "CORE-3323 and CORE-3493: fixed the build number displayed in the help-about screen"

This reverts commit c6e2575797554080e72eb723efdb44f8f24ab342.
CORE-3323 and CORE-3493: removed some unused dependencies
Read file correction
Change :
Changed version number to 1.9.12
Message :
added script and icon
Added my name to hack night list
Merge pull request #1 from fonnesbeck/master

Added my name to the list for Dec 19
jorendorff's in
Candidat Test
Merge remote-tracking branch 'origin/master'
Preferences: Show/hide homescreen icon labels

Change-Id: Ie61613653f0f0dc5b94362c7f36298bee54cd40a
double readme fix
double readme fix
-Projekt Projektaufgabe1 erzeugt
Made signing part of the deploy phase
MCPatcher color experiments, misc
Created responses with some blocking elements
Animate shelf to make it prettyl.
Hide battery text color options till I have time to revisit it
OSMM-11: css and images are moved into templates
I have lambdas now!
first commit
Merge branch 'master' of github.com:remialvado/boilerplate-request-response
Moved pm to modules directory
Rebase from 'release/theora_image_transport' @ version '1.8.9'
Generated debian files for quantal
Rebase from 'release/image_transport_plugins' @ version '1.8.9'
Generated debian files for quantal
Slight documentation changes
FEATURE: Add quick links styling
add storeId field; ignore virtualenv in .gitignore
fix uploading of unicode filenames without tags
Merge branch 'fix_unicode_uploads' into develop
Correction de la creation de ping. Maintenant completement fonctionnelle.
Second pass at the Media Services Admin pages
fixed keylayout.
compare is
add some newlines to get a better markdown output
Corrected the threshold
Merge pull request #350 from apepper/tz_autoselect

Autoselect "local" timezone.
removed phtml template files from phpcs tests.  Not worth it.

[ci skip]
Minor color/size changes
ENHANCEMENT: Use Config layer
updated a bug fix
API now automatically points to correct protocol version.
Tamir added textile pages
Fixes links to contribute page
Tamir added mongo link
Work on MovieSetsView
cleanup/update bayer libs/fix battd path error
Update notes for submitted changes

* Finishing mdpi transition
BoardConfig: allow flashing of p3110 builds on p3113

Change-Id: I569e305ad811785328ad037ce80c010f8272ab5d
Update notes for submitted changes

* (mach-tegra: clocks) & (sound: soc: tegra): fix playback with screen off
forgot to include cpufreq
visual studio 2012 프로젝트