labofsahil/github-event-dataset-2012 huggingface dataset:
We should now be able to update an adapter's config
Added test.
Refactored more cleanly.
Merge pull request #575 from futuraprime/OTA-location-hotfix

id:1225 comment:Should now be able to update an adapter's config
Removing adapters from the develop branch.

Revert "Merge pull request #563 from futuraprime/adapters-setup"

This reverts commit 256581ea6696c68bb528b8df992b8aadf7f22f18, reversing
changes made to 8349c2dc8f9ef411e587fdee2afd68da8616001e.
Merge pull request #578 from futuraprime/develop

Removing adapters from the develop branch of Mulberry
Merge remote-tracking branch 'origin/develop' into release

Conflicts:
	app/mulberry/app/DeviceStorage.js
	spec/app/mulberry/device_storage_spec.js
Revert "Merge remote-tracking branch 'origin/develop' into release"

This reverts commit 39d5eaece21d1cf92873a03597101f5e10b801ca, reversing
changes made to da45fc81effc41fae7d35156e89b5a9b53a298bf.
Merge pull request #578 from futuraprime/develop

Removing adapters from the develop branch of Mulberry
Conflicts:

	app/mulberry/app/DeviceStorage.js
	spec/app/mulberry/device_storage_spec.js
re-add query string to AppConfig.js so it gets generated correctly in preview
Merge pull request #579 from mrdanimal/b-preview-kludge

re-add query string to AppConfig.js so it gets generated correctly in preview
Merge branch 'develop' of github.com:Toura/mulberry into develop
Site updated at 2012-09-18 16:16:21 UTC
Update pod in App::Notes
Merge branch 'master' of github.com:throughnothing/App-Notes
v0.005
Convert all errors to execeptions
* AudioEngine should not only check if we have a prev/next result, but also if it's playable / online.
* Don't ever accept invalid results coming from resolvers.
* Fixed crashes in DbCmd_SetPlaylistRevision.
* Indicate invalid PlaylistEntries.
Don't prompt for auth for your own accounts.
* Split up CTOR and setSource methods.
* Split up CTOR and setSource methods.
* Use new Recently- Played/Added -Model's API.
Squarify no-source SVG and add SVGs for album, artist and track placeholders for grid view
Don't need this anymore....
Show spinner for an account while it's connecting
Removing IDE specific files, these don't belong in the repository.

Signed-off-by: Omar Gonzalez <omar@almerblank.com>
Adding .gitignore file so IDE files aren't accidentally added to the repository.

Signed-off-by: Omar Gonzalez <omar@almerblank.com>
Changed the running property to a private variable with a getter to make it read only from outside of the class's scope to prevent someone from manipulating this attribute that should not be used outside of the P2PGame class.

Signed-off-by: Omar Gonzalez <omar@almerblank.com>
Added an event handler for the disconnected net status event. P2PGame now dispatches a Event.CLOSE when the connection has been severed.

Signed-off-by: Omar Gonzalez <omar@almerblank.com>
Cleaned up constructor.

Signed-off-by: Omar Gonzalez <omar@almerblank.com>
Fixes a bug with UserList that throws a run time error if code calls the P2PGame.close() method immediately after a connection has been established. Without the if wrapper to the NetConnection object the call to groupAddress getter throws an error.

Signed-off-by: Omar Gonzalez <omar@almerblank.com>
Removed the IRealtimeGame interface while I refactor some of the P2PGame methods. Refactored the sending mechanism so it can be replaced in a P2PGame subclass with customized messages sent to the peers. Refactored the client object to a P2PGameStreamReceiver that can also be customized in a P2PGame subclass to create a customized client with additional game methods. Reduces clutter of methods in the P2PGame object.

Signed-off-by: Omar Gonzalez <omar@almerblank.com>
Added an optional Class parameter that can be passed into the P2PGame object to add a custom client to the NetConnection object. This argument allows you to create a custom client object that can receive and send remoting calls from FMS as well as send class mapped objects over the established RTMFP connection. The Client constructor must accept 2 arguments, first a NetConnection object, and second an EventDispatcher to listen for events dispatched due to callbacks executed on the client object.

Signed-off-by: Omar Gonzalez <omar@almerblank.com>
Added a getter/setter for the group name. Commented out the join() method in the onConnect() handler. Going to refactor this so there is an opportunity between the NetConnection.connect() method and the P2PSession object creation to retrieve a group name from somewhere asynchronously.

Signed-off-by: Omar Gonzalez <omar@almerblank.com>
Added a groupName to the join() method. You now have to call it after establishing a connection with connect(). This gives you an opportunity to his a server side script on PHP, FMS or whatever to get the name of the group you want to join the NetGroup to.

Signed-off-by: Omar Gonzalez <omar@almerblank.com>
Connecting the RealTimeChannelManager after the group has actually been connected. Part of the refactoring to have a window between NetConnection connecting and the peer group being started.

Signed-off-by: Omar Gonzalez <omar@almerblank.com>
Merge pull request #2 from s9tpepper/master

Bug if you call close on P2PGame right after connection
De Movie class wordt nu gebruikt door zowel Core Data als de API!
Fixed compile error
introduced alert view for possible errors in the core data stuff
Small fix for issue #17
Site updated at 2012-12-31 04:55:18 UTC
use the full class name for publishing events
bring everything up to aokp's framework for now!
update spyder.mk
fixing adjacent log line edge creation
spec and build jtk validation module
removed _cache and _site
New sample app

Added a sample app (lists/things)
- Allows users to sign up and keep lists

Modifed baseUrl to be baseURL everywhere
#1
#1
Em construcao
sigo poniendo todo a tu merced..
間隔
Created base infrastructure for API calls
Updated with first cut of API
Merge branch 'master' of github.com:unepwcmc/carbon-benefits into master-new

Conflicts:
	app/models/layer.rb
	app/models/work.rb
	db/schema.rb
