labofsahil/github-event-dataset-2012 huggingface dataset:
ECR template update
agregadas dos funciones(getRandomNumber y getRoundRandomNumber)
fix bigarray
Fix destination resolver
Initial Commit from Private Repo
Rubros 100%
terminados los cambios: los nodos del arbol se pueden mover
Added CUBLAS GEMV operation. Fixed column-major support for BLAS operations.
implements_IEventDispatcher.as meged into classes
Completed release process: Include manualqc.exe and docu.
Refactored. Was badly needed.
installation#photos now includes image urls
Merge branch 'master' of github.com:veos/veos.backend
added 'flagged' fields to reports
Merge branch 'master' of github.com:veos/veos.backend
Fixing an error when using the same sound
Added protection for slow headers/body attack via a new SIP And WebSocket configuration option: timeout_anti_slow_attacks.
"Contributors" points to the web.
333
33322
Merge branch 'master' of https://github.com/veshorrible/elite
fffff
Merge branch 'computer2' of https://github.com/veshorrible/elite into ghost
Added depth first search to comp coords and modified constructors in node
git ignore .DS_Store

Signed-off-by: Gabriel Vigliensoni <gabriel@vigliensoni.com>
remove component.json for now
it does not work properly,
we need to fix up mocha to utilize components
for a lot of the internals first
build
Release 1.7.1
added Travis CI barebone .travis.yml
force perl install
Updated mcmap binary to Zahl's newest version (includes jungle tree and upside-down block fixes)
Fixed string set and get, and command line test

Also using command line for the second part of the test
+ ARM: vmlinux.lds.S: do not hardcode cacheline size as 32 bytescache: assume 64-byte -> L1 cachelines for ARMv7 CPUs (64-byte) ;)
Rename vtkArmatureWidget signals

See Issue #13616
Refactor create and node function

Make it return the ewly created node. The remove node from hierarchy is
also simplified to accept both node and positions.
This implies a change of the reparent function which beomes simplier and
safer.

See Issue #13616
Add parent control methods

It can be quite useful to know if a bone is directly parented or not with
a given parent.

See Issue #13616
Add merge bone method

This method allows the user to merge two bone that are parented (directly
or not) together.

Also comment out the vtkBoneWidgetTwoBonesTest.

See Issue #13616
Se cambio el modelo en todos los modulos, se agregaron los casos de uso Abandonar Proyecto, Manage Proyecto, Read User. Se definieron patrones a seguir
Se arreglaron conflictos
comitat server
Minor cleanup of x224 layer
Removed some annoying castings
Prepared structure RDPSerializer for native recording format
Merge branch 'native_video' of github.com:pykoder/redemption
New GraphicToFile class that write a an RDP 'movie' to disk
Removed disconnect from Transport API
Added tests for GeneratorTransport
Unit tests for transport classes
Added unit tests for FileTransport
Unit tests for recording orders to file (and reading them back)
Completed first unit test for native file recording
Renamed send -> draw for RDPGraphicDevice as it's semantically more accurate
Scafolding for RDP UnSerialiser
Fix stupid recursive call in Transport
Explicit transmission of clipping to draw surface
Convergence of GraphicDevice toward RDPGraphicDevice (to be continued)
Removed dead code in SocketTransport
Fixing mod/rdp capabilities
Fixing client capset negotiation
Fix random connection failure connecting to Windows 2008 server (buffer too small in send_font)
Inserted Mcs reference grammar in switch inside Mcs class
Added forgotten test file (sorry, it broke the daily build)
修改demo引用的ico路径
Added support for the strange package change in Bukkit 1.4.5 by proxying utils and changed default destroy tool
CheckResults: pass IServer to sharemap=, but get_sharemap() returns serverids

This changes all code which feeds CheckResults(sharemap=) to provide IServer
instances, but CheckResults converts these to old-style serverids during
output, so downstream code doesn't have to change yet.

It adds a temporary get_new_sharemap(), which *does* return IServer
instances, so the immutable repairer can build new CheckResults from an old
one. This will go away when get_sharemap() is updated to return IServer (and
downstream code is updated too).
Raise error on backend calls for non-Shoes objects
Add more flexibility for Gradient, Color

Now element methods call #pattern to generate stroke/fill, rather than
color. This means they get Gradients if appropriate.

Starting (with oval) to extract style handling for greater flexibility.
Add Swt backend for Gradient fill for Oval
Use full path for app icon
Fixed issue #123.  Revised background and border to use Shoes::Swt::Common::Painter as same as rect.
Implemented mouse method. This is a test snippet:

Shoes.app do
  _b = _x = _y = 0
  animate do
    b, x, y = mouse
    p [b, x, y] if b != _b or x != _x or y != _y
     _b, _x, _y = b, x, y
  end
end
Remove unused dependency: facets
Merge branch 'master' into shoesspec
Fix Arc specs to use real backend
Added more classes and functions.
grunt Rollback to 0.3.16
Merge branch 'master' of https://github.com/webbers/dongle.js
version 3.1.1

Bug fixes and documentation update.
findUserById fixed. Added my twitter account to fixture file.
update for the oversampling for v1 and v1 IDG
AeroQuad_STM32: remove obsoleted BattCellCount
Merge pull request #241 from kh4/master

AQ32: remove the obsoleted BattCellCount and replace with 0 (autodetect) just like on Arduino side
test
test
Initial PPM works (incomplete)
Add config def.
fix
fix
fix
fixing up
fixing up
fixing up
fixing up
fixing up
fixing up
fixing up
fixing up
fixing up
fixing up
Made build version of GC Web Usability intranet theme independent of the GC Web Usability theme (to resolve Drupal namespace clashes). Also GC Web Usability intranet theme no longer references images that aren't used by the theme (to cut down on encoded CSS files sizes).
Fixed the CI error by added missing clean target for the grids and base
Merge pull request #61 from LaurentGoderre/master

