labofsahil/github-event-dataset-2012 huggingface dataset:
#4 Display number of changes for each entity type (needs styling!).
EDOC is now up-to-date.
Merge branch 'master' of github.com:margnus1/kid-mud
Fixed tests for damage and change the damage function to work with players damage function.
Merge branch 'master' of github.com:margnus1/kid-mud
Merge branch 'master' of github.com:margnus1/kid-mud
Only expose 1-argument IncrementIterationContext to evaluation
Don't report outgoing connections as incoming in ScanLastSeenQuality
Fix the counting of entries in cf-key -s
full destination file path in repository is required
Differentiate error markers
set trustkey=false in default failsafe policy to avoid spoofing attacks
Fix JSON errors and some other previous lost commits restored to format occurrences
I just noticed this would define a method on model, if the Base class respond_to? that method, so I better revert it

This reverts commit b3c149ce068538eb9f927fc22bb332b11c75dd22.
discrete SetParameters to deliver the app name
refactor evil settings
make deploy script
Merge branch 'master' of github.com:marocchino/waldo
Making ApplicationController inherit directly from app's ApplicationController
Remove layouts/application.html.erb
add .gvimrc & color ls for macos
Fixed bug where decodedImageWithImage: ignored image scale and orientation.
Merge pull request #252 from reidmain/master

decodedImageWithImage: ignores scale and orientation
Fix an LLVM warning (fix #254)
Don't dispatch cancelAll calls. 

- should fix pre-fetcher problems #247
- cancelAll should be always called using the main thread
Correctly set PATH in npm start script

Allows coffeescript to be installed globally
adding bell codes for more exciting presentations
slow down typing delay
libdict: Finish parsing pronounce part
Page class now stores date in UTC format
Add the lime homepage link as a core property
Demo page updates
solarized, vimrc tweaks
	modified:   .netrwhist
	new file:   bundle/vim-colors-solarized
	modified:   vimrc
ignore netrwhist
	modified:   .gitignore
Checkpoint of build.xml cleanup
minor cleanup
don't build coverage war
use final.name for jar
Deploy to maven
Bump version

Version 0.0.4 has been deployed to the sonatype maven repo, so bumping to 0.0.5.
Also bump version in pom.xml
Update pom.xml version based on version in build.xml
Add info on where to get datafu
Update javadoc link
README change
corrections, ajouts de graphs, d'expérience
Added read me page

Signed-off-by: Max Woolf <maximus@zingysaturn.co.uk>
jira5 method

initial method to play with the base63 encoding. Just a test, possibly not useful

Signed-off-by: Falko Zurell <falko.zurell@gmail.com>
AFormControl init
some further trials to get something running on Windows
clear out commit buffer
switch to m-n/m-p
Más cambios :)
Fix master migration to happen only on threshold
added timeout to rpc client
Fixed paths to use sufia engine routes
Plugins allow you to run a file through a compiler before mundle parses it
For example, to include coffeescript or jade files.
With tests, updated docs, and npm version bump.
Added frequency-independent sexual selection.
Integrate branch 2.0 manifest

Change-Id: I1152b2df5b33127a183d4986bd059ff7c63a3824
Reviewed-on: http://review.couchbase.org/14800
Reviewed-by: Jin Lim <jin@couchbase.com>
Tested-by: Jin Lim <jin@couchbase.com>
vimrc: skip panes in insert mode
first commit
Merge branch 'master' of github.com:mgtrzo/git-tests
2nd commit
第20章 セルマホ VEI まで翻訳 (107/121)
update the single char view if the edit box is changed
VPN shortcut now does checks to see if it's configured
Ars redesign
show Reddit sidebar
Remove target, .target, and logs dirs
initial commit of editable. some functionality works.
Fix word count REGEX and bump up tp version 1.0
Fixing stuff for mac
update for niconico zero.
Japanese version of the subsection "COUNT"
+cffi +pycparser
opensc: 0.12.1 bump
gradle: renamed perfTest -> dev
checkstyle: AvoidStarImport

allowStaticMemberImports=true
Checkstyle: More check rules
Extended GUI functionality
Renaming
Removed whitespaces and abstraction of UIDisplayWindow
Checkstyle rules: Added comments

New comments
New rule: Indentation
Removed rule: IllegalImport
UIWindows are scrollable
Renaming / Moving
Checkstyle: Suppression and severity

Suppression for protobuf
Changed severity to warning for some checks.
Fix for calculating scroll container height
Fix for disable mouse click event out of cropped areas
Merge pull request #339 from miniME89/gui

Gui
Checkstyle: Fix for Eclipse plugin
Merge pull request #338 from mkalb/gradleOpti

Gradle, perfTest, Checkstyle
Update src/main/java/org/terasology/logic/manager/PostProcessingRenderer.java

fix style warnings
Merge pull request #341 from Philius342/patch-1

Update src/main/java/org/terasology/logic/manager/PostProcessingRenderer...
level generator start
Cleanup in rosinstall file for build server
heroku88
new db
2 messages pass
Works fine.
gravity
Using collidesWith(..)
Collision OK
Sound
Match Collision
Collission-linkedlist
Revert panel drawing to previously inconsistent state as it seems to be more stable.
[NRefactory] Updated nrefactory.
[NRefactory.CSharp] Updated NRefactory.CSharp.
Track NRefactory API changes.
Fix the ms.net 4.x builder

Apply the same msbuild project changes to the ms.net 4.x builder
add uninstall in external/Makefile.
[Debugger] Don't recalculate length in these cases...
[Refactoring] Optimized source analysis.
Fixed 'Bug 4825 - "protected internal" methods are incorrectly
overridden'.
[Core] Fix some license headers
More tests
breaking out index test from query test.
breaking out index test from query test
dodanie polskiej walidacji logowania i rejestracji v2
Name = translation via mobile
Arabic translation of clock
Finishing arabic translation of videos
arabic translation of email
arabic translation for contacts
Finishing arabic translation for dialer 
Finishing arabic translation for gallery
Finishing arabic translation for system
Finshing arabic tranlation for sms
arabic translation for calendar
arabic translation fro fm
arabic translation for music
arabic translation for settings
Merge pull request #2294 from riadhchtara/arabictranslation