Add layer creation migration
minor improvement to saving the layers
added extra mime types for zip files, as Windows complicates things a bit
started work on geo entities auto complete
Merge branch 'new_design' of github.com:unepwcmc/cites-checklist into new_design
the api had an issue where overridable programme settings were being overridden with nulls instead of using the default value. this has been fixed along with some other minor bugs
Merge pull request #92 from unikent/refactor/api-fix

further api fixes
Add multiple checkbox support (initial version)

There are some flaws with this implementation, but it does provide the requested functionality on a basic level. (tested in chrome)
picsupload
Merge branch 'master' of https://github.com/unknownArtist/petmatchup
fix
better
Added some useful functionality to the Program class (e.g. computing
program size partially).
Fixed logical errors in crossovers operators, they didn't preserve
maximal number of points in programs.
Added unit tests. Changing version to 1.0.6

Signed-off-by: Tomasz Kamiński <kaminski.tomasz.a@gmail.com>
Datadefs for embedded samples
Merge branch 'master' of git://github.com/uwcms/FinalStateAnalysis
Added hackish script to rebuild everything including libs and fursuit.
initial commit
remove .pyc files
Merge github.com:vanjoe/weather-indicator
No throw exception when pb with datestamp on vfs implementation ...
Merge branch 'esup-filemanager-portlet_1_0'
first commit
Initial commit
first commit
Merge branch 'master' of github.com:viktorMarkevich/stimulus
Merge branch 'master' of github.com:viktorMarkevich/stimulus
added pratica, aggiornamenti, scadenze
Site updated at 2012-11-30 10:20:56 UTC
Actualización menus - Un único VC - Antes de la eliminacion de SopasViewController
New SequenceSolution
some Makefiles added
Minibar: Remote Libraries fix
cam props
Update browser history only on blur or when the mouse is moved.
Added spider for esquire.com.
handle HTTPErrors via RestError.__call__()
organized files
updated page scraping code (to reflect changes to source HTML)
switched to grunt-simple-mocha
widgettizzati blocchi homepage
Added the illustration for the introductory area.
2012/5/10 12:30
ChartPortleg -> ListPortlet
Finished Android UI
insert and delete records updated
+增加线程同步条件变量
+添加线程池代码
Revert "Revert "Removed call from general ViewController""

This reverts commit 345b85444897898feed747df73063c4d96b8688c.
Merge branch 'master' of https://github.com/whiteTeam/iHappiness-iOS
Merge branch 'master' of https://github.com/whiteTeam/iHappiness-iOS
Merge branch 'master' of https://github.com/whiteTeam/iHappiness-iOS
Added DS_Store to .gitignore
Merge branch 'master' of https://github.com/whiteTeam/iHappiness-iOS
Added icon and MVYToast to the project
LoginDAO connect with basecamp API
Now the login screen shows the logo and perform complete login
Let TextContentTest extends MediaWikiLangTestCase

There is signature expansion, which fails on $wgLanguageCode = 'de';

Change-Id: I827693a9f872219b983c62f4d3483e67ed9e8a2f
Merge "Let TextContentTest extends MediaWikiLangTestCase"
Localisation updates from http://translatewiki.net.

Change-Id: I857041254a52acb1ba791211048840168c120384
Merge "Localisation updates from http://translatewiki.net."
No more photos link
Películas y juegos
opdracht sentinal opgelost
Modify build.sh to ignore .git rather than .svn
Update lib/namespace.js

https://github.com/LearnBoost/socket.io/issues/1093#issuecomment-10889859
Site updated at 2012-06-26 04:42:57 UTC
Add link to node-ktoblzcheck on the frontpage
added carousel and transition js for slider
Works with idlex. Commit before testing with idle.
Site updated at 2012-12-13 16:25:42 UTC
AdSupport.framework added
error fixed
fix: do not to process hwstate until all touches not changed or button not triggered.
Merge branch 'fix-elantech-split-packets'
add sliding mode for swiping
Merge branch 'add-sliding-mode'
fit template in TFR style
gitignore, require 4.2.6, invoke_vaarg
Removed red dots while waiting.
Add what.cd support.
update decision_tree.py
Merge branch 'master' of github.com:zengkui/machine-learning
Fixing links to Grails lib & Michael Pangopoulos profile
Merge pull request #1 from leggetter/patch-1

Fixing links to Grails lib & Michael Pangopoulos profile
Update sample activity files

- Update sample activity files.
Merge from 'expression-graphing-test'

- Merge from 'expression-graphing-test' branch into
  'expression-graphing-staging' branch.
添加压缩处理
考虑session未发生变化时，不执行序列化动作。问题是，如何判断session是否发生变化？
增加session是否发生变化的检测，未发生变化的话不写出。
增加BaseService
created and tested the form processor class ajax script form submitter and submisison displayer and a function in the form class to append inputs to form instance
changed player hit box, now incorporates head
soldier moves
Rewrite array filter and map properties
renamed game.js to gapiWrapper.js
Adapted quickstart guide and started to document thirty.ini.
Added Bootstrap
Merge branch 'master' of https://github.com/7Liter/Skill-Challenge-SW
corrected readme information
fixed typo
Update notes for submitted changes

* Added option to select location of saved videos / photos
Update notes for submitted changes

* Camera: fix crash on restore preference
Update notes for submitted changes

* Camera: Hide storage option if device only has one storage
Changed permissions of aokp_saga_defconfig;
add my tuna and toro
added tab fix to swipe
changed email link text to be email address
added text shadow to selected tab
fixed links looking funny on print preview
changed home
changed <ul> to <nav> in header
Fix #221

