labofsahil/github-event-dataset-2012 huggingface dataset:
Add warning when authentication has not been complete
Add sort param
Change all the structure :shipit:
Make tests pass :feelsgood:
Merge branch 'change_structure'
Refactor api chatter
Add helper file to cut down on dev time
Merge branch 'fix_the_hacky_api_code'
remove broken setup file
Remove MANIFEST
Merge branch 'remove_broken_install_stuff'
Remove pain; Add Emojis
Update README - just in time for pixel hack day!
Merge branch 'make_readme_better'
Merge pull request #6 from zachaysan/master

better
album info to the top
Added last missing translation reaching 100% coverage of Bahasa Indonesia
updated test to reflect bad CIA maths
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
and here comes the saviour bringing back the blue dots... hopefully
Fix memory management issue in primitive setter
fix merge collision in default.ini
check resources for null to avoid error in loop
check resourceUri if it is really a URI
Merge remote-tracking branch 'upstream/develop'

import two TitleHelper fixes
Update wiki/v1.md

true --> false
Merge pull request #1 from fisk1201/patch-1

Update wiki/v1.md
Correction du dernier commit.
Participant list with contact picture
And a lot of things more
add other links for img map
fix images for fullscreen mode
[Change] int scalar typedef is not signed.
Merge branch 'master' of github.com:Allanis/Thing
Added error handler for all modules
Fixed content message visualization
Added rotating refresh image when updating notifications
junit import fix
Updated version and tagged it.
根据Magic统一升级更新用例

[Testcase]根据Magic统一升级更新用例
dialog、carousel：根据Magic统一升级更新用例
Merge remote branch 'origin/dev' into HEAD
根据Slider的修改（添加自适应、缓存条、setRange功能）更新用例

[Testcase]根据slider的修改（添加自适应、缓存条、setRange功能）更新用例
magic.Slider、magic.setup.slider、magic.control.Slider.fx、magic.control.Slider.$cache：根据slider的修改（添加自适应、缓存条、setRange功能）更新用例
Merge pull request #66 from tianlili/dev

Dev
Bug fix for sending form requests with form ennctype text/plain
Remove #stub_user_info from the Wizard mock.
[MOD] Options: HTTPPATH replaced with WEBPATH
[MOD] Core: parse and assign "org.basex." system properties
[MOD] IO: IO.dir() replaced with IO.dirPath(), IOFile.dir() added
Archive entries decompression fix.
Typo fixes
Merge pull request #9 from ChrisFletcher/master

Small fix
reduce complexity/depth of presetForm and add isSearch variable to check if the current request is a filtered search
Merge pull request #60 from dereuromark/develop-is-search

reduce complexity/depth of presetForm and add isSearch variable
Removed some old files. Still not stable.
Added the mean k-mer coverage in the list of metrics.
Ray is now tested with these C++ compilers too: pathscale and pgi.
Now using the BufferedData object to compute contig abundances.
Added new MPI tags to eventually distribute more the inputs and outputs.
Added comments in the virtual communicator.
Added some comments in the switchman
Each rank now writes their own files instead of sending data to master.
Fixed the contig mean coverage and an assertion.
Documented the memory management code.
Fixed a compilation warning with fprintf()
K-mer coverage depth proportion values are now computed by Ray.
Normalised method names for master modes.
Normalised method names for slave modes.
Renamed the script engine and the nova engine.
Changed column names to more verbose ones.
Changed the default to DEBUG=n to disable debugging symbols.
Added a machine helper class to delegate things.
Moved the code of call_RAY_MASTER_MODE_SEND_COVERAGE_VALUES() in the machine helper.
Added slave switches for RAY_MPI_TAG_WRITE_KMERS, RAY_MPI_TAG_EXTENSION_END and RAY_SLAVE_MODE_EXTRACT_VERTICES.
Ported the scheduling of the k-mer academy step to the switchman framework.
Reset _glhckInitialized on termination
Add ignore=dirty to gitmodules
Compile bootstrap css from the LESS files to allow us to easily change them as required.
Use Scala 2.10.0-M7, and update a few deps.
Added disconnect to Sftp
Add VS 2012 Solution file.
! But still using VS 2010 Project files.
[0.6.0.199] Fix bug after the last commit.
Update master
Merge pull request #370 from styfle/patch-1

Update master
Clean up strings
LF errors ?
Added ModifyOptions activity
Ignore qrc cpp files since they get rebuilt
Merge branch 'master' of github.com:DC2012/DC2012
[DS-1208] - fix recursive filtering of web.xml
Merge pull request #79 from robintaylor/dspace-DS-1208-1

[DS-1208] - fix recursive filtering of web.xml
readme.md: more compelling
removed newrelic; added rake task for pinging
MOTHERSHIP: Starting on input validation for mothership
MOTHERSHIP: More input validation for input elements

Input validation to some degree has been added to the config page for
the SERVICE_PREFERENCES string, the groups page to enforce a 2-10 
alphanumeric character group name, the autoconf message elements
to enforce the number of nodes/ratio of nodes to create being a digit
(the number element does this explicitly, just providing fallbacks for
people modifying the value through a dev console of some sort) and 
a maximum length on the event name for scheduled events
now cookie attributes are added to the response header
added an example that greets a user by using the user name delivered in a cookie
added 'tipi.vaadin.context' system variable to bypass tipi.properties
for OSGi bundle based scripts
dependency fix
BinaryExpression support added
add java services
Adjusted Gemfile for jruby (optionally)

  all specs green,
  tested with jruby 1.6.7 in 1.9 compat mode, and with postgresql 9.1
The nssocket server now prints out correct routes.
Add is.invasive fnc

Edited Read me, add function and man page.
Merge pull request #73 from ibartomeus/master

Add is.invasive function, written by ibartomeus
edited readme
Add up and down voting functionality to links.
Add link overview in index.
Merge pull request #4 from EckMe/feature_voting_link

