labofsahil/github-event-dataset-2012 huggingface dataset:
Added simple link resolution for BCL types. Updated version to 1.0.7.0.
Change-Id: I2970396e485c232db0604829e1eb53191852fca2
adding music and sunflower
internal - misc. changes:
Creada la vista y el fichero de plantilla para el panelFolder en la creación de un nuevo pin.
Reparada la barra de control de zoom de Google Maps que se ha visto afectada por la inclusión de Twitter Bootstrap
added quarter commod + period command
Merge branch 'master' of github.com:yeleman/unfpa2012
Core/Mail: Fix float-calculation of expire-time
Merge pull request #8568 from FH3095/int2float

Core/Mail: Fix float-calculation of expire-time
DB/Scripts: Fix copy and paste fail in 40b010e3ad9ca2bbc7ad4dc4bc469362f4e1d7b5
Core/Map: Kill Engrish (thx Takenbacon)
Closes #8574
Core/DB: Creature text for 53 script files
Merge pull request #8570 from Gacko/creaturetext

Core/DB: Creature text for 53 script files
Core: Fix non pch build
Core/DB: Creature text for 22 script files
Merge pull request #8582 from Gacko/creaturetext

Core/DB: Creature text for 22 script files
Merge pull request #4 from TrinityCore/master

merge
update ip4 to ip6 in nmsetting_ip6config
Adds navigationpart to API module
Bugfix for ezexecution. Note to self: next time call it using the correct identifier! ARRRR!!
definition of Object.bind
disable daemon for now and remove warnings
build static library
improve Makefile and statically link sundown library
add a stripping target
Ignore all *-build/ stuff.
set up debug_static+tests as default config.
Same build dir for mac and linux.
Velocity topic changed to our new /mobile_base/commands/velocity
Just renamed
Make test_battery works again
Merge branch 'master' of https://github.com/yujinrobot/kobuki.git
remove broken setup file
Remove MANIFEST
Bug fix! Dir['*.jpg'] can't be expected to order ny filename.
Less weak references
memoize path costs
Fixes insanely stupid makefile.
Removing NERD Tree, adding project.
Added parsing for Content
Fixes
Trying to get pygments styles in. Broken.
Changed 'poster' component to 'posterImage' to prevent conflicts with API.
fix add 2 space after @param
Merge branch 'hotfix/2419'

Close #2419
Merge branch 'fix/cs-fixer-zend-autoloader' of https://github.com/samsonasik/zf2 into hotfix/2422
Merge branch 'hotfix/2422' into develop

Forward port #2422
fix i18n @package and @subpackage value
Merge branch 'fix/zend-i18n-package-subpackage-name' of git://github.com/samsonasik/zf2 into hotfix/2734
Merge branch 'hotfix/2734'

Close #2734
Added MessageId header and tests
Updated as per rfc <
CS fixes
moved tests to separate file
Merge branch 'feature-mail-headers-messageid' of https://github.com/davidwindell/zf2
fix for setJsonpCallback not called when recieved JsonModel + test
cs-fx
Merge branch 'hotfix/2642'

Close #2642
Merge branch 'hotfix/issue-jsonstrategy-omitted-callback' of https://github.com/basz/zf2 into hotfix/2643
Merge branch 'hotfix/2643' into develop

Forward port #2643
Arquivo README melhorado
tests: listChunk handlers, attach_secondary_events coverage
Also clear heartbeat timer when we get data messages.

This fixes an issue with spurious connection closing.
Handlebars: allow dots on helpers, methods, and undefineds
LiveRange fix; _rangeToHtml; more tests
close iframe tag in tests
another test case
fix test for IE
handlebars: don't consider helpers in {{this.foo}}
handlebars: set `this` appropriately when calling methods
Fixed bug in Meteor.accounts.updateOrCreateUser
Rename login-buttons package to accounts-ui. Rename login_buttons template to loginButtons.
CSS and string tweaks to login buttons.
Send all of user except services and private (instead of only name and email)
Clean up users autopublish.

Users table suppresses private fields when autopublished. Current user published turned into automatic publish, so the warning about the autopublish package is suppressed.
Change {{user}} to {{currentUser}}
Better interface for OAuth2 login services + more cleanup
A variety of improvements to the accounts packages
Improve local storage mechanism for login tokens
Renamed login_buttons_image.css
Rename oauth2 package to accounts-oauth2-helper.
Changed com.feeling package to feeling package.
basic tooltips
basic mouse-over info for in-game objects
Merge branch 'master' into tooltips
mostly complete
Merge branch 'master' into tooltips
fix const reference
Merge branch 'master' into tooltips
use different image pixel format
attribute tooltips
Merge branch 'master' into tooltips
toggleFullHelp
general GUI refactoring, part 1
window caption fix
back & ok button caption
fix another bunch of gui stuff, some strings were untranslated and buttons were not resized to fit their text
fixed text input box
add interface for tooltips to MWWorld::Class
fix compilation
fixed gold pickup sound for international MW versions, fix npc tooltip
adding more safety checks
updated to gitconfig
Whitespace.
Header (if UIKit.h not prefix-included).
Test for group item ETag and creation/modification user on tag edit
normalize a index
window hiding fix
Теперь обычная авторизация сохраняется в кукисы и не нужно каждый раз вводить логин и пароль
a guruguru joy
chuning & refactering
Use current launchers from get-prebuilts
proba

sasadadsdas
Delete parametrs
GUI caching system.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Updated components list
- implemented LavishScript 2 bindings
- moved some of the logic out of the LavishScript 1 bindings (e.g. OpenTable, CloseDatabase) to avoid some duplicate code
Merge pull request #1 from LaxLacks/master