Test value :
http://fa@^ c$éb&o\o+k.c"o'm[1-9]/1.*
Changed some minor errors
Started working on the heightsystem
Fixed a heightmap and fixed the 3D collisions so they work properly
change of get data form
Added a new class for a third color/to show few hues, many values. Changed on the navigation bar from main color to thirdColor. This allows the user to see which page they are on and not confuse them being the highlight color of the links. Also updated the imgSize class to add a border radius of 5px. This will help tie in all the images to the UI.
update y.a.r.p.p
Removed references to defunct attribute "us_homemail" (closes #3052)
Merge pull request #479 from eguaj/3.2-A3052

Removed references to defunct attribute "us_homemail" (closes #3052)
Added the bin folder to the ingore list.
Removed bin folder from ignore list
Changed types to reflect new Database architecture.
Added the RaveRadar.dll file to the ignore list.
Added the compiled RaveRadar.pdb file to the ignore list.
Checking in bin files.
Fixed the name of the primary ID from FacebookID (old) to VenueID (new)
Updated the type to match the new database architecture.
Updated field names to match the new database architecture.
Releasing.
Made some changes that were missed when trying to convert field names to the new database architecture.
Updated the code and renamed fields in line with the new database architecture.
Finished converting the project from the old database architecture, to the new one.
TST-1 testing http access to repo
Modifying the user index and show pages.
Changed Controller and Model names
Updated readme with information about caching and performance
STYLE: Updated xml files to point to Slicer version 4.1 wiki pages
Merge branch 'master' of github.com:dmwelch/BRAINSStandAlone
Merge pull request #58 from dmwelch/master

Updated xml to Slicer 4.1 version documentation
Changed underline link colour from yellow to green.
More mapchanges
Merge pull request #701 from Iberis/master

Antiqua
San check for rebuilding zones.  Just crashed the server.
Voici les infos
Initial snapshot commit of VRay buddy
Added vray subdirectory to build
Merge remote-tracking branch 'upstream/master'
Fixed an issue where the particle count would be incorrect when converting
from emp to bgeo.

The fineTileCount function was used to determine the tile count, this
appears to be incorrect, doesn't include all particles. Changed to using
the block_count function in block3_array3f.
Removed String in Src
REGISTER ALL OF A HELPERS/LIBRARIES FUNCTIONS

TWO NEW CONFIG ARRAYS TO ALLOW A USER TO REGISTER ALL THE FUNCTIONS OF A
HELPER OR LIBRARY JUST BY INSERTING THE HELPER OR LIBRARY NAME IN THE
ARRAY
changed how one passes 2 params in the comment create method
removed binaries and dist folder
Merge pull request #17 from Celdecea/master

Added griefed status; fixed Kizantium/Columbia road.
Merge pull request #18 from Celdecea/master

Added Valenwood and Agraria and temporary road.
Adjustments for Valenwood portal and associated road.
added Create Response
Merge branch 'master' of github.com:HeadspringLabs/WebAPIContrib
initial spike of create response
added support for seting a location URI to a Create response.
removed dead code from tests
rought cut on setting location headers for CreateResponse in a strongly typed way. This is by no means the final version yet, as it is hard coded to work only with a route called 'Default'
removed ContactManager from solution that I added by accident
Added ApiController extensions for common responses
removed "visa", because we're using a passport.
Merge branch 'master' of https://github.com/CitsLabs/AgileFluencyTest
Criação de Teste BDD
Added remote jquery.
- upload.pl: support HEAD requests + redirection of them
BUG Fix: Chest collectors repairing items with high damage
* Block bags were casting damage to (byte) causing value wrap
* Updated all block bags to int for damage value
Fix edit reservation overlap with the edited reservation
Minor style change
Merge branch 'master' of https://github.com/DDropinski/Serveservation
Заливка новых картинок...
testing git @ eclipse
excluded app.ui.MySelectionsFormController
 from All users Permission . 
Rewrite levenshteinDistance function in order to match a list of terms with an ontology and generate mapping result
in excel sheet in which the first column is the list of original terms, the second column is the list of ontology
terms that are mapped with, the third term is the list of ontology term Ids and the last column is the similarity
score between original term and ontology term!
tiding up ...
just synchronizing
corrected name CatalogueTreePlugin, produced problem in header. 
Exceptional default values. needs revisiting . 
test 
Merge branch 'master' of https://github.com/antonak/molgenis_apps.git
pull from despoina
change the levenshetin class so that it can create multiple mappings for one term as long as the mapping gives a score higher than the cut off
Merge branch 'master' of https://github.com/ChaoPang/molgenis_apps
yes
yes
yes
yes
yes
yes
Merge branch 'master' of github.com:DartHackPrague/dart-music
Fixed Target/Focus change bug. TOC 1.01
png in readme.md
font link speed adjust
Start converting unit tests from jasmine to mocha
- mocha
- chai.js
- sinon.js
Added browser, cli and config specs
Started file-list.spec
Getting the css config right
Updater for 2013
git gc --aggressive only cleaned up 4 mb of disk and took 7 minutes to run.
It doesn't seem to be worth the (admittedly small) time penalty.
ifq: Use ifq_set_maxlen for ifnet.if_snd
sctp: Don't test ifq_len against ifq_maxlen; let IFQ make the decision
ip6: Don't test ifq_len against ifq_maxlen; let IFQ make the decision
ifq: Move ifq_set_maxlen declaration to the declaration code block
Tkinter - Hello World example
filtering points
Merge remote-tracking branch 'origin/master'
alternative patient pickers
Drop down patient, pat info in mainview
newuser validation added (git name error)
Allow an optional dollar sign at the beginning of the bid amount. Fixes #73
Merge pull request #75 from ElementalAlchemist/dollars

Allow an optional dollar sign at the beginning of the bid amount.
Zusätzliche Beispieldaten für zweites Fahrzeug im Profil aufgenommen
Fix: SeatHeater heißt Sitzheizung
Rename brief overview
Updated the recording/replaying capabilties to bunnybot version
imagens da visualização adicionadas
Allow stickman head to go through everything
Reset particle flags in create_part
fix compression during fusion

Conflicts:

	src/powder.c
Only create one NBLE particle for each fusing H2 particle
Completely remove SING formation from fusion
fix dynamic static content
Solve the queryHex bug. Few adjustment on displayHexs.
Merge branch 'master' of github.com:FreezingMoon/AncientBeast
Fixed #159 . Added Scoreboard at the end of the game.
removed trailing whitespace, so that the line would be really really empty
This is the first 20 of the Problems that I have redone with some others
Repaired Broken Path in repair rgi.
Supressing some errors for now.
We can decide against this later, by adding file checks, which is extra io.
I prefer we add our own error handlers for these major issues like file read and write failures.
hotfix
hotfix
Merge pull request #460 from GetSimpleCMS/hotfixes

Hotfixes
Cell border for linux style
Merge branch 'develop' into feature-uberAmazingThing

Conflicts:
	program.txt
More amazing added
Fixed tiny but bad syntax error.
implemented infobar which shows: current page, result count and username if presented
Tutorial.cs
Merge branch 'master' of github.com:Haseo/Electric-Potatoe-TD
Changing project to Release
Update Forms in CMS
[improvement]Remove Contacts.xml
This file is created by the application itself.
Added headline for screenshot in README.md

Added a headline for the screenshot in the README.md file.
GPU working
GPU Working
lynda resources styles and logo on ic
Typo.
Add tests for hashchange and popstate events, fix bugs related to it, closes #2.
Set timeouts.
Fix tests in the file protocol.
#5 done
Merge pull request #6 from fitil4e/master

alabala
sic Usage
        $("#slidesContainer").googleslides({
           userid:'108064384905305757851',
           albumid:'5672395025442218017'
        });
corrected homepage in package.json
Result page added
Merge branch 'master' of https://github.com/JeppeKnockaert/Knelkiezer
Merge remote-tracking branch 'origin/master'

Conflicts:
	examples/Canvas/Traffic light.kt
	kotlin.web.demo.server/static/canvas_helper.js
	kotlin.web.demo.server/static/components/converter.js
Send errors to client in one format
Change examples and help structure: one list for example with args and runner from help file
Update kotlin version
Add getUserName method for server
Js refactoring: implement MVC at js part
Js refactoring: delete redundant scripts
Change version of applet
Changes in API. Fix tests for js
debug map painting
stop player's jump when he's touching a case
add somes images for player drawing and windows icon
add game file (use to start the game)
improve player jump
main prog is changed
change map cases
menu/functionmenu.cpp

debug menu
debug menu
fixed a bug in head.py where a video without any likes results in an IndexError
fixed a typo. ._.
fixed more typos and resolved a divide by zero error
C++0x selected as default compiler.
accueil recette clickable - added ingredients to recette + preparation text
Changed path to allow for ECE 375

Since I had issues with the USB driver and avrdude in windows 7
under bootcamp, I decided I should get the whole avr toolchain
working under OS X instead. It took a little bit of work, and
one of the big changes involved installing software in various
places. Hence, that path changes.
Large scale vimrc editing

In truth, I should have probably done a series of smaller commits
with the goal being to not make so many wholesale changes. Still
here's a list of the big ones:
- Lined up the comments.
- Removed omnicompletion since I wasn't using it.
- Altered my python specific options.
- Removed automatic spellcheck.
Something with netr that VIM did automatically.

No idea why it did this but hey, it must know what it's doing
right?
Initial Push from AOKP for Jenkins

Change-Id: I0a6a246207ddbccf026ab9c02ec050aa44c55fd7
SuiteView/MainView hinzugefügt
Adding mail-mta/ssmtp-2.64
modif
Merge remote-tracking branch 'origin/master'

Conflicts:
	message.php
nova: add nova-api-metadata service

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
新的后台主页
Revert "更智能的题目搜索"

This reverts commit e30b7db0136603c0ab7d99567c07eb79633ebe81.
back
old versions added
Chrash fix due to missig label for uploading config file
Water temp Warning
Added '(owned by <name>)' to shop infotext
Now LCD work with CWM.
forgot changes =\
added another algo to the not covered ones
fix relational diagram
Typo
Merge pull request #48 from Ragnar-F/patch-8

Typo
Added unit tests and more work on saving regions
Tweaking the names, adding unit tests
Updated for version 0.1.3
Minor tweak for finding postgres
support for Nemo icon & startup scripts; preliminary sdist_fedora support
fixed src control filed
Merge branch 'master' of github.com:MarcoCecchi/org.glite.wms
fixed path of pc file
fixed model.edmx not being able to open since 2011 CTP.
Fixed build issues after merging FEAT-3779-Skin_engine_enhancements
moved agents into the tvcontrol project.
deleted a few dead classes.
Merge branch 'EXP-TVE3.5-PREPARE-MERGE-FOLDOK_SEBTEST' of github.com:MediaPortal/MediaPortal-1 into EXP-TVE3.5-PREPARE-MERGE-FOLDOK_SEBTEST

Conflicts:
	TvEngine3/Mediaportal/TV/Server/Mediaportal.TV.Server.sln
	TvEngine3/Mediaportal/TV/Server/SetupTv/Sections/CardDvbS.cs
added first version for transifex support: a few batch files, for a suggested workfow and a XML Transform file, thx to arion for that
added correct filename
added pull script
added pull scripts
added transform for Android to MP2 - thx to arion
moved some files
delete old file
cleared transifex config again
moved texts and scripts
first commit of TransifexHelper utility: allows to push templates, pull tranlations and trasforms automatically from MP2 to Android and backwards
added cache
removed obsolete language file
updated transifex project
moved scripts, examples and workflow to docs
added new scripts to push and pull
added more console output
minor reworking
after push
added example to push single translation to Transifex
added german wheather translation to Transifex cache
separated push/pull from transformation
Added NativeMethods, COMHelper and FilterLoader to load DirectShow filters by filename only
Changed TsVideoPlayer to load TsReader.ax via filename
Added hover styles, added a better font-stack for other operating systems, and improved the unread notification styles.
Merge pull request #6 from Subcide/master

Style updates
Removed unlisted interviews from bottom nav
Added test project

Example test project.
Small fix to model transfer
Fixing model transfer
Adding data dump command to support import into new ModelSEED
Fixing dump to files.
Fixing data dump.
Fixing bug in dbdump
Rename & refactor ObjectManager and PersistenceAPI

Renamed ObjectManager and PersistenceAPI to reflect
how each class functions within the framework.

PersistenceAPI => Store::Private
ObjectManager  => Store

The interface to both classes is nearly the same, with the exception
that Store requires user authentication upon initialization, while
Store::Private accepts a "user" as the first argument to each
command.

Most operations should make use of the Store class, and save
Store::Private for very "internal" things that cannot be done any
other way.
Reglage EU
Merge branch 'master' of https://github.com/MonksRevenge/monksrevenge.git
Edited TimeRule.java apply method to use Calendar's day-of-week numbering convention instead of Date's convention.
Merge pull request #160 from aglaine/master

Edited TimeRule
Changed days array in TimeRule.java back to Monday->Sunday order, and edited TimeRule.java apply method accordingly. Also fixed a bug in TimeRuleViewerActivity where Sunday listener would listen to Saturday button.
Merge pull request #161 from aglaine/master

Edited TimeRule and TimeRuleViewerActivity
remove rule for real
Merge pull request #162 from WhatAdun/master

remove the filter for real
JavaDoc'd Location
ForecastData JavaDoc'd
Added a few comments to Notification
Minor comment changes to Location
Fixed the bug where every filter autocreated a notification whether or
not it passed.  
Added getUnits method.  I didn't know what the units for everything
were, so some of the fields are blank, but it's ground work at least.
apparently made changes to filtersActivity but don't remember what ...
Merge pull request #168 from Tim727/master

layed groundwork for confirmation dialogs for deleting filters
tweak scheduler settings to produce lower CPU load
Merge branch 'master' of github.com:Craig-Macomber/WeatherOracle
fixed apply for TimeRules - Filters should pass for all ConditionRules but only atleast one TimeRule
some changes to conform to PEP8
Added backup/restore knife plugins from https://github.com/stevendanna/knife-hacks
adjusted speaker info
Updated _posts/2012-10-25-able-sentry-questions-test.md
killstreak locale
a - Drops class, f - commands now work, ud - Factions (1.7.x)
+const sur certaines methodes
Tweaked the counter style (no shadows, brighter colors).
Add nightly.sh
Merge branch 'experimental' of github.com:OpenBEL/openbel-framework into experimental
remove the "registration not open yet" note
More Playing with COnfigs, ksatta and b5xx defconfigs should be best.
Final commit for release :D
Logging info about loading item storage
Core/talents: correct cost of  Dual talent specialization

- cost has been reduced since 4.x.x, from the original 1.000g to the new amount of 10g
thanks to: Defrag & Nevan

Signed-off-by: Bootz <bootz@projectskyfire.org>
DB: Removed none existant spell
Merge branch 'master' of https://github.com/ProjectSkyfire/SkyFireEMU

Conflicts:
	sql/updates/world/2012_05_02_00_world_spell_override.sql
2012年10月15日0:18:45
switch to specific revisions paralell with panopoly.
cm: Remove un-needed lines
changed event to first for test
config: build rsync

Change-Id: Ic88bb9848074b7ee87e3182f46fb1865d04f6033
APN/FIX: typo in german O2 apn

Change-Id: I2aac5e52b6f236ef652314b96510b6de2401b844
Merge "config: build rsync" into jellybean
Merge "APN/FIX: typo in german O2 apn" into jellybean
cm: add ville to lunch menu

Change-Id: I0799f72c7c4626d660665f2da6016a1985f183a6
CM: add d2usc target

fork: https://github.com/noobnl/android_device_samsung_d2usc

Change-Id: I57f795fe10217083b8f5a96e7f58cc7e52f8a996
cm: add evita to lunch menu

Add ATT One X/One XL device to lunch menu

Change-Id: I653d9aead47608f791be7f67a2ca6bf0be075e1c
cm: add jewel to lunch menu

Add EVO 4G LTE device to lunch menu

Change-Id: I0fc63f3fce2426c407fa3aca2a2bacdcd435000c
cm: New boot animation from Cameron Behzadpour

 * Promo video here: http://www.youtube.com/watch?v=ogp9f4_yEoU
 * It looks *way* better on a device, though :)
 * The animation is square, so the names have changed.

Change-Id: I8eebdf29a7d30632d75210a6d3975d7ea17d5246
pngcrush: don't print out an error on mv if optimizing fails

pngcrush is currently storing the optimized png in <pngname>.out.
If optimizing the png fails, e.g. on palette errors, mv can't
overwrite the original file with the nonexisting .out file and prints
out an error like this:

mv: cannot stat `./foo/bar/baz.png.out': No such file or directory

Writing stderr to /dev/null will suppress that message.

Change-Id: I0b7339392545e98586d66cc8ff8abf52c443f66f
cm: Add Quincy targets to nightly builds

Change-Id: I64b53565613642576a54cf12536d09cfe3e8575e
Merge "cm: Add Quincy targets to nightly builds" into jellybean
Revert Localized Carrier SPN Changes.

This patch basically reverts the changes done to spn-conf.xml here:
http://review.cyanogenmod.com/#/c/10038/ , which was then ported to
ics and jellybean branches.

The localized SPN function requires a framework change (Found here:
http://review.cyanogenmod.com/#/c/10037/), which is not
present on ics nor jellybean branches, effectively rendering the
settings useless.

Until the framework changes are present, I think it'd be best to
change this back so that users of these Chinese carriers will at
least have their carrier names displayed correctly.

Patch Set 3: Fix description links.

Change-Id: I12bcf308dd797ea7638327c33f9252a20894ad05
Merge "pngcrush: don't print out an error on mv if optimizing fails" into jellybean
cm: Remove quincytmo for now

 * Will return shortly.

Change-Id: I7b6d18e01d607888dba678ca401d4fdcc8cac22d
Merge remote-tracking branch 'cyan/jellybean' into jellybean

Conflicts:
	config/common_full_phone.mk
	config/common_full_tablet_wifionly.mk
	config/common_mini_phone.mk
	jenkins-build-targets
Building out reinforcements screen
R

SP
Addition and updation Test
Backbone.BindTo
===============

[Backbone.js](http://documentcloud.github.com/backbone/) extension for automatic binding and unbinding of model events to views.

### Features

#### BindToModel

In a lot of [Backbone.js](http://documentcloud.github.com/backbone/) applications when you want to react to __model__ events you have to write:

```javascript
window.UserCard = Backbone.View.extend({
  initialize: function() {
    this.model.bind('change:name',  this.renderName,  this);
    this.model.bind('change:email', this.renderEmail, this);
  },
  remove: function() {
    this.model.unbind('change:name',  this.renderName,  this);
    this.model.unbind('change:email', this.renderEmail, this);
    Backbone.View.prototype.remove.call(this);
  },
  renderName:  function() { /* ... code ... */ },
  renderEmail: function() { /* ... code ... */ }
});
```

With Backbone.BindTo you can just do:

```javascript
window.UserCard = Backbone.View.extend({
  bindToModel: {
    'change:name':  'renderName',
    'change:email': 'renderEmail'
  },
  renderName:  function() { /* ... code ... */ },
  renderEmail: function() { /* ... code ... */ }
});
```

#### BindToCollection

Of course, there is a similar method for binding to collection events:

```javascript
window.TodoListView = Backbone.View.extend({
  bindToCollection: {
    'add': 'renderNewTask'
  },
  renderNewTask: function() { /* ... code ... */ }
});
```

#### Remove

Backbone.BindTo automatically ```unbinds``` from all model and collection events when the view element is removed via ```Backbone.View#remove```.

#### noConflict

If extending directly ```Backbone.View``` bothers you. You can use the ```Backbone.BindTo.noConflict``` method. It  restores ```Backbone.View``` to its original value. And returns the ```Backbone.BindTo.View``` object which has the ```bindToModel``` and ```bindToCollection``` helpers.

```javascript
window.BindToView = Backbone.BindTo.noConflict()
```

### Installing

Just copy ```lib/backone_bind_to.js``` into your project. Or if you are using [CoffeeScript](http://http://coffeescript.org/) you can use directly - ```src/backbone_bind_to.coffee```.

### Requirements

```
Backbone.js - 0.9.2+
```

### Running the tests

Just open - ```test/runner.html```

### Contributing

Every fresh idea and contribution will be highly appreciated.

If you are making changes please do so in the ```coffee``` files. And then compile them with:

```
cake build
```

### License

MIT License.
Fixing file/folder structure
collapses menu to 3 lines now.carosel loading not fixed.
css.scss files organised under application. navbarCollapseWidth added. Footer addded. carousel text updated, images same size.
MySQL database for this ghost + OpenStats
升级瀑布流
fix loadStorage bug
Added cmake Findruuster-common to debian packaging
New concept. Shrinking cows.
Added Contribtor 94: @awr (Andrew) - Welcome!
added async one way integration test
Remove unneeded email option
changes to pythonSVG.py: additional function flower(), javascript update, editor update
run. failed
modifying code so it's similar to the python example
Clean up requires and decouple handler specs from server
* Integrated storescrapper tasks into Django using django-celery
* Enabled admin for the project
* Added scripts to automatcally run the necessary workers for celery
* Enabled visualization of tasks in the admin using celerycam
* Streamlined requirements.txt
* Updated settings with sensible defaults for django-celery
Fix: jquery not loading through https connection
SHL-6 - Spring Shell does not support "help"
modified project content
JSON Files are now in the repository
sstufpiousahdfp
File ready for EDIT

How to use guide will be added soon!!!
refactoring
Unexpected dependencies in MenuActivity were removed.
Limitted the filter search assignee field to just reviewers and above.
suppr bool inutile
Update Resources/public/base.js
Merge pull request #937 from netounet/patch-4

Fix js for collection field
update ca translation
Merge pull request #954 from kuert/master

update ca translations
Merge remote-tracking branch 'upstream/master'
add threadNumber into DownloadEngine
HTML file for google maps

sends latitude and longitude coordinates to  SimpleHTTPServer
MD5 culling was using a zero bbox. Stop that.
Use white when chat prompt colouring is off.
Add a default download location for Mac OS X; minor tidying.

(Info from Sixthly).
Store GUID and pubkey inside profile folder.

This allows for different profiles to have different GUIDs and pubkeys.
Regenerate GUID+pubkey when creating a new profile
ensure that ent->classname is always non-null (for entity numbers up to level.num_entities-1, and ENTITYNUM_WORLD, and ENTITYNUM_NONE), for player entities and #ENTITYNUM_NONE in particular
alter trigger wait timers a bit, remove duplicate code
allow maps to override buildpoint limits

note: this implementation uses the crappy write-cvar-and-revert-upon-exit solution
add a string-duplicating function to the game module
slight reorg: change moviesoap.* to blackout.* and rename the two modules
Added initial Project.

* Init Unity by IHttpModule.
* Added basic configuration by persisting to SPWebApplication.
netd: fix argument interpretation bug

While working around the logwrap() issue, it was replaced with system()
which could lead to various commands getting misinterpreted.

We now use a system() equivalent that doesn't use "sh -c".

Bug:5758556
Change-Id: I2599b526ac34bcfca18d05261286d902d547efda
Add back hook for inserting OEM specific iptables rules.

The functionality was lost during merge in ICS branch.
This patch is adding back OEM iptables hook in netd.

Bug:5862460
Change-Id: I9444b8c53e8b84fea2002c2c1d9ba42e45ae5f0c
merge in ics-mr1-release history after reset to ics-mr1
Increase the valid name of the iface to IFNAMSIZ

Define MAX_IFACE_LENGTH as IFNAMSIZ instead of 10, to
prevent netd from treating an interface name 'rmnet_sdio0'
as invalid.
Also fix an off-by-one error.

bug:5675718
Change-Id: I2b6ba823c89941031e5898b24dab388cd9c2dae8
merge in ics-mr1-release history after reset to ics-mr1
netd: do check on command, not buffer.

Bug: 6132094
Change-Id: I76aef21b07c07db76bbc6587ae732b1ceb4488ce
merge in ics-mr1-release history after reset to ics-mr1
merge in ics-mr1-release history after reset to ics-mr1
merge in ics-mr1-release history after reset to ics-mr1
Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/system/netd into aosp

Conflicts:
	SecondaryTableController.h

Change-Id: I38f047260af7edc17e1e8739264093459f7e40fb
Allow different lease time in tether start command

Make "tether start" recognize an optional argument for the lease time in
seconds. Defaults to 1 hour.

Change-Id: Ic65818fdb472a49c72fb56b1ad3ac33e4136a9a4
NatController: Raise the max length of an interface name

"rmnet_sdioX" has more than 10 characters, so devices using qcom's
SDIO_AL stuff were unable to use rmnet as an upstream tethering
iface

Change-Id: If4ae0060a135294583f38fc2d88c94675abccd79
Merge remote-tracking branch 'origin/ics' into ics
Merge branch 'ics' of git://github.com/CyanogenMod/android_system_netd into ics
netd: TI softap for wl12xx devices
Merge branch 'ics' of git://github.com/CyanogenMod/android_system_netd into ics
Fix build.
Revert "Fixed block size"

This reverts commit 0f416855e02145afe8901f0d92a50b7d6c7ae7b8.
node.js test for AudioEngine
add test for NPE error when reading PLAYER target and fix core issue.
avoid npe when loading Vault if it cannot load the economy module (and add a couple more log messages)
release 2.6-pre2
Added support for multiple jobs in build part of script
adding feedback. Trying different route with get2dastring
refs #444: add context to plugin.yaml
cambie el titulo de la pagina
Add multi-recipient form
Move SMTP setup to separate directory
Add directions for setting up multi-recipient form
Core: Alog improves added.
minor corections
cross platform ruby development is hard
removed forum, trying to finalize menu
Simplified speex jni
Minor fix to makefile on linux
Changes to swig interface to prefer char[] arrays
Updated swig interface
Various updates to allow log setup, building, and debugging
Updated swig interface
add sign up Page
Merge branch 'master' of https://github.com/acherushnikov/BloomNation
merge
Replaced realpath with expand_path

Replaced the realpath style method for absolute file paths with
File.expand_path.  Whilst not exactly the same, this should fix issues
with the 1.9.2 build.
Merge pull request #6 from adamphillips/1.9.2-rails-3.0

Replaced realpath with expand_path
trying with site dir included
Import cleanup
Simplified
Added color coordination and self bullet tracking
Well, that was COMPLETELY WRONG.
Reduced the alpha of the projected opp path
Dammit.
Turns out the time fudge is unique to opponent bullets.
Using robocode's bullet class to get more accurate data
Changing crosshair so it's easier to see the targetting crosshairs
Predictive targetting finally working well.
Created class for bot color changing
Refactored out color code, removed references to Triggers
Cleanup
Removing unused classes
Continuing cleanup
Heavily refactored and commented my Vector class
Updating classes to reflect my Vector refactor
Removed the LinkedList functionality of BattleHistory. The states themselves replicate this functionality
Trying to clear things up a bit
LOL
Added isdecimal.m, the octave version. Function is well documented
Initial evernote functions
comment creation of user evernote auth table
Refactoring evernote
Add tags
Fix space
Fix space
Fix tab space
0621
Merge branch 'master' of git://github.com/mykingla/pin-stories
调整evernote验证逻辑
pantracker kernel will actually track somewhat now
Header size.
alternate (non-braille) display and configurable paging in the full board view mode
updated README to match new features and keys
Removed: Unnecessary files.
bin/cucub-server uses Bundler to setup gems
Final progress
fixed problem on matrix initialization
average calculation is now incorporated - (Joaquim Part)
httpfetcher-fork fix
remove deprectaed vendor folder
uberdoc.html -> index.html

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Implement the beginnings of data verification

This implements a lightweight framework for verifying various partial
results of the parsing process, on an as-needed basis. The goal is to
throw meaningful exceptions when errors are encountered.

Signed-off-by: Gergely Nagy <algernon@balabit.hu>
ordering_newの修正3
ordering_newの修正4
ordering_newの修正5
ordering_new:編集で非表示
ordering_new:編集で非表示2
ordering_new:編集で非表示3
ordering_new,index: お届け先の表示制御
ordering_new,index: お届け先の表示制御
ordering_new,index: お届け先の表示制御
ordering_new,index: お届け先の表示制御2
住所自動入力
住所自動入力2
住所自動入力3
save
Add RSpec, Cucumber and initial Cucumber test
Add RSpec, Cucumber and initial Cucumber test
Add director to movie model, allow for edit and view of director in movie view
Finish Cucumber, add additional RSPEC, 50% code check
Add test, coverage ~= 90%
Update RSpec to work with autograder
Deployable service jar added
Forgot the die message in pmort.
added loop to make sure player entering adjacent room
Merge pull request #126 from andresmoschini/master

Increment version to 1.0.0.8
Extend drop-zone to all employee detail page
Minor output tweaks (Aldiko still crashes).
add mean_variance.py
MW std lib doesn't have va_copy function.
MW assembler doesn't have .balign operation, but it is the same as .align.
Merge pull request #23 from aplotitsa/master

Renamed base class name
Exented DFBaseTest
Removed an extraneous import
Add PhpStorm files to .gitignore
Add basic .gitignore files
Add Void library files
Add basic application skeleton
ios/cinder/CinderRenderDelegate -> ios/cinder/CinderDelegate
FIXING ANDROID APP-RESUME
fixed up some more, added mouse controls
Rename ListDetailViewController to DetailViewController.
Ready
All files added .
Refs LOD-51 and LOD-25.  In addition, an unused import was removed from the CommandLinePropertyFactoryTests.java.
bring in from default-installer
strip html tags
max_length
add connection timeout
translation to hungarian
Add UnitOfMeasure scaffoldding & edit other views

- edit Component view files with twitter-bootstrap-rails generator
no bugs in histogram method
Fixes #674 allowing both 'create' and 'create and continue' to save remaining hours when entering a TimeEntry.
Update README.md

Updated download info.
Added new leaderboard demo.
Do not detect slow plugins, as they are still pretty darn fast
Added Emmet submodule
helper scripts for windows
in the case of using eclipse+ccw
must use call for pause to be reached, because lein is a .bat
Merge branch 'windows'
a couple of smallish style changes
Update with real hints
Only flush cards that need changing
Better menu item name
Anki strings are already unicode
Added Sleep Clause to doubles random
Adds additional logging to assist in debugging
Preps for first production deploy on appengine:

-Removes client side metrics collector
-Turns off client-side logging
-adds CI profile
add js runtime to Gemfile, and the database.yml.bak
add projects module
add thin as server
Actually USE the token in _config.yml. The token that was in search.html wasn't even dealloc's.
Added a todo
Added host CPU MHz to vm_mhz_to_percentage
Added another todo
Fixed the links to the other download formats
delete book in delayed job
delete book in delayed job
adding logs for delete
no longer need log statements
Moved app list into its own container
Some bugfixes for the App framework.

* Toggling app mode didn't work if App Launch Mode was set to app page.
* Opening apps from the Actions app would in some cases flicker back to the Actions app.
Fixed enemy ground collision handler

- Fixed the enemy ground collision handler by looping through all the
collision entries, instead of assuming the zero'eth one to be the proper
plane
- Also fixed the enemies' self-shadowing issues by using a negative
depth offset
Update conf/gunicorn.py
Added support for non-https served flash client.

 * See "A secure server that allows access to movies hosted via a
   non-secure protocol" section at http://adobe.ly/r2f8I
Merge pull request #56 from samet/master

Added support for non-https served Flash client.
text range function
Ajout de la fonction like

- Au survol, le bouton like + compteur apparaît
- Bouton non opérationnel
- Compteur OK
Fixes cookbook_path that contains cookbook name in git_add

Fixes regex in git_add that strips cookbook name from cookbook_path
to only remove the last occurance of #{cookbook}.
Updated ErrorHandler styling for a more TwitterBootstrap look & feel
added the CMakeLists.txt and main
bug 796960: tracking bug for build and release of Firefox 17.0b2. r=kmoir
bug 796960: tracking bug for build and release of Firefox 17.0b2. r=bhearsum
bug 802953: tagging started mail broken in multimaster. r=rail
Bug 791492 - Do automated blocklist updates on mozilla-release and mozilla-esr10, r=coop, lsblakk
Bug 778969 - Switch off OS X 10.5 jetpack builds; r=bhearsum
Bug 791389 - Split mochitest-browser-chrome out of mochitest-other; r=bhearsum
bug 800025 - enable emulator webapi tests on cedar. r=bhearsum

--HG--
rename : mozilla-tests/thunderbird_config.py => mozilla-tests/b2g_config.py
rename : mozilla-tests/thunderbird_preproduction_config.py => mozilla-tests/b2g_preproduction_config.py
rename : mozilla-tests/thunderbird_production_config.py => mozilla-tests/b2g_production_config.py
rename : mozilla-tests/thunderbird_staging_config.py => mozilla-tests/b2g_staging_config.py
Merge branch 'master' of git://github.com/mozilla/build-buildbot-configs into index-files-contrib
Bug 737590 - puppet configs for scl3 - r=jhford
Bug 739778 - create replacement for preproduction-master and preproduction-stage in scl3. r=bhearsum
Bug 739778 - create replacement for preproduction-master and preproduction-stage in scl3. r=jhopkins
Merge branch 'master' of git://github.com/mozilla/puppet-manifests into mac-mar
get layouts in db working
new layout approach
riak 1.2.1 (no changes here)
this is getting embarising
Version bump to 0.2.4
Regenerate gemspec for version 0.2.4
added .password_hash field, deprecated .time field
added password field
use .created_at instead of .time
Tweak generation a bit
Site updated at 2012-08-31 15:17:48 UTC
Site updated at 2012-09-12 15:10:02 UTC
Version 0.1.4: Before attempting to use (and `gsub` against) the passed-in
message, the logging extension now explicitly converts it to a string. This
bug fix is an attempt to address [Issue #2][issue2] (which I have been unable
to reproduce yet.)
Disable collisions after pubmates/bros die.
update with async
updating routeconfig
Merge branch 'master' into mbta
Merge branch 'master' into mbta
inc ver
inc ver
updating routeconfig
Merge branch 'master' into mbta
removing bus route 222P
updating routeconfig
Merge branch 'master' into mbta
Merge branch 'master' into mbta
adjusting for new directory
Merge branch 'master' into mbta

Conflicts:
	ant.properties
Merge branch 'master' into mbta
Merge branch 'master' into mbta
Merge branch 'master' into mbta
inc version
Merge branch 'master' into mbta
updating routeconfig
inc ver
use project id
Reordered require statements.
changed enron email directory. added functional scanning to scanner
class. scans all text and 0.
Added layout, styles and added a user controller
Allow argv to be passed in as late as possible.
adding answers interface
Before thumbnailer.
We're peers.
added command history for free class
Merge pull request #34 from brntbeer/history-and-collaboration-class-notes

added command history for free class
2012-12-05 day2 classnotes
updated corner menu that will be displayed on website

Rectangle placed on top and opacity set to 0. This means I only detect
mouse hover on one element.
links file removed, there is a wiki entry on github now
Moved installed apps check file because
I hate djcelery tasks
Update myFirstFile.rtf

Also added Kirby.
MORE PREDATORS FOR THE ENVIRONMENT
Merge branch 'master' of https://github.com/camielv/Autonomous-Agents
Starting adding details for places
[TIMOB-8652] Refactoring the sdk commands into a common include.
misc utils including a time-repeat macro and more maths functions