Feature voting link
starting work on the command line tool
user button click envent WIP

user validity identified only
swr: fix compilation with ancient toolchain that doesnt support SSSE3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Remove internal MPlayer FourCC viv1.

Reviewed-by: Derek Buitenhuis
Reviewed-by: Paul B Mahol
mpeg4videodec: Use format specifier PRId64 for int64_t.
mpeg4videodec: Add two missing format specifiers for debug output.
Fix libilbc compilation.

Fixes ticket #1540
lswr: channel_map requires input conversion.

channel_map is applied between in and postin.
Without this test, if the input format is an acceptable internal format,
the in->postin conversion is skipped. In the best case,
it ignores channel_map, in the worst case it causes an assert failure
if the number of channels is changed by the map.
yuv2rgb: implement 15/16bit ordered dither

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sws: handle non native rgb<->rgb convertions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
rtp: Only choose static payload types if the sample rate and channels are right

If using a different sample rate or number of channels, use a dynamic
payload type instead, where the parameters are passed in the SDP.

G722 is a special case where the normal rules don't apply.

Signed-off-by: Martin Storsjö <martin@martin.st>
configure: Add a dependency on https for rtmpts

The rtmpts protocol uses https implicitly, via the ffrtmphttp
protocol, but the ffrtmphttp protocol is also useable for plain
rtmpt without https, so the dependency needs to be added here instead.

Signed-off-by: Martin Storsjö <martin@martin.st>
doc: Add Git configuration section
build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled

The ffrtmpcrypt protocol depends on external libraries, which are
also required to compile the header file.
aac: Mention abbreviation as well in long_name

Most people know the codec as "AAC" and not "Advanced Audio Coding".
rtmp: Move the CONFIG_ condition into the if conditions

This makes sure these calls are removed by dead code elimination
even if optimization is disabled. This fixes building without
crypto libraries without optimization.

Signed-off-by: Martin Storsjö <martin@martin.st>
rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code

Our implementation of RTMPE is heavily based on librtmp.

Signed-off-by: Martin Storsjö <martin@martin.st>
ffmpeg: keep packet/frame availability in global structures.

This replaces the use of the no_packet and no_frame arrays.
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code
  rtmp: Move the CONFIG_ condition into the if conditions
  aac: Mention abbreviation as well in long_name
  build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled
  doc: Add Git configuration section
  configure: Add a dependency on https for rtmpts
  rtp: Only choose static payload types if the sample rate and channels are right

Conflicts:
	doc/git-howto.texi
	libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libopenjpegenc: set numresolution max to INT_MAX

OpenJPEG doesn't have a max lowres limit, so don't enforce an arbitrary one.

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
parse_packet: reset pkt->pos after it has been used

This should have no effect as it was not used in this case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavf: factor AVStream st out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
riff: make the G723.1 in wav output compatible with WMP/msacm codec

Attached patch (together with demuxing patch) allows WMP/msacm G723.1 codec decode files encoded by FFmpeg.

Tested with both 6400 and 5333 mode

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
MDL-32203 completion: Fix issues with data object where clauses
MDL-31393 qtype_essay upgrade: save old question_answers.feebdack
MDL-32204 MNet: set auth method to mnet for users enrolled remotely
MDL-28557 Calendar filters: show all group events in course to teacher
MDL-26562

Signed-off-by: Vadim Dvorovenko <vadimon@mail.ru>
MDL-29173 grade: altered the definiton of round() in /lib/evalmath/evalmath.class.php
MDL-33102 blogs: userid will be added during blog visibility upgrade
MDL-33055 theme_formal_white: changed "general" to "standard" in $theme->layouts array index
Merge branch 'MDL-32204-mnet-auth_21' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE
MDL-32564 fix admin/timezone.php page setup
Merge branch 'w21_MDL-32564_m21_timezonecontext' of git://github.com/skodak/moodle into MOODLE_21_STABLE
MDL-33191 theme_magazine: changes to magazine/config.php fixes $THEME->layouts for Base & Standard
MDL-32155 blocks: User can't access file, if block is hidden or doesn't have block:view capability
Merge branch 'wip-mdl-32155-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE
MDL-33212 Course page: Eye icon should override other conditions

Conflicts:

	lib/conditionlib.php
Merge branch 'MDL-26562-21' of git://github.com/vadimonus/moodle into MOODLE_21_STABLE
Merge branch 'MDL-32203c-21' of git://github.com/srynot4sale/moodle into MOODLE_21_STABLE
Automatically generated installer lang files
MDL-33318 use $CFG->admin in path correctly - thanks to Clarence Prudhoe for report/fix
Merge branch 'm21_MDL-33318' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE
Change to calc element, so it renders as a simple span, rather than a
form input, in form or detail view.
Giving emailData precedence over _formData for placeholders in redirect
jump page.
added: grouped lists, you can now state if the groups start collapsed, and if opening one group should close another group
changed: big select option now a global option in J cFabrik global config. Closes GH-410
icorrect form admin label and description text
Merge branch 'master' of github.com:Fabrik/fabrik
added: visible option to window clas, allows you to load hidden windows
altered google map element js to only load in external js lib once
hacked: ajax list links: loads form window on page load, to avoid issue where first loaded ajax form was not submitting (js instance of form js class not created)
code style
changed: js code to load element plugin options, no longer uses bindwithevent
fixed: mailchimp form plugin, if submission failed box was unchecked
added: fileupload amazon s3 - option to include or not the server path in the bucket path
Merge branch 'master' of github.com:Fabrik/fabrik
fixed callable typehint in Mockery/Generator.php
hdd
Merge branch 'master' of github.com:Fydot/gittest
rm
Nothing useful to report
Adding progress on docs. Adding STGZ generator. Adding new SDL.dll
merging
7个item
ignore
WH-13 - Config handling bugfixes
Faux fichier XML contenant les informations de localisation des status d'un utilisateur
Added tracker url.
Alle Strings in strings.xml eingefügt und verwendet.
Merge branch 'master' of https://Jens9891@github.com/HSKC/WG-Buddy.git
Task E-Mail senden funktioniert wieder.
Revert "Revert "Test""