Arabic translation for apps
Bug 823524 - Missing l10n entities in the Cost Control app, r=stas
Merge pull request #7138 from fabi1cazenave/l10n-costcontrol

Bug 823524 - Missing l10n entities in the Cost Control app, r=stas
Bug 823534 - Missing l10n entity in the Contacts app, r=stas
Merge pull request #7139 from fabi1cazenave/l10n-contacts

Bug 823534 - Missing l10n entity in the Contacts app, r=stas
Auto-merge from branch 'master'
Implement Date and Time --> Time Zone
Merge pull request #5414 from ian-liu/date_time_timezone

Implement Date and Time --> Time Zone
Bug 806761 - Airplane mode: Should also turn off Wifi hotspot when we are in airplane mode.
Merge pull request #6107 from rexboy7/fix-bug806761

Bug 806761 - Airplane mode should also turn off wifi hotspot
Auto-merge from branch 'master'
[Diale][USSD] Message area styles after html * overflow hidden deletion.
Merge pull request #6112 from gtorodelvalle/dialer-bug-805360-reopened-overflow-hidden-issue

Bug 805360 - [MMI] Force long MMI/USSD replies to wrap; r=basiclines, a=vingtetun
added verifyChain in addition to verifyBundle
change img
storyboard
Merge branch 'master' of https://github.com/mp607/GoldMining
abc
forgot a comma in the custom.js file
Warn if something loaded by vars_files is not a dictionary
Make the logic behind vars_files smarter, so host specific vars go into the setup cache, but other variables
are usable top level.  This allows vars_files data to be used, most of the time, just fine in with_items,
(error handling pending) but is mostly a memory and efficiency thing.
Arrow is also Pointed in the covariant parameter.
roll back <*> as infix of ap

see https://groups.google.com/forum/#!topic/scalaz/g0YPdgBeEAw
adds implicit def unapplyA, which unpacks A into [a]A
fixed the drawTree method which was not printing results properly
added an example for the previous drowTree fix
Merge pull request #154 from etorreborre/scalaz-seven

Fixed the drawTree method which was not printing results properly
Merge pull request #153 from eed3si9n/topic/unapplya

adds implicits to Unapply to unpack A into [α]A
Merge pull request #152 from eed3si9n/topic/applyops

roll back <*> as infix of ap
remove unnecessary type param constraint
remove unnecessary type param constraint
fixes NullPointerException caused by initialization bug in STArray
Merge pull request #155 from eed3si9n/topic/starrayfix

fixes NullPointerException caused by initialization bug in STArray
Curry xmaps in core, for better inference.
Merge pull request #157 from S11001001/topic/curried-xmap

Curry xmaps in core, for better inference.
Merge pull request #150 from S11001001/topic/arrow-applicative

Arrow is also Pointed in the covariant parameter.
Add pragmatic non-typelevel Nat operations
Merge pull request #158 from bmjames/scalaz-seven

isZero and prev methods for Nat
Fix name of Nat#pred
Merge pull request #159 from bmjames/scalaz-seven

Fix name of Nat#pred
Add a MonadTrans instance for WriterT.
update travis build.  fix #10
Update src/main/webapp/WEB-INF/web.xml

geen proxy op het internet
simplify layout en toevoegen toggle voor vergroten van de kaart
fix #12
tweeak

transparantie aangepast van de +/- knop
[informe] metodologia de trabajo
view offer page css, js item price, offer page display
mp_settings: allow setting to None
SRTM: only report first download failure
display COMMAND_ACK messages

this should fix ACM autotest
don't print SRTM download failure msgs
added reboot command
map: added SlipClearLayer
uses now commons-dbcp & serialization issues fixes
Add basic support for the runner to use regular expressions for vars
toysat: rewrite variable queue
Use pattern matches instead of guards
Add some tests
Pre-merge
Merge branch 'master' of https://github.com/mschwartz/SilkJS

Conflicts:
	src/cairo.cpp
Use saturating adds to avoid overflow

When the addition overflowed, asserts were triggered later, where
the values were assumed to be non-negative.
Refactor prompt info to pull info from multiple sources.
Start showing time since last commit in prompt.
Refactor git var updates into a function.
Added other time cases. Cleaned up logic to unset variables as required.
GATEWAY-3146: working DS
fix bug in drag
main fragment: implemented error-handling for calculation
Update README
Merge pull request #1 from pumakuma/patch-1

Update README
work on horizontal timeline and started work on feed
update gaia submodule to nightly-sed branch that makes Makefile work on Windows
Updated link to OrmLite on Github
add syntax for srfi 78
lexical2/repeat.hpp Add.
lexical2/lexical.hpp: repeat.hpp Add
lexical2/characters.hpp Add.
x
db/sql/table.hpp: class create_table_column_ Add.
clean up Yahoo Client, create free agent request
use forked Stk
Dyad books 1st commit
11/2/2012 - before allowing to submit each question
clasificación provisional
clasificación provisional
fix thumbnail remains when file moved, and copy also thumbnail at copy
Merge remote-tracking branch 'origin/2.x' into dropbox
add elFinder class opts 'netVolumesSessionKey'
Initial commit
Merge github.com:nasif/Rub_webapp
Major internal repair of EventManager

Before, removing a _listener in the middle of processing a _ event would
be problematic, as, if the iterator was pointing to the thing being
removed, the iterator would become invalid. Frame listeners had a
special hack to fix this, but it was slow and wasteful.
Automatic seting of index value
Some handling of NULL changes
compute node->host through inimbus so it works smoother in environments where supervisors don't exist until topologies exist
Looper does event handling
Various fixes for using Python 2.5.
Fixed several bugs, mostly concerning Firefox.
Adds master election barebones test
handle options
added arg to daemonize it
Formatted and reorganised code