Fixed build error
Corrected documentation and terms links.
Added vclick handler for Share widget popup text.
Fix resource path from build to dist

Few missed files from the move in the root directory
IE7 doesn't support hasAttribute

Extended fix to breadcrumbs
Merge pull request #784 from nschonni/hasAttribute-replacement-746

#746 regression with hasAttribute in IE7
Merge pull request #783 from nschonni/fix-index-resource-path

Fix resource path from build to dist
Merge branch 'v3.0'
change except policy if weibo api
reconstructure code & now django and local program can run together
inotify.py
Improved speed by adding JS ad the bottom.
Fixed logging, Fixed case where startup would fail with an empty config, and other bugs related to the empty config
CSS Cache deleted
FAQ, Hilfe and Studienplan update with data from fabian
ein paar verbesserungen. i´m not ready
modifieded studienplanung

carousel does not work (endless cycling after the  pushing the button) .
I can´t  find the errore and eliminate it.
.settings & .svn excluded by default
Merge branch 'master' of https://github.com/wikipeter/meinFHD into frank
Merge pull request #3 from wikipeter/Andy

studienplanung is almost ready. but there are some troubles
added improved template for stundenplan
adjusted gitattributes due to autocrlf problem
Normalize line endings
corrected autocrlf handling in gitattributes
Merge branch 'frank'
removed .settings folder (eclipse) from repo
removed .settings folder from repo (eclipse)
Merge pull request #4 from wikipeter/frank
global_data: user-id changed
multiple: foreach brackets added
Merge branch 'master' of https://github.com/wikipeter/meinFHD.git into frank
Merge branch 'konny' of https://github.com/wikipeter/meinFHD into frank

Conflicts:
	.gitignore
	Codeigniter/application/config/autoload.php
	Codeigniter/application/controllers/admin.php
	Codeigniter/application/libraries/Global_data.php
	Codeigniter/application/views/desktop/includes/header.php
Merge branch 'frank' of https://github.com/wikipeter/meinFHD into konny
test delete
* added 'form_validation' to autoload
* outsourced creating user rows in views

Signed-off-by: kaston <don_kaston@yahoo.de>
menue include über load->view

Signed-off-by: kaston <don_kaston@yahoo.de>
working on missing -- fix bug and add code that returns phase1 missing
Commit dependencies too
Embed API: maxwidth and maxheight work better now, removing warning about use.
moo-improvements
model definition changed to 'full'
print information flow data (all)
change response data type
Merge branch 'issue8dev' of github.com:works-ate/aws-sdk into response
bug fix and signature
Previous plugin vulnerability (count-per-day) at the right place
- added nojekyll
Updated documentation.
ifan
	modified:   protected/config/main.php
	modified:   protected/data/nju_software_app_management_2012-04-03.sql
New smtp settings! That Work!
Merge branch 'master' of github.com:xaccrocheur/kituu
Testing crunchbang
exit tabbar-ruler
exit tabbar-ruler
Changes in xaviervia.com.ar
Implementing check for if the user is a valid administrator
heroku really hates sqlite3........
file embed upload template
Merge branch 'master' of git://github.com/AlloVince/eva-engine into epic
event upload
index and units html
modify units.html
refactoring : simplified getting the attributes
Building now creates a single .jar in store/

Modified .gitignore to ignore store/ and change the newlines to UNIX newlines.
internal - added paging support for music playlist
increased the NGX_NUMBER_MAJOR to 2
fixed the id prameter
lowercase nuget package
lowcase urls
yet more mode sense supporting code
adding PHP files.
.user削除
Windows版対応
add sdh conf
expand shd template
Added status 500 to response if error getting tags
swp dir creating fixed.
Added removing bochs log to make clean
Add new twitter bootstrap, improve business show page, and fix home page search
有问题啊？有问题？PS的算法是什么
add chang flash button && change  UI style
Added----- configfile
linux fonts check
js
initial turn
spell miss
spell miss fixed
ninjitsu fields!
ninjitsu list
test
test
merged
No need for space in enum docs.
Update ODatabase API docs.
add template and rack config for the site.
broke 1/3
Merge branch 'master' into gh-pages
modify: config/routes
adding crawl
Enhance component replacement with add class w3s-replace in trigger
link spacing
github ribbon on resume
express and pdf deps
pdf generation test
semantic tags, <p> not <span>
generating pdf with cheerio for parsing dom
Add some lines to dump all angles, slight change on a function...
adsf gem required for local webserver
use jquery instead of zeptojs
RWTH CTF 2012 - Azure Coast - writeup part1
Fix console usage, switching from arguments table to usages table/line.

In case there are arguments array('-arg', 'description') directly followed by usage lines array('some usage <param>' => 'help') the resulting info was rendered in a single table, which for long usage lines would be hard to read. After this fix, in such case there would be 2 separate tables (with separate columns) holding arguments and usage lines.
Fix console routes not being loaded.

One of previous commits added ability to fetch console or http router on demand from Mvc\Service\RouterFactory, but this broke default behavior - automatic console detection and instantiating of console routes.
Change usage info, add extra newline between consecutive tables for readability.
Fix console optional flags alternative and optional named params.

Fix parsing and matching of the following console routes:
foo [--bar|-b]"
foo [<bar>]
foo [BAR]
Fix injection of named console params from route into the request.

This fixes the original behavior of zf2 console feature, that the console $request->getParams() holds named parameters as retrieved from a matching console route. This change is BC compatible as all original console params (positional) will be preserved and accessible via numeric keys.
Merge pull request #2045 from Thinkscape/feature/console