This reverts commit b854c0704aed82b864f0fc4c93c45b683b8f531c.
Added folder needed for WorldStreaming to run, plus 1 world created by
running a streaming world.

Change-Id: I41859aa89e86dbb97557ca764eaef4c17e5f156a
fixing registration message. and polishing off fb login. Still 1 bug remains
deleting registration
Updated the 'users' and 'users.roles' modules
Updated the 'taxonomy.vocabulary' and 'taxonomy.terms' modules
Updated the 'nodes' module
1. New function ActualScalarDepth was added
2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added

Conflicts:
	modules/core/src/arithm.cpp
1. New function ActualScalarDepth was added
2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added
Merge branch 'master' of git://code.opencv.org/opencv
add bruteForceMatcher to ocl module
Added initial travis config.
Skip colour checks when SKIP_COLOUR_TESTS is set.

The colour checks are incredibly system specific, and this makes it easy to skip
that group.
adding simple utils (and again)
Alert when a page is added that they type does not exist.
Fixes #169
Added Setup Copy Application controller to copy a previous cycles application.
Fixes #170
fix MPS-15887 After Migration: Parent language is not accessible
editor configuration in idea plugin is a page in idea editor configuration #MPS-16540 fixed
Merge remote-tracking branch 'origin/MPS2.5'
Removed 2D physics stuff
Removing STL from Heart. vector,list & map removed. deque and string still to do.
Replaced TinyXML with Rapid XML. Added XML Helpers.
Added hEntity and hComponent base classes.
Removed more STL usage.
Replaced from legal headers.
Removed Tiny XML
Removed references to tiny xml.
Ignored warning 4001 in freetype
Started to add Entities and components.
Defined lua script component as a initial test component.
Added registering component.
Seem to have broken the red triangle :(
Component write out their properties to COMPONENTS.XML
Added Initial version of entity editor. Allows Save/Load/Open & Import from components.xml generated by heart.
Upaded ignore file
Updated ignore file
Began implementing Entity tree functionality for Entity Editor
Entity Editor can Add/Delete entitys. Add/Delete components from entities and update an entities component properties. Save/Open work. Import needs more work to cope with import changes to components.
Added initial device classes for sound
Adding libOGG
Updated libogg ignore file
Adding libVorbis
Updated ignore files for libvorbis
Initial version of ogg streaming audio playback.
Release version of streaming ogg audio compiles. Doesn't run correctly, probably threading bug
Switching to unity for heart, removed device projects to engine, aborted premake move, updated file headers, possibly touched every file, world script loading half written
Initial Commit
Init
Revert "Init"

This reverts commit 5e42816be61c18f8223768673b636bd4e1e037a5.
Merge branch 'master' of https://github.com/Joywii/Baobei
improved quality selection
Emit dataChanged() when changing content via setData().
docs: update with celery post-install steps.

Closes #87 and #88.
Merge topic 'multiarch-include'

da1d9ba Test find_path multiarch support (#13742)
b96f6fc Teach find_(path|file) about Linux multiarch (#13742)
Merge topic 'fix-watcom-test-timeout'

2238505 Watcom: Avoid prompt from wmake about dll with no exports...
Merge topic 'MinorFixFPHSA_13755'

4809cad FPHSA: don't succeed if only checking for XX_FOUND (#13755)
Merge topic 'fix-cpack-tests'

587b7b6 Tests: Use the right path to CPack value for running CPack tests
Merge branch 'master' into next
Removed FaceInvaders from demos in favor of its new home in the kgames repo.
Fix the git URL
Fix the git URL
Fix the git URL
Fix the git URL
Fix the git URL
Merge branch 'master' of github.com:Kozea/Overlay
OwnCurrentBetComparatorTest fri från röda pluppar
har fixat till handelAllInCase metoden
Nu visas showdown upp och vem som vunnit
modif page login
Merge branch 'master' of git@github.com:Kryzalead/cms.git
commented out buggy wow api functions
Fixed #479
Merge remote-tracking branch 'kirkby/master'
Fixed issue #424: Accessibility improvements
Merge remote-tracking branch 'ybk/master'
modified:   ../Header/LKProfiles.h
	modified:   Calc/BestAlternate.cpp
	modified:   Calc/Calculations_Utils.cpp
	modified:   Calc/FarFinalGlideThroughTerrain.cpp
	modified:   Calc/FinalGlideThroughTerrain.cpp
	modified:   Calc/GlideThroughTerrain.cpp
	modified:   Calc/Task/FAIFinishHeight.cpp
	modified:   Calc/TerrainFootprint.cpp
	modified:   Dialogs/dlgConfiguration.cpp
	modified:   Dialogs/dlgWayPointDetails.cpp
	modified:   Draw/DrawGlideThroughTerrain.cpp
	modified:   Draw/LKDrawLook8000.cpp
	modified:   Draw/LKDrawWelcome.cpp
	modified:   Draw/RenderAirspace.cpp
	modified:   Globals.cpp
	modified:   LKProfileResetDefault.cpp
Previous commit was about fixing the rounding problem of inaccurate safety altitude and safetyaltitude terrain using imperial units.
Changed SAFETYALTITUDE and SAFETYALTITUDETERRAIN storing value *10.

Update changes so far.
bug fix event name
bug fix event name meta info modify
added ex3.1.rb file
fix display awkwardness in GroupMemberManagementActivity and others.
Merge pull request #49 from tikiet/br-1.0

Br 1.0
install ibus.el
small precision
Fix ArrayIndexOutOfBoundsException while LoginEvent.
refactor the actions replay
refactor the actions replay
Revert to 1d85857ab146c6da13ea3d824362d6e87049fa1c
Sync with SVN
Merge pull request #3 from RtsAiResearch/original

Sync with SVN
Update gitignore
test
Update gitignore
Merge pull request #4 from ogail/master

Update gitignore
Update to latest
Merge pull request #7 from RtsAiResearch/original

Update to latest
Merge branch 'master' of https://github.com/RtsAiResearch/bwapi
Add snvrev.h
Update gitignore to ignore Release_Binary generated files.

Signed-off-by: Muhamad Lotfy <mhesham.fcis@gmail.com>
sters gitignore
Integrated XPCKit and ObjectiveFlickr as sub-projects.
added file test1
added file test2
Merge pull request #1 from Mathayus/test

Test with no problems
Not running. A lot of excellent refactoring is happening. :)
Refactoring complete! All lines are now shown. :)

AND it's easy to change anything! Woo!
Optimize bsxfun type handling
add whitespace in display
Properly fix error in scalar access on expand.
This reverts commit 3ce3567ff2ed7de686b72229707042bccf38e0f4 and
provide a proper generator for expand_.
Remove improper cref qualifier on reshaping size settings
Fix none test
add deleter in memory: function object that calls deallocate
Make expression with compound size streamlined

This patch adds a few feature around expression of the form :
 foo(some stuff, some stuff describing a size)

This is done using :
 - a as_size function converting pile of values into an of_size instance
 - a make_expr_with_size helper that wraps the required proto to make it
   happen.
lower the priority of various specializations to avoid ambiguous calls
Refurbish generative to use make_expr_with_size
nan, Ones, Inf, Zero, True constant changes
Refurbished indices
Make boost::simd:constant_ tag the generative tag.
Adapt generative to use proper constant_ tag
Temptative fix for expression value_type
Nan False Inf new form
bugfix with references
mobots_msgs cleanup, ImageFeatures.msg -> FeatureSet.msg
map_visual updates
Merge branch 'master' of github.com:Mobots/mobots
rviz image pose setting, turns around center instead of bottom left
Merge branch 'master' of github.com:Mobots/mobots
test commit. :)
Cleaned up .Search() method signature
Add a big amount of new classes
Fix software structure bugs
Iteration 1 - Part 1/?
Change MythUIButtonList::SetValue() to pass QString by a const reference rather than value.
Attempt to plug a memory leak in MPEG2 "lossless" transcode