I finally figured out the indent settings enough to make the code not
terrible looking. I've also reformatted the getopt stuff to be in
alphabetical order.
quicker way of getting list of inapps
easier installation procedure
Clean up SQL and try to make chueckConnection more reliable
Install markdown-mode
Tidy up the way paths are added to exec-path
messing with class path so you can run tests from command line
Removed lower-casing of tableName and columnName. If the user defined the database, let s/him worry about keeping consistency. Running lowercaseString on a column name for every call of objectForColumnName: results in huge auto-release pool buildups.
upload edit
Merge branch 'master' of
https://nikotsunami@github.com/nikotsunami/osce.git
merge
Anonymize SP, Role Checklist Print PDF and Module 5 Changes
repair midi out
New can now be called from the api
Import Lisalo files and export Midi as tracks (no gui)
Add Exporter and importer to gui
More space for the track strip
Jack Midi Label in Track Strip
Connect Jack Midi port to backend
Remember last open dirs
Modified resource classes.
stripes were better
added script thunarterm
LocalPath.dirname returns LocalPath instance. Same with RemotePath. Issue #32 https://github.com/tomerfiliba/plumbum/issues/32
Added some functional. Work in progress
Added low and high-pass filters.
did measurements with measure_stripes.py
added experimental support for receiving NOTIFY within call (cb_notify)
Adding phpmathpublisher_php5/img folder to gitignore

All math formula related images created during running on local server
need not be pushed to depository
Added maxBatchSize.

Also emit errors from nextTick, and change timeout logic a bit.
c/manpages: Re-direct man's stdout to /dev/null

While closing stdout does not seem to cause any errors, it seems
more prudent to redirect to /dev/null instead.

Signed-off-by: Niels Thykier <niels@thykier.net>
re-use some existing code from Stijn
add basic cli interface for submitting jobs
docstring
capture environment vars and pass them to pbs
key -> name
forgot a semicolon
typos, typos everywhere
update gpl header
Merge pull request #39 from nudded/238-pbs-job

Added support for submitting a task as a job to a cluster (supporting pbs atm)
Merge branch 'develop' into 315-regtest-rework
rename build_status to build_stopped
Added a callback to the #submitTask function in the client.
Cleanups.
NXP-10110: add new 1-arg constructor for DocumentTypeImpl
changed gitignore
gitignore change
Macroed timers.
Import.
Test commit
2nd test.
Merge pull request #1 from nventuro/import

Merge
Merge branch 'master' of https://github.com/observing/square
ability to pass groups as option
Merge branch 'master' of github.com:Swaagie/square
Merge branch 'master' of https://github.com/observing/square
empty dependencies also lead to critical errors
Merge branch 'master' of github.com:Swaagie/square
fix comments, do not push empty groups
Merge pull request #7 from Swaagie/master

Output/watch groups specified as option
groupcount
Merge pull request #11 from Swaagie/master

group counting improved
Merge branch 'master' of github.com:observing/square
Also wrap without leak detections
fix doneGRoup
Merge branch 'master' of https://github.com/observing/square
Merge pull request #13 from Swaagie/master

Store the file count outside the merge
Don't kill middleware processing just because a dep fails to update.

Show which file fails to update.

Recompile regexps because we could be using regexp with a global flag that
messes up the .exec method.
Merge branch 'master' of github.com:observing/square
Merge branch 'master' of github.com:observing/square into development

Conflicts:
	lib/square.js
Switch to color functions rather than variables
Style dancing-without-architecture colors and title pages
Added window masking toggle, to only have graphics in a 3:8 aspect ratio.
Adicionando novo documento preencha-aqui.txt
Upgraded to work with changes to 1.6.1 Group/Data forms
searchbox css
Privilege collection re-write hibernate issue: debug
contribution instance
Initial Camel sample from Camel In Action free chapter.
Merge branch 'use_observer' of https://github.com/ommicom/monMongo
Merge branch 'master' of https://github.com/ommicom/monMongo
Merge branch 'develop'
Merge branch 'master' of https://github.com/ommicom/monMongo
tornado async
Merge branch 'develop'
@
clear code
resolve confilict
Merge branch 'master' into develop
side side - get data from mongodb
Merge branch 'site_side' into develop
moved testdata functions into separate file
moved out canonical test data functions
moved out canonicaldata test functions
CLIENT: new About dialog image for GDA RCP products

Has some space around the edge to leave a gap between the about dialog border
and the logo/text within the image.

The image is specified on the "Branding" tab in the beamline product (in the
beamline feature).