LavishScript 2.0 bindings (not fully tested, but fully implemented)
added a threadsafe attribute in appengine-web.xml to be compatible w/ appegine-sdk 1.6.6
Simplify the waiting for stuff.
Get the arithmetic right.
liblib
Make mark thing go away
adding simple animation that just does the animation of mario alone.
Adding Lab 0 complete
mpws light: 1.2.6.x

updated customer templates
mpws light: 1.2.6.x - ref local
Merge branch 'master' of github.com:AndrewEastwood/web
mpws light: 1.2.6.x - minor changes

seo titles and sections
Fixing array posting for ruby 1.8.7.
Added usage text

Added information about release app and usage and restrictions
associated with source.
Merge pull request #4 from ArcGIS/dopdev

Added usage text
Mod: MScene/mscene.cpp
[22] Implement Stat Update

Signed-off-by: AriDEV <AriDEV@azet.sk>
803 Build version advanced to 2492-12

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@125107 eb64e737-3616-4df0-8941-5ee2ae88103d
Update cloudify url

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@125108 eb64e737-3616-4df0-8941-5ee2ae88103d
Merge git://github.com/CloudifySource/cloudify
Use namespaced controller name in action route.
Camelize the response message also in WSDL.
Removed namespace from response params as it breaks .NET WCF [Fixes #52]
Remove namespace also from faultcode and faultstring
Merge pull request #53 from ebeigarts/fix-routes

Use namespaced controller name in action route.
Merge pull request #54 from ebeigarts/fix-camelize

Camelize the response message also in WSDL.
Merge pull request #55 from ebeigarts/fix-response-namespace

Removed namespace from response params as it breaks .NET WCF [Fixes #52]
Version tick
Fixed the positioning of the HexagonGrid GameObject, added the correct position  (0, 0.1, 0) of the grid in the js description.

Added the EnergyStorage Asset.
added a math helper function for getting the world position of tiles, updated some old code to use this function

/**returns the lower left corner world coordinates of the tile, (x, 0, z)
*/
function tileToWorldCoordinates(tileX:int, tileY:int):Vector3{
	return new Vector3(tileX * tileWidth + (tileY % 2) * tileWidth / 2 , 0, tileY * sideSize * 1.5f);
}
Installer: fixes
Revert "remove tests"

This reverts commit 537346b43e59a114b815c02255c5385df1b7353b.
remove test from pom
SGS3 Add
plain buttons
Update README
Using a new Utility class to access private fields.
Adding API for getting player inventory. See #122
Added new Command /openinv to open the inventory of the target player.
See #122
Passing to 6.0-SNAPSHOT, little change in ClassUtils to search also in
the superClass.
Updating inventory when other user is closing it. See #122
Updating the API for OpenInv. See #122
CopyRight from OpenInv for the concept and IDEA.
Updating the API and how it is used for the OpenInv. See #122
disabled recent comments and recent author in BQV
[maven-release-plugin] prepare release cdi-unit-1.0.1
Add newlines to example of adding tracks to a playlist
Additional check for nfdumpseen in case of invalid timestamps
Changed nfdump parser that succesive nfdump files can be handled

cat *.log | nfdump-seen -s 10.0.0.1 -f
cat *.log | nfdump-toptalker -s 10.0.0.1
replaced accidental use of catpath with catdir
not going to be using POD, so removed POD-specific tests
Log4perl support
updated MANIFEST
sc-hsm: Added basic write support for EFs
sc-hsm: Fixed a failed assertion with half-initialized cards
pkcs11-tool: Fixed issue with ID increment failing on constant data
sc-hsm: Added pkcs15init layer to support RSA key generation, certificate and data storage
sc-hsm: Replace alloca with malloc
sc-hsm: Added missing object in Windows makefile
sc-hsm: Added missing profile in Windows installer
Added Paste
Stage
Merge branch 'master' of https://github.com/Carlangueitor/diti
Templates changed
Tie the WebService to the UI
"deploy"
Tie the WebService to the UI 2
"deploy"
update xsl template modified index, and began writing script for client side xsl transform.
added unicode support for registry._determine_type
better unicode check for _determine_type
Calling it a Night
Finished lbrx_source.h/.cc and compiling up to the point SWIG expects lbrx_sync_streams_to_time.
Merge pull request #3 from CodePlus/master

Display Update
GameObject class implemented and main arguments was fixed.

Also included code to insure the headers only get called once if we implement inheritance.
Merge pull request #2 from Xirdie/master

Display & GameObject
Made file call asynchronous
Ajout des commentaires d'en-tête manquant.
Séparation des requêtes et réponses dans la grammaire Relax-NG
Suppression du Tracer des clients
On ne sérialize plus les objets imbriqués au retour
bitbucket: added SSH Keys feature to the API
Reorganizing, adding & using a type synonymm, throwing in some of edwardk's stuff tweaked slightly
Added clone and an example file adapted from edwardk's blog
made a table of type families for each basic label of TS
Added the rest of the jautomata library.
Refactored. Works not bad now.
Fix kick broadcast.
blue-tether: Add option parsing + config file

Rather than hard code the bluetooth address of the NAP to connect to we
can now either read it from a config file, or have it passed in on the
command line.

Signed-off-by: Ian Munsie <darkstarsword@gmail.com>
blue-tether: Improve message when no bdaddr is provided

This message is especially helpful in case someone runs this as sudo
./blue-tether and the config file is in their personal home directory.

Signed-off-by: Ian Munsie <darkstarsword@gmail.com>
Python and shell scripts to set a bluetooth device as trusted

I had some weirdness where my Android tablet only seemed to allow the
most recently paired device out of my mac mini and my eeepc to connect
and thought it might be a trust issue, so I wrote these to mark a
particular bluetooth device as trusted (since the android UI does not
expose this property).

Turns out python scripting environment on android is full of fail (I
should have guessed), so then I wrote a shell version...

Then finally as I ran the script with the bluetooth address of the mac
mini and my eeepc I noticed that they are EXACTLY THE FREAKING SAME!?!

They are both CSR BlueCore4 (External firmware - nice) chipsets
(differing builds), but seriously WTF? I didn't think that Cambridge
Silicon Radio was that lame that they would reuse a bluetooth address
(broadcom sure - I've had a bunch of broadcom bluetooth dongles with
stupid addresses, like 00:00:00:00:00:00 or one that changed every
single time it was plugged in... yeah, pairing for the fail)... The
addresses are usually re-programmable, could the driver have set them to
a hard-coded value?

Signed-off-by: Ian Munsie <darkstarsword@gmail.com>
blue-tether: Refactor DHCP code

Signed-off-by: Ian Munsie <darkstarsword@gmail.com>
blue-tether: Register atexit handler to cleanup DHCP client

Signed-off-by: Ian Munsie <darkstarsword@gmail.com>
Add .desktop entry for blue-tether on N9

Signed-off-by: Ian Munsie <darkstarsword@gmail.com>
blue-tether: Track connection state & support automatic reconnecting

This now keeps track of the bluetooth PAN connection, starting the DHCP
client when it comes up and killing it when it goes down.

If a reconnect interval is specified with -r or in the config file, it
will automatically attempt to reconnect at that interval if the network
goes down. If no interval was specified it will terminate.

Signed-off-by: Ian Munsie <darkstarsword@gmail.com>
blue-tether: Fix reading reconnect value from config file

We weren't casting it to an int. I've tried to handle this in a generic
way that will allow other int options to automatically convert.

Not entirely sure if the convert_value function is stable - it's not
mentioned in the documentation, but it also isn't preceded by an
underscore.

Signed-off-by: Ian Munsie <darkstarsword@gmail.com>
blue-tether: Prevent 'ALREADY DOWN' warning

Signed-off-by: Ian Munsie <darkstarsword@gmail.com>
Merge branch 'master' into temp-merge
Fix non scrolling bug with Fixed Columns

Fix error I reported in
http://datatables.net/forums/discussion/comment/37284#Comment_37284
Merge pull request #3 from JasonPunyon/master

Fix Non Scrolling Bug in Firefox / IE
Reworked model service init logic.
add devise and authentication logic
Update lib/mobile_fu.rb

Keep the regular site version for the ipad. It's easier to take it out of mobile user agents then to check for "is_device?('ipad')" everywhere.
Changed PNGImageContainer to convert BGRA data to RGBA. Moved glesContext.release() to the end of the example.
README changed
Add static pages controller
Add SIGFPE handler
Added Twitter API and other needed files for Twitter
Added support for Ubuntu (from article at http://www.cloudcomp.ch/2012/06/automating-the-icclab-part-one/)
Added support for ubuntu
Merge pull request #3 from dizz/patch-1

Added support for Ubuntu 
Merge pull request #4 from dizz/patch-2

Added support for ubuntu
puppet-lint fixes
Add class relationships to tftp and lint-check
Fix TFTP location on newer RHEL/Fedora releases
Merge upstream
added the local features, changed the processing for the active contour, thresholding finalization
[MIGRATION] Bla
removed extra comments
added null geometry check to test.html
Merge branch 'master' of https://github.com/Esri/geojson-utils

merging updates from remote
post benchmark, few changes to the registry
Окончательный переезд на внешний движок
added basic stylus support
Try a multi glob patterns
hooking up browse url
connect signup lightbox to registration logic and email confirmation
fix FINISH UPLOAD submit styling
modalUpload.html inherit form base.html not index.html
autocomplete dropdown styling
Added missing binoculars image
Cleaned up everything, moved submitted pdf to separate folder.
Begin move to switch based compiler
Created HumanPaddleController. Resolves issue 9
Merged issue_9 into development
Revert "Adding Product Properties for New Spree Sample Products"

This reverts commit 1bf3ae78e02ab0e115b2c4bd928f5a4fdb9c59a1.
he añadido hola
initial standardization of project
scala and sbt code to support testing and deployment
Final view of XGVertexBuffer
Skip useless rows
Added the arbin schedule parser.
first commit prog1_4.
frist commit prog1_5.
It semms there are some problems when run the program, cause it will run the "command" 2 times then exit.
Beginn mit Versuch 2
Se agrega gitignore y se eliminan archivos sobrantes
Adding basic (and broken) intersect test
No scroll
Using incorrect drag bounding box for now
Working contains flower
Cleanup
Merging with master; adding stalk curvature
Merging with master
Adding parallax scrolling
easier commenting
Merge pull request #5 from Swaagie/master

Commenting improved
Added packages/repositories.config
Ignoring everything inside /packages/ except repositories.config
Added NuGet reference to IKVM and removed local "lib" reference and folder.
Enabled NuGet package restore
Removed NuGet from the "tools" directory
Added NuGet reference to IKVM to the test projects
Removed NHtmlUnit.build because we probably won't be doing builds with NAnt anytime soon
Removed /tools/SVN since we'll never use it (hint; git FTW).
Removed /tools/NAnt since it won't be used
Removed /tools/ILMerge since we can't merge IKVM generated assemblies
Referenced NUnit on NuGet and removed /tools/NUnit
Added "docs" solution folder with various files from /.
Moved HtmlUnit from tools to lib
Updated Make.cmd to accommodate the path changes in the solution
Made a new build of HtmlUnit.dll with version 2.10 of HtmlUnit and the latest version of IKVM
Added "Make.cmd" to the "docs" solution folder so it's easier to edit
Re-generated NHtmlUnit based on HtmlUnit 2.10
Updated README to better reflect NuGet as the preferred download location and improved the text here and there
FIX: mission statistics for those that use AfterMissionSalvage=true.
Fixes for statistics.

Added logging the mission stats to the console as well
<ISeeDEDPpl> can standings in eve be above 10? I dont think they can be...

<Asmodeus655> nope they cant
<ISeeDEDPpl> ok, Im going to commit a fix for agentinteraction then because as it is wrriten corrently it is making ppl enter screwey numbers into settings for the agent decline time / standings check shit
<ISeeDEDPpl> if either minstandings (what you have in your settings xml) or the actual standings are above 10 questor will now devide by 10 before doing the comparison
<ISeeDEDPpl> fixing the odd bug
removed max-width=none, should fix horizontal scrolling
Moved to Hogan.js and cleaned up sections
t_else fix
error responce
fixed editing of not-yet-activated members
remove unused import
improved test
fixed creation of users with non-ascii characters
better testability for invitation emails
added a function to import plone-users
require add-permission to see the import-views
removed unused import
fixed and improved batch-upload-confirmation
version 0.3
start 0.4.dev
Add subexpression matching checking
Standardize usage of $ with variables
Move towards converting token stream into tree
Add in error handling to AA API.
Merge branch 'master' of https://github.com/aurora-sim/Aurora-Sim
Fix a bug with the Region Manager that was blocking the ability to get regions properly.
Add some locking to the OSD requests to attempt to make them less evil on the server (and to make them stop having odd closed connections). (ConnectorBase.cs changes from OpenSim, believe the fixes were by JCC).
Don't reuse connections if they have failed or taken a long time.
Fix a bug where the console would cease to work if two threads were fighting over who wanted the console. Fix more bugs with Default Region setup.
Fix sending the fly animation if the avatar is in ForceFly mode.
Add image serialization to the OSD (de)serializer. Pass the default regions available across the wire to Aurora.Management so that it doesn't just look at the ones that it has access to locally.
Fix the Combat Functions.lsl example, all thanks go to djphil.
Clean up and make .net4 ADNE compile again.
Add warning for those compiling with .net 4.
Fix SQLite spamming the console about supposed issues creating tables when there actually were no issues. Fix cleaning up after the SceneViewer.
Fix an issue where the region manager would attempt to start regions multiple times because it wasn't closing properly. Fix clearing of all data when DeleteRegion is called.
Merge https://github.com/aurora-sim/Aurora-Sim
Save Space in fullSEIR
Rename project, minor refactors.
Move into subfolder, minor debug refactoring.
Missing import.
cleanup old tzdata
Moved logic to single file, running as Web Worker. Renderer in separate file. Added more details to renderer. Example shows use of external library for visualising agent brains.
finit le latekse
Configure command and parameters title on command dialog now only appear when there are editable arguments for the command.
Bug fix for incorrectly overwriting non-null with null.
adding privacy and user terms
Add card bases
fixed clauses
fixed path to xsd
removed unnecessary code
fixed clauses;
teaser can now be displayed only in portal
box can now be closed
fixed code; added possibility to show teaser only in the portal
corrected spelling
fixed tabs
added needed CDATA and updated version
[add] Добавлены Layout из bootstrap
Hide stacked tasks to follow the xrath's original idea
Tekst

Nowy plik tekstowy
Integration of OPTIONS with arguments (c,d,t) + tests.
Rewrote info activity, mapview is now in a external activity.

Signed-off-by: Lukas Bernreiter <lukas.bernreiter@gmail.com>
Created a simple layout for the info activity.
created browse_lessons.xml
Correction d'un bug ou une double quote dans l'url enpèché la fermeture d'un onglet
UI ß.02
dummy - forgot to finish the last commit
added visible tag for TV show label
Cleanup.
Updated SearchMounts.
Updated AltPowerBar.
Use SetPoint() instead of Point() in Blizzard frames skin(soon, a replacement will be everywhere).
The same goes for SetHeight/SetWidth().
Raid CD
Merge branch 'master'
Implemented supplier and supplier user
Deleted useless files, I need to add a .gitignore or something...
Initialized
ESR-Tools added
Management command to cleanup expired tokens, for automation with cron.
修改 搜索框样式
devel/eio depends on devel/eet; Fixed pkg-plist in x11/efreet, lang/embryo
Readme

Modified
Revert "Changed format title for DataTimeSlider.java class."

This reverts commit 7d5b45c45d211097144ff147ae46c71cff2ee504.
Added Bezier animation classes
Some work on putting the components together
Gjorde flowcost() publik.
Merge pull request #47 from DavidLarsson/master

flowcost() publik
mobile experience
.
.
.
.
qr code generator
First commit for players module.
the source code hopefully
Added block sound;
Add install/uninstall actions

Tests are now seemingly unable to find the 'text' package. That's the
only obstacle before release.
title, login bar to editor
ultimately fixed path problem in installed games
Core/Players: Use correct size in variables
Core/DBLayer: Convert PAppend() queries to prepared statements No.3
Core/AchievementMgr: We heard you like uninitialized variables so... we initialized them for you so you can hate us
Core/Misc: Implement Trinity::Auto_Ptr. Ditches ACE_Refcounted_AutoPtr (we strongly suspect it does NOT clean up the underlying pointer properly). Underlying type is now ACE_Strong_Bound_Ptr
Core/DBLayer: Restore pinfo ban info output
DB/Auth: Update auth_database.sql with recent changes

DB/GameEvent: Resync Darkmoon, again - by Aokromes
Core/Player: Fixed accessing possibly deallocated memory
Core/Misc: Fix logic for owner check in Unit::RemoveGameObject
Core/DB Layer: Make SQLTransaction AutoPtr thread safe (valgrind caught a race condition)
Core/Spells: Don't remove summoned gameobjects for non-channeled spells when spell cast was canceled

Fixes issues like Demonic Circle: Summon removing the last summoned circle when the new cast was canceled
Core/CombatLog:

- Send more proper hitinfo values in SMSG_ATTACKERSTATEUPDATE (still lot of research todo)
- Some renaming and commenting

- Minor cleanup in Player::UpdateZone
Fix compile and fix a possible crash for mob_kiljaeden_controller
Auth/Realmlist: Make use of RealmFlags and rename color to flag (core- and dbwise)

Also fix connecting with realmflag & 4
Core/DB Layer: Fix a memory leak.
Core/DB Layer: Fix a memory leak for synchronously executed prepared statements.
Partial revert of "Core/DB Layer: Fix a memory leak.", mysql library related stuff. Original memory leak fix is still in place.
DB/Creature Template: Some updates, mostly HoverHeight and InhabitType. Thanks to KingPin for re-parsing ~5GB of sniffs.
Core/DBLayer: Convert PAppend() queries to prepared statements No.4 NOTE:

Most of the cores queries have been converted to prepared statements now. If your code contains queries, please either use the exiting or implement new statements.
The only exclusions are one-time queries (e.g. for core startup) and queries that can't be prepared due to limitations.
Core/Spells: Fix Misdirection (thx to elron) closes #5869, #4343
Core/Spells: Fix Necrotic Touch proc closes #538
Intergrate with Facebook iOS SDK.
Add AFNetworking as submodule.
Adding query to log file.
Removing files we don't need in the transmartApp anymore. These might already be deleted in RC_2 but I think my repository was acting up.
Adding checks to make sure we don't throw an exception if parameters are empty.
This might be because I am not doing this right, but I can't do a push without a pull and I can't pull without losing my config changes?
Merge branch 'RC_2' of https://github.com/transmart/transmartApp into RC_2

Conflicts:
	grails-app/conf/BuildConfig.groovy
	web-app/js/datasetExplorer/highDimensionData.js
Adding changes to Export and High Dim Data.
Merging changes Sai made.
Remove Identity Vault authentication as this is specific to JNJ.
disabling view customization in the internal config file
Merge branch 'RC_2' of https://github.com/transmart/transmartApp into RC_2
Merge branch 'RC_2'

* RC_2:
  disabling view customization in the internal config file
  Remove Identity Vault authentication as this is specific to JNJ.
  Merging changes Sai made.
  Adding changes to Export and High Dim Data.
  This might be because I am not doing this right, but I can't do a push without a pull and I can't pull without losing my config changes?
  Adding checks to make sure we don't throw an exception if parameters are empty.
  Removing files we don't need in the transmartApp anymore. These might already be deleted in RC_2 but I think my repository was acting up.
  Adding query to log file.
  Cleaned up internal config file
  Modified request to support i2b2 1.6.x
  Resolving a js issue
  Second big commit. This removes files deleted from the latest pharma code and also improves the headers
  Updated to latest code version
set log4j configure for dev env - test and prod env should have its own log4j configuration with fixed path to a log file
changed app name back to transmartApp
add back guest login and force login
Update ignore list.
PFIZER-39 - Fixing logout by adding global javascript variable for the path.
Remove .settings from master so that other branches can use eclipse and switch between branches without overwritting.
Update master
Update master
updated online help
some example should remain in tiles dir
Modified automated build to not include extensions points
Updated Transport Connection Strings
Merge pull request #19 from esculli/master

Updated Transport Connection Strings
Added config to control mask of newly created files
Fixed file generation errors
Added "generate controller"
More misc fixes (been a long time coming, can't remember all)
Merge branch 'master' of github.com:Naatan/XenForo-CLI

Conflicts:
	library/CLI/Xf/Addon/Import.php
Fixed unnecessary observer
Migración

Esperemos que nadie estropee nada
Fixed a few issues with wide string decoding.
Added support for JMS's weird variations in encryption.
Optimized a few things.
Fixes #2576 : correcting typo in the formating of trace log
Fixes minor bug in Translator. Removes old txt files. Added Battle and Registration text
eleven_commit
Added Clopath2010SynapseCollection. Added titles to plots in STDPTestGUI. Minor refactoring, API changes.
|#117|+Manan| setting up backend on Requisition Group Upload
|#000| Rahul| context path removed
Removed .DS_Store file and added them to .gitignore
Added null check for empty function list in ProgramNode
cellml-api-1.12 is now officially released.
Adding pmr2.captcha.
SVG parsing is finished

Now we just need to code generate
Added a method to validate whether an auth token is valid.  This does so by checking whether we can return information about the current user from the api.
Check for a token or if we have one, validate it.
Altered the shadow rendering which should drastically improve the overall "smoothness" of the sliding panel.
Merge pull request #77 from alephnulll/master

MFSideMenu shadow rendering
Added rounded corners across the app.
Removed unnecessary files.
Removed rounded corners over whole app.
Fixed navigation bar mask height
Merge branch 'master' into jedi
most of the widgets are placed in position
fix build on Linux.
various improvments-add about and help page
share drop down tests
forgot to mention set.foreach
Renaming README
Adding content to README
Introducing, ModLoader
balconista finalizado
get ready for deploy
freaking bloody haml
fixing css in production
fixing kel and yos datetime crap
fixing kel and yos datetime crap vs
nope not working, reverse to original date time setting
Started work on MySQL
work on estimating number of tiles that need to be downloaded.
temp change
added pref options
어드민 로그인 기능 테스트를 위한 config 변경
suppression de fichier inutile
maj readme
Mise en forme des fichiers lua.

C'est deja plus propre ! Indentation emacs.
Ajout des licences dans les entetes des fichiers, affichage de dt a l'ecran.
Adaptation de la vitesse en fct du dt
Fix bug fct vitesse

Calcul de la vitesse en fonction de la resolution, le retour !
Nerf de la vitesse des tanks
Patch de emergencia de actividades
revamped view, option and accessor
Merge branch 'development' of github.com:SashaCrofter/grove into development
Version 0.3
models for budget portal
Altered Model
basics of budget portal
Budget portal to update plan with items
Basic Budget portal to update plan with items
comments added
Minor front-end changes
basic events coords page for budget portal
Permissions created, items can be deleted, open/close portal
finance coord page for budget portal done
Basic Budget portal changes merged

Conflicts:
	finance/urls.py
	finance/views.py
	templates/finance/budget_portal.html
Support GET on /instance which return list of instances.
Test GET on /instance
Sort imports
Revert "Drop --develop"

We still need it for backward compatibility
This reverts commit 9b0745baf3c1cc1871d0dc3083458e2c20810a34.

Conflicts:
	slapos/grid/slapgrid.py
fixed initialization with no options provided
Moved from Style Pages to Style Sites
drop the old testing pdb
add couple more details for heroku
Updated SQS input plugin to properly unpack events.
Send Event data through SQS as JSON.
out-parameter in get_dir_entry is changed from path_t in buf_t
caused by changed out parameter type in get_dir_entry
first implementation of get_dir_entry
Final tweaks before release.  Added flow configurations.
AntiBot v4.0 rewrite in progress.
wlcore: set 5Ghz probe-req template for DFS channels

Even passive scans on DFS channels require us to send probe requests, so
configure the probe-req in this case.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
wlcore: debug: ignore high Tx watermark

Signed-off-by: Arik Nemtsov <arik@wizery.com>
mac80211: deny ADDBA on VO AC TIDs

Avoid Rx BA on TID 6 and 7 to prefer lower latency
on VO AC instead of higher throughput.

Signed-off-by: Eyal Shapira <eyal@wizery.com>
Signed-off-by: Igal Chernobelsky <igalc@ti.com>
wlcore: update AP rates after band change

The channel and band are updated after the basic rates have already
been set. This causes us to choose wrong HW rate indices that are passed
to FW. Fix this by updating basic rates when the channel is updated.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
changed possition of description
Full screen on the book pages
メッセージクラスの見直し
level hashmap is non-static
add task sitemap_generator:refresh
Small changes to make components no longer dependent on each other
Big Errors with calendar. Need looking at. Does not work. 
Other Errors found are with things we tested in past but have broke.
First commit from iPad :) ... just outlining some of the stuff I've been
trying out, and ideas.
merged old repos to teamrepo
Release the first version, 0.0.1
Add the minified files
now calling this minifier and obfuscator
Help change
I want talks
- Added some code to enable generation of shadows maps
- Added to repo some missing resources
Mark some core.stdc.stdio functions pure.
Fix unit tests broken by https://github.com/D-Programming-Language/dmd/pull/994

* Fix private-use code points to Unicode characters
Merge pull request #241 from dheld/master

Fix Unicode unit test breakage
Fix core.sys.windows.windows.LPCVOID

* also reformatted a bit
Merge pull request #242 from denis-sh/fix-LPCVOID

Fix core.sys.windows.windows.LPCVOID
Merge pull request #240 from alexrp/core-stdc-stdio-pure

Mark some core.stdc.stdio functions pure.
Merge branch 'master' of https://github.com/D-Programming-Language/druntime
移動範囲を制限

Map→Stageにした
spotReachTo()はnマスのとこと、min～maxまでの2つ作った
where is the php binary?
Bill calculation working :D
Set lua-cjson url to uhurusoftware/resources because of down default site
(#15693) Allow restart command to be specified

Previously, the windows service provider did not support specifying a
custom restart command, and instead would always just call stop & start.
The ability to customize restarts is desirable in cases where the service
must be stopped in order to overwrite a file the service is using.

This commit refactors the `instances`, `restart`, and `restartcmd` methods
from the `base` provider to a new parent `service` provider.  It also
refactors the `ucommand` and `texecute` methods.

There are no changes to the `base` service provider other than those
methods residing in the parent `service`.

The `windows` service provider no longer implements the `restart` method
directly as its parent `service` provider handles this correctly.

I didn't refactor the `start` and `stop` methods to make them
customizable, because it's not as critical for Windows and it was more
changes than I wanted to make now.
Merge pull request #1051 from joshcooper/ticket/2.7.x/15693-windows-service

(#15693) Allow windows service restart command to be specified
Revert "Revert "Merge branch 'ticket/2.7.x/15464_a_gemfile_would_improve_contributor_on-boarding' into 2.7.x""

This reverts commit 76ef99b3ea5baeeaa3482d0b3617a1b799c7028c.
(#15464) Exclude gem command from bundler

This patch simply excludes the `gem` command from the dependency
handling of Bundler with the `rubygems-bundler` gem installed.

This patch also updates the README to describe the resolution to the
spec test failures we've been seeing when Puppet contains a Gemfile in
the project root.

To summarize: Use of RVM is considered dangerous

We're able to work around the problem, but the hijacking of shell
builtin commands is a maintenance burden we're not willing to shoulder,
hence RVM being considered a dangerous tool.
Merge branch 'ticket/2.7.x/15464_gemfile_try_2' into 2.7.x

* ticket/2.7.x/15464_gemfile_try_2:
  (#15464) Exclude gem command from bundler
  Revert "Revert "Merge branch 'ticket/2.7.x/15464_a_gemfile_would_improve_contributor_on-boarding' into 2.7.x""
Fix typo in create_resources function's description string

This documentation used a hash rocket in a variable assignment instead of the
required equals sign. This commit fixes the typo.
Merge pull request #1058 from nfagerlund/typo/2.7.x/create_resources

Fix typo in create_resources function's description string
Update CHANGELOG, conf/redhat/puppet.spec for 2.7.19
Merge branch '2.7rc' into 2.7.x
added new devel calibration scene and Calibrator.cs
Calibrator.cs now works with keyboard input
Accumulation of velocities and densities to the grids + some tests
[Fix] Merge branch master of git://github.com/TrinityCore/TrinityCore
added ccnode + gesture recognizer files
move various bail and log calls into their respective function
New venusian 1.0a5 skips scanning some things that might be duplicates. That caused the discussion_listing method to be skipped :(
nuevos iconos
Merge branch 'master' of github.com:Wargo/Bloggers_php
Navigation KA
adjusted tabs_border smaller and lighter
debug true
remove caching for location requests
debug false
Fixes to comply with coding standard.
Updates to build script.
Renamed download method
Renamed cleanArgs method
Renamed isCommand method
Fixed links to PHAR archives; Refactored installing of PHAR archives;
Modify last CL section
README.md: use markdown syntax
History.md: use markdown in more places and remove spaces before the list marker
Commit que habia comiteado hace tiempo
Sync with SAMLmetaJS upstream to get a bugfix
Use the unicode representation of the entity instead of the name attribute any time we display a label for an entity
Change the __unicode__ method to return the display_name, the entityid or the peer id, in that order
Just render the unicode representation of the entity in the entity lists
Remove obsolete rules
Remove the name field in the add entity form
Remove the edit name view
Implement search looking for the search terms inside the metadata, not the name of the entity
Remove last traces of the name attribute
!rps command bugfix
Why did I make the FWPlayer an interface...
cosmetics in cs.po

Signed-off-by: pieterg <pieterg@users.sourceforge.net>
subtitle: fix pts LSB, and slightly optimize extract_pts
subtitle: fix closing brackets

caused by 3b24f0d476f16733823852e3778360a8276d9b59
subtitle: undo HBO hack

The HBO hack, which was introduced in
8ae90fb361092e8bc95a269dfacdc695292e574b
breaks other providers, and it seems no longer
needed for HBO.

As suggested by ims.
sv.po: translation updates by nisse69
Merge remote-tracking branch 'pli/master'
[MovieSelection] add '<' to go Up into parent folder.
openvix: build 517
Merge branch 'master' of git://github.com/OpenViX/enigma2
no.po: translation updates by andy1
openvix: build 518
openvix: build 519
sv.po: translation updates by nisse69
[mytest] fix possible BSOD, when pressing power button, and have is set goto to deep standby, and recording but box has not been woken by timer.
servicemp3: match_sinktype: don't unref non-matching elements

though the 0.10 gst_iterator_find_custom description seems to
indicate that we have to do so, this leads to obvious refcount
issues, such as:

GThread-ERROR **: file gthread-posix.c: line 171
(g_mutex_free_posix_impl): error 'Device or resource busy'
during 'pthread_mutex_destroy ((pthread_mutex_t *) mutex)'
ecanvas: Add drawLine function

Should allow you to draw e.g. clock hands from a Python renderer.
rc position
openvix: build 520
openvix: build 521
[NetworkSetup] fix embedded skin.
Merge
Merge branch 'master' of github.com:a646767/PyMCServer
Merge
Merge branch 'master' of github.com:a646767/PyMCServer
Niitattu clientin kaatuuminen kun hosti lentää avaruusaluksella ja päinvastoin
Adding the ability to perform different chunk conversions per player.

By subscribing to a ChunkPostProcessingEvent, plugins can customize 
the processing of chunks down to individial 16x16x16 segments. 
Let Java inline the functions for us.
More changes to the cache system.
Added the ability to resend chunks.
Merge remote branch 'origin/master' into anish
push dev changes
asdf
push changes
push changes
push changes
global changes
saffasdf
push chnga
Merge remote branch 'origin/anish'
put Search button in sprite and changed to text
theme Follow Us block
fix playlist div id
Add osm2osm test utility for the osm_parser.cpp code

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@24671 f0d54148-0727-0410-94bb-9a71ac55c965
Prevent CPLCreateFileInZip() from creating duplicated files in the same archive (#4785)

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@25401 f0d54148-0727-0410-94bb-9a71ac55c965
Prevent the LIBKML driver from creating a 'doc' layer (#4785)

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@25402 f0d54148-0727-0410-94bb-9a71ac55c965
Updated script to use /etc/apt/sources.list.d/ instead of appending to
/etc/apt/sources.list
Merge pull request #6 from Jawk/master

Updated script to use /etc/apt/sources.list.d/ instead of appending to /etc/apt/sources.list
Added pics from Fasenmeyer -awardi
realised TCityList
realised TCityList
Fixing bug in the error message
Provides the mode in which the lexer failed in Illegal error.
The returned object hold a error property set to true when an illegal char was encoutered.
Escaped chars are now marked with a escaped class.
Improve detection of regexps in various edge case.
It fail to exclude punctuation after the end / when there's no option char.
try to fix compile error #2
JS folder
Se agrega carpeta js y contenidos
Minor/ignore - refactored a few field/variable names
Added "Play" button to preview MPLS files in default application in PlaylistDataGridPopulator
Anlamadim yani hala napayim.
oof of
removed unused scenes and slight formatting
Map View
Did no longer respect lowest common denominator
Store and display goal text
Merge branch 'master' of https://github.com/adobbs/touch-focus
Ensure streams are closed
Upgrade ADT (Eclipse plugin)
Increase the supported API level to 16
Check dbFile is not null before attempting to decrypt
Handle potential NPE on AddEditAccount
Fix bug in code that tests if file is UPM db
Call super.onContextItemSelected()

According to the docs implementing methods
should call the parent impl of this method.
Update translations with new strings
Prep for 1.13 release
Fix adapter to Adapter
Include the SBT project prompt in `comint-prompt-regexp'.
Merge pull request #258 from hgiddens/fix-comint-previous-input

Fix a “text is read-only” error when calling comint-previous-input in SBT buffer
removed table row hover effect for every table, will be fixed in next version of twitter bootstrap
updated validation for Reservation entity
moved 'findAvailability()' function from ActivityRepository to SessionRepository
added functionality to filter Reservations search results
added form template to filter Reservations search results
updated code to display new/merged Reservations values
code format
fixed date selector initial values
added functionality to display availability calendar for session selection
added styles for the availability calendar
Utils: split dialog files...
Merge branch 'master' of git://github.com/saikobee/nature-sim
Made Grass have more caloric value
Modified the map slightly
Added hungerIncrement() and made Animals wander if all the food around them doesn't sustain them
Misc empty line changes
Merging
Added cool slider!
Made animals wander in all directions
Fixed a bug in adjacent locations which wasn't returning adjacent in all directions (OBOB)
Added toString()
Merge branch 'master' of git://github.com/tgriswol/nature-sim
Merge branch 'master' of https://github.com/saikobee/nature-sim
Merge branch 'master' of git://github.com/saikobee/nature-sim
Added the CUTEST wolf.
Merge branch 'master' of git://github.com/saikobee/nature-sim
New map
Merge branch 'master' of https://github.com/tgriswol/nature-sim
Removed the old lame maps.
Fox makeover.
Images!
Addition of Luhn Algorithm and tests
Updated README to include a bit more information on what algorithms and formats are supported
fixes: buckets work again, added strict mofe
Fix bug for overlay colorbar toggle
Odblokowanie .unityproj
missed a s/com.hibernate/org.hibernate/
Modified-mstp-display-as-per-standard
enh: started library
fix: changes to cherry from library
Add short mysql migration quickstart.
Update samples/java-play2/README.md

Play2 module lives in maven central
… again
some custom CWorm attribs (isLocal, isHuman, isBot)
wpnslot_t weaponName access
access to worm state attribs
small fixes
DynamicList size attrib access
avoid warnings about uninit wpn
run all startup*.lua scripts
Cmd_reinitLua
LUACALLBACK(playerInit) always
LUACALLBACK(localplayerInit) always
new Lua callback wormPrepare
Cmd_restartGame
Lua iterator for DynamicList
rough first drafts of survey results and monthly schedule
added brief colophon
Extras are downloaded into a separate folder
started with voucher repaiment
Add filtering interface
some show.html.haml changes, user relationships, watched/watching
fixed stylus middleware config
Al : updating readme to reflect correct deb pkg deps :trollface:
Latest version, tables are not visible !
fixed some media queries and added others
Near rewrite:) 
Fix synchronization model completely
Fixed performance problems
Downgraded to appengine-SDK-1.6.3 (Performance)
Removed dependency on msgpack
Ah, forgot to reenable a slight performance enhancement.
Added page header, tweaked layout
Added well around tables
Cleaned up modal code for 2nd pair of eyes and fact check emails
Added class to newly buttonised preview button to reintroduce button spacing
Removed unused links from toolbar
Require 'addressable/uri'

This fixes the problem where policy pages were returning 500 errors.
It's difficult/impossible to add a test for this in our app because both
launchy and webmock (test dependencies) require 'addressable/uri' for
us.  Instead of fighting against that I've chosen to add a test to
Smokey, see
https://github.com/alphagov/smokey/commit/6ff2c670cc3f43e1689541a0ed7947f250aa1395
Merge commit 'b4c89ce0aa69707a8aa76a43d0add0b61d18f1f0' into HEAD
IDE: Make TMainIDE.UpdateDefaultPascalFileExtensions a global proc and change its name because there are others with identical name

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38703 4005530d-fff6-0310-9dd1-cebe43e6787f
lazreport - Revert part of rev  37448. Fixes issue 22451

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38647 4005530d-fff6-0310-9dd1-cebe43e6787f
lazreport - Implement TfrPreview.Clear

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38648 4005530d-fff6-0310-9dd1-cebe43e6787f
TAChart: Add test for TListChartSource cache

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38696 4005530d-fff6-0310-9dd1-cebe43e6787f
bump to latest sqlite-jdbc version
[cli] usage message + version check
[ios] glob {PhoneGap,Cordova}
Got the 2Wire thermometers added and identified
Change to non-parasitic mode and relinquich control when an interrupt occurs
autoactivatetrendlines
growing and redme
updated classes for aligning with new logic
change the way logging is done, using the standard log tree instead of
calling the module-level functions on an unitialised logging object.

This allows to
- simplify log.py
- use one logger object for each file
Merge pull request #273 from AndreaCrotti/logging

change the way logging is done, using the standard log tree instead of
Refactored Actors and messages to their own package
mamapichas jodedor
borrando otra vez
Fixed issue "Redundantly setting both halves of a has_one rel causes issues" close #156
Added TODO comments for gc
Scripts back to footer, using inheritance on layouts to do the typeahead
INamed interface for lookups
BlobService ammended for command line useage
HORNETQ-1078 - restart server after replicated failback
Fixed end of line issues in mp.build_execute().
Fixed file permissions.
Some tweaks to 'check_for_updates'.
Updated language files.
changing paging behavior

if totalServerItems is 0 (default) then there are no jump to first/last
paging buttons.
docs(ngHide): Fix typo and make it more in line with ngShow