Fix console routes not being loaded, usage info styling.
første visning
shell for user game history
add ie6 hacks
add less support
Merge pull request #1 from tidezyc/master

add less support
Fix wrong function call
Add missed  in class PMA_TableSearch
Add some more variables to PMA_DBQbe
Test cases for Error.class.php
Merge remote-tracking branch 'yasitha/master'
Move variables to appropriate function
Merge remote-tracking branch 'upstream/master'
Improve usage visibility of criteriaSearchString variable
make it beautiful

- added DAOs
- Deleted some useless classes
- "Estadia" now has a family ("EstadiaGrande", "EstadiaMedio",
"EstadiaPequeno")
- "Dono" is now "Pessoa" and became more generic
Added initial app skeleton
Hardware keys demonstration function and output
Fix one thing and it breaks another. childBrowser updates

This seems to be an angling issue with cordova. When one plugin works
it is at the cost of another. Trying to find a happy medium where
everything works well enough to call them all features is the biggest
challenge.
Adjust layout & Put "new" badge.
打开log中的DEBUG信息
去除多余代码
Wed Mar 28 14:32:55 CEST 2012: ++
More of core structure
Lesson 5-2
Removed default RoR page.
changes 04-12-2012
Update notes for submitted changes

* Suppress error about the missing vendor libwvm.so
Adjusted to new structure of package id file
removed stubby from gitignore and changed npm postinstall to prepublish
practica 1 version 1.1
Fixing problems in Neo Catalog
Updating AWE-OpenSource launcher
Removing old projects
Fixing ProjectExplorer dependnecies
Fixing warnings
Refactored ProjectExplorer plugin to be based on updated architecture
Running chain of Events
Fixing bug in Catalog Plugin
Refactoring of Abstract and Network Rendered to new Architecture
Refactoring Models
Fixing tests
Implementation of new Model Methods for Rendering
Refactoring work with Renderable and GIS Models
Searching for a multiproperty-indexed data
Modify Renderer to work with GIS Model
added table for correlation result displaying. fixes
added pom for correlation.ui plugin
modify .gitignore to ignore jre folders
remove existed jre in feature plugin
Fixing bug with loading Geoptima Data
Updating Geoptima Saver with additional logic
Fixing statistics label provider
Support different Periods for Statistics
Bug fixes - empty data in statistics
Fix AWE Product category definition
Date period messages
Updating version info
Oops.
Newline
Better debug and don't connect to 0.
Cleanup
Checkpoint
Ignore access specifiers.
Fix some issues with constructors. This is some awful shit that I had
hoped I'd never had to do but there's seemingly no other way to get the
right behavior.
Fixed wrong PEP-8 replacement
Added command line interface
Ignores
Support for defining own Python module containing variable extraction rules
Added example to README
PEP-8 and cleanup
Support for defining multiple modules containing variable extraction rules
Added example for custom variable extraction rules
Agora com configuração de dns.
lots of changes. too lazy.
testa
803 Build version advanced to 2493-25

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

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@126981 eb64e737-3616-4df0-8941-5ee2ae88103d
Merge git://github.com/CloudifySource/cloudify
fix typo
CLOUDIFY-1131 remove file gs-openspaces-src.zip
make public uploaded files
Merge git://github.com/CloudifySource/cloudify
markdownify small frames, css for new profile.
We have a maybe working simulation
Working sample
merge conflict
een test bestand, geen nuttige inhoud
load/save functioning, probably buggy.  Need to move on though
GBA and Unittest working building successfully
Examples Project
Fixed compile error in the sample project where the iPhone target was trying to import Cocoa.
Remove unnecessary function

Never used, not implemented and has a duplicate.
Preserve whitelist ordering. Addresses BUKKIT-1805
Changes '/whitelist list' to ignore comments. Addresses BUKKIT-1804
Fixed the set text in toasters
Merge branch 'master' of ssh://git@github.com/CS301Team/cs301w04
Files for tutorials in CartoDB central
change klick on background
Only Allow Letters Numbers and '_' for filenames.
HW in day06 and homer
Update README re directory listing
Support Python 2.5

Seems silly to rule out Python 2.5 (and consequently Debian stable)
for the sake of a few numbers.
Allow an auth object to be passed when connecting

This means other authentication methods can be used, e.g. digest
or NTLM, by simply constructing one of the relevant auth objects
supplied with the Requests library.
CDN URL
Renames the folder
First commit

Full theme in current state
added <prefix>-s command to multi-split a window
Fix short DOI regex and support 4 or more digits after 10. in DOIs.
rename to routeStartup/routeShutdown
update anzu repos to the pac side
trim the buikld
* Added piston and explosion protection.
Change see question text and made it translatable.
Accessing fields/properties of CLR objects fix (incomplete binding restrictions)