Clicking "Synchronize" in the "Overview" tab in the product then copies the
image filename into an org.eclipse.core.runtime.products extension in the
beamline plugin.
Add CMake option to disable libproxy usage and disable it on SLE. (bnc#752500)
New posterior pole doodles and automatic grading algorythm
Added new doodles to hadnle cross sectional views of anterior segment
updated with sample server
added Privacy Policy page link in smartphone navigation (fixes #2961, BP from #2940)
added User Agreement page link in smartphone navigation (fixes #2962, BP from #2941)
Remove unused metadata serialization

Only used by the compute API in Nova for e.g. images and server
metadata.

Change-Id: I223aca1a1c8e35c9339107e5c11bdd8a39968681
Remove unused get_{id,version}_from_href()

The former is only used in the compute API in Nova to e.g. get
an image or flavor ID from a client supplied ref.

The latter is unused even in Nova since the removal of the 1.0
API.

Change-Id: I4e00ca816820cb51c0ab3d4d864766d981854939
Merge changes I4e00ca81,I223aca1a

* changes:
  Remove unused get_{id,version}_from_href()
  Remove unused metadata serialization
Fix minor leak in utf8 conversion
Enabled x axis label for histograms
Add missing delete page option for cello.
Fix bug with map roads rendering
convert "Show more map detail" from a property to an attribute
Adding base files yet again
Synchronize kept-in-sync files during account synchronization, in both directions and considering conflicts
Headers().random_user_agent() and Headers().auth() added
remove auth and randua parameters from fetch(). Now you can do it via Headers()
adopt test cases for fetch() interface
Replace repeating styles with Teacup stylesheet
Refactor: code/look improvements

- used accessors to get/set instead of instance vars

- table rows made bigger

- blackColor UILabel, right pane background
updated online to test sakura-check-version
This is your Captain speaking… here to announce the current state of control. NOT fully functional yet. Just a port of the existing state machine from Navigator to an independent class.
rails
Merge branch 'master' of github.com:pandales/bambuco
rails and role
minor bugfix for file resolution
Merge branch 'master' of github.com:papyri/navigator
Fixed broken type info.
Missed a type variable
kanagram version bump to 4.9.3

Signed-off-by: aydemir <yusuf.aydemir@istanbul.com>
Merge branch 'master' of github.com:pardus-anka/2013
new toolchain based updates
new toolchain based updates
comar fix build when python3 is installed
hamcrest güncellendi.
Changes HTML changes, check boxes instead of drop down menu, and button instead of drop down menu for workflow selection.
working code with all instructions changed in machine-std.cu and machine-rot.cu
updates for UI fixes
old background image deleted
Added Log, Config and DECLARE_PROPERTY macros with samples
Merge pull request #1 from WilstonOreo/master

New TbdLib features!
nu kan de applicatie alleennog afgesloten worden met de MAK_BACK key
compile_mesa: Add support for compiling 32bit on 64bit.
compile_mesa: Always build swrast.
Add a terminus setting type

The terminus setting type makes it possible to set a terminus to nil by
providing an empty string in the configuration. It also converts the terminus
name to a symbol automatically.

This required making all terminus settings consistently use symbols.
Support unlocked_ioctl
Shift ROI, buffer allocation, etc, to camera initialisation.
Add missing include for strndup on windows
let there be code!
let there be code!
Don't truncate video titles when indexing into Solr.
Conformed to the caption spec, spliting and displaying 32 chars per line, for a max of four lines, for https://unisubs.sifterapp.com/projects/12298/issues/606511/comments
Fixed solr tests for nf, ugly hack
Add timestamps and tee'ing to the solr reindexing in the fabfile.

This is kind of crazy, thanks to shell escaping.
Run migrations in a screen session.

This will save us if we're running a long migration and our SSH connection dies.
Merge remote-tracking branch 'origin/dev' into dev
Fix #1122

Improved the TeamVideo template (so we can search
for description and title via auto-query)
Fixed description on TeamVideoLanguagesIndex (it
wasn't searching for the right field)
Changed teamvideo search to use auto_query instead
of just searching by title
Merge branch 'dev' of github.com:pculture/unisubs into dev
Ported the diff email notifications to use the new diff function, cleaned up templates and implemented unit tests for it
Ugly CSS workaround
1807: In non-task teams, prompt for help with incomplete langs
Merge branch 'staging' into dev
libfakedns actually works in some simple scenarios
Final touches, desktop environment is still faulty, but you can run apt-get
More finishing touches
FIX: item whith
FIX: 12hour to 24 hour
ADD: pictures feature done
Added Module and Menu classes also other stuff
libgeda: Fix use-after-free in rc parsing logic.

Closes-bug: lp-1086632
gschem: Draw cues in separate pass.

Fix a problem reported by Peter Clifton where sometimes joint cues are
drawn underneath pins.
gschem: Make zoom-extents tighter to the window boundaries

I have changed from the fixed 95% view fill to ensureing we have
a minimum padding in pixels (currently defined to be 5px).
gaf: remove redundant call to s_page_objects()

In export_draw_page, s_page_objects() is called twice unnecessarily. Remove
one of the calls.

Coverity-ID: 746990
gaf: parse margins from config into correct settings field

Margins in the configuration were being copied into the size field of
the settings variable. Put it into the right place.

Coverity-ID: 746986
Coverity-ID: 746989

Closes-bug: lp-1088041
gaf: remove null dereference in command line parser.

The variable err was dereferenced in one of the error handlers even though
it was never set. Remove the dereference, the variable itself and the
variant error message that was used in the faulty fprint() command.

Coverity-ID: 746988
gnetlist: starting the Dutch translation.

Signed-off-by: Bert Timmerman <bert.timmerman@xs4all.nl>
gnetlist: ignore the generated geda-gnetlist.pot file.

Signed-off-by: Bert Timmerman <bert.timmerman@xs4all.nl>
gsymcheck: starting the Dutch translation.

Signed-off-by: Bert Timmerman <bert.timmerman@xs4all.nl>
New: __.$ Calls __ and wraps result in a jQuery object
Lagt till fler funktioner till Listan från Labspec, random ej testad än
moved sync
modular refactor
proper status codes
runtime error
total points
prepare report
extracted to common
judge report
no sync on report
UTF8 encoded instead of UNICODE
About link on main page now works
Fixing renaming/escaping generating SQL for aggregates
Vim, Xresources, and Xmonad tweaks
change json_encode to Response::json
added static directory with css
Fixed HELLO-5. Update method.
fac order
added popup, add product special, messages, modified installer.
redirects3
Removed useless split_chr
feature: out of band requests
Adapted code to use the new DisableResult, avoiding nasty race condition
with || process->detached()
Started express app as test fixture
- up to 3.7.1; up vs patch and imq patch
Version: 3.4.3
Do not package nagioswall.php twice

Exclude nagioswall.php from theme, it is already included in the -cgi
package
transcription
bump version
bump 0.2.14
tweak doc in gemspec
update planet repository location
`geos_c` library not needed on Windows
add cea projection.
have drawcoastlines use line segments instead of polygons to
avoid 'thickening' of lines around edges of map.
process coastsegs and coast polygons ahead of time
code cleanup
fix for disappearing Eurasia line segments
fix typo
only gshhs coastlines can be polygons
fix streamplot
fix for recent changes in tripcolor
Merge pull request #78 from jswhit/master

avoid thickening of coastlines around edges of plot
Merge pull request #74 from cgohlke/patch-3

`geos_c` library not needed on Windows
geos_c not needed on windows
update
add module variable latlon_default to set default value of latlon kwarg.
update
update
Merge pull request #80 from jswhit/master

allow user change default value of latlon kwarg with a module variable (latlon_default)
fix for issue 79 (drawing meridians and parallels in very small map
areas)
update with new URL
Remove outdated PmFollow directory.
Add distance test block.
Add -r option for rebase in 'pull' command
Add an option '--autorebase' to the 'rcheckin' command to continue with rebasing when new changesets fetched
[testing] fixed test amqp handler, simulating a consumer
Removed automatic inclusion of jruby core and stdlib into output jar. Removed temporary directory extraction for creation for jruby core and stdlib. Added assumption that jruby core and stdlib jars will be located in the same directory as the output jar when output jar is run using java -jar.
LIBMRUBY variable, expects built mruby with root same level as JsMruby, modify to match your enviroment
don't overwrite buddy list file while saving, use a temp file.
不知道什么时候的修改，不过mysql.php需要重新修改，mysql数据库编码问题尚未解决
Adds the button to see month timesheets.
Added test to prove #321
Created Employee and EfficiencyReport + Spring Roo MVC
added project with:

 - parsers;
 - tests for parsers
(maint) Remove CHANGELOG from Hiera

This commit removes the CHANGELOG file in the top level
of Hiera, which only contains commit hashes/ messages
from the previous releases, and is of debatable utility.
This information can be gleaned easily from a git log,
and is not of much use without git.

It also updates the packaging to remove references to the CHANGELOG.
Merge pull request #96 from haus/maint/1.x/remove_changelog

(maint) Remove CHANGELOG from Hiera
Merge remote-tracking branch 'upstream/1.x'

* upstream/1.x:
  (Maint) Lenient checks for looked up data
  (maint) Config=>RbConfig in hiera.spec.erb
  (maint) Fixup json dependency for redhat
Merge branch 'master' into 1.x
Update VERSION for Hiera 1.1.0-rc1
fix redhat spec release template variable

fix redhat spec release template variable

The rpm release variable changed in the packaging repo,
this commit updates it
Merge pull request #84 from MosesMendoza/fix_release_rpm_var

fix redhat spec release template variable
Оптимизация работы с JS

Скрипты для работы проекта вынесены в отдельный namespace
Try to be less wide
2012-12-21 update database to 353
many packet changed, wait fix.
add additions to license.
#297 fixed, admin of event list tweaked
fixed bio admin
its not necessary to include bootstrap.css ... coool!
Remove Symbol: from symbol selector tree view names
GDAL overviews bug fix conditional < 1.9.2
Remove extraneous Mac browser app aliases from failed builds
Updated IT GUI translation.
Merge branch 'master' of github.com:qgis/Quantum-GIS
Added ShowMarks plugin.
Add link to and ignore catalog page
Fix non-protocol url linkage in some cases
Fix html chars leaking from textContent

parsing with textContent and adding back with innerhtml leaks.
Fix spoiler css to 
 elements

I like that it makes better plain semantics than <span>, but it really
should be qualified as .spoiler still, so 
 can still be used
elsewhere.
Fix non-protocol linkifier regex

Was picking up stuff.jp(g)
Fix elements within spoilers not being blurred

I really wish there was a way to ignore a cascade higher up in css.
Kinda like inherit, but subtly different
Redo img preview lightbox in (more) pure css

Unprefixed transitions sure are nice. I hope it works in chrome.
Remove dead div#lightbox and styles
Merge branch 'fancyhover'
Display youtube video titles over thumbnail

Very cool looking. I liked the play arrow too, but this is far more useful.
Improve force-quote handling for inline replies

At the expense of css complexity. gotta redo that shit sometime.

But it sure looks really nice.

Also, bye bye Georgia, hello Droid Serif. Normally I like the uneven
digits, but for 4chan's usage, it's just a bit jarring.
Remove delete checkbox

It was cramping my style, and you can always go back to vanilla anyway.

Will need to redo it in js sometime.
Fix race condition with imgpreview
Fix backlinking of inlined posts

I think; lots of messy state to monkey-test.

Also fixed api post numbering, forgot how it was called
Hide extended image information until hover
Fix backlinks again

I was confused on the detail.post parameter
Fix linkification at end of comment
Replace post counter with absolute idx

Instead of counter-increment, which was cool but hacky.

Removed the image # completely, as it wasn't useful.
Remove poster name from possible page titles

Was useless. the posters really don't matter
Fix initial setting of new-backlinks

I _think_ that's all the bugs....
Improve Cokefile

tabs -> spaces

Remove dependency on underscore. I guess it's not that big a deal since
it's only at build time. I sure do like implementing debounce in every
single project though.

Remove references to .swp files, since I finally figured out how to deal
with that shit properly
Update readme to fall 2012 joke standards

Hmm, I wonder how the github API works for downloads. Would be cool
to write a release script that tags the repo and pushes the compiled script
to github downloads.

You know, if I ever have release numbers ;_;
added txt file describing emwave.emdb structure
Revert "Initial commit"

This reverts commit 7f0c86403a96eb95bba1a922dbe6c620cf675526.
adi - added clone from master
update the region hotel
Signed-off-by: 525846028 <525846028@qq.com>
v0.5.3
- changed version to 0.5.3
- fixed few strings
updated regression recipes to reflect new artifact directories
Refactor destination building logic
Fixed reference for clouddoc-maven-plugin to 1.6.1-SNAPSHOT
added force option for recipes so they can be used to update existing environmetns
Merge branch 'spike' of github.com:rackspace/repose into malconis-spike
added modifyhd --type immutable
Implements per-request workflows, that are constructed from URL query/path.

This patch implements a solution to https://github.com/radiospiel/imgio/issues/8.
Workflows and workflow source are defined per request via the URL (see README.md).
Refactored tests

- Adjusted new-style request URLs
- mocks HTTP requests using vcr
- split test helper from _test.rb
- renames Http module to SimpleHttp to prevent name clash with vcr/webmock 
Split test in "functional" and "integration" test
Adds SimpleCov to run tests always with code coverage
added a new method to insert processed words - vaidy
record 함수 수정
 (좌표 받아서 스트링으로 바꿔주고 배터리 절약을 위해 배열로 요청을 받고 처리함)
Merge remote-tracking branch 'origin/experiment' into experiment
implement authentication against dol2day (running salt)
Still missing are various relations to penalty rules etc
logging, results, result backends, task execution time
Bump version to 2.1.0

Major features of this version include:
 - CBAero Wake modeling
 - Curvature based meshing
 - Re-worked CFD mesh GUI
 - X3D file output
 - Online version check

Bug fixes and minor features include:
 - Scale wing area by linear dimension instead of area
 - Don't write commas in Cart3D files
 - Batch mode mass properties calculation
PAHMA-223: Update pahma extension versions to 2.4-SNAPSHOT.
PAHMA-223: Update versions to 2.4-SNAPSHOT.
Merge branch 'ucb-deploy_2.4' into pahma_2.4
Style development

Basic implementation of style structure
Font.MONOSPACED
Treat aborted jobs as failures.

Aborted jobs can be caused by test timeouts, treat them as failures.
Merge pull request #1 from nshi/ab77414bf2048f1aaa3aa35d9fc91f242af9bce5

Treat aborted jobs as failed
Diagrama etapa 4
Better way to detect author capabilities
Updated scm tags for github
Populate Store updated
added activities and sports page, a user can add themselves to the attendees but they cant create their own event yet, it also displays the current attendees and you can add people to attend, also fixed the meal plan c page to fit the requirements laid out by chen
13.11.2012 if-Anweisungen
Okay, if we're modifying the overall header, might as well add in ace too.
Added a "hist" alias
Add datamodel for loading caculate

	modified:   plugins/plugins/net.sf.pipitrace.ui/src/net/sf/pipitrace/ui/views/histogram/LoadFullTraceHistogram.java
	modified:   plugins/plugins/net.sf.pipitrace.ui/src/net/sf/pipitrace/ui/views/histogram/LoadHistogram.java
	new file:   plugins/plugins/net.sf.pipitrace.ui/src/net/sf/pipitrace/ui/views/histogram/LoadHistogramDataModel.java
	modified:   plugins/plugins/net.sf.pipitrace.ui/src/net/sf/pipitrace/ui/views/histogram/LoadHistogramView.java
	modified:   plugins/plugins/net.sf.pipitrace.ui/src/net/sf/pipitrace/ui/views/histogram/LoadTimeRangeHistogram.java
Fix yaxis max value

	modified:   plugins/plugins/net.sf.pipitrace.ui/src/net/sf/pipitrace/ui/views/histogram/LoadHistogramDataModel.java
rhosimulator: security_token argument from rake command-line support
'3.3.3.beta.5.20'
escape slash in app_build_configs
net: fixed bug getting partial content.

Conflicts:

	platform/shared/net/CURLNetRequest.cpp
fix autocomolete by T&V requests
Merge branch 'master' of github.com:rhomobile/rhodes
add OpenSSL and EzCrypto links to CREDITS
Use connect 2.3.x
Use connect 2.3.x
Merge branch 'devel'
Merge remote-tracking branch 'origin/master'
Fix 'calipso server' command
Change version
Fix calipso command line for modules and themes.
Move package dependencies from assets to root
Move dependencies for mailer as well
Upgrade to 0.8.6 nodejs for travis
TravisCI fixed node deps. Remove explicit dep for 0.8.x
estilos de comentarios
login view and controller added
login view and controller added
authentication flow implemented
Update vendor/assets/javascripts/foundation/jquery.foundation.orbit.js

compatibility improvement: js error presented when fail to include src or data-src attribute for img element
Adds exports for CreatureClass in creature_class
Updated test_sim with epectations
Got the forms working again; "method GET" was the problem.
tidied up login page
Merge pull request #4 from rockad/exam

Exam
Update README.md
Merge pull request #5 from rockad/master

Master
improved Makefile
updated devDependencies
added .jshintrc for eqnull
clean up makefile a bit
adding Chinese(zh_CN) support
Added correct plural forms for Russian language
Add traditional chinese support
Merge pull request #167 from rockymeza/makefile-improved

Makefile improved
Merge pull request #170 from dreamerslab/master

Add traditional chinese support zh-tw
Merge pull request #168 from suupic/master

adding Chinese zh_CN locale
Merge pull request #169 from fduch2k/master

Adding correct plural forms for Russian language
Adding jshint options from build script
Making a default format for moment.fn.format

#121 Default format is 'YYYY-MM-DDTHH:mm:ssZ'
ASP.net dates can be negative #161
Added automatic iso parsing

#153
Building changes for automatic iso parsing

#153
add zh-tw test
fix zh-tw MM bug
Merge pull request #174 from dreamerslab/master

Add traditional chinese test zh-tw
Fixing bug for #176
news ok, asso ok, partenaires ok, work on team, cas, user, user_data
Only install Sublime settings on OSX
Se agrega el campo de cliente a la hora de crear una nueva venta
readmy & license commit
이슈4
Implemented support for static files.

A few modifications in the umbra/settings.py file, as well as in some
views provided by the "blog" app, were made in order to allow support
for static files.

To place those files, a new directory -- namely the "static" folder --
was defined as one of the STATIC_DIRS, which basically means that there
is the place were we are going to put our static files.

Despite we're using the "static" folder as the default place for
storing static files, the server will actually use the directory
defined in the STATIC_ROOT constant for this task. Thus every time a new
file is added to any of the STATIC_DIRS we must run "manage.py
collectstatic" so the server can update STATIC_ROOT's contents.
Replace FontOptions argument to FontCollection.Select with more-flexible string slice ranges.
Use rune for codepoints.
Use rune for codepoints.
Factor out drawing state into struct.
Theme Customizer: Only show uploader 'remove' links when there is an image to remove. see #19910.

git-svn-id: http://core.svn.wordpress.org/trunk@20261 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Compress scripts/styles: 3.4-alpha-20262.

git-svn-id: http://core.svn.wordpress.org/trunk@20262 1a063a9b-81f0-0310-95a4-ce76da25c4cd
improved chapter editing
Updating: minor.
Updating: minor.
Updating: tidy up.
Updating: tidy up.
around hooks should not be reversed
turns out there was an else
Fixed accidental deleltion in translation entry creation loop of constructor
proper piston logging
Get everything working with Juno release of Eclipse.
Fixed uploads on WP7

The file names are ugly, but we can live with that :-)
added sia3
adding code objects to search index
break out list item blocks for article, code list pages
simple item representations for search results lists
whoa
Doen
Lol
alksfjslkjfd
Ben test
Merge pull request #2 from bscharfstein/master

Ben test
M1 related changes
M1 related changes
readme
Reworks chord angle calculations to make scope dependencies clearer

Now each scope arc segment is split in two-- outbound dependencies on one side, inbound dependent successors on the other half. In addition, if multiple successor or predecessor links are present, the half of the arc segment is further split amost the chords.
Fixed bug with disposed isolated storage.
added product controller and model
Make it pass cane

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
Readme

Added Readme with DB instructuions
Update README.txt
Merge updated README.
Extra Credit: group top places by country
Removed some silly commented out code'
Refactored populate_table
Currently only loading from the local inventory
it works
Remove Blog/Public
Refator
Add DISQUS Plugin
Change CLI.php
nodes now use comman base class for message handling
Merge pull request #290 from Kronos11/develop

Fix for sql::SQLException messages on login. Note: getMoreResults must b...
quick updated to match object types to database types.
Merge pull request #291 from Kronos11/develop

quick updated to match object types to database types.
Updated fictionally reserved names to be lowercase as that's how we are checking them. Also slightly fixed the ui message we are sending back.
Merge pull request #292 from Kronos11/develop

Updated fictionally reserved names to be lowercase as that's how we are ...
Creature switched to 'new style' of message building and put in necessary glue...

Needs review before going further. IE: Is it appropriate to pass in shared_ptr, or should we just be passing raw pointer and doing null checks?
Changed the Quadtree interface to allow query buy a polygonal geometric shape. Implemented some of Node.
Fixed issue with plugins not generating a test runner and library when unit tests are present
Merge pull request #293 from apathyboy/feature/plugin_tests

Fixed issue with plugins not generating a test runner and library when u...
Merge branch 'develop' of github.com:anhstudios/swganh into feature/spatial_indexing
Updated to new docs location
Corrected the directory check for the docs dir.

Added the swganh-docs as a submodule.
Removed docs that were moved to the new docs repo
Updated to latest docs
Removed docs as a submodule and as a requirement to build the project
Merge pull request #294 from apathyboy/feature/docs

Feature/docs
Merge branch 'develop' of github.com:anhstudios/swganh into refactor/msg_builders
Lots more message builder refactoring. Idea is to completely decouple the objects from the message builders themselves using events.
more hardcore refactoring...
Quadtree object insertion into nodes seems to work. Created unit test which inserts 3000 objects at random coordinates.
update class descriptions
FC-2689 updated history tab to work with non-versioned content types, added support for bArchive (for archiving normal content types on setdata)
+ devise for user auth, links to entry show pages
SPLASH PAGE

Updated svg, jpg
fixed the clear canvas function
fixed merge conflict
config
Merge branch 'master' into personal
config
merge from master
Merge branch 'master' into personal

Conflicts:
	Makefile
	xoat.c
title
Merge branch 'master' into personal
GAP bug in flipped layout
docs
Merge branch 'master' into personal

Conflicts:
	README.md
fix clang warnings
Revert "fix clang warnings"

This reverts commit 94ab5472b9866e5fb98e1995efa44ff49a84bf45.
tweak config.h defaults
clang warnings
clang warnings
these collection guards seem unnecessary
I actually prefer to test bindings and public API
  separately, so I've reworked the tests to demo
  that a bit. 

This change is 50% style and (IMO) 50% beneficial.
  The benefits are primarily that it tends to make
  unit isolation a tad easier to pull off, and in 
  the long run I've found specs that focus on 
  tackling named methods easier to maintain. I say
  maintenance is easier b/c the spec tells me the 
  public API very clearly (when I need to change
  a method I know where to go), and when a second
  event calls the same method, I don't have to hide
  behind any shenanigans like "shared example groups"
  to DRY things up.*

*But really I do love shared example groups when
  they make sense
Avanzando, pero funcional, aun con errores
Merge branch 'master' of https://github.com/sebakan/proyecto.git
git: import .gitignore_global
Merge remote branch 'volodymyr/master'

Conflicts:
	sensei-core/pom.xml
Fixed complex template mapping for BQL.
Fixed integration tests on Windows platform
Refactored the Sensei servlet
Added some files to git ignore
Fixed indexing ltancy issues related to the activity engine
Merge branch 'master' of https://github.com/wonlay/sensei

Conflicts:
	sensei-core/src/main/java/com/senseidb/servlet/AbstractSenseiClientServlet.java
Merge branch 'master' of https://github.com/sguo/sensei
Merge branch 'master' of https://github.com/jasonko/sensei

Conflicts:
	sensei-core/pom.xml
Merge remote branch 'volodymyr/master'

Conflicts:
	sensei-core/pom.xml
return fetchStored even if the request does not explicitly say it because federated broker may want it by default
Fixing the activity engine memory leak
Merged from master
logging for route by param in node level.
Merged from master
disable pre variables replacing for bql for now.
First working version of fastjson.
Merged from fastjson
Fix NPE.
Fix kafka NPE.
fast json is now passing basic tests.
Merge branch 'fastj' into sig
Make some arguments optional
Merge pull request #2 from bengourley/master

Make some arguments optional
Checks for iftest (demo) before updating database.
Added new API operations for bill and people.

* Find bills by person.
* List people.
* Find people by party.
* Number of presented bills by person.
Added Android maps
changed a couple of output files
Changed data-rotation-* to data-rotate-*
doc: typo fixes
uniconvertor and (dependent) sk1libs formulas
wrote more description on README.md
Add --num-threads 1 .

This is required for predictable results.
Convert to FCS_PARENT_AND_MOVE__GET_MOVE.
Convert to FCS_PARENT_AND_MOVE__GET_MOVE.
Calculate parent->child by enumerating moves.

This calculates the moves from the parent to the child by enumerating
them. We don't need to store the move.
lib ディレクトリを廃止
パッケージ周りのリファクタリング
scripts が不要になったので削除
changed table id
Added a second Appender
0.44 :/
(theme) profile -> activities template(s) converted
(theme) memberlist template converted
(theme) various small corrections
libpan initial stuff.
cleaned up. better state mangement (kind of do it clean with RAII).
Install libuuid before tests
exec! spec deals with reboot
Make prefs mandatory
Adjust error messages for prefs
Merge branch 'master' of git://github.com/collectiveaccess/pawtucket
Properly seek() when filtering results
Merge remote-tracking branch 'upstream/master'
img detail size
Handle posts in new API.
Require recent version of Requests.
Make streaming work in theory. In practice Twitter servers hate me.
Added support for cpp:undefined reference errors
Now lambda is used instead of all sentinels.
You can always trace which signatures you're matching (and you have to)
so when you reach final state, you know for sure, which signature matched.
Streamline intro
minor word change
Merge pull request #178 from carterpage/javadoc_prop

Revise intro
changed references from short to int16_t and calls to sizeof(int32_t) to sizeof(int32_t) as they should be the same size
test
Merge https://github.com/slimane/dotfiles
Fixed python binding imports
Python bindings debian installation update
Rearrange order and location of including major classes
Rearranged loading of classes in !inc.php. Created require.php for non-phar loading only.  Moved truetype font to Captcha directory in progress commit
Changed to Captch class. Fix of bug with UnactivateException
moved font dir with font.ttf into the config folder. Updated Captcha.php to use new location of font file
Updates to sitemap.php and SiteMap class
Updates to sitemap.php and SiteMap class
Set include_path to point to LAMPCMS_LIB_DIR first in require.php. Updated HtmlSafe.php to use relative path to Pear. It will make use on new include_path now.
Updated H2t, Updated paths in HtmlSafe, updated bootstrap.dist.php to allow phar based setup, added phar_stub.php which is used only during the build of phar archive.
Merge branch 'Phar'

Conflicts:
	lib/Lampcms/SiteMap.php
Added selection of timezone in user profile. Added initial support for
multi-site usage with a single Lampcms installation. Updated several
non-critical exceptions to use AlertException and NoticeException
Added spaces after each : to satisfy hint build
Updated how visual state triggers in place details view model.
Rename NodeNameSet#{target? => target_relationship?}

This communicates the intent better
fix pending page
cancel xmain
fix pending jobs from index
fix end_action
/gmindapp/document
Changed the serve_static_assets to false for production.
Remove. rpeo
resolved issue #31 (Change ControllerResult initialization)

```php
// Changed all instances of this
$result = new ControllerResult('Controller');

// To this
$result = ControllerResult::init('Controller');
```
minor housekeeping
Resolved Issue #14 -- Storage code cleanup

- Added new Issue to file header
- Added or updated comments as required
- Changed `self::` to `static::` for uniformity
- Added
- Other minor cosmetic updates to method definitions

Also fixed some test cases from TestStorage.php
Resolved Issue #24 -- Extract commented code block from __toString() method

- Wrote AuthorTagger Worker to build HTML tags for Author object
- Made updates to all required views
added 1.3.9 dev scripts

git-svn-id: https://jsplumb.googlecode.com/svn/trunk@1721 ebaf65f8-305e-11df-bfeb-7b4c664f286a
dashstyle in straight canvas connector now paints the last, partial, dash.

git-svn-id: https://jsplumb.googlecode.com/svn/trunk@1722 ebaf65f8-305e-11df-bfeb-7b4c664f286a
switched dev version to 1.3.9

git-svn-id: https://jsplumb.googlecode.com/svn/trunk@1723 ebaf65f8-305e-11df-bfeb-7b4c664f286a
update internal version numbers to 1.3.9

git-svn-id: https://jsplumb.googlecode.com/svn/trunk@1724 ebaf65f8-305e-11df-bfeb-7b4c664f286a
fix for moveParent: bgCanvas was being added after fg canvas.

git-svn-id: https://jsplumb.googlecode.com/svn/trunk@1725 ebaf65f8-305e-11df-bfeb-7b4c664f286a
mark VML arrow overlays as being top level; they will then get copied correctly in the moveParent method.

git-svn-id: https://jsplumb.googlecode.com/svn/trunk@1726 ebaf65f8-305e-11df-bfeb-7b4c664f286a
a proper fix for ids polluting the html
docs for getConnection method
Initial conversion from Oinq.EdgeSpring
Removed dependency on JSON.NET and implemented RestSharp.
Amended .nupkg file to get correct framework name.
some more updates for RHUI 2.1
School code added in admin list