Seems that when we hit the 2000 frames in use (i.e. queued), we very
ungracefully reject more frames, "No more queue slots!", and then we promptly
leak the packet we were going to put in that frame.  Added a few more
av_free_packet() to hopefully plug the leak.

Also, since it seems the HDHR Prime (and perhaps other sources) record MPEG2
that can sometimes have exceedingly large GOP sizes.  This code was mostly
designed for use with ivtv and others with predicably small GOP sizes.  To
try to get the "No more queue slots!" to disappear, I have increased the
max frames from 2000 to 20000.  This could still use a rework, but hopefully
will fix the short-term issue.

Thanks to rkulagow for reporting this mess. :)
Use background buttonlist loading to speed up the Watch Recordings screen.

Fixes #10161.  MythUIButtonList is enhanced with new methods for
loading and fully initializing button list items in the background,
i.e. several items during each iteration of the Qt event loop.  This
can give a faster response time for Watch Recordings, particularly on
weak frontends like ION when there are hundreds or thousands of
recordings.  Previously Recorded is also modified to use background
loading, which is even more dramatic as long-running MythTV
installations may have many thousands of Previously Recorded entries.
Do not disable LPCM if 16 bits audio isn't available

That would prevent JACK to use more than stereo.
LPCM should always been supported if we support the right number of channels
Modificari PMXML2YAWL
Update master
Merge pull request #638 from Nicklight100/patch-11

Update master
tradotta riga mancante
Merge pull request #766 from Matta95/patch-50

tradotta riga mancante
Comments in message window
updates for monitor objects, annotations are now registered with object wrapper
Merge pull request #55 from brharrington/master

updates to monitor objects
Remove getConfig helper function

An expression like ‘getConfig [ "cabal" "libraryProfiling" ] false’
can be written more concisely as ‘config.cabal.libraryProfiling or false’.
Fix build of neon on darwin

svn path=/nixpkgs/trunk/; revision=34375
Use /var/log/sa for statedir of sysstat, in stead of $out/var/lib/sa. This path cannot be overriden at runtime, so choosing a 'sane' default.
ghc-wrapper.nix: cosmetic
filesystem contention
Merge branch 'master' of github.com:NoKriK/CSE221
Modified BaseWidget to Handle handler
Merge branch 'master' of github.com:Noxalus/YAPOG into Interface
Fix Merging
Modified Way that gui
picturebox.
Update js/grid.base.js

one more small bug fix: the usage of `hasOwnProperty` for wrong variable
PIMS-1724 Could not find file liquibase.exception.SetupException:
<sqlfile path=install/baseline.sql>
Added HISTORY command
forgotten files
tex with forgotten files
Updated Constants
Merge branch 'master' of https://bondeulv@github.com/Proj11/Proj11.git
Connection established! =D
Close funker ikke helt.
define |kClickThresholdTimer| constant
define |kDisableDefaultClick| constant
update comments
Fixes #49 issue

Calling self.Layout() after changing the static text fixes text going
outside the box.
Needs to be checked on Linux and Windows.
CircuitBreaker Library documentation
script for generating javadocs
fix css bug
fix js bug
Fixing make prescription bug
Switching queue back to prescription (registration queue is much too long from patient import), adding drug details
Refactoring with better comments and variable names
Merge pull request #204 from johnstoecker/master

Fixing bugs for making prescription, improving drug details
changes index

changes index
GitIgnor correct
update fold_info_pos
[11945] Fix a bunch of counter achievements. Some still require more work

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11946] Add commits for death in statistics, fix some engrish

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11947] Improve SCRIPT_COMMAND_MOVE_TO

