labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'master' of https://github.com/AlphaHo/training.git into zhansf
Merge branch 'master' of https://github.com/AlphaHo/training.git into zhansf
a
Signed-off-by: zklscut <taitoubiyan1@gmail.com>
更正文件格式
Signed-off-by: AlphaHo <alphaho@vip.qq.com>
Merge branch 'liupan' of https://github.com/AlphaHo/training.git into alpha
修正文件格式

Signed-off-by: AlphaHo <alphaho@vip.qq.com>
added "file-to-generate"

Signed-off-by: AlphaHo <alphaho@vip.qq.com>
Merge branch 'alpha' of https://github.com/AlphaHo/training.git into alpha
增加数据表英文名

Signed-off-by: AlphaHo <alphaho@vip.qq.com>
finish the txt-to-model.cs.lisp

Signed-off-by: AlphaHo <alphaho@vip.qq.com>
models generated

Signed-off-by: AlphaHo <alphaho@vip.qq.com>
Merge branch 'alpha' of https://github.com/AlphaHo/training.git into zhangkl
change DBContext to DbContext

Signed-off-by: AlphaHo <alphaho@vip.qq.com>
Merge branch 'alpha' of https://github.com/AlphaHo/training.git into zhangkl
Merge branch 'master' of https://github.com/AlphaHo/training.git into zhangkl
Merge branch 'hshcuai' of https://github.com/AlphaHo/training.git into zhangkl
合并
Signed-off-by: zklscut <taitoubiyan1@gmail.com>
beta1.0
Signed-off-by: zhansf <929707351@qq.com>
Merge branch 'zhansf' of https://github.com/AlphaHo/training.git into zhangkl
Merge branch 'zhansf' of https://github.com/AlphaHo/training into hshcuai
edit (2)
edit (3)
Fix fitting creation, step 2.

Allow anonymous users to create loadouts.
Support presets.
Split code.
Updated the javascript include to use the asset application.js file
Exercise 5.4: Koch Curves and snowflakes - Updated
cleaned code 0.0.1
[bugfix] 保持set接口的参数不变，兼容老接口
[bugfix] 增加2.0支持magic的文件
Merge pull request #430 from linlingyu/dev

Dev
[Change]baidu.array.each升级
Merge pull request #271 from huangfangrong/dev

[Change]baidu.array.each升级
add usermgmt to readme
Added a windows64 build target and fixed source for stable builds on all
targets (linux linux64 windows windows64 scar)
Merge pull request #95 from BenLand100/master

EIOS Fixes/Updates
Merge pull request #94 from kwollaston/master

Added BitmapExists function
advanced filtering buttons
--> https://github.com/xbmc/xbmc/commit/39ab944a45b51499854516a3efbdc623211fa998
Add alarm + rotating fanart for poster panel widget
Merge remote-tracking branch 'origin/3.0.0-pre' into 3.0.0-pre
Remove extra hardcoded error reporting flags, these are unneeded and the ENVIROMENT variable should be respected instead. It could also pose and information disclosure security risk if errror reporting was enabled in production. Fixes issue #4
Began globalizing site configuration (stored in config SQL table)
Added link to Dev Bukkit project page.
Port FindCODASH to FLP, resolves missing transient dependencies
Fix FLP reentrance wrt transient package version parsing, add warning
Add finder for Mercurial
Add transient dependencies to FindMonsteer
Minor cleanup
Revert "Add finder for Mercurial"

This reverts commit 27b9564de5777321385bf2149a8f240d86beda31.
Relax git requirement (for launchpad)
Reenable a warning in Common.cmake
Update FindEqualizer
CommonCPack fix
Run ldconfig after rpm installation
Merge branch 'master' of github.com:Eyescale/CMake
Run ldconfig after rpm installation, second try
Tweak message
Fix CMAKE_MODULE_INSTALL_PATH for Windows
Revert "Fix CMAKE_MODULE_INSTALL_PATH for Windows", doesn't work.

This reverts commit 118cab2b040f3728ced55acf43869b07fc5ff2b4.
Fix RPM postinstall script
Add finder Qwt library
Tweak message
Create tarball target
Adding framework to handle web requests for plugin management
add basic timezone
maj.php
Added support for handling Shaped clients. Damn you Google Chrome. But I love ya, you're soooo pretty.
Merge commit d67298f from PSTCollectionView
Merge commit 5913118 from PSTCollectionView
integrating splash screen with login page

Signed-off-by: Louis Alridge <loualrid@gmail.com>
Fixed density bug.
Physic Object conflict resolved.
F_ixed issue #14. Catrobat forum link updated.
F_ixes #15.
Autoformatted all XML files.
adapted string resources
Merge branch 'master' into Issue#14-#15-LinkFix
Revert "F_ixes #15."

This reverts commit 42835769f638639c1dca0b97b5cbcd21d4eca083.
Reverted autoformatting
Fixed #14
Fixed #15
Removed whitespace.
Task 7.44c: refactored some variables and methods
Merge branch 'master' into StephanFellhofer
Brick speak XML editText removed,
EditText resize tests removed
.catroid -> .catrobat
change destruction order to fix crash on exit when a video is playing
Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback
fix 2 unrelated leaks
Only use one stream for the ffmpeg decoder
Only store one packet at a time
Update the ffmpeg decoder to use avcodec_decode_audio4
Merge the stream struct into the parent decoder
More fixes for the audio clock

The audio_clock for the decoder represents the end of the current packet, so it
needs to be adjusted back to match the position that's actually going to be
read next.
added: client disconnect handling to the game server
added: client connection to target server argument handling
disabled: some debug printouts
disabled: memory manager
changed: world physics
changed: client run script now targets my machine IP
Brett Terpstra inspired bash prompt
Updating homebrew formulae
Sublime Text 2 as EDITOR
Updating .gitconfig
Adding to .gitignore
Homebrew bash completion
Load z
Updating folder aliases
Alias Drupal dev sandboxes via z
Updating path
Adding DiffFork symlink
Disable trust_server_names in .wgetrc