git-tfs-id: [http://falcon:8080/tfs/Projects]$/Phalanger/Main;C3312
count() supports ICollection (Array, IList, IDictionary etc.)

git-tfs-id: [http://falcon:8080/tfs/Projects]$/Phalanger/Main;C3313
updated button title
got rid of theme specific styling for full screen
Merge branch 'master' of https://github.com/DGI-EMiC/emic_cwrc
solr authorities
TFJ-735 Fixed profile urls without extensions parsing
add css rule, remove pem field
add a rule for ul class
pem is random generated
Merge pull request #85 from msapunov/pem

Pem
rules.ts okay, but the grammar has a conflict ...
Revert "second DI commit"

This reverts commit 4c0baa70f9b185934e9dba724004c584e082fd4a.
Revert "second DI commit"

This reverts commit 54e268509a546ffd2d71f668b6073abb94b9bf6d.
Revert "Dependencie Injection with Guice, Kick-Off"

This reverts commit 4e9f14435c60de2e84c1aba88d3ebf501f101eff.
Fix opening inventory after trade summary
Refactoring, method organizin'
Change F8 textwidth to 79

80 characters is fine for text, and the autocmd for text files already
sets this. 79 is handy for pep8-compliant code, and the shortcut's
helpful to toggle forcing the behavior.
add scripts (/usr/local/bin)

Signed-off-by: Deleterios <deleterios@gmail.com>
Release - v1.0
updated information sidebar, and change sorting of nodes to be by decade, rather than by year, to allow for some self organizing
Ran a few migrations to update the stopwatch database tables and cleaned up the flash CSS.
Added a bunch of CSS and placeholders to the stopwatch view.
Update: Define 'mobile' variable.
new file:   8.107/107 protokoll.fot
	new file:   8.107/107 protokoll.synctex.gz
	modified:   8.107/107 protokoll.tex
	new file:   8.107/pics/aufbau.jpg
	modified:   solar/protokollSOL.synctex.gz
	modified:   solar/protokollSOL.tex
Update Project/GTalk.ConsoleClient/Program.cs
Editions in conlusion and summary
Merge remote-tracking branch 'origin/master'
Added support for the CLIPS programming language

CLIPS or C language integrated production system is a tool for writing expert
systems.
Initial report tool commit
Initial report tool commit
Better handling of model name.  Update to include iOS 5 NSManagedObjectContext concurrency guidelines.
Fixed broken Vimeo embeds.
個人書庫頁(非會員後台)
Updated tracker
Merge branch 'master' of github.com:ElbertF/Wappalyzer
Lightbox - jQuery - ImageTiles

There are now Image Tiles that can be clicked to open the Original Sized
Image in a Lightbox.
Homescreen Implementiert juhu
Final update before first release
implemented acceleration
path bug. added slash: [] = ['path'].trim(,'/').'/';
adding a clean files management command
adding new note page, still using js iframe loading from the old system
update thank and flag logic to disable button if already flagged, TODO: make js version of the same
Merge branch 'master' of github.com:FinalsClub/djKarma
removing alert for Terms of Service checkbox
Merge branch 'master' of github.com:FinalsClub/djKarma
some link improvements to course_log.html and person_log.html
Updated jline to latest version.
Changed update check to false and removed text specific to bukkitdev
since this is a diverging fork.
Changed project name, updated for api project name change.
Fixed some bugs with exit;
Added some console functions;
405 = not authorized, 404 = resource/user not found
Issue #27 resolved.
added less 1.3.0 to deps
Merge branch 'master' of github.com:GreenLoops/std-lib
Added exisiting problems to repo
Merge branch 'master' of github.com:GreenOlvi/rosalind
Ignoring win gvim backup files
Added random movements to magikarp and increased spawn rates.  They
actually look like they're swimming now
set hasGiven after a starter chosen
Object sharing
Update 404.php

polish translate
added file output for better comparison
order history
commit
add total price with discount
Merge remote-tracking branch 'origin'
Fixed unary-op issue and added some more tests.
FitBitCreateExerciseTest uncommented
DltExplain
Adding the L10N
Change AvoidBumpingThings to gradually increase the orbit distance up to 5x normal (1 increment every 30 seconds)

Also added a global 'panic' at 15min if you are still stuck questor will relog.
Send warning to console log when you have been stuck on an object for more than 5 min.
https://github.com/ISeeDEDPpl/Questor/issues/245

this also reorganizes the variables listed in AgentInteraction as they were quite unorganized...
more logging fixes... and a variable thats needed for the KillSentries setting previous committed. This should now compile
FIX: panic to warp ASAP if it WAS warp disrupted and is no longer warp disrupted
Make sure *all* inventory windows are closed
Improve DB field_data() for Oracle (and fix its max_length for MSSQL / SQLSRV)
Improve DB field_data() for PostgreSQL
Corrected phpdoc comment for mysql_to_unix() method
Merge pull request #2003 from webmasterar/develop

Corrected phpdoc comment for mysql_to_unix() method
Improve DB field_data() for IBM Informix and IBM DB2 (PDO)
Fix issues #751 and #2004
PDO was not escaping strings for SET as array
Add db_set_charset() support for the mssql driver
ci update
Require Resque lib before write ResqueMailer specific code
Example showing how to test HasClickHandler. NOT MADE BY ME.
* Injection Connection using Guice
Beginning Ch 10
up to date
Put require to the end of file cause cycle require
Fix
Fix
add project and task database actions
Combine config in a json encoded array.
Atributos listos
Renamed app from Analyzr to Postr
issue #1404 Add new object to qtp_ObjectRepository.
Improved SetSpeed from Movement
Some new classes
Add one more override
Add new tranlate function for future use
Add `git brpb` and `git shas`
only package private constructors and overview abstract position fix-up
Fix "onlineUpdater" Component exception when trying to install the Templates in an user defined directory.

Closes #173.
Update various actions slots methods names.
initial commit Thurs AM
final
Varias cosas arregladas (deberia andar, ver que onda el prescaler).
Merge pull request #14 from jubeira/master

Cosas
Grabbed the best from the recent limeblast.co.uk rebuild.
Apparantly, a branch was removed from the ZfcTwig repository
Fenster verkleinert
Sol mis en place
Perso placer, plus déplacement, plus accélération.
test java docs
About to edit main.xml to make the score textviews.
Silly report for summer practice at GlobalLogic Ukraine
English copybook for 7th semestr
Lecture notes for economy
Add lecture notes for mathematical modeling and system analysis
Lecture notes for basics of work safety
Save trees : use 10pt font
Merge branch 'master' of github.com:MPogoda/latex-docs
Link changes
Adding messages for forces.
Adding messages for bounding box
A bunch of other stuff
adding age calculation
non static bus stations solves #9
priority queue solves #3
embedder abstraction
key actions
Merge remote-tracking branch 'joschi/master' into overview

Conflicts:
	src/main/java/infovis/data/BusData.java
	src/main/java/infovis/data/BusStation.java
	src/test/java/infovis/data/test/BusStationTests.java
Add Function RecursiveTraversal and update namespace names
Reverting tooltip for now until we can fix the node issue
Adding ability to follow based on node selection
Merge branch 'master' of https://github.com/MattStockton/nodal

Conflicts:
	static/js/nodal.js
Fixing compiler errors in XCode 4.2
Also fixing a bug in TSPopoverPopoverView.m where an if statement was making an assignment instead of == check
Revert "test4"

This reverts commit 1d769dda506f1715cc8148c981ca720025a9d8c9.
Revert "test3"

This reverts commit ee4a704c01ae9dc173efb906efa5f23cc0af0874.
Revert "test2"

This reverts commit 64f771cd11b51d1e236c6f556f8ccc3558c91339.
Revert "test"

This reverts commit bbb77e8663bd68f6fd00902b4feae6cce2be129d.
The Script manager integration

I hope I did the right thing. Compiled. Will be launched at the presence
server.
Merge pull request #141 from CynicRus/master

The script manager integration
Added task table to show tasks as they run.
Actually associate the tweeps to the user

Also, passing specs.
Handle the case where no new twitter user ids
One save to rule them all
Merge pull request #1 from mattyoho/refactor_tweeps

Refactor tweeps
Custom : Change chatbox command security
typo in save_work
fixed metadata error
Implemented some functionality in Parser. Added base functionality in Calculator class
check js less and py changes get detected
updated for GPL 1.0 RC1
updated for GPL 1.0 RC1
removed these 2 controllers as they are now in the R plugin
removed as these 2 have been moved to plugins
Updated to latest code version
Second big commit. This removes files deleted from the latest pharma code and also improves the headers
Resolving a js issue
Removed these files as they have been moved to Rmodules
added check to see if subset's result-instance-id list is empty
Modified request to support i2b2 1.6.x
Cleaned up internal config file
Add ignore file to ignore target and other build/run related artifacts.
Add ignore for application.properties
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.
renamed hotmetal to hot for compatibility
Update error message detection for MyPick and Ero/Guro page
Update yasou_ini.php
fixing pending spec
better specs for delegations
Revoking a delegation specs
string to C++ AST: only 2 nodes to be implemented
Solving on running heroku rake db:migrate that gives DEPRECATED WARNING
Upgrade 'ZXBasic.Mod' - increase safety; add consts MinCodeStartAddr, MaxCodeStartAddr.
Asset.populate: Resolve root-relative urls correctly when both assetGraph.root and the base asset url are file:
Release 0.4.53.
pdfgrep
basic repo-model, qik-rough-jenkins-install
basic bootstrap script started, update to jenkins rough sketch
#0|Manjyot, Lokesh|Functional test fix for intialize RnR screen
Core/Map: Fixed some crashes from mmaps. and readd old working code.

thx vlad852.
Fix to OOCalc Reader for percentage and currency datatypes
Changelog for OOCalc bugfix
Bugfix to ensure that General format is not treated as a date format
despite containg e for epoch
OOCalc Reader modified to process number-rows-repeated
Modify OOCalc Reader to only read cells that containing data, or merged cells
(depending on setReadDataOnly setting)
Formatting constant GENERAL should be FORMAT_GENERAL
Unit Tests for Date helper functions
General - merged (with some localisation mods) from a pull request by alexgann - Add Currency detection to the Advanced Value Binder
General: Work item 18404 - setCellValueExplicitByColumnAndRow() do not return PHPExcel_Worksheet
Ensure that chart worksheet is correctly set when adding chart to a
worksheet
. Started tweaking BRDF vectors!
 => Building my sampling base for minification algorithm...
Some changes in Qt
Moved qtgui folder
Create gh-pages branch via GitHub
Added description, links, demo and docs
Added paranoid-proof disclaimer
Better copy
Changed author url to github page
Updated compatibility information; added opera-related passive aggressive note.
Added chrome 12 flag activation suggestion
Specified compatible ff versions
Inverted the annotated code and demo, in order not to hide the former for inferior resolutions
Added twitter on the sidebar, just because.
Merge branch 'gh-pages'

Conflicts:
	index.html
Camvas is now a library
Forgot some files
Restored example in home page
Updated README to reflect the fact that Camvas is now a library
Updated README to include syntax highlighting
name of the distribution is Dancer, not Dancer-Core. Remove autoprereq
added test client, added offending XML to unpickling error messages, some cleanup
Removed BADIDSTORE, a class that is no longer useful
Added some warnings for what I plan to change... one thing at a time though...
Better icons
Direct download link
Fixed Icon
Merge branch 'master' of github.com:Pro/put.io-firefox
added 'is' command to cec-client, to mark libCEC as inactive source
send active source message when we received a routing change with a device that is handled by libCEC as address. issue #89
fixed: return value wasn't updated in GetLogicalAddresses()
fixed include path for threads.h in PHCommandHandler.h
updated version number in the windows installer
updated changelog
no Reload for all links. tztztz...
Bringing in Swing Pad into Decaudin.AD, edited README and
package-info's.
more work on setting aoi from within project, stacktrace improvement to dump function itself when a function in stack is anonymous
[#32097437] tested JSON response from search controller, removed obsolete tests
테스트 서버에서 로그인 키생성 런타임 버그 해결,
페이스북 로그인 에러일때 에러창 추가
PRINT TO PERMIT
variable Services
 + print to permit routine
BPPermmitServices
 + print to permit routine
bprule.sql
 + new field getVar statement
FAASService: do not check balance for datacaptures

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
LandRPUService: add support for selective land value adjustment
to simplify cases in agr land in mix-use mode wherein there are
several numbers of agri land and one residential land.
Adjusting the agri land using actual use takes time and error prone.
Set the "landrpu_calculate_landvalueadjustment_all" variable to 1 to
enable selective adjustment with landvalue.

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
ruleanalyzer: fix bug in line of business operated screen

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
RPTBillingService : support quarterly previous year ledger for manual billing
rptcollectionmanual: fix paid period bug

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
RPT Ledger
 + double click table to open or ctrl + 'Enter'
RPTReceiptService : add checkdates field to the returned map
		    of online and manual collection
AF56_guimaras     : add checkdates field

Signed-off-by: Grace <cabantan_mg@yahoo.com>
af51guimaras : adjust report template

Signed-off-by: Grace <cabantan_mg@yahoo.com>
Merge branch 'master' of z:/ETRACS2
Merge branch 'master' of z:/ETRACS2
LandRPU : allow editing of assessed value when datacapturing

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
BldgRPU: workaround grid cell-locking problem

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
BldgRPU Structure: add indexno to sort the structures and simplify data entry

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
RPTBillingService: fix bill parameter to updateDetailPeriod

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
rptbill.sql : properly handle partial payment for currentyear

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
RPTReceipt: fix partial payment voiding error ( partial fields does not accept null values )

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
BPApplicationService
 * change txndate default value to null if txnmode is 'CAPTURE'

LookupBusiness for Ledger
 + new field txnno in list
Merge branch 'master' of z:/ETRACS2
LandRPU: add option to either edit av for datacapturing

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
ETRACSUserService: add query for rpt officers for lookup
ETRACSUserInterceptor: properly update middlename

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
fiddling with servlet root location detection
hg flow, add branch `feature/MDG`.
Cambiados los permisos.
Se crea el archivo ODT de la guía de desarrollo.
Se ha comenzado a escribir la guía.
Se escribe la introducción.
Merge branch 'feature/MDG' into develop
* restructuring the model and doa
* removed some old database classes
Fixed a problem with the present claim url
Fixed a problem with the queue
Broke a lot of stuff. This commit should fix it again
CodeSnippets init commit
Make albumData() actually work
Generated documentation for 13114ef27114a7797dd1ca6358332b234a6dd4eb
Various Needed Utilies
Version 5.14

v5.14 -- Added determination of difference between Topaz and BP Topaz
sites.
Added separate events class

Removed events from SkyQuestPlugin class
Added player respawning with magic book
Stopped Magic book from being dropped on death
Arquivos .git removidos.
ajout du conflit
added point init to Voronoi, fixed GeneratedLayer so that it used proper dimension, minor cleaning
RRD 0.2 + tests
RRD fixed query. Tests.
Couch DB Setup
fix nuget
bump version
auto-player: Sort by highest first
utils; Add write_file
auto-player: Output crude html
3.2.5

3.2.5
Bug fixed with autohide on resource/eclipse/demonic fury/health
New plugin: Bandit's Guile (Rogue combat)
Bone shield added in DK config
Frenzy added to Hunter config
Add event to handle unit = "pet"
Added player death (test with /kill)
Support Sale Order causality relation.

When instance is requested in stopped state it will not have setup delivery on
casuality relation, so just use Sale Order state.
Install vifib_agent, as it is required.
Add wro4j
Quest: Through the Eye
Have not commited in a long time, so I forgot what has been changed. But it works, I think I was trying todo something with functions_of_time.c and then changed my mind. But I'm adding those anyway
Function of time testing...
Testing something with DTMF tones, I forgot what I was doing
Been playing around alot with this
Ignore the tmp directory, contains lots and lots of output data for plotting an fft animation of a large wav file
Also played with this alot since last time
Some correction
Curent state
unfortunately json escaping isn't available in the freemarker version in restlet
fixes #207
Merge branch '2.x' of github.com:Studio-42/elFinder into 2.x
Make it pass on jshint
Finished geData function
Adding the 'set' command for use with the CLI
Merge pull request #1 from ev0rtex/unique-hostnames

Adding the 'set' command for use with the CLI
Typo

Signed-off-by: Gabriel Luethje <gabriel@thefstopdesign.com>
add place holder icons
changed mongohq url
setup devise; added user and organization model + controller
Change for jmcore
add an mcrypt.ini file
Add top scope specifiers to hostgroup fact
GUI Widgets, Removed old debugging prints.

Replaced the previous hardcoded GUI element system with a more dynamic
widget system.
file extension, multi path
Мелкие исправления

Закоммитил тестовую версию
v. 0.2.5
Implemented Main Menu button (former Exit)
Exit button now is on Main Menu screen
Fixed timers bug for rotating
Other bugfixes and minor changes
Added the `net\http\Auth` class and refactored `net\http\Request` and `security\auth\adapter\Http` to use it.
Template\Helper: the `'handlers'` option of the `_render()` method is now supported
Merge pull request #690 from jails/pr51

Support the `'handlers'` option (`lithium\template\Helper::_render()`)
SEO Module and seo Layout
Updates (Unit Tests)
PCMM Assign or Unassign API and UI
Expand Entry API and UI
Display Team Information API and UI
Removed assumed variables and direct global access (1)
Removed direct access to ^XUSEC
Removed assumed variables and direct global access (2)
Add missing UI questions to Make appointment.
Merge branch 'master' of github.com:kthlnkeating/VistA-FOIA
Removed assumed variables and direct global access (3)
Fixed "Roll & Scroll" bugs to pass Functional Tests.
Fixed SDAMEVT bug.
Fixed Cancel appointment bug.
Fixed Change Date error.
Fixed Select clinic bug,
display pending appointments (missing lab, xray and ekg info).
Merge remote-tracking branch 'upstream/master' into MDWS_SCHEDULING
Taggeada nueva version para nitf
Changed to tests
Update for api-bullet branch
Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Clean up Bucket handling

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Better Nether portal handling

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Revert "Merge pull request #292 from R-T-B/master"

His code wasn't bad, I just accidentally hit merge before I got him to sign off.
Post outline
docs

docs experimentations
Version 0.1 beta7 delete old class files
Morpheme splitting algorithm rewritten; started updating benchmark
compass sprites running
dont drain all
Merge branch 'hotfix/dont_drain_whole_pool'
Merge branch 'hotfix/dont_drain_whole_pool' into develop
Merge branch 'release/staging'
enquoted column type changes
added column checks to the shp file importer
Merge branch 'hotfix/column-nature-fail-fix'
Merge branch 'hotfix/column-nature-fail-fix' into develop
Merge branch 'master' of github.com:Vizzuality/cartodb into develop
really long osm names fix
Merge branch 'hotfix/osm-tablename-length-fix'
Merge branch 'hotfix/osm-tablename-length-fix' into develop
line added to txt
Merge branch 'hotfix/treat-txt-like-csv'
Merge branch 'hotfix/treat-txt-like-csv' into develop
remove beta test
Merge branch 'develop' of github.com:Vizzuality/cartodb into develop
updated osm renaming method
Merge branch 'hotfix/still-with-the-names'
Merge branch 'hotfix/still-with-the-names' into develop
Logger class implemented
First commit
Merge branch 'master' of https://github.com/WarrenFann/Porsche
added navi icon to ferrite as well
Add shadow for line text.
button, layoutHorizontal, layoutVertical, scrollableView added
Bug fixes
Merge branch 'master' of github.com:WouterBos/graphite

Conflicts:
	Website/internal/css/gp_values.less
Get *all* selected values from a CheckBoxList
Deleted a couple superfluous files
added a toString method to ActualParameter
fixed a null pointer bug, caused by the invocationexception bug thrown in
main not having a cause.
Fixed a bug caused by a programming error in basicmodule. The objects
being passed into a method were ActualParameter objects, rather than the
*value* of those objects.
removed a println
added a toStringMethod to FormalParameter
console now spits out log messages
fixed bug where GUI would not highlight a correct string even if it
verified.
This bug was occurring because isValid in Verifier wasn't doing
everuthing that the verify method was. That was due to several factors:
- I was creating dummy objects of type Object, rather than the actual
type of the parameters, so the boolean method was unable to see them as
being correct. I corrected this by adding an underlyingTypeInstance
method to Type (previously I had used it only in collectiontypes).
- I had to reimplement underlying type instance in an annoying weird way
for collection types. Boolean method wasn't iterating over empty
collections, so would just return true. I added elements to the
collecitons returned by underlying type instance so that the boolean
method would iterate.
Merge branch 'master' of github.com:XManticore/project
Build Inverted SnapBlack // 014
Cleanup time (3/3)

Settings > XYSettings
changed world to "Jenkins"
Commit of doom...
Support benchmark return list
Add "All Categories"
add .DS_Store to .gitignore
Merge branch 'Marlin_v1' of https://github.com/ZetaPhoenix/Marlin into Marlin_v1

* 'Marlin_v1' of https://github.com/ZetaPhoenix/Marlin:
  Add .DS_Store to .gitignore
  Back from Axis Move goes back to Prepare instead of main menu
  Fixed Retract in LCD Menu
  Added pause and retract lcd menu items
  Updated Language.h with pause, resume, and retract
  Updated config
Found this cool new form library
New stop, list commands
Intial commit after app generation
Updated Readme file
Updated index and template files to strip out grails default
Päivitetty muutama inventory iconi ja koodattu nettikoodi loppuun. Nyt se mätsää tänhetkisen singleplayer version kanssa.
add default profile pic
KMLSuperOverlay: add Open() support

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@25021 f0d54148-0727-0410-94bb-9a71ac55c965
ogrupdate.py: add new sample script to update an OGR datasource from another one, by trying to identify matches between the 2 datasources

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@25193 f0d54148-0727-0410-94bb-9a71ac55c965
Avoid an error when iterating through features with Row or Tuple methods.


git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@24256 f0d54148-0727-0410-94bb-9a71ac55c965
GML: Improve detection of extent and srs for WFS 2.0

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@24620 f0d54148-0727-0410-94bb-9a71ac55c965
Re-apply r24828 that was lost due to a merge issue

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@24831 f0d54148-0727-0410-94bb-9a71ac55c965
init_hostfs added()
Merge pull request #53 from abhinavc/master

new question
Reworked the figures
修改全文复读方案章节内容，添加表格阐述复读流程，更换图片
以v2.3相关文档作为工作起点(此时Aboboo已发布至v2.4.2)
[views] fix syllabuses/_exam_form remove execution_date
hatalı extension kullanımı
doğru kullanımı ;)
Add support for ServerAliases.
Take the suck out of janus
Named ctors for making matrices from arrays (closes #8)

 - Added fromArrayInRowMajor and fromArrayInColumnMajor to Mat3
 - Added fromArrayInRowMajor and fromArrayInColumnMajor to Mat4
submodules contain my config files. (firmware settings, print settings, etc)
add link to reportlab.com
Added example image
add the right file this time...
added mail verification
Перемещение файлов-примеров
added proper user authentication
minor fixes
fix visual glitches
some initial styling and homepage stuff
Change name in html to Text Vault
start incremental DBSCAN
added static pages and made mailing list signup possible
packages update .... need to remove this from the repo
project files
Good command separator.
Stratford Static TT Data

Complete set of data for stations at stratford gate.
Added modifications needed to integrate Xlib.ext.render
Rename a view folder to 'organiser_connexion'
qemu: whitelist kvm pv eoi feature

Whitelist kvm pv eoi feature. The feature is enabled
with -cpu kvm64. To disable: -cpu kvm64,-kvm_eoi.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Apply patch [#383] problem with script usergroup.php on cronjob - cvs plugin by Erica Vidal
argh! this is because of someone not understanding make rules…

can’t have a meta-target the same name as an existing directory/file
without marking it phony…
did I mention I hate dh7?
swapped columns and rows to make the calendar table easier to read
equalised the width of the table columns containing the dates so it doesn't look ugly
Revert .brand colour to white
Fix the match against parts in the report method
Ensure we get UTF-8 strings from the CSV file.

On the preview server, titles which were locally returned as UTF-8
were instead returned as ASCII-8BIT. For example, locally:

    #<CSV::Row "Title":"Second survey of employers\u0089Ûª policies, practices and preferences (... etc ...)

On the server:

    #<CSV::Row "Title":"Second survey of employers\xC2\x89\xC3\x9B\xC2\xAA policies, practices
    (... etc ...)

The encoding setups in Ruby at least seem the same, but I
discovered that using CSV.parse will return the titles as UTF-8
on the server, so decided to use that.
Use a 'virtual' factory attribute to simplify attachment creation.

The details of the implementation of `Attachment` and
`AttachmentData` aren't relevant for most tests, so they shouldn't
need to refer to them when creating an attachment using the factory.
Use a slug in document series urls.
Changes to wire up the experiment typo fixes
Upload DFT news

There are four articles with invalid markdown which will inserted manually.
Revert "Upload DFT news"

This reverts commit 626f7d17a0dcc89602bf36b1581ae18f0fcf23d4.

For some reason the minister associations are not recorded.

Reverting until I can investigate, there will be incorrect data on
preview and dev machines, sorry.
No need to generate test coverage reports when running locally.

They will still be generated as part of the Jenkins CI build.
some minor tweaks on other orgs page
Apply style to indicate current page in policy

This will be used to give the visitor a better indication of where they
are: either viewing the policy, or one of its supporting documents.
Use appropriate titles on supporting docs
Merge commit 'd67b4292ff451990bdaecf833507e036b53c14a8' into HEAD
**又从**GoAgent里面steal了一个trick使得http_handler在处理connect请求时不会长时间等待自身不再有数据的self.connection。
Always close ResultSets
replyしたら発言欄にフォーカスするようにした
pass the "econtext" as to translatestring's translate() method so it doesn't need to get "request" from threadlocal which causes issue with green threads.
tests restored
freemarker additions
change write image to read image
Create simplehtmldomtest.php
added support for missing user

added jquery jsonp error support:
http://jquery-jsonp.googlecode.com/files/jquery.jsonp-2.3.0.min.js
Text rendering with 5x7 LCD font
ImageHandler property names, shorter names
EntityController for MVC
List of changes:
- Added (empty?), (boolean=?), (type=?)
- Moved EvalSyntax() to EvalList()
- Changed SValues to []Any
- Rewrote Env.Define to better support lambdas
- Rewrote builtin syntaxes to fit Transformer interface
- Fixed lexer (r => \r)
- Fixed (list->vector)
List of changes:
- Added unlist1O(), unlist2O()
- Added ErrorToPanic(), PanicToError()
- Moved Eval() logic to Deval() builtin
- Moved Env methods to list.go
- Renamed SSyntax to SPrimSyntax
Changed builtins.go
Added parse.go and Makefile
updated nq error logging
updated string cell template js to not have tabs.
docs(guide/started): fix examples
Updated player to have a better collision in the world.
Merged.
new commti in file1 and file2
Merge branch 'master' of github.com:anjanrs/ProjectGit into branch4

Conflicts:
	File1
	File2
Merge pull request #14 from anjanraj/branch4

new commti in file1 and file2
Merge pull request #186 from tuhaihe/patch-3

Update js/translations/chinese.js
Removed Tags & Replaced with Hashtags
Merge branch 'master' of https://github.com/stayradiated/Nitro
utils
Merge branch 'master' of github.com:annag/SCDLifeStyle
Fix installation of new dotfiles
Merged revision(s) 1421598 from lucene/dev/trunk:
no comment!

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1421600 13f79535-47bb-0310-9956-ffa450edef68
multiple top level element management for required views and widgets
plugin now runs on python version less than 2.7
tighter checking of titanium location
0.1.19
Merge branch 'development' into release
Merge branch 'release'
BUGFIX to RISC-Jogging and re-indent control.c

* the update_pos_req should be blocked when there are pending TP commands
* re-indent control.c with Eclipse's "ctrl-a", "ctrl-i"
WOU: add machine-is-moving signal

signal name: wou.motion.machine-is-moving
 	    set to 1 when machine is moving
Improve the decrementing/incrementing of the brightness of the screen
with C-t F5/F6
better social buttons styling
full path of file
Killing the "+50000" hack now that I figured out what racerender hated about wifilapper's CSV files (backwards-in-time jumps)
Fixing reported crash - if we went to draw a lap that only had one position, we'd crash.
ALM-110 return historical data in a consistent format, i.e. parse the ALM 1.x data from CouchDB
Merge pull request #68 from arvindkhadri/master

Fixing conflicting conf variables.
overlay bars, editor & prompt are fixed
Merge branch 'master' of github.com:Alipi/alipi
Again changes in Overlay bars, editor & prompt fixed
Merge pull request #69 from ajaykools/master

Again changes in Overlay bars, editor & prompt fixed
Language and location auto-completion implemented.
Update index.html
Merge pull request #2 from ksessions/patch-2

Update index.html