This changes the handling of SCRIPT_COMMAND_MOVE_TO, to not expect some travel-time, but directly provide the speed for the movement (*100).

Attention to DB-Devs, please check your MOVE_TO scripts.

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
Merge branch 'master' of https://github.com/mangos/mangos

Conflicts:
	src/game/AchievementMgr.cpp
	src/game/SpellAuras.cpp
[mr1872] remove wrong part of 1856. - movementgenerator - not true place for operations with combat/threat, only movement must be. - part of removed code cause creatures freese (and server freeze with low chance). - now chase state be dropped if target is not acceptable or target lost (may require additional correct).
[mr1873] recheck distance for delayed spells at hit v0.5, related to #873
[mr1874] fix crush with incorrect DB data after 11945
[mr1875] next stage of LockedVector improving
[11948] Check achievement related dbc data

This will fixed a few crashs for criterias without referred achievements

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11949] Check group id of group loot timer when timer is started. Close pull request #39

Also fix a small possible bug with loot shared to players at similar position on a different map

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[mr1876] Fix broken transport data updating after mr1461 #748
Merge branch 'master' of https://github.com/mangos/mangos

Conflicts:
	src/game/AchievementMgr.cpp
[mr1877] StateMgr v2.7 - some corrects in mgr code (safety) after rework map scripting engine, thx to Undergarun. related to #917.
[mr1878] StateMgr v2.8 - add UNIT_ACTION_HOME and some more work with TargetedMovementGenerator
[mr1879] comment part of not-offlike code, related to charhe effects (wrong conditions from #769). testing.
[mr1880] don't apply SpellBonusWithCoeffs to spells with attribute SPELL_ATTR_EX3_DISABLE_MODS. related to #877, testing.
Merge branch 'master' of git://github.com/mangosR2/mangos

Conflicts:
	src/game/AchievementMgr.cpp
replace test_grib_load.py testcase "test_fp_units" with a Mock test.
 - also small tweak to GribWrapper __init__, to prevent possible infinite loops
enable all non-calendar grib time-unit codes.
Merge pull request #184 from pp-mo/grib1unit10_additional

Additional GRIB time units
Entering words
edit spiral out
Fix a couple of minor bugs with query and queryOptions getters
Rephrase log message, removing mention of discontinued property
change the version of Apache from 2.4.1 to 2.4.2
Add missing git extend
Adding Florian Bourse's certificate to the list of trusted certificates
fixup! Add missing 5884.
Adding audio cues now works
Fix container cache
improve script and auto-save
This allows compiled definitions to be specified in configuration as filenames and added to Di as ArrayDefinitions
This allows RuntimeDefinitions to be disabled by removing them from Di
Allow setting RuntimeDefinition to use annotations through configuration
Tests for runtime enable/disable
Testing for RuntimeDefinition use_annotations from configuration
Adding tests for compiled definitions through configuration
update unit tests for lucene mutlisearch

update unit tests for access document on mutlisearch
fix ZF2-319 & id document

multiindex have problems with access document. Id (which is the
document id) has change, so access document is broken.
s/setServiceManager($instance)/setServiceManager($serviceManager)/
Remove hard dependency on DI
Lazily instantiate and attach router to url view helper
Lazy-load basepath and doctype view helpers
Add more information to 'service/alias' already exists exception
s/setLayout/setTemplate/ in view quick start
[ZF-10284] Zend_View - Added support fluent interface.
sync svn r22879
ZF-10345: allow specifying id attribute in headLink helper
synv svn r23242
ZF-9919: extended serverUrl helper to correctly identify scheme
sync svn r23370
[ZF-9324] Zend_View Fixed docblock
sync svn r23386
[CS] Zend_View - Fixed ajust in docblock, missing '*'
sync svn r23387
Zend\Stdlib\Hydator\HydratorInterface::hydrate() returns object
Currently for the implementations we provide, it's not needed, but in case you want a doctrine\hydrator (f.e. https://github.com/prolic/HumusDoctrineHydrator), the object must be returned by that method, because it could be, that a new object instance will be created by doctrine, because it get's loaded from database, so finally it's a needed changed and the api is also cleaner, imo
added start parameter to runner
Merge branch 'master' of github.com:SpuqTeam/spuq
Nothing important
FDFSF
Sasi | Styling changes for participants
Sasi | Included participants in new comment mailing list
Add tablify & collectionify
Merge pull request #58 from JacksonTian/butterfly

Add tablify & collectionify
Initialisation Android Project
Add login logout page
Add template and test for login logout
add user to cashflow model
make test execute more often on the GPU.
small code refactoring. Also, there is no FAST_COMPILE on the gpu.
Disable GpuAdvancedIncSubtensor1 when set_instead_of_inc is True and warn about it.
Merge pull request #574 from nouiz/gpu_setsubtensor

Gpu setsubtensor
Add a new evdevkeyboardcontrol layer for linux, which hooks the keyboard before X even sees the keys. No more backspace hackery. Will almost definitely break non-qwerty keyboards
Update documentation (error)
Jixianlin
access adapter directly
Set some regexes to ignorecase.
Let valama_project.load_project_file() throw LoadingError.

 * valama_project can now throw a LoadingErorr which is thrown by
   load_project_file method if xml file (.vlp) parsing does not succeed.
   This is not properly handled if Valama is started with an invalid project
   file. But this should be done with an easier interface for all GUI elements
   because all of them needs the valama_project class.
   So fixing this issue is related to roadmap 1.0: 4. GDL
 * Additionally check inode on Unix systems (disable with NOT_UNIX macro) to
   prevent opening same file.
Revert a local debugging change I inadvertently committed with the
merge.
This appears to be dead code.
Refactor: pass interface instead of class.

Pass SiteProcedureConnection instead of ExecutionSite to
the system procedure baseclass. It only used the interface
but for some reason was asking for the concrete class.
ENG-2513 - Fixed licensecheck and updated all examples and tutorials to use partitioning DDL.
Small updates to hopefully get a slightly better picture of the ZK port conflict problem.
The ZK port robustness commit from earlier had a unwinnable race. Fixed.
Run JUnit with console logging turned on.
Ignore the /log/ directory.
ENG-2788 -Initial LIKE/ESCAPE clause support with new unit tests and better error messages. Only supports simple patterns ending in '%'. Literals with now wildcard, escapes and imbedded wildcards are not working yet.
Merge branch 'master' of github.com:VoltDB/voltdb
Testing a hopeful fix to the ZK bind issues by localcluster.
This tests ports bindability before using them.
If this blows up, we can revert. It's a test code only change.
Robustness and fixes for LocalCluster & TestAdHocQueries
LocalCluster now logs using log4j
LocalCluster prints a few more things to System.out on purpose.
LocalCluster sets the timezone to GMT before computing filenames based on time.
LocalCluster has improved (but still not perfect) shutdown and process killing.
TestAdHocQueries more defensively closes connections between tests.
Make TestAdHocQueries not bind to 8080.
Make TestDistributer not take 2min for no reason.
Make TestZK not use fixed ports.
ENG-2896: fix junitclass for regression suites.
Keep full logs around for Jenkins
Attempt to get individual log entries into testouput.
This makes up for JUnit throwing out stdout when processes are killed.
Add an assert during init that shouldn't fail, but I think it will, eventually.
Merge remote-tracking branch 'origin/master' into voltcore-integration

Conflicts:
	src/frontend/org/voltcore/agreement/AgreementSite.java
	src/frontend/org/voltdb/RealVoltDB.java
	src/frontend/org/voltdb/utils/MiscUtils.java
	tests/frontend/org/voltcore/zk/TestZK.java
	tests/frontend/org/voltdb/regressionsuites/LocalCluster.java
	tests/frontend/org/voltdb/zk/ZKTestBase.java
	third_party/java/src/org/apache/zookeeper_voltpatches/server/NIOServerCnxn.java
For ENG-3626, black list another odd config to fallback to the old replication strategy.
ENG-3509.
This time, only to include ./bin/sqlcmd in the java client pkg.
Fix #103 typo
moving webinterface to own repository.
You might find it now at https://github.com/WPN-XM/webinterface
readded server-control-panel and webinterface as git modules
adjusted buildfile
Added gradient file
Empty homepage file.
Added timer class based on boost::timer.
404 handler should have a status code of 404
don't crash on trying to view a non-existent page
Started working on rotation changes
simple refactoring pychatgui.py
Merge branch 'master' of https://github.com/WoenZu/pyChat

Conflicts:
	PyChatGUI/pychatgui.py
Cleans CSS, adds new grid and list view, replaces small parent-folder icon.
Fixes Apache mod_autoindex date parsing.
Optimize images with PNGGauntlet.

The decrease is 31KB in total.
changes gitconfig username
Inventory.load & .save, untested
Various __methods__ for Inventory class
CRUD methods for Inventory class
Dirty flag for Inventory
xupdate: fix problem of tag-cloud on ThemeStore
xupdate: show & set options into ThemeInstall too
xupdate: add <label> to checkbox caption on (Module|THeme)Install
xupdate: Version 0.18
Merge branch 'xupdate' into CorePack
changed depentds of cacheops
Just append oversized chunks to eof
Add Light fixer
Add Placeholder tag for potential future file restructuring
Add support for item enchants
Add Randomize Chests
add Edit Signs.py
Workaround for multiple saves.
building loader
Skip band addition, if BandName not found
added 'reddit'
new readme
Changed the README.md
Merge branch 'ABICLOUDPREMIUM-3384' into stable
[ABICLOUDPREMIUM-3386]The same privileges should be necessary to retrieve the list of tiers and to retrieve a tier.FIXED
Fixed merge conflicts
[ABICLOUDPREMIUM-3541] Fix small error hard disks -> hard disk FIXED
Se actualiza temes/default
Fixed / slowed down monster healing.
Extensions as of 6/3/2012
Don't reinitialize g_mri on each debug exception.

The previous code was clearing out the flags field in g_mri by mistake on each
entry into the debugger.  This caused the shared UART support to break.
Disable 'Refresh' button when loading events

Avoids double/triple clicking, which loads all calendars and events several
times
Improve UX in create calendar dialog

Dialog is closed before operation is done
Improve UX on delete calendar dialog

Destroy dialog as soon as possible
Implement AXFR filtering by IP address.
Exit normal from the process.
fix removeTagByName for singleField
Use title instead of name and improve tag editing
Begin client side integration tests
Replace TetrisMusic....mp3 with TetrisMusic....wav
Updtae main2.c
fix git ignore for _drafts
add draft for knights post
Empty line between functions.
Updated to remove compiler warnings.
(#17493) Safer handling of EC2 'open' calls

Prior to this commit, both the Facter::Util::EC2..can_connect?
and the Facter::EC2.metadata calls had unsafe 'open' calls which
would raise uncaught exceptions if something unexpected happened.

This commit wraps both of them in begin/rescue/end blocks to
prevent facter (and therefore puppet) from exiting unexpectedly.
Complete String::GetHash() function.
Refactor function type, add InstructionSet and Bootstrap.
Commit gotignore
Update src/baruwa/config/models.py
Update src/baruwa/settings.py

Added Active Directory search field 'primaryGroupID'. PrimaryGroupID association won't work unless this is in settings.py.
Merge pull request #55 from liveaverage/patch-1

Minor Fixes
Updated Readme for 2.0.7 changelog
Updated Readme for 2.0.7 changelog
Updated language picker translation

. #6
Fix background logo on wxMSW.

Wx::StaticText + Wx::StaticBitmap does not support transparent backgrounds on wxMSW; fixed by using a custom paint routine instead.
Use proper ellipsis for all GUI '...' strings
avoid performance penalty for scope (success)
Improvements to std.format documentation
Added vim swap files to gitignore
Adds singleSpec to std.format

Adds a helper function for geting the format spec for a single format
specifier
Fixed up singleSpec Documentation
Fixed up code
fix Issue 7919 - Sample code works on GDC but fails with DMD
Remove std.bind (deprecated from the day delegates were added to the language).
Remove std.intrinsic for good.
Remove std.stdarg (deprecated since 2010).
Enable sessions saving/restore
DUBBO-507 还原变更
Social Sprites
Form title removed
Refactoring, cleanup, removed TCPC, MultiColTable (extends JPanel), etc, revised class structure further.
Cleaned up comments a very small amout. Otherwise same as jays 19sep12 multicol demo code.
fixing merge conflicts from a minor change in MCV
center the game, and black overlay, fix the loading bar
change to how scene and encounter works and add jquery ui

now party is stuck in a scene (map) and starting in a random chosen map
(not city)
updated has many through to have a reference back to the original collection
updated requested and borrowed templates
Add custom CorePlot repository with my local changes
first ftrbr tests
Merge branch 'refs/heads/tests_ftrbr'
additional packages  in packages.th7 list
Initializing actions
Fix warning in redis.c for sentinel config load
Merge pull request #603 from mrb/fix_sentinel_config_warning

Fix warning in redis.c for sentinel config load
Now accounting for the case where there are no userchannel
nützliche Links hinzugefügt
hellurei
Decided I want to keep the tests for streams/update-index after all.
FIXED: "CheckTriggerPrerequsites" is now correctly spelled "CheckTriggerPrerequisites". // IMPORTANT: Replace "CheckTriggerPrerequsites" in your world.conf file with "CheckTriggerPrerequisites". The new world.conf file is already corrected. // WICHTIG: Ersetzt "CheckTriggerPrerequsites" in Eurer world.conf-Datei mit "CheckTriggerPrerequisites". Die neue world.conf-Datei ist bereits korrigiert.
FIXED: ...comments in world.conf files.
Merge pull request #242 from Ceterrec/CheckTriggerPrerequsites_fix

FIXED: "CheckTriggerPrerequsites" is now correctly spelled "CheckTriggerPrerequisites".
Setting the correct parameter name for email activity
Allowing calling the email activity without subject, just with 'to'
jruby needs a different database adapter name
Fix header display functionality and add dynamic home display.
Fix comments
Ignore system crap
Fix license
Fix gemspec
Init rspec
Add Yard
Add ISO8601::Atom#to_i specs
Change the way to test whether an atomic value is Numeric
Add a test for the second argument of the ISO8601::Atom
Add an abstract #factor to control that it should be implemented by each subclass of ISO8601::Atom
Fix the Years#factor. It should be 0 when the atomic value is 0
Add specs for ISO8601::Months
Add specs for ISO8601::Weeks
Add specs for ISO8601::Hours, ISO8601::Minutes and ISO8601::Seconds
Add documentation for each Atom subclass
Ignore yardoc
Add yard gems
Fix documentation and encoding
Add annotations for each part of the pattern regex
Add some comments about how this implementation deals with reduced precision years
Fixing Travis CI configuration.
Fixed fabfile for new project layout
Added a breadcrumb to the view my listings page
Improved 'view my listings' page
Another edge case: appointments without end dates are now properly included in the queryset
Why?

Signed-off-by: Allen Goodman <allen.goodman@me.com>
- First working compile of the new graphics engine.
- Fixed graphics and texture rendering.
- Added logging system.
- Added basic font controls like kerning, leading, space and tab width.
Button.hx updated events and html5 files added
Adding first draft of the project description.
Imported repo from heroku
5025 created new default theme for 2.1 series, and cleaned up some gard coded styles
Merge branch 'atutor_2_0_3-multisite' of github.com:atutor/ATutor into atutor_2_0_3-multisite
Added <tag>:<name> feature as a convenience.
Merge branch 'modal' into patched
Initial commit of setup script, license, and .gitignore.
fixing bug with index, basic test for object graph now passing

Change-Id: Ie8f46e258dededee5492b8f70f9307df24f95518
Move the vi mode indicator to the left prompt
Change Git branch and prompt color
Update sorin theme screenshot
[Fix #261] Add documentation for writing prompt themes
[Fix #277] Make the peepcode theme status symbol customizable
Fix dirty indicator spacing in peepcode theme
Set unused prompts to an empty string
Fix vcs_info zstyles in nicoulaj theme
[Fix #116] Add documentation for spectrum
[Fix #283] Define $LS_COLORS for completion
Match BSD ls colors to Linux ls colors
Increase readability in utility init
Set title in screen even when using Apple Terminal

In modules/terminal/init.zsh, the auto-title code currently will only
set the screen title if $TERM_PROGRAM != 'Apple_Terminal'. As a result,
if you use screen within an Apple Terminal, the screen title will not be
correctly set.

To fix this, I changed the logic such that the screen title will be set
even if the $TERM_PROGRAM == 'Apple Terminal'.
Fix URLs in tmux documentation

Use full URLs instead of relative urls.

Fix link about kernel issues with tmux on Mac OS X.
[Fix #257] Add zstyles from READMEs to zpreztorc
merge sorin's
Add single value assert_match_regex
ディレクトリのファイルを取得するAPIサーバ
れどめ
thread creati dinamicamente
info sullo scopo del programma
IEEE POSIX 1003.1c, convenzioni
global_var +1 ad ogni thread
pthread_join() info ricongiungimento dei thread
accenno alla mutua esclusione, pthread_mutex_
add combine and compile
rearrange build order
rearrange build order
insert whitespace
Skip test that requires simple application if examples haven't been made
available
Modified the script for modifying data
Docas.io synced with 2e5b137
update css
Merge branch 'master' of github.com:baoshan/docas
Bump qt dependency to 4.4+ due to new network code

See commit d7ca74a3523ff4686e1e889c5470eba149d87f50
NEWS file: "Improved network code (needs Qt>=4.4.)"
old rsvg-converts have a different syntax!
more portable way to use rsvg-convert

First, we update desktopfiles/Makefile to use option -o.
Second, instead of calling rsvg-convert again, debian/rules uses
the already generated pngs to produce the xpms
Merge branch 'upstream'
Less vines and breakable flowers
Move tests over to scorecard in client-side, and only send them if riak_test is asking for them to be filtered.
Fix atom_to_list() usage problems with EUnit
Add tombstone status to riak_kv_put_fsm:init()'s DTrace probe
Remove extra put_tag call
Add DTrace probes to riak_kv_delete.erl
Merge branch 'slf-dtrace-take1' of github.com:basho/riak_kv into slf-dtrace-take1
Import revision 48115 from the trunk:
From Gerri:

modification of TFileMerger to cope with the problem in

   https://savannah.cern.ch/bugs/index.php?99015

Basically, for non-mergeable objects the check on recurrent names is
skipped.

Also, before non-mergeable objects were written to output at once
by scanning all the open sources on the first occurence; this is
creating duplications once the check on the names is skipped. In this
patch I have commented out that part, so that non mergeable objects
are written out to file as they appear in the program flow.

Remove the warning:

Warning in <TFileMerger::MergeRecursive>: cannot merge object type (n:'namedObj', t:'namedObj') - Merge(TCollection *) not implemented


git-svn-id: https://root.cern.ch/svn/root/trunk@48116 27541ba8-7e3a-0410-8455-c3a389f83636
In the following example the white spaces were ignored.
TLatex t; t.DrawLatex( 0.1,0.1,"text   #Lambda" )


git-svn-id: https://root.cern.ch/svn/root/branches/v5-34-00-patches@47604 27541ba8-7e3a-0410-8455-c3a389f83636
small fixes


git-svn-id: https://root.cern.ch/svn/root/branches/v5-34-00-patches@47605 27541ba8-7e3a-0410-8455-c3a389f83636
Added to README file
Merge branch 'master' of https://github.com/bdfoster/flow
Rename operations#sum as operations#add

Better to name it this way to avoid confusion with sub and sum.
Добавление таблицы пользователей
Добавление таблицы денежные лимиты
Добавление таблицы ЦФУ
Добавление таблицы Рассписания
Добавление таблицы операторы
Добавление модели userperiod
Добавление журнала пользователей
Drop mysql
Minors changes about comments
dev env dev role stub
Added reset option
Site updated at 2012-10-25 00:21:36 UTC
kalua: cron.evaluate_ulogd_syslogemu: stop ulogd if started 2 times by accident
Cleaned up code, removed useless Util.g variable
Removed file blog_post.org
Removed file #Test.java
Who to rate messaging.
small readme update
zen\App: request handler constructor now receives Request instance; invoked request handler method now receives request params only; 'afterHandler' event receives request handler method results as a parameter
zen\RequestHandler: $this->request magic property to access request instance
cleanup various "unused" warnings in non-debug builds
1.7.3 stuff
Statusbar height no longer needed
PR#5700, take 2: another misaligned call to caml_stash_backtrace.


git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.00@12817 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Initial commit
05
1
Merge branch 'master' of github.com:bogbuk/bogbuk

Conflicts:
	README.md
qwerty
introduce tests for extending flow tree
each flow can be extended with other flows
update readme
Add tests
First version ready
VIM: add ctrlp plugin, add .ejs filetype, small tweak to indentation
Changed scrollbar styles to be awesome
Basic string compression in JavaScript.
Started with matrix rotation.
Finished simple matrix rotation, i.e., rotation of matrices where the width == heights.
A simple fuzzy matching algorithm.
Fuzzy searching in Java.
Matrix rotation for the cases width != height
Preparation for in-place rotation.
Renaming...
Removed duplicated directory.
Displaying current branch in statusline
feature: 添加异步HTTP REQUEST示例
On branch dev
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    modified:   src/www/action/hello.py
    modified:   src/www/service.py
Merge branch 'dev'

* dev:
  feature: 添加异步HTTP REQUEST示例 On branch dev Changes to be committed:   (use "git reset HEAD <file>..." to unstage)
Splitting at newlines
Improve user_command

Refs burke/matcher#2
More tweaks
Merge pull request #6 from kien/master

Splitting at newlines
Updating auto reload vim config for local settings as well
FEATURE(#1) Check uptime before polling.

If the uptime has been reset (or wrapped), the host will be marked for
reindexing. If we couldn't get the uptime at all, we consider the host
down and avoid polling it at all.
mention railscamp before pics.
able to search by last name as well as first name.
More Product changes
Merge branch 'master' of https://github.com/caseymonc/hit
fixed product tests
Fixed conflict
Merge branch 'master' of https://github.com/caseymonc/hit
Added template filter to front page images, amended image links to use full size urls rather than thumbnails
add git commands to Aide, fix README footnote number
whitespace
move to packages::mozilla::hgtool
InputTest now cleans all comments
now reads in and groups all needed data.

Puzzle size is a simple int sizeOfBoard
the clue list is a vector of strings, each string broken up as "clue"/position/length/orientation
the word list is a vector of strings, each string broken up as word/posisiton/length/orientation

as a note, the clue orienation is either ACROSS or DOWN,
and the orientation for words is either a or d
removed to resolve conflict
git is really messing with me now
added alen to authorlist on inputtest
无组件上传类（jscript）基本完成，还需要进行细小的限制代码。

Signed-off-by: cevio <evio@vip.qq.com>
Handle listing files where GenomeSpace could not guess the data format
Avoid hard filtering with HaplotypeScore for GATK Haplotype calls, since reported values are higher and many extra calls will be filtered