Didn't work well for me
Add git aliases
Add drush aliases
Simulation Works

Next is re-run simulation or decide which robots to decommission.
Shorter User-Agent.
use potentially more efficient method when paging from a file
primer commit clase1
primer commit clase2
clean up renderer example
Proper parsing of show slave status on 5.5
Make it 2.2.7
Merge pull request #10 from DataDog/mysql-replication-fix

Mysql replication fix
Better formatting & version info.
Better formatting.
Track metric + event count in status.
Remove process id from format.
Add seconds ago to status info.
Fix Apache bytes and requests rate [fixes #257]
bubble up apache check exceptions so they are caught by main check loop
Falling death
Added extra conditions to Listener block pickup.  Fixed up a few little
errors in commands/command registration.
Added in code for eventual config.yml support for custom vals.  Right
now, items will give a default score of their typeID.  Not too realistic
or representative of rarity.  Also, items have to be blocks.  That'll be
changed in the future.
Make the original result available in case of erronerous result:
in `run`, call `done(new Error(…), result)` and you can use `result.data.data.originalResult` (ouf) in your job scheduler
Merge pull request #14 from naholyr/amqp-originalResult

Make the original result available in case of error
Text fixes.
Merge branch 'master' of github.com:Doddler/ld48game
added info about prerequisites to readme
Updated the Mono Repositories to correctly link Nhibernate with MySql.data.dll
Update Insect-visitors connector due to changes in webpage structure.
Added standalone test that exhibits the data race, this needs to be ran
inside GDB
Properly set the title of a MIDI convertor window to indicate the rig
it's part of.
eventloop: move timer logic into its own function.

Also move timer checking into run_once().
Changed get_mobs/1 input from tuple to list.
HTML Tidy Up!
HTML Tidy Up!
#28 the winning items are now loaded from a list in the config, and the welcome message lists them in (tidied) plain english.
#64 tweaked proximity alarm code
Fix error 'catm command not found' when using vim

'vim' command is now replace by 'cat'. Before, the first match for replace was the substring 'vi' resulting to replacing by the not existing 'catm' command.
rename
Fix start row for smile accounts
Add footer to make valid OFX
Add line ID to FITID so that you don't get duplicates with transactions on the same day
Update version, date, links and credits
Always draw the floor opaque
Fixed build flag for testing
Added a mechanism for release/devel builds.
Fixed sprites spinning when changing facing
wokring on the start screen
Layout changes
Started work on a story menu
More work on the story menu
Hacky, but the game now starts by going through a nice menu
updated scripts
Removed some debug statements
Rick's Friday Files, with scripts for Chapters 1 and 2 that don't quite work and some new entity files to go with them.
Merge branch 'master' of github.com:RickDakan/haunts
bugs
Merge branch 'master' of git@github.com:FlyingCar/haunts.git
Merge branch 'master' of github.com:FlyingCar/haunts
New Scripts for Ch01 that totally work and some new entities to go with them.
New Ch02a, which totally does not work.
Merge branch 'master' of github.com:RickDakan/haunts
Working on a new chooser
Got mode selection looking ok
Fixed secondary widget
Merge branch 'master' of github.com:FourSquad/portal
Added tweet history.
Merge branch 'master' of https://github.com/FredDotNet/TwiBo

Conflicts:
	Twibo/Twibo.suo
прикрутил редактор уровней. дальнейшие добавления в редактор уровней будут осуществляться по ходу развития проекта.
added stack
Merge branch 'master' of github.com:GRAYgoose124/BLT
imgset.download accept multiworded tags now
Correct paths for my vimrc files
Install scala-vim
Byter ut alla jars.

Signed-off-by: Anton Myrholm <anton.myrholm@gmail.com>
Some changes to my .vimrc file

* Fixed a bug, where I wasn't actually loading Vundle as a bundle,
  it was commented out
~ Changed my statusline a little bit
Did some changes to my vimrc file
Parsing complete
a first layout

for the packages and main classes,
helper classes may be added as needed 'n' all that stuff.. :D
now emits a warning if taxon can't be found, rather than dying
New initiation
If url has 2 parts, assume its in the form of 'cnn.com', and return that.
Created a sphinx document tree

All top-level modules and packages now have corresponding ReST
documents in the toctree.
add another bar to main menu
cheaper gamma decode and shader cleanup fix
dumpshader command
Revised crossover. Removed old code
Revised generator
Changed daemon(1, 0) to daemon(1, 1) to catch uncaught exception message from console
Upgraded node from 0.8.5 to 0.8.6
Upgraded jquery from 1.7.2 to 1.8.0
Modificado proyecto para compilar en Windows (x86)
лабораторная работа 3
Add the ability to align the tip right-justified with the target
Update the docs a bit
Merge https://github.com/zurb/joyride
Now you can set the position for each element
Merge pull request #1 from boopathi/master

Patch to set position for each element
Merge git://github.com/owenmead/joyride into HEAD
Removed support for data-position since you can change the position for
each tip via data-options

Conflicts:
	jquery.joyride-1.0.4.js
Code cleanup.
Fixed indentation
Default to bottom left alignment even if not specified in the options.
Fixed a bug where steps inherited options from previous tips if they
didn't set the options specifically.
Added support for reversing the orientation of the tip when it goes off
the viewport.
Fixed problems in older browsers. Modernizr should include mediaqueries
test.
added images and nested grids for user page
Validation update to support numeric validations on strings
Fix for Export/Import bug and Dup key bug
remove junky container from checkout.html
after_init: call setupOutpus when configured
Remove C client from repository

The C client removed by this commit has been deprecated in favor of
Crakoon, which you can find at https://github.com/Incubaid/crakoon

Change-Id: I0bd7206503979195bcfd223ca0ecb9d190f81c0a
dumps more info
CI: recreate client if valid exception encountered
dropped tokyo cabinet
process Romain's remarks regarding nursery documentation
merged in thomas's changes
Fixed JsonSignature property casing (value->Value);
Fixed broken href string/Uri conversion
update fog to perhaps kill some carrier wave stuff
update 500 page
added remix button on right pane
add title to remix on right [ci skip]
stupid puts to make sure our session secret is correct
prevent mobile fu on tumblr cuz it makes tumblr sad
add huge interaction buttons on hover state
notifications are now visible!  yayyy B)
cleanup stream stuff
make bookmarklet work on page with no HEAD tag (ie like single jpg pages)
Merge.
fixed custom mix loading and country list drop down size
Removed README.txt
removed haiku.pages
removed xx.gb
Merge branch 'status' of git://github.com/IronCurtain/test
modified idiot.txt
couloumb's law
hahahaha
Merge branch 'mapus'
Buffcoat and Beaver
finish Iteration plan doc, and add it in
add more functions and sample extjs sample code, but still no unit test for extjs
.idea/*
extjs4/*
Merge branch 'master' of juncpsc301:juncpsc301/cpsc301Proj
add pattern into .gitignore
clean up and move source code into 'ProjSRC' directory
modify application server structure
clean up
clean up
remove Documentation folder
Merge pull request #12 from juncpsc301/master

to merge first week source code
Implemented username and id converter

Note that tests fail as code isn't implemented server-side
Worked on game. Threads run smoother.
fixed multiple warnings
Removing files from source control
Fixing .gitignore
fixed untracked files
Added Word Delete Command
Added worldedit personal schematic folders script
KT-2363 Drop secondary constructors
Test data updated
Refactor and clean RPILUniv

The valent literal deletion bug should still be present though.
Added: The submit button text now changes to "Loading" when the form is processing then back again once finished. Is a nice but subtle indicator that should hopefully prevent the forms being submitted multiple times.
damn twitter part 2
damn twitter part 3
damn twitter part 4
Update release numbers.
Forgot to add IE to supported browsers.
More jQuerifying.
More jQuerifying.
Use jQuery trim.
Use unminified version of dialog.
Minify again, and use media queries to select size of alert and progress images.
Don't remove jQuery on clean.
Progress gif should be animated.
Merge branch 'release/1.1.0' into develop
fix ostov by search in-depth
add ostovstack algorithm
Added  consumer tests for content install/update/uninstall
Merge pull request #12 from parthaa/consumer-package-tests

Added  consumer tests for content install/update/uninstall
#4 Ajout du champ personnalisé ResourceField pour lier les ressources
#4 - Ajout du template du champ personnalisé
#4 - Chargement dynamique de la popup
Update github-button iframe so that a GitHub page isn't being iframed. Fixed #2
Add two more properties to .editorconfig
Normalize
Update to QUnit 1.10.0
BUG 13033 color editor scalar range problem

Change-Id: I767e912225a588c066045b7fcad917c5aec72bf5
Fixed a range scale logic error

Change-Id: I785fe3b01555d669931537a9bf7d7fd39fde1706
Merge topic '13033_color_rescale' into next

9570265 Fixed a range scale logic error
c061744 BUG 13033 color editor scalar range problem
SciberQuestToolKit -- vector support for binary threshold

Change-Id: Ia00c372625ecdde40dd42342662f029b94515864
Merge topic '0013481_SciberQuestToolKit_ctest_fixes' into next

da281f3 SciberQuestToolKit -- vector support for binary threshold
Implement basic import Fasta/Sequence/Sequences

-Added type checking and tried to handle errors for methods.
-Consolidated code were possible.
-Broke set_filehandle code out of Fasta constructor, to allow user to set
the file or filehandle manually if necessary.
-Added warnings when incorrect data type was passed to functions
Added Fasta ability to handle multiple sequences through array_ref input
Switch from cssutils to tinycss as the CSS parser
Use the faster native tracebacks in pytest.
Remove remaining references to cssutils.
Pre-process stylesheet (do validation just after parsing)
Simplify text tests
Also pre-proccess @import and @media
Use the released tinycss in tox.
Catch up with tinycss changes.
tinycss again
Tests n’ fixes. Lots of them.
Rename value(s) to token(s) in validation.
Do not keep tokens for percentages after validation.

Make (value, unit) namedtuples instead.
Pixel values that could be percentages are not plain numbers anymore.
Clean up shorthand properties tests.
Add some tests for validation.
Tests and fixes for drawing
Disallow _ instead of - in property names.
Simplify the handling of 'auto' lengths.
Simplify error handling in images.

Catch any non-sytem exception and consider that as an invalid image.

This may hide bugs, maintaining a growing list of invalid-image
exceptions was no fun either. The exception’s repr() is logged as usual.
Tweaked xf86-video-fbdev-damage install prefix
Merge pull request #1 from Kyso/master

Made the YouTube function not use regex to pull an ID.
now depending on url
Merge pull request #2 from Kyso/master

Less redundancy and a new config option for nicks. 
Refactor to use nconf
add nconf to package.json
derp, npm don't like
version
new config
rm old config
fix indentation
Youtube URI sniffing!
Fix script compiling, using new "wrappers" to access variables.

Removed Obsolete SetStunned function
probleme d'exception quand clique sur le popup (localisation) -> pas
resolut
:(
rendered in an abstarct class DocumentReaderWriterTest and DocumentStoreTest
Add support for editing uint attribute in the EC Editor.
Print also error line and column if reading of Scene XML fails.
EC_GraphicsViewCanvas: clone the material from the EC_Mesh that is used for rendering the canvas content.
Move StaticPluginRegistry.h to correct folder. Only use StaticPluginRegistry on Android for now (although it could be used on other platforms as well)
no change, just git for windows hickups
Changed vim colorscheme to solarized...

Conflicts:
	.gitmodules
Changed terminal's theme to match solarized
Remove rxvt's configs from Xdefaults...
Submodules update :

  syntastic
  vim-ruby
moving the cart to sidebar complete.
moving the cart to sidebar complete.(add new files)
remove the bak file.
add a dash ajax complete.but the first click is no effect.
initial script, readme and license
server demux and decoder added
first commit
Merge branch 'master' of https://github.com/MatthiasDE/BaShD
Added new string in locales for decline pet duel.
Fixed FloatingPetBattleAbilityTooltip skin.
Fix GameTooltipMoneyFrame font size.
ruRU update.
Updates for MoP.
Merge branch 'beta' of https://github.com/Shestak/ShestakUI into beta.
fixed bullshit errors
Beheben eines Bugs

Wurde ein Beitrag aus dem DRAFT freigegeben, stand hier noch ein altes Veröffentlichungsdatum (Datum vom Anlegen des Beitrages)
Wurde durch setzen einer extravariable behoben
Hinzufügen des Benutzers Anonymous, der keine Rechte hat und die Beiträge der gelöschten Benutzer übernimmt (UID = 2)
hinzufügen der Toolbox
Fehlerbeheben: Schlüsselwörter von Beiträgen

Beheben eines SQL-Fehlers im ADB-Connector, der dazu führte, dass neu angelegte Beiträge keine Schlüsselwörter übernehmen
(Änderung in Funktion addOneBeitrag)
mask optimization on device
updating monitor
Im about to fuck up all the models
Fucked up the models, it is now working
Added a way to view pending movies
Add CIELuv color space support.
Updated system/framework/framework-miui-res/res/values-de/strings.1336390403.xml and moved to system/framework/framework-miui-res/res/values-de/strings.xml
Updated progress and fixed about_arrays.rb
Add new VARs to example config (server2.cfg)
s/cpu/thread ...
Remove filename in lottery() and add global var ID_LIST_NAMES
Added function is_ramdisk() which checks if SERVERDIR is a RAMDISK ... will be used for backup...
Don't do a backup if SERVERDIR is empty because something must be wrong in this case.
Fix check whether a directory is empty.
Finished > Site navigation
fix update profittodb() func a array bug
Bug fixes and more legal mumbo-jumbo! :D

Yup. :P
Started the move towards IQM.
client details modified
graph included in dashboard
add MOD-ZIGBEE-UEXT web server example
fix for deprication
Allow disable sprite sheet loading
Revert "Fix for single action sequence"

This reverts commit 0304907c9484bcfb8b207916dc5ba6f50242c762.
Resolve the one-two issue?
MComix 0.98

git-svn-id: https://mcomix.svn.sourceforge.net/svnroot/mcomix@652 6cf541bf-b722-4a7c-9fc0-fb1e75421f59
Fix scroll increments being too large for mouse wheel scroll.

This is probably the most horrible code I have ever written.
Duplication everywhere. Complexity over the roof. This should
really be fixed, but unfortunately, I don't see how at the moment.

git-svn-id: https://mcomix.svn.sourceforge.net/svnroot/mcomix@710 6cf541bf-b722-4a7c-9fc0-fb1e75421f59
ClassCOde WORKS BITCH
Fix upgrade script for this branch.

le sigh.
Ajout de public
Initialisation
third test commit for new branch
Yay, only the skill tag left!

Oh, and the indications of available SPECIAL points
Correção do container (ID do serviço é sempre minúsculo)
Aufgabe 6.1 jetzt hoffentlich fertig
-
added .idea to gitignore
added .idea to gitignore
Add wool to dependencies
deleted old file
now i think i fixed it
Merge branch 'release/fixed_shared_db'
Added html5 plugin
Added vimux plugin
Registration modal
Don't demand a password confirmation
Changed position of password textbox
Toggle register modal on 'Sign up today' too
Error and success messages
Diffrent message headers
updated some comments in stylesheets
Merge pull request #42 from Powder/master

update develop branch
Merge pull request #43 from Powder/master

update develop branch
Update Slider2d
Added description and clear code
Added valueRange
Delete init method (moved to Constructor)
changed Anchor triangles
Comment out Debugging stuff
Added valueRange, valueRangeMoving support, added range bar interaction.
Merge pull request #44 from Powder/master

update develop (Slider2d)
Merge pull request #45 from Powder/develop

update master
make sure data() returns null instead of undefined when  unset. this will prevent chaining which may seem weid. fixes #230
mark elements as selected when closeOnSelect is false so they cannot be selected again. fixes #229
update css, html structure, bd schema
Update to the Share via Dropbox script

- no growl
- no shorturl
+ Notification Center (requires LaunchBar 5.4)
Muokattu niin että testi toimii
Added text in helpWin and fixed the memory leak problem.

added text in helpWin and fixed the memory leak problem

sadf
turn off electric return
Allow import and export from/to raw Nokogiri elements.

This is useful for classes that want to extend the XML structure,
which would otherwise require reparsing for already exported
strings.
DRY update

Previously, three declarations would be included with every grid-col call, which is totally not necessary. Now, the first include extends `.grid-col` so there are no repeated declarations.
Will actually compile now
Added gem minitest to Gemfile to prevent adnotations when running rake
callback-notifications added
Update README.md
Update sections/api/callbacks-notifications.md
Merge pull request #1 from presskey/master

Notification callbacks added
ajout de #define
Переносы
Simplifying RuleBuilder, adding some validation.
associative nature of competitions and heats pushes me to write some model specs
Add styles
Add style
TouchpadView: Improve haptic feedback

Refactor haptic feedback and give feedback on gestures.
README: Update build preparations

The build logic of the current Android NDK (Revision 8c) has changed so
that projects that specify the app platform android-10 are linked
against the NDK platform android-9 instead of android-14.
Fix Lint warnings
TextBoxs
Updated vote.js to use approved (and some minor clean up)
Delete not used stylesheets
Use officially provided ranking API
made HARDMAN
screen does not unmount or remount
due to emulator problems (?)
Add ability to check for copyright/licence header, and fix missing headers.
Merge pull request #34 from rhattersley/header_check

Copyright/licence header checks
commit fsfdfd
J'ai rien dit
Changed database to TIMESTAMP for length, changed plugin to use logger, code is not working
Add search;
updated readme, added contents
- Improved edit action in command kind.
- Fixed updatetime restore problem.
Cleanup of category attributes format.
fix: NULL derefrence in ^C handling
PC
Merge branch 'master' of github.com:SirReal/dotfiles
Explicated dataType JSON for subsubmit response
Add ICU detection to autoconf & configure scripts.
Merge branch 'charsets' into icu
LabElec : Mesures de la partie CNA
200612
Remove ORM extension of Doctrine
Add custom ORM (based on Data Mapper pattern)
ORM : Yaml parser
ORM : fix YamlParser
ORM : plugin registration
ORM : définition dans les évènements de collection
ORM : table suffix for multilang plugin
ORM : refacto getEntityDatabase and add table pattern in PDODatabase
ORM : phpdoc
ORM : fix EventDispatcherInterface use
ORM : improve exceptions
ORM : improve mapFields use and perf
Clean and adapt Container override classes to new SF2 Component
Create ContainerFactory
Merge branch 'feature/container' into develop
Merge 'develop' into 'feature/controller'
Started work on the Knob control.
Added mouse dragging to Knob.
Improved Knob.
Added ValidatableDoubleField.
Removed the auto-add of http:// to the URL property of WebRunner,
instead adding it to the request if needed.
Fixed bug making the Terminal drag area too large.
Added the ability to add JavaFX Nodes to component layouts.
Replaced the slider on the Splitter component with a JavaFX Slider.
Improved the Splitter Components slider.
Added KnobTest.
Added the v_resize cursor to Knobs.
Merge branch 'sprint4' of github.com:SmartBear/loadui into sprint4

Conflicts:
	loadui-project/loadui-fx-interface/src/main/java/com/eviware/loadui/ui/fx/views/canvas/component/ComponentLayoutUtils.java
	loadui-project/loadui-fx-interface/src/main/resources/com/eviware/loadui/ui/fx/loadui-style.css
	loadui-project/loadui-fx-interface/src/test/java/com/eviware/loadui/ui/fx/util/StyleTester.java
Replaced the table in TableLog with a JavaFX Table and refactored the
rest of the component.
Fixed bug with Movable when clicking between different sub-windows
sometimes causing erratic movement.
Merge branch 'sprint4' of github.com:SmartBear/loadui into sprint4
Merge branch 'feature-table-log' into sprint4
Fixed styleTester.
Removed an unneeded debug line from WebRunner.
Added storing of column widths for the TableLog Component.
Added OnOff switch to OnOffComponent.
soapUI project selector as CustomPopupItem
Started work on the event log.
some fixes
Add launch_cmd and every bash control functions
Implemented Melon/Pumpkin Stems, Nether Brick Fence and Brewing Stand.
Signed-off-by: Steven Downer <NinjaGrinch@hotmail.com>
Merge pull request #189 from NinjaGrinch/master

Implemented Melon/Pumpkin stems, Nether Brick Fence and Brewing stand.

aPunch can cover the rest.
added index.php file
added name, email & username fields.
added fieldset for Preferred Languages
added "notes" & checkbox for "accept terms"
added submit button.
created css file
added form-processor in "includes" folder
added 'if' statements.
styled "label" & ".error"
Changed yog-generational to yog.
Changed to generate only .tar.xz.

Any other formats are larger than .tar.xz, and .xz got usual in many
platforms.
got rid of warnings, improved efficency
Commandes et makefile
Merge branch 'master' of https://github.com/Syrak/projetalgo
Fixed failing test because of typo in the spring config
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
修改货位分析页面
Signed-off-by: zqloon <zqloon@gmail.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git

Conflicts:解决冲突
	code/Authority/Wms/Views/CellAnalysis/Index.cshtml
	code/Authority/Wms/Views/StorageAnalysis/Index.cshtml
	code/Authority/Wms/Wms.csproj
更改页面分页显示50条数据，修改分配顺序>0
Signed-off-by: loou <loou@vip.qq.com>
mark3.0
Signed-off-by: NameJun <122419795@qq.com>
优化
Signed-off-by: NameJun <122419795@qq.com>
Merge remote-tracking branch 'jj/master'
Merge remote-tracking branch 'thok-zxl/master'
Merge remote-tracking branch 'thok-zql/master'
修改货位分析
Signed-off-by: zqloon <zqloon@gmail.com>
库存历史明细（mark）
Signed-off-by: NameJun <122419795@qq.com>
修改货位分析页面
Signed-off-by: zqloon <zqloon@gmail.com>
修改货位、库存分析页面
Signed-off-by: zqloon <zqloon@gmail.com>
mark0918
Signed-off-by: NameJun <122419795@qq.com>
Merge remote-tracking branch 'jj/master'
Merge remote-tracking branch 'zql/master'
1.修正了ExportExcel.cs的数据超出。2.添加了ProductTimeOut打印页。
Signed-off-by: NameJun <122419795@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
抽离、封装
Signed-off-by: NameJun <122419795@qq.com>
修正
Signed-off-by: NameJun <122419795@qq.com>
Update src/dat/TerrainRestriction.cpp
[500] Save widget stretch info to session file
Twitter stuff is starting to work
Merge branch 'master' of github.com:Team-initrd/ypfs
Possible de sortir de la maison
Removed credits from help page.
This haven't got updated and are likely to change often. Best credit on the website instead.
Fixed the bug with the value converter on the main page

Fixed the bug with the value converter on the main page
Added 404 and other errors pae
5th problem solved
6th problem solved
added virtualbox support
Spelling mistake in Major Region error message is fixed.
forgot to commit there

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
added 2nd window activity
New pictures
Merge branch 'master' of git@github.com:Unic0arn/Bombify.git

Conflicts:
	src/game/PlayState.java
Fixed user list messages
Fixed specifying room in config
special support for content-type: application/x-www-form-urlencoded added
Remove GraphicsDeviceCapabilities class
This class was removed in XNA Framework 4.0 when the Reach and HiDef graphics profiles were added.  Our class was never implemented in any case.
Added two more classes to Content Pipeline
Completed stub implementation of the AudioContent and SongProcessor.
Merge branch 'develop3d' of https://github.com/mono/MonoGame into pipeline
Merge pull request #756 from slygamer/graphicscapabilities

Remove GraphicsDeviceCapabilities class
Merge pull request #755 from slygamer/pipeline

Added two more classes to Content Pipeline
Merge remote-tracking branch 'upstream/develop3d' into develop3d
Refactoring action performing.
Added method eject_card and random_card uses eject_card instead of deleting directly from Deck.card
Better result handling

The results are finally in a usable state and the aspects are quite nice to maintain the output. Still some minor issues but i the design should be sound.

The user can now implement his own scorer and therefore fit the output to his needs.
Redirect running tools if no params specified
* fix #283
Update README
Merge pull request #5 from lingyanwu/Dev

Update README
Modified tmux-pbcopy
Changed place of yankring_history_v2.txt from /Users/Yasu to /Users/Yasu/.vim
clear all secure text fields on begin editing -- like iOS
Added tar shortnames + small reorganization
security routing updates
Update on HTML Parse Logic
Revert "Updated the code with ARC changes. Please sync this before committing your changes."

This reverts commit 7fa583f7402d5d155c371b86771a07c4e488ce8e.
Fixed bug ID :72 --Hemant 09/05/2012
Fixed Bug @ FFWD Decl
Merged changes from "Test Driven Infrastructure w/ Chef"
Import chef-client version 1.2.0
Adding some new cookbooks
Import getting-started version 0.4.0
Update with latest from publicsuffix.org.
Initial revision, backported from Pig-0.9.1.
Fix type-o in comment.
Auto-create a "ping back" user and set this site's pingback URL to itself.
Readme works for real
Cleaned up the TinyOS source, out for now
Adding conversation model and generic express app
add solução para Imports, deslocado os enuns Android de Classe e Methods para a classe Android
adding backend page
Added single-threaded comments
Add https support

Simple fix to enable https support for external resources.
Merge "download" and "install" pages.  Describe SVN access.
Import http://caml.inria.fr/ocaml/anonsvn.en.html
Now when editing own user, image and name are updated.
Fixed User controller update test. It now returns a subset of the user's data.
Removed old and unused controllers and helpers.
Removed css' since we now use sass.
Added css to gitignore.
Now bug report points to GitHub.
Fixed a bug when creating the story. The controller forced realid to be set, overwriting the one the user sent in the form.
Added colored postits support.
Merge branch 'develop' of github.com:agilar/taskboard into develop
Fixed tiny jitering issue with post-it color selectors.
There was an error in the view when moving tasks to finished. Added a test to ensure that calling tasks_by_status returns ok at least. Don't gave much effort since tasks_by_status is a candidate to refactor and remove.
Added edit profile.
Now making a project public updates the project and shows the lock.
Fixed public link.
Now team stories are sorted correctly.
Updated to sass 2.
Moved postit color selection to left and increased transparency of delete and flip buttons
Added url parsing to tasks description.
Users migration now loads the rails environment.
Now the bug icon follows scroll
Removed unnecessary files.
Changed cursor to 'move' when hovering on 'add task', status tags and name tags on menu.
license updated
License update
Testing gh-pages a bit more
Added Helpers and started migration to HashMap

* Added helpers for simple global needs.
* Added a more generic parseDouble() from String
* Migrated from LinkedHashMap:s to HashMap:s for speed
graph builder bug fix
Seperation of libpdnative/libpd extension for Mac OS
Add search for selection.
Now outputting requests, and de-gzipping them so we can see!
add some prototype schematic stuff
timeline, fix 1st time modal
++
UserManagement modified according to new formats
Fixed the form to show project status.
Made monthlog ordering more sane; of course the order ought to be based on the month
Genetic engineering is now useful
First experiments
Before last point has goal for last point MAX priority
Campaign with fixed towns and roads
Start sources campaign
Building fort in first turn is OK
Last version for BIA semestral work
мини-гуи болванка
pus ceva
Armando charla 2.
Add assoc-if function
Threw together a script that shows which branches are descendents of which other branches
Add JavaScript and Unity binding to manifest.
detect: more refactor, remove globals
Adding readme, as well as implementations in Java, Bash, C, and C++.
Changed Perl filename to be more consistent.
add support for certificate lists and verifying against certificate
lists.

Not really fun at the moment though, because chain verification against
certificate lists apparently does not really work that great in NSS...
Fixed library locations so it doesn't screw up archiving
stopped abstract close triangle from cutting off by adding padding to entireAbstractBlurb
fixed clipping problem with globe image, turned off outline anchoring to address this problem.
almost done with fixing image clipping bug, need to update anchorMinTop variable appropriately.
added updates to abstractMinTop
added case to reading setup in case expanded outline (left column) is greater than article total height.
adjusted outline so it anchors after the expand all collapse all link to protect against the case when the expanded abstract is longer than the height of the window; also added 5px buffer to anchorMinTop variable, need to test this with more articles.
took out prints from js files.
swapped in herokuapp for now.
eliminated anchorMinTop hack.
adjusted styling to fix weird spacing problem between preOutline and outline for chrome and firefox compatibility, added bg color to wholeLeftCol in css.
Merge https://github.com/mpnagle/django-cms-heroku

This is the merge between larissa's final fixes and what's on my local machine. it will go onto heroku once I look at it.
refactored title by using helper method
Green button is now unnecessarily large, not unnecessary :-)
Fixed spelling of 'crikey', mate
Issue 84: Project is saved even if repository is not created

ProjectController now creates the DB info, then if repo creation fails
it will delete the associated DB info.  This is a bit easier than
creating the repo, then deleting it if the DB creation fails.
Added LDAPAuthCake submodule (in progress), fixed another couple of template typos
Adding vaguely-accurate install instructions to README
Part of fix for DevTrack #84, GitCake and vendor Git library now do better checking for repo create failures
Part of fix for DevTrack #84, GitCake and vendor Git library now do better checking for repo create failures
Returning the body from the HTTP response
added bash profile for macs
shearmodel=2 contact model back to contactLinear
wmode read disabled
Talk a bit about Release_buffer.t
Mention how to build docs
Adicionado o campo nome na tabela de usuários.
updated ignore for gvim files
added dataframe foundation
Fixed atmospheric interpolation bug
the firest modify on feature-2
fsad
.cpp

Signed-off-by: Anjini <anjinishukla@gmail.com>
finally moved start button beneath spinner also renaming and some minor updates to board
no need to authenticate on reconnect

connect message is sent as well
Add MacOS support. Abstracts UIPasteboard/NSPasteboard behind the ApplePasteboard typedef. Adds category on NSPasteboard to map UIKit selectors to AppKit, minimizing #if/#endif blocks.
FLUID-4661: One more tiny code dehydration
change homepage content to make it look more finished

* fixes issue #23
changing the way I handle the root path
break layout into partials
Merge pull request #39 from ao140505/homepage

Finish Homepage
Adding Google C++ 1.6.0 test livrary
Add first tests for c++ array list
Revert "only highlight visible lines during initial buffer scan"

This reverts commit 7c327827dadc57131fc6d214b38aae849688ee05.
precompute color keyword highlights for faster load
add one more compactedRow.close on empty (#4492)
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Module.getModuleGrade()-muokkausta, kokonaisuuden luontiin lisätty syötteentarkistus
A bot with GUI

This is my GUI Bot, is an alpha version. I hope this help people to have
an idea on how to build a bot with user interface. The BotLogic is
strongly based on DemoBot.
Merge pull request #2 from njmartinez/master

Merging Botlogic by @njmartinez
Update sync_cmd mapping
another oqrev fix
Merge pull request #820 from arbeit/another-oqrev-fix

[r=trivial]

another oqrev fix (better parsing of the branch name)
Merge branch 'master' into unit-type-fixes
expanded the user handling on kick.
General Update

Killing it softly!
price为0时，不允许进入READY状态
Delete bad naming convention file
Extract some genealogy util functions
Impact on the lacij graph
Hierarhical layout seems better now.
Merge branch 'server' into node-deps-refactoring
Merge pull request #61 from bem/node-deps-refactoring

Refactoring of bundle node to not hold dependencies info (#47)
Add `LegacyTech.setContext()` to fix bug with context absence for legacy tech modules
small bug fix. Incorrect indentation within loop in wavefront_velocity function.
Added initial navigation packages.
Merge branch 'master' of github.com:/arktools/openfdm
testing integration with mongoose
Change argument type in sendRequest method to service. And Bugfix
Wcf failing to serialize the command

Once again wcf fail to serialize the command. the xml serialized on the
client does not take the properties of the command only of the
commandbase
refactoring the directory structure
actions: implement filtering playlist on priorities
Undistort subwindow
Test Saboteur
Test (and fix theoretical bug with) Scout
Test Secret Chamber
Test Shanty Town
Test Steward, and improve its logging
Initial tests for Swindler
Fix for minor timing issue in Swindler
Complete Swindler testing
Test Torturer
Test Trading Post
Test Tribute
Test Upgrade
Test Wishing Well - Intrigue complete
Monkey-fix chat, history styling broken by previous commit for #24
加入了异步请求网络图片的功能
Remove links to external vegX sites, they're all dead or stale at this point
Do sprintf of distance for benefit of front page geolocation
tested pitch conversion added
Added stubs, updated copy
fix ocaml ports for sparc64
devel/omake: add documentation to PLIST
remove empty library dirs from ocaml ports
rename PROPERTY ocaml_native_dl -> ocaml_native_dynlink
add pcre FLAVOR to devel/ocaml-net
ocaml 4.00 updates ready to commit
update math/coq PLISTs for sparc64
fix devel/ocaml-net FLAVOR=pcre
fix math/coq PLISTs for native archs
Add audio/chromaprint, to use instead of internal Clementine's version.
And we'll have regression tests now too.
Explicit use of chromaprint library in Clementine.
fix no_x11 example for sysutils/conky
add sysutils/conky to FINISHED
py-prettytable.

Will test with research stuff. Before posting on ports@
Merge branch 'master' of github.com:jasperla/openbsd-wip
+ shells/ksh93
ksh93: install some more headers that are probably needed for dtksh, clean up
Makefile, make regress work.
needs libast and libcmd installed too, so have to add @conflict libast-*
rename printproto -> xprintproto
Move things into the right place. Test java bindings.
Added django setup utility (using virtualenv)
Added note message to the end.
creating shape as new common base
uglify-js version fix
change the name of the consumer
upgrade KryoHadoopSerialization to Kryo v2.
Sets the flow name
I fired up the compiler and fixed up a few issues. (Weak, I know.)
Removed type parametrization on ListSerializer.
Released cascading.kryo 0.3.0 proper to Conjars.
Merge pull request #57 from sritchie/feature/kryo2

Upgrade to Kryo v2
Updates meat-locker and maple
Adds Abstract Algebra
Merge pull request #58 from johnynek/feature/flowname

Set a non-null name for the Flow
Merge pull request #59 from johnynek/feature/update-deps

Feature/update deps
Update to wip 271. Fixed issue w/ transient field in Maple.
Change meatlocker to maple.
Merge pull request #61 from sritchie/feature/maple-upgrade

Update to wip 271. Fixed issue w/ transient field in Maple.
Upgrade Scalding and its dependencies to Kryo 2.04. (This loses the kryo-serializers dependency.)
Merge pull request #62 from sritchie/feature/kryo-upgrade

Kryo Upgrade to 2.04
Break up autogenerated and manually written code in AbstractAlgebra.
Fix serialization test.
Merge pull request #63 from azymnis/fix_serialization_test

Fix serialization test
Merge pull request #60 from johnynek/feature/abstract-algebra

Feature/abstract algebra
Bump cascading to wip 278.
- 新增csvrender
- 新增funshionrender
- 新增ModelKit
删除logback test
Merge branch 'master' of github.com:b1412/jfinal-ext

Conflicts:
	WebRoot/WEB-INF/lib/JFinal-1.1.6-bin.jar
	build.xml
	test/test/com/jfinal/ext/log/LogConfig.java
refactor !commands
Changes: max sms sent by minute (Issue #66)
Revert "Initial commit"

This reverts commit d9531bf05b082ca27d7460c3f55d2bb9a6c322ce.
Update master
Merge pull request #3 from MaxZw/patch-2

Update master
prace nad wyświetleniem selecta z uprawnieniami w edycji usera
Add restriction for ajax request
separated representation fom logic (moved html from tag cloud generation)
refactored a little
adjusted example a little
version bump
Merge branches 'baopham' and 'master'
thanking @baopham for the tag cloud feature
Change alt to title in anchor link

Update README
Verhalten bei taphold verbessert
attempted dibs count
hauk,lithium added to ignorers
added cache.vim
write hash_tag
LUT to ADF conversion for delivery
LUT to ADF conversion for delivery: usage of auxiliary data files in JobOrder
Fixed bug that required multimedia libraries. Added code to VideoWidget
fixing bipartition finder
determineImageSource and getImageUrlBestMatch including tests

determineImageSource and getImageUrlBestMatch

determineImageSource and getImageUrlBestMatch
Merge branch 'determine_image_test' into determine_image
implemented table control
added exception if the directory with binaries is not found
some refactoring of the LTL code
Merge branch 'develop' of github.com:bendisposto/prob into develop
getting there 2.10!
Merge from upstream
simplify shortest path
add shortest weighted path
add requirements_dev.txt
bump
Adding neurogrid python simulation
Removed backup from version control
removed compiled python module from version control
Configuration files for sphinx
Some comments added
Changing NG to package (work in progress)
Continuing with splitting NG into packages and modules
Adding files for sphix documentation
Refractory period added to Quadratic neuron model
Moving NG to NG_custom to make library based on brian
Skeleton Soma module for use with brian
Cleaned up the directory
Added dendrite model (untested)
-soma with adaptation added
-example script for chattering
Preliminary wrapper for brian to accomodate Neurogrid models
Top level module
Added helper function to support model creation with model names
update devtools list
Commit
Merge branch 'master' of https://github.com/berser/Vialidapp
Rake
Update lifecycle documentation on statuses available at ticket creation

A section of the lifecycle documentation describes the statuses
available during ticket creation, mainly to document what the ''
(empty string) transition key signifies. However, the reference
to the default configuration was out of sync with the actual
default configuration.
Merge branch '4.0/lifecycles-documentation-fix' into 4.0-trunk
Repare EntryPoint problem due to Gin problem
fix typo
Fix UniTime and stuff
notes about stuff that needs doing in Sender
Nightly, again
ALPHA29
Remove `parseAdjustment`.

Moved the regular expression application in `parseAdjustment` into the
body of `convert`. Using `$` for the one variable in `convert` used to
hold onto a value for a test within the argument loop.

    File                             Raw         Min         Zip     Min/Zip
    timezone.js              14100/13.77  7240/07.07  3891/03.80  2776/02.71

Closes #86.
Merge branch `adjustment` into `master`.
Merge branch `changelog` into `version-0.0`.
Release 0.0.13.
Merge branch `version-0.0` into `travis-ci`.
outputing to file ok
Implement application log #97
Adding autocommit comment.
search results refinements
fix nil advertisement
will paginate set original
Merge branch 'deploy' of https://github.com/blahutka/novinky into deploy
Seg fault on ShortestPath
Alias BDD#false? as BDD#contradiction?
Use Cudd_ReadLogicZero for FALSE, not Cudd_ReadZero.

See Cudd documentation about the distinction between logical zero
and arithmetical zero.
Code style and not need to deref.
Wrap Cudd_Eval as BDD#eval
Fix the errors when parsing exception
1) Finish merge
2) Implement LocalVariableTable attribute
3) Introduce PyQT for later GUI development
git, bash and vim
add topic.index, add some sub-folder for render
Merge branch 'develop'
fixed typos in playlist views
album, song, and show crud
Merge branch 'master' of github.com:FangedParakeet/sinistereo
more song crud
strftime bunged in
playlist crud mergeed with site
a little more crud
file upload w/carrierwave implemented
started ajax
ajax attempt 2 (spoiler:failure)
showing user's playist in side pannel of homepage
moved playlist bar over to application.hmtl.erb
added accordian effect from qjuery ui on playlists
premium blend play list now pulls from an eponymous method on song.rb.  Yes, eponymous.
added code to verify there's a user and that user has playlist before showing playlist secions
removed backbone bs
add song javascript added, upload working
resolving conflicts
Merge branch 'master' of github.com:FangedParakeet/sinistereo
fixed typo in routes
Added new 'app_asynchronous.php' for all controllers that aren't really 'backend'.
Update source/posts/2012-05-08.md
Merge pull request #33 from f1vlad/patch-1

URL fix appending http://
preparation for new style editing
remove DOMContentLoad Event
Basic zoom styling and functionality. Styling can be polished - handle can now be placed over plus/minus buttons.
Merge branch 'master' of github.com:bohman/placepeer
Better installation of nerdtree.
Use the http instead of the git protocol
I wanted to type α from .XCompose
git patch alias (format-patch -1)
update model form creation
tm alias for tmux attach or new.
Formatting where clause
Remove the need for extraneous/unused return via void
Converting metric to an ADT
Removing Rate type in favour of simpler Maybe Double
Readme updates

Signed-off-by: Kevin Kinnebrew <kevin.kinnebrew@gmail.com>
changed artwork
fix dispatched arrays and cleanup (compile.ljsp loads)
add basic thumbnail generation
Beans.fill and Beans.override methods
Validator conversion to support valueOf(Class, String)
Use Statement.RETURN_GENERATED_KEYS only when requested
Call Extended.complete() in the finally block
A utility for string translation
Exception message improvement
Stupid growl