labofsahil/github-event-dataset-2012 huggingface dataset:
Clean up in the failing exchange redeclaration test

After a channel-level exception (406) in the test, we can no longer use
the same channel so we clean up using a different one
Undoable group destroy
groups spec dir
Adds default group ordering by created_at
Renames group model file
Styles group summary view
Fixes error when feed had a chance of not rendering currently added action
IDI-50: Adding focus styling for the IDI logo.
GraphView is drawing fine now
Still testing
changing some styles and making links
Lot more reuseable
Add a full_title hepler
Adding files zip from section 3
Beginning to stub out module space.

Updated setup to point at module.
Added stubs for module space layout to split out the logic into logical
files.
Handle zero-length input and prevent segfault

Fixed segfault when input was zero-length.
Fixed issue with short input.
Integration tests added

Also had to remove shipped.html.erb because functional tests were
failing due to protection_forgery? error
Small Changes to mail stuff

deletion of shipped.html.erb template due to some Rails forgery checks
when trying to render HTML form outside of website itself
Create VERSION.markdown with Jenkins for ZIP
Merge remote-tracking branch 'movingblocks/develop' into VersionInfo
Changed version files
Merge pull request #356 from miniME89/gui

Gui
Merge remote-tracking branch 'movingblocks/develop' into VersionInfo
Added manifest version and changed VERSION.txt
Merge pull request #358 from miniME89/gui

Gui
Merge in version info changes from @mkalb
Renamed SelectionChangedListener
Added TabFolder widget / Added RowLayout and StackLayout / Optimized styling system / A lot of widget bug fixes
Fixed crouch button.
remove break at the end of copyright
This should fix the rest of the tests on Travis.
Patch to make except work properly in py2.7

    try:
        import utmp
    except ImportError:
        utmp = None

was rendering as

    try:
        import utmpImportError
    utmp = None

for some reason
Merge pull request #2 from blast-hardcheese/master

try/except was not being handled correctly in py2.7
changed preview post template tag to return 7 sentences instead of 1000 words
Remove duolicates.
Added test page for admin to be able to see what their changes look like on live.
Fixed article content on every page.
customer login/signup page: client side validation for email
added syntax highlighting for rdoc files and Guardfile's
Fixed long instructions.
Renamed the columns Languages/Audio Languages into Audio
Added Audio Language selection to newShow template and fixed a little bug which threw an error
adc button working
up: folders&files organization for futur uses.
fix: function syntax.
add: allow to load a car.
up: move some files in some betters folders.
up: load a car sprite. #24
del: debug.
fix: set the players marks from server.
add Q94 solution.

Signed-off-by: KouichiYamada <k-yamada@tg-inet.co.jp>
Creating Item struct.
Moving transaction into index. Clean up.
Updated files with Apache Lic
improvements/fixes for count countUntil

Changes:

1. Count:
1.1 Better conditional statement
1.2 Count will now turn down any infinite haystacks (or else you'd count to infinity...)
1.3 Infinite needle will instantaneously return a count of 0.
1.4 Fixes a condition that was checking pred(haystack, needle), as opposed to pred(haystack.front, needle.front) (guess no one ever tried a fuzzy count?)
1.5 Fixes reference range support...*

2. countUntil:
2.1 Better conditional statement
2.2 countUntil supports InputRange for element and predicate search.
2.3 Fixes unicode bug (return the amount of popFronts, not index)
2.4 Fixes http://d.puremagic.com/issues/show_bug.cgi?id=8804
2.5 Fixes http://d.puremagic.com/issues/show_bug.cgi?id=8821

Note: count is still subject to the bugs in splitAfter
* Incorrect reference range support
* Incorrect split for forward range
Both are corrected in another pull.
As such, no unittests are added (yet).
ActionSheet delegate and buttons
Added quote DB commands.
remove bin, no-one uses them
bump jingo-minify for fixed tests
Revert "Move nazca to github module"

This reverts commit 4d66c809dcdcc8d15289a8cc395570a9e498edc6.
Intermediate checkin.
The parser is still work-in-progress, with large chunks unimpleted (and currently does not compile) ... but committ'ing to check-point.

Note that script support has been disabled - it will require substantial effort to support, and dont want to block rest of codebase on that.
Add a file called "msabramo"
Update README.md

Fixed link to project's issues.
Merge pull request #2 from styx/patch-2

Update README.md
lastfm: update API key
Merge branch '1.0.5' of https://github.com/mutualmobile/lavaca into 1.0.5

# By George Henderson
# Via George Henderson
* '1.0.5' of https://github.com/mutualmobile/lavaca:
  Fixed bug where a undefined computed property would throw an error
Add travis-ci build image.
notifications finished
Merge branch 'master' of https://github.com/mwilkowski/studnote
Update CraftBukkit to Minecraft 1.4.4.
Correct digging behavior. Fixes BUKKIT-2780

If a block is air we return immediately so miss the cleanup work that would
normally happen in this case in vanilla. This causes us to get in to a
situation where, due to odd packet sending from the client, we never
properly stop an attempt by the client to break a block and thus it
eventually breaks.

We also use our own variable for block damage and never sync it up with the
vanilla one so damage reporting to other clients is not always correct.
Add EntityFallingBlock from mc-dev
Potentially fix glitch with falling entities.

When a block creates a falling entity the block is not immediately removed
from the world. Instead, the falling entity is responsible for removing it
but only if the block still exists. Due to certain piston mechanics it is
possible to move the block before this check happens and thus the block is
not removed. This should be fine as the entity will kill itself in this
situation. However, the code does not stop here and continues running the
rest of the entity logic which includes either placing a block in the world
or placing a block item in the world depending on the circumstances.
Clear out empty extended block ID array. Fixes BUKKIT-2923

If a chunk gets a block added to it that requires the extended block id
nibble array (block id greater than 255) the array is created and saved
with the chunk. When the blocks are verified to make sure they exist these
entries are erased but the extended block id array is not. This causes the
server and client to disagree about how much data a chunk has which makes
the client crash while trying to load the chunk for rendering.

To resolve these issues we now clear the extended block id array on chunk
load if there is no valid data in it.
Add crafting result slot for sheep breeding. Fixes BUKKIT-2926

Sheep now use the crafting system when breeding to determine what color
their baby should be. This triggers an event but the event wants the
crafting inventory to have a result slot which sheep do not have. This
event could be useful for plugins to control the output of sheep breeding
so instead of disabling it we add a result slot so the event fires without
issue.
Merge remote-tracking branch 'upstream/master'
Update spec to reflect new parsing module method name.
Add some debug output to see if the expected directory listing error is being raised.
Fix the error that sometimes happens when invoking 'vh' without a deploy.rb.
Create db2dart report file
Add table extent map
Fix db2dart report file name
Fix db2dart report file name
Create extentmap generator
Modify outputs
Modify
Create report file
Create 16k report file
Add about 16k
Create db2dart report file
Add about 32k
Add conclusion
Ball Physic
[COOK-1679] Create a flag to append users to group

Instead of simply replacing all the members of the group, this allows
for appending users to the group.
Merge pull request #1 from nationalfield/append-to-group

[COOK-1679] Create a flag to append users to group
Added a Pages controller; also fixed the sqlite3 in gemfile
Done with static pages
Updating Makefile in test directory to compile with appropriate flags when HDFS is enabled.
Updated GM_Writer methods to handle storing into HDFS.
Attempt to fix orange in bug 772823

--HG--
extra : transplant_source : %C82%CF%EC%AD%E8%D1%87%19%22%10k%9E%F3%EA%CF%FB%F9%8FC
Bug 814038: Fixing codec negotiation to use actual payload in SDP rather than preferred payload when populating codec-specific parameters r=ehugg
Bug 814149. Fix GetCanvas. r=bz
Bug 812453; fix CopyInnerTo; r=bz
Bug 811911 - Allow UTF-8 output from the SpiderMonkey shell; r=Norbert
Bug 806699 - Port browser_privatebrowsing_ui.js to the new per-window PB APIs; r=ehsan

--HG--
rename : browser/components/privatebrowsing/test/browser/global/browser_privatebrowsing_ui.js => browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_ui.js
extra : rebase_source : bc814120977d36fee6285ea7391aa340361b33cc
Bug 783368 - Add critical display port content property. r=roc

Add a property to represent a sub-rectangle of the display port that is
considered 'critical' to render correctly.
Bug 783368 - Prefer the critical display port, when set, in basic tiled layers. r=bgirard

If a critical display port is set, only validate content within it when using
basic tiled layers.
Bug 783368 - Add resolution to TiledLayerBuffer. r=bgirard

Add the concept of resolution to TiledLayerBuffer and add support for it in
BasicTiledThebesLayer and TiledThebesLayerOGL.
Bug 783368 - Disable ReusableTileStoreOGL by default. r=blassey

Add layers.reuse-invalid-tiles to control use of the reusable tile store and
disable it by default.
Bug 783368 - Add a low precision buffer to tiled thebes layers. r=bgirard,kats

If there is a critical display port set, render the area outside it into a
lower precision buffer.
Bug 783368 - Don't duplicate high precision rendering in low precision region. r=bgirard

Don't render valid high precision region in the low precision buffer.
Bug 783368 - Send the correct display port when rendering low precision. r=kats,bgirard

When doing a low precision update, send the display-port instead of the
critical display port so that more appropriate cancelling decisions can be
made.
Bug 783368 - Correct the height calculation in ProgressiveUpdateData. r=kats
Bug 783368 - Fix progressive tile update coherency issues. r=bgirard

Fix some progressive tile updating coherency issues caused by aborting at
inopportune times and tile draw ordering.
Bug 783368 - Uncouple low precision updates from standard. r=bgirard

Allow low precision updates to happen regardless of the state of the unscaled
tile buffer.
Bug 783368 - Add a pref to control low precision tile rendering. r=bgirard

Add pref 'layers.low-precision-buffer', enabled on mobile/android.
Bug 813204 - Don't send multiple hasTouchListener events for the same document. r=wesj
Bug 779504 - pin datazilla pypi package to version number, r=jgriffin
Back out c0a09f9d5215 (bug 778230) because of Android build failures
b=779019, GLContext being destroyed on wrong thread with OMTC textures and shared handles; r=jgilbert
Bug 778322 - Remove the prefetch deleted registry key from machines that contain it. r=jimm
Bug 777175: fix sidebar splitter styling, r=dao

--HG--
extra : rebase_source : 67e661eb551c9da94fb023c8bfd08b1b4ad7eebd
b=779019; bustage fix
Bug 778204 - update marionette test harness emulator documentation, r=jgriffin
Bug 761261 - Add JS profiling to SPS (r=luke,ehsan)

--HG--
extra : rebase_source : 328a82697aa9a9f63d18c7a30a813f436e163922
Bug 770663 - Add a JS shell function to turn on a static profiling stack (r=luke)

--HG--
extra : rebase_source : 7e7ad51d73d5a517ef6bb9d62255e673944b4330
Remove unnecessary decls (mostly to trigger a clobbering rebuild) (no bug, r=me)
Bug 763702: Ensure font inflation bits are set during frame construction for root frame to prevent crash. [r=dbaron][a=akeybl]
Bug 801055 - Fix strangely tall Downloads button on OSX when background theme applied. r=mak.
Back out b8214dfa2924 (bug 794091) for talos hangs
Fixed loads of bugs. Extraction now working but unstable.
Make sure ontologies_linked_data is available
Revisions to the relational operator implementations

- Original was mostly correct, but didn't properly resolve primitives.
  Rewrote to use the abstract relational comparison algo, per the ECMA
  spec.
Implements the Error global object and prototype.

- Not very useful yet, but will come back into play when try, catch
  and finally get implemented.
- Still need to modify the fh_error fn to create an error object.
added more on good corp
adding photos for toc post
Update assets/demo-scripts/demo-opengl.rb

Added response to touch event
handle packets is now ready. Added function to show client list
Updated PRC content-type fields.
Display team details field.
Add Renan to README for threads_on_fork worker
Update doc for Xitrum 1.12
Made input and input:hover styles a little more subtle
Reparada ruta imagen logo
Delete bad readme.
removed done-signs
Styled stats page
updating konoha package
updating konoha package
remove logpool and jit package
add travis.yml
Depend on Kombu 2.1.2 or later

Kombu 2.1.2 fixes a bug with AMQP and SSL.
added client and client selection in order form
done with model stuff
Stop loops, debug.
Tweak the nbar for the NB1 site.
Tried to fix category migration issue
Changed schema
Merge branch 'master' of https://github.com/nolanblew/ShareSite

Conflicts:
	db/schema.rb
Ignoring RubyMine config
Merge branch 'master' of github.com:noonie2k/games-pool
Added the decription the gui, updated decriptions on all levels based on the results of the play tests
Merge branch 'master' of https://github.com/nthykier/CronoShift.git
added wavelets shader
[✚] Added “bean”, “bowser” and “qwery”.
ruby bindings: Fixed a miss-placed cast.
ruby/main: Fixed "format not a string literal and no format arguments" errors.

These kind of errors are reported by current versions of GCC.
Merge pull request #352 from tokkee/sh/build-issues

ruby bindings: Fixed a few build issues.
Updated readme with move-move conflict
Mortal Scumbag Theme
multiple versions could occur and should also be highlighted
bundler plugin - don't "bundle exec rails"

As per http://blog.wyeworks.com/2011/12/27/bundle-exec-rails-executes-bundler-setup-3-times
Get the Hostname

Main library should use ZSH native hostname function
Merge pull request #790 from cicloid/master

Getting the hostname, correctly everywhere.
Fixed the rfind command in the  ruby plugin
Merge pull request #799 from plindborg/ruby-plugin-fix

Fixed the rfind command in the  ruby plugin
Merge pull request #785 from simonjefford/patch-1

bundler plugin - don't "bundle exec rails" 
autojump plugin enhanced
Apple Terminal.app resume directory plugin
Git Plugin: adds 'grhh' alias for 'git reset HEAD --hard'
remove the -v flag from a few mercurial aliases

The -v flag for these commands really isn't very useful.  It will
output some information about the hooks it is running, but that is
generally not useful and just noisy.  The desire to add -v to these
commands is exceptional and IMHO it's better to make the common
case of not seeing those messages the supported behavior.
add annotate
Merge pull request #816 from lucapette/add-annotate-to-bundler-commands

add annotate command to bundler
Kill the compdef; Introduce 'grh' alias for 'git reset HEAD'
Merge pull request #806 from OutPunk/terminalapp-plugin

Apple Terminal.app resume directory plugin
Merge pull request #784 from lnxbil/967e84ebaa180ad2ab1eebc9a512f94d93e84aea

multiple version should also be highlighted
check if autojump is installed
Removed calls to compinit in the extract and the bundler plugins. compinit should only be called once, after all modules, libs, etc are imported.
Don’t report that Oh My Zsh has been updated when it hasn’t.
Supression des cotes non UTF8
version pour la release
add .bash_history

Signed-off-by: Olaf Hering <olaf@aepfle.de>
added option for generating spherical voxel distributions
virtual env transport to ec2
Updated URL to authorizer
Updated Gemfile
updated plugins to work with latest version of Liquid
Do not strip trailing slash of canonical URLs.

Usually, links for posts are generated with a trailing slash, but
canonical URLs aren't.  Some services (e.g. http://b.hatena.ne.jp/)
are confused with that behavior.

We can fix it by removing canonical URLs, but then anyone may read
a post with /index.html URL and post the URL to some tool or service.
Therefore rel="canonical" seems useful IMHO.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
Improvements to code plugins
- Range options are now properly stripped out of code plugin markup
- Markers now add start and end class names for more style control
- code_block plugin properly passes markings in highlight options
- Deprecated title before file name syntax for include_code
Syntax highlighting theme now defaults to the light color scheme. I also added new styles for marking lines of code, and a better custom/_colors.scss file
Merge pull request #592 from omasanori/fix-rel-canonical

Do not strip trailing slash of canonical URLs.
Merge branch 'master' into 2.1

Conflicts:
	plugins/code_block.rb
	plugins/pullquote.rb
Merge branch 'master' into 2.1
Removing .sass-cache in update_style task to ensure that Sass caches don't cause problems when users update. Related to issue #555
Added video and css masks to modernizer tests. Updated styles to work with new image mask classname
Added support for using text based social sharing links instead of javascript widgets which may track users and do trigger crazy high http requests. Also added a custom sharing template file for injecting any other sharing widget into the sharing section after a post
fixed the embedded example in include_code plugin
updated facebook link share url pattern
Fixed issue where gists wouldn't get line numbers added. Fixed issue where backtick code blocks were getting empty figcaptions
Changed do_not_track setting to respectfully_social. Added a better description to the config file. Also, now social icons are sprited for bandwidth friendliness
improved the wording of the respectfully_social description
Added styling for github follow button, improved javascripts for adding GitHub and Twitter sidebars
Added more customization points in layout for pages, posts, comments, and meta data.
added custom after post include to post template
Fixed issue with CSS image mask test failing. Refactored Octopress.js functions into a closure. Added Twitter and GitHub feeds to Octopress.js to reduce http requests. Fixes #596
fix bug #23
Starting to implement realtime logs
check if iframe is allowed
check if iframe is allowed
Merge pull request #1 from adililhan/master

iframe
New layout for the website, still buggy, so really just a snapshot...
Cell selection  - added delay attribute .
Cell Selection - added keyboard support for Ctrl+Home/End.
Merge branch 'master'.
Removed from tld executeRenderedComponents attribute.
New tool to generate content entries for MonoDevelop projects.
Notes about finding the AMI if you're in a different region; also about security settings on AWS
Ported DIY cartridge to new framework
Merge pull request #396 from jwhonce/testing

Merged by openshift-bot
BZ857824 The response message of do threadump to unsupported app by REST API need update
Merge pull request #521 from calfonso/master

Merged by openshift-bot
remove preconfigure and more work making tests faster
Bash environment support

 * HISTFILE set to ~/app-root/data
 * Empty .bash_profile created
Merge pull request #430 from jwhonce/histfile

Merged by openshift-bot
Automatic commit of package [cartridge-mongodb-2.0] release [0.21.7-1].
Set db ctl script var that was no longer getting set due to refactoring.
Merge pull request #418 from mrunalp/bugs/db_ctl_script_missing_var

Merged by openshift-bot
[RefData][ORI] Fixed the coordinates of a few airports (YDS/Desolation Sound, YNZ/Yancheng, YPC/Paulatuk).
Initial commit
Merge branch 'master' of github.com:ophielia/menushaker
Added support for SSH keys(Linux).
Fix #252 "Label with nested HTML output produces escaped HTML"
fr:alert-dialog: close box if only neutral choice + better button padding
Minor: val instead of def and use Scala-style name
build number
build number
build number
build number
build number
build number
build number
build number
build number
KB-292 Remove duplicate help text in submission above/below
User rating
getImage attributes passed as array
kinect gestures work somewhat, but timer is a little iffy so still working on that
Merge branch 'master' of github.com:paigedr/swipenserve
fix git problem
fix sql task's answers
Merge branch 'master' of github.com:palexvs/TaskManager
Wpisy w klasie Aplikacja.
MTREXT: Correct short int
MTEXT: Added comment for R2000 code
drawArrowButtons renamed
Refactoring to make jslint happy
Merge branch 'master' of github.com:partkeepr/PartKeepr
Added some more helper methods for the user preferences; implemented unit tests for them.
Removed forced utf8 declaration
Added unit tests for the User entity
Added missing "getPreferences" method
Use the UserPreference helper methods instead of manually fetching the data from the DB
Automatic transfer of the user settings on login, so we have the information immediately available after login.
Merge branch 'master' of github.com:partkeepr/PartKeepr
Fixing geo positions
Github username changes.
Merge branch 'v1'

Conflicts:
	install.rb
gk110: add ld/st g[]
Delete useless variable keysDown
Propely reference Map in Game model
PrimeSum: improved output, grab last one.
Rename user zone to top zone
FirstCommit
Empty Django (ver 1.4) Project (python 2.7.3)
Merge branch 'master' of github.com:peasnrice/CompOrgan
Added hasGroup method.
Changed the constructor to acceps a X509 certificate and build the credential internally.
Renamed EntityManagerContext to JPAIdentityStoreContext.
Renamed EntityManagerContext to JPAIdentityStoreContext.
Code cleanup and refactoring.
Changed the constructor to acceps a X509 certificate and build the credential internally.
Renamed EntityManagerContext to JPAIdentityStoreContext.
Code cleanup and refactoring.
Code cleanup and refactoring.
Renamed EntityManagerContext to JPAIdentityStoreContext.
Added group entries for testing.
Renamed EntityManagerContext to JPAIdentityStoreContext.
Setting syntaxes. Installing vim-jade
updates to The First Post
Updated tests: fixes bug in hs_metrics
DumpFile iterates over paragraphs and sentences
more with scrolling the scene
fixed some aliases and add new function on bin
Fixed issues after @brendo's code review.
Moved everything around
Removed Warnings
Fixing
add Envoye de ...
Atualização do dicionário en_US referente a palavras no widget de
operações executadas
add cd commands from $work
files must end in .zsh
more xterms
set editor to emacs
Fix exports in SFML module to work on Win32.
Standard Android App with Fragmented Tabs

Signed-off-by: ph-wert <pascal.hagedorn@gmail.com>
Anchor build script.
added julian day functions to TimeShadow
added julian day tests for ShadowTime
Merge branch 'master' of https://github.com/roflharrison/robolectric into roflharrison-master
Undo config change
Cosmetics
Mode change
modified:   view/theme/smoothly/comment_item.tpl
	modified:   view/theme/smoothly/contact_template.tpl
	modified:   view/theme/smoothly/jot-header.tpl
	modified:   view/theme/smoothly/jot.tpl
	modified:   view/theme/smoothly/login.tpl
	modified:   view/theme/smoothly/photo_top.tpl
	modified:   view/theme/smoothly/profile_entry.tpl
	modified:   view/theme/smoothly/profile_vcard.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	view/theme/smoothly/icons/
	view/theme/smoothly/lang_selector.tpl
	view/theme/smoothly/wall_thread.tpl
	view/theme/smoothly/wallwall_thread.tpl
Added IDs to buildings and messed around with the fighter class
Fix a typo for the last text on advanced pagination.
Prefix select
Fix default_value_parameter to pull from $_REQUEST (get/post)
Prefix submit class with pods-
added missing st dependency
fix pipe wc tests
debug captcha
original rebased file for 12974
fix newer attribute changes (12974)
add extra patch for 13423
new command, mild refactor
merge?
Merge branch 'master' of https://github.com/prehensile/skypebot
Mon Update
Add JsonEventSerializer for external use
Allow private event classes
sheepdog : fix volume_size_info && parentid check

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
also list vma backup archives

bump version to 2.3-1
Simplistic is a free Thesis skin.
Merge branch 'master' of https://github.com/psahalot/Simplistic
added section for AutocompleteRequest
Fixed psplinkusb script
Fixed linux compilation by updating gmp, mpfr, mpc
Craig: Adding new gem requirements
Craig: Fixed display of story number onto template
Renamed transmitter.c to main.c for a future merge of the RX and TX branches.
ignore .DS_Store
Templates, urls and views
trying to create a html form
添加查找对话框工程
sscall: Comment `handle_sigint'

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Merge branch 'master' of github.com:quicksnap/githubbug
wee bug
update after lecture 1

Signed-off-by: Qu Xiaofeng <quxiaofeng.at.polyu@gmail.com>
Mockup Page 4, BandBase Signup
Making the design of the Mockup Page like the Design Slide
Changed files towards comments on the pull request: simplify the code structure and avoid unused scripts
Remove last space at the end of the html file
Merge pull request #5 from tino-junge/master

Assignment MockupPage Slide 4
Replace non-HTML5 tags with divs in signup_generalinformation.html; Modify associated css rules
Fix whitespace in signup_generalinformation.html and signup.css
Remove media attribute from link tag
Remove non-standard and malformed css tags from signup.css
Adding python project
faster version of are_connected
Merge branch 'master' of github.com:rafewenger/sharpiso
updated test_script06
add wraparound & menu scrolling, add some keys and define ITEM_BACK
enable repeat up/down. Thanks to clockwork, I could have never figured
this out on my own :)
Use error logging for missing template
Minor fix to 96c025a
make sure we truncate data from file when overwriting
Include all clj AOT assemblies and source in runtime package.
v
RenRenSDK
fixed problem of UploadActivity.onCreate being called on device rotation
Updated README and setup
Aesthetic fixes
More aesthetic changes
overlay4u.get working and tested
Updating to 0.0.3 release
NOJIRA: Add xmlmerge rules for enum tag.
Merge branch 'master' into ucb-deploy
Merge branch 'ucb-deploy' into pahma
Start building out the individual detail API call
Add MANIFEST.in

Signed-off-by: Raphaël Barrois <raphael.barrois@polyconseil.fr>
check in new zoom control change
Start to fill out the implementation with decoders
minor corrections in app, begun behaviour handling
README and CHANGELOG Updated to reflect new versions
Cancel button no longer uses btn-danger class for consistency with Bootstrap cancel button defaults
Fixed composer.json after update to composer

- Fixed situation when no dist but only source reference is given.
- If none is given, throw exception
Merge pull request #4 from baldurrensch/no-reference

Fixed composer.json after update to composer
Allow to match js files with more than one extension like js.coffee or js.coffee.erb in refinery:override rake task.
Activate WillPaginate.per_page again as this was a red herring.
wip changes to python dependency listing
Made error message reference encrypted file systems as well as journaled file systems.
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
I added a script for generating the Debian version trailer.
I made some improvements to package versioning.
I added some functionality for library path finding.
I corrected some scripting errors.
I added some options.
I fixed some permissions.
I finished implementing separate static option paths.
I corrected some package naming.
sh compliance.
Escape stuff.
Strict version-checking.
Amend.
I made make happy.
I added a comment regarding the nodejs-legacy stuff.
Update reql docs
Update reql docs. Following Bill's merge
Merge branch 'next' into michel_dataexplorer
Fixes Issue #1385.
Made an attempt at #1387.
correct enumeration
overridden cwd may not exist, and puppet does not seem to set PWD which gecko uses
where'd my gemlock go!?!?
Finished gesture recognizers
refactor, faster board recognition
fix warnings
Add alias to pk query, fixing ambiguous "ctid" reference (#6620)
Start all topology layers as invisible (it may cost really a lot to visualize...)
Only change the TopoGeometry definition, not its reference, on edit

Refactor the TopoGeometry editor to avoid touching the edited table
and directly act on the topology relation instead. Fixes #6621 but
also generally makes less writes to the database.
add CORE_EXPORT to QgsAttributeEditorElement/QgsAttributeEditorContainer/QgsAttributeEditorField
allow saving single geometries as multi geometries
german translation update
classe mensagem criada:
recebe um usuário, uma mensagem String, e flags que caracterizam se o status da mensagem é de conexão ou desconexão, e se o usuário já está autenticado no servidor como usuário logado.
TapeReader should fail fast if test is not writable

As @erdi points out there's no point chaining when you find no matching request if you know you then won't be able to write to the tape.
improvement: added test for the remote method definition translator
Locating and database is working
Call proper DRM makefile for tablets.

  -Fixes Issue where device can't download from the play store
  -Fixes unstable netflix playback

Change-Id: I4996ba3ed081d9ee8165e6c988a81a0f0373c912
Signed-off-by: KhasMek <Boushh@gmail.com>
Fix non-existent boot animation size to correct one

Change-Id: I46b0c2a78f68d779dea4b59c160858840bc0978b
Signed-off-by: dhacker29 <davidhackerdvm@gmail.com>
Merge "Call proper DRM makefile for tablets." into ics
Add overlays for n7000 toggles and advanced settings.

Change-Id: I7fbd7979d87dbf18e63185a0bec42efbdc8c1807
Merge remote-tracking branch 'upstream/ics' into ics
Update to 219
Update to 503
mysql2 gem used in dev
pg gem used in prod
先把目前已經加上詳細資訊的加上去
use auto-generated message files and install them
Rebase from 'release/rqt_py_console' @ version '0.2.4'
Generated debian files for oneiric
Rebase from 'release/rqt_robot_monitor' @ version '0.2.3'
Generated debian files for quantal
fixing finding search string from environ
more clear on when you have to tell encoding, in intro
semaphore thread for load manager
PPA: Keep long description line under 80 characters.

Also lintian thinks mplayer is not a "really really great movie
player" but only a "really great movie player". Can you believe this?

(description-contains-duplicated-word)

Signed-off-by: Rüdiger Sonderfeld <ruediger@c-plusplus.de>
add bash_aliases file
Add python extension
sdfsd
Merge branch 'master' of github.com:saeidghoreshi/test2 into b1
Added voltage control support
Because @ is a great substitute for \!
adjusting the css and adding image display block rules
moving the site title to the detail view for ipad
Fixing bug around losing the reference to the active story after sharing it.
Attaching feed title gradient to scrollview, so you can pull it down and the gradient now follows the scrollview (like a proper folder title). Requires many shadow hacks to get right.
Merge branch 'master' of github.com:samuelclay/NewsBlur

* 'master' of github.com:samuelclay/NewsBlur:
  Fixing the small things on blurblogs. Just margins, colors, and removing times from dates.
Bumped version number
Fixed ordering for all shared stories and socialfeed/blurblogs.
Fixed count issue where read counts updates were not unique for feed values
Fixed various issues as per feedback
Fixed feed refresh issues, FTUX UI issues.
Added 'Delete feed' to feed item list menu
Fixed crash on first load when new feeds have just been added.
Fixed crash due to misplaced network call on main thread
Fixed bug whereby Shared Stories count would feature a zero-value in cases where pos or neutral counts were not
Bumped text-size
Modified login process to redirect to logging in if using the registration form and login exists. Fixed login form layout.
Bumped version number.
Fixed bug whereby the first story in a social feed wasn't marked as read internally.
Fixed issue whereby when reading in feedReading, older pages would deleted due to passed parameter
Optimised layouts for readability. Removed minor rounding issues with comment-liked images.
Removed debug logging.
Removed further debug logging. Modified count requirements for itemlist requests.
Bumped version number.
Fixed formatting issue with strings. Added flag to ensure text was sentence-capitalised for comments/replies.
Modified story intelligence formula.
Drink Mate they said… it'll be fun they said...
Added autocomplete and turned on nocompatible mode
Removed `vim` alias.
Replaced dollar-sign with a arrow
Moved prompt-arrow to newline.
Merge branch 'master' of github.com:sbruchmann/dotfiles

Conflicts:
	vimrc
Indented code blocks in listings
Fixed broken URL definition to Oracle JDK
Merge remote branch 'upstream/master'
Merge pull request #92 from rlegendi/master

Readme code indentation and link fix
Because of a potential deadlock in the Eclipse internals, the log action need to be executed in the UI thread.

This is a temporary (and not really ideal) fix for #1000914. I've opened a ticket in the Eclipse buzilla: https://bugs.eclipse.org/bugs/show_bug.cgi?id=374272.
Merge pull request #72 from 'scala-ide/issue/logger-deadlock-1000914'

Fixed deadlock occurring when accessing the Eclipse Log.
Correctly handle preferences change events

Some Java preferences get set the first time a code template is
used. This preference changes trigger UI updates, but the Java editor
(base of the Scala editor) does not execute these UI updates in the right
thread.
Forcing those preference change to be run in the UI thread.
Fixes #1000738
Merge pull request #82 from scala-ide/issue/invalid-thread-access-1000738

Fixes the invalid thread access generated when creating a Java file for the first time
Fixed nightly builds.

Allow me to elaborate on the reason of the failure:

The key element is the ``ColourPreferenceInitializer``, which is eagerly
intialized by Eclipse through the extension point:
``org.eclipse.core.runtime.preferences``, declared in the plugin.xml.
The initialization of ``ColourPreferenceInitializer`` results in a call
to ``ColourPreferenceInitializer.initializeDefaultPreferences``, whose implementation
currently depends on UI classes belonging to ``org.eclipse.jdt.ui`` bundle.

This caused some tests to fail in our CI server because the session executing the tests
on that machine does not have access to display components.

The resulting stacktrace was something on the line of the line of:

```
java.lang.NoClassDefFoundError: org/eclipse/jdt/internal/ui/javaeditor/DocumentAdapter
[...]
Caused by: org.eclipse.core.runtime.internal.adaptor.EclipseLazyStarter$TerminatingClassNotFoundException: An error occurred while automatically activating bundle org.eclipse.jdt.ui (45).
[...]
Caused by: java.lang.NullPointerException
	at org.eclipse.jface.resource.FontRegistry.calculateDefaultFont(FontRegistry.java:519)
	at org.eclipse.jface.resource.FontRegistry.defaultFontRecord(FontRegistry.java:562)
	at org.eclipse.jface.resource.FontRegistry.defaultFontData(FontRegistry.java:575)
	at org.eclipse.jface.resource.FontRegistry.getFontData(FontRegistry.java:591)
	at org.eclipse.jdt.internal.ui.JavaPlugin.ensurePreferenceStoreBackwardsCompatibility(JavaPlugin.java:448)
```

The actual fix is pretty stupid: the implementation of ``ColourPreferenceInitializer.initializeDefaultPreferences``
is now executed only if ``headlessMode`` is disabled.
Merge branch 'master' into feature/scala-debugger-1000864
rename base.urls
Added Postgre to the Gemfile
Fixing weird wording
implemented placebo's list & create function
Just testing this.

Going to see if this lets larger chunks pass through. It may not work. In the end, the only harm is that it wont be able to read negative length chunks (which are impossible).
k
just like the html ones finally
ccc
kk
kkm
add arrenment and schdule
Show current username while logging in to a service.
1
1
处理android 布局代码 很苦恼啊
initial state bug for windows like Xephyr and mplayer
Avance panel administrativo #12
The README was modified to be better.
The memory/MyAllocator.cpp lacked a header.

This was reported by Habib Rijzaani.
When a expire was not set on a ticket, made modifications to use the default value.
Fix:
When booth deamons is started at the same time, then a dead-lock may happen.
Update how to subscribe
Removing superfluous stuff from demo
Fixing field offsets, custom file reading
templates:agregando el menu en la pagina de inicio
indicated which documents and media section from the old user guide was moved to the new guide
Merge branch 'master' into user-guide-reorg-ch7
Merge pull request #212 from jrao/user-guide-reorg-ch7

indicated which documents and media section from the old user guide was moved to the new guide
More generic table viewer.
FACET design lattice
Fix git update log output
Fix BundleSync command
Small fix
changed txn handler signatures
info: always indicate if a keg is linked

We mark the linked keg with an asterisk when multiple kegs exist, but
not when there is only a single keg. Start marking even in this case,
giving consistent behavior and a reliable indicate of the link status.

Fixes #11300.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Astyle 2.02.1

Closes #11305.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Mozilla Rust 0.2

Closes #11309.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
redis 2.4.10

Closes #11310.
coreutils 8.16

Also fix gsha224sum link.

Closes #11308.
Grails 2.0.2

Closes #11313.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
New formula: legit

Closes #11197.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Merge remote-tracking branch 'upstream/master'
added android projects
another attemps to order list of params
Fix missing newline in to_s output
luci aria2始终显示“打开web客户端”按钮
修复usb多分区时aria2无法启动问题
bad period.
form validation complete?
trim the form inputs on submit.
Modified package_config/FAIBASE & UBUNTU
party > partyInform.html 추가
Fixed spelling of "its" in documentation (more info: http://angryflower.com/itsits.gif)
Minor fixes
Update readme
Updating name attribute to also be sitm-contacts to match gemspec filename
Privide access to persister for model collections
New comment in readme.
Add comments and use new progressError() in code.
Implement unit test for FwTextBox.PreferredHeight (LT-13806)

Change-Id: I24f6839d45aa7da9050456f171713bab30240495
Update notes for submitted changes

* Work in preparation for LT-6424
* Display semantic domains from search
AP(RE)CHANGE Exclude files with the underscore prefix from manifest.
- Readded check for _config.php in ClassManifest.
- Added UnitTest for files with underscore prefix.
ENHANCEMENT: SSF-38 initial rearranging of the insert image form to allow uploads as well as choosing an image from the CMS (and you can pick and choose from both)
MINOR: SSF-38 i18n of some of the form
ENHANCEMENT: SSF-38 added new template for the upload field that is used within a page image insertion dialog box. This upload field is slightly different from the one used in Files. E.g. it uses smaller fonts (h4 instead of h3)
MINOR: SSF-38 adding class for delete button on template
MINOR: SSF-38 adding some additional classes to delete button
MINOR: changing template to make delete icon appear in the list of uploaded files
MINOR: SSF-38 renaming the PageUploadField template to HtmlEditorField_UploadField
BUGFIX: SSF-38 making the entwine selector for the upload field more specific, so it doesn't apply to every upload field in the CMS. Also, handling the case of uploading multiple files at once
ENHANCEMENT:SSF-38 - Styled in-content file upload dialog box. Also added fixes for cms-content-header box-shadow. 
MINOR:added spaces to css.
BUGFIX: SSF-38 removing the z-index on the TabSet so that the upload button works in the HtmlEditorField insert image lightbox.
ENHANCEMENT: allow each dialog pop to have their own extra class.
MINOR: add 'edit-profile-popup' as extra popup class
BUGFIX:removed header from edit profile popup and restyled broken tabs - still needs a proper fix after beta II.
ENHANCEMENT make gridfield status applied with header filter and header sort before export
FEATURE added GridFieldPrintButton compoonent
ENHANCEMENT make gridfield status applied with header filter and header sort before print
ENHANCEMENT:incorporating "simple" theme into the the SS3 Install - styling the install page to fit with the "simple" theme
Changed placement signature and added generic return to create process

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>
Merge pull request #322 from bergerkiller/master

Changed placement signature and added generic return for createProcess
Moved player controller setup to a protocol method
Better resource loader now accepts multiple extensions

Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>
Merge pull request #321 from simplyianm/betterresourceloader

Changed ResouceLoader to accept certain extensions.
Main game loop skeleton setup

Started work in the ai class
need to do battle function in battleship.py
gotta finish main game loop
Main game loop almost done

-needs to finish AI and battle to finish main game loop
- need to repair random AI placement because it causes index error
Site(s) -> Group(s) take 2.

Forgot to actually commit my changes.
Merge branch 'site_to_group'
use a constant to get the result array from the dictionary
- added installation of maven to
  create-publication::create_publication_definition_and_war, needed in
  some cases not previously tested.
- added vosa:set_etc_hosts, will create aggregate of files found in:

  /var/lib/vizrt/vosa/files/common/etc/hosts.d
  /var/lib/vizrt/vosa/files/<instance>/etc/hosts.d

  and also include typical entries, generated, such as 127.0.0.1 and
  127.0.1.1 and entries needed for IPv6.

  The method isn't called from anywhere yet.
- added some hardening to widget-framework::set_up_wf_nursery_config
- ece-install now leaves a trail of what it has done. For instance,
  the ece-install.conf settings:

  fai_db_install=1
  fai_cache_install=1
  fai_editor_install=1

  Currently leaves the following trail:

  $ cat  /var/lib/ece-install/1343660280-ece-install.trail
  trail_db_port=3306
  trail_cache_port=80
  trail_editor_port=8080
  trail_editor_shutdown=8005
Merge branch 'master' of github.com:skybert/ece-scripts
fixed some mistakes in the AWS overview
Marked updateFeatureCount as unused (removes compiler warning)
Merge branch 'master' of github.com:qgis/Quantum-GIS
minor fixes in gui fTools
Merge pull request #148 from slarosa/master

minor fixes in fTools GUI
message log: fix crash on exit
validation/geometry/threading fixes:
- fTools/polygon centroids: catch missing centroid with invalid geometry
  (fixes #4963)
- fTools/validate geometry:
 * fix final position of progress bar
 * don't use isGeosValid()
 * zoom to feature on locationless errors (including OTFR support)
 * store/restore dialog position
- QgsGeometry(Validator):
 * log GEOS exceptions
 * (closed) rings need at least 4 points not 3
 * log error when geometry can't be exported to GEOS
 * don't produce "geometry is valid" error
- improve logging from threads
 * keep message output from main thread as popup
 * log message from threads to message log (fixes crash on python error
   in thread)
sip bindings: add /Transfer/ to QgsMapCanvas::mapRenderer()
(otherwise mc.mapRenderer().hasCrsTransformEnabled() can crash)
german translation update
Added anomaly files for windows
Merge branch 'master' of github.com:qgis/Quantum-GIS
fix #4521
Smaller treshold for GetFeatureInfo for polygons
remove unused includes
fix #5490
fix #3549
poprawka dla rotacji
Update javadoc comments
update .gitignore
Add default exception constructor in case message is not available from TSK - to satisfy JNI linkage
Cleanup javadoc from overriden methods
Merge pull request #71 from adam-m/master

java bindings: add default exception constructor and update datamodel javadoc
[#19] Made distinction between solid an non-solid collisions.

Now, a Mobile+Collider(solid) entity cannot move over another Collider(solid) entity
added script to merge resources.
some modifications for adding new credit card...
corrected zeromq build for libuuid dependency
imported py-zmq build from 2012Q1 stable tree
防止 unvaildfields 添加重复项
Grammar.

The correction of a minor grammatical error.
fixed incomplete type problems
NXBOOK-643 implemented feedback from Peter Lynch and some other minor fixes
tipo_habitacion,tipo_movimiento,tipo_producto,tipo_transaccion
Merge branch 'master' of https://github.com/sonico999/sisjungla
New function mpq_matrix_set_identity

--HG--
rename : tests/test_mpq_matrix_set_zero.c => tests/test_mpq_matrix_set_identity.c
lockvisor-1
2
3
3
55555
10-11
10-17
10-20
2011-10-21
2012-01-21
2012-01-21-2
2012-02-01
2012-02-02
2012-02-08
2012-2-19 instrodunction modification & fig modification
update gitignore
add lockvisor xlsx & simulator
rm eurosys tex
the complete git version fordat plt draw
fig path updated to relative path
Merge branch 'moreNodes'
removing external references to af_mhost.c
Adding Gemfile for gem dependencies and bundler use
made TOC togling script more generic

Instead of a dedicated function to toggle the TOC we now have a function
that allows to use this functionality everywhere. This will be used to
toggle the sidebar in the mobile view (in an upcoming patch).

Note, this required some changes to the CSS (to make it more generic).
The CSS is still located in the TOC sections but should probably be
moved into its own section instead.
mobile styles for the TOC structure changes
collapse sidebar in mobile view FS#2473
added some missing spaces (to popularity and revert plugins)
html validity fixes (removed name and align in some plugins)
LDAP User & Group Work

First pass done with adding ldap users and groups management.  Next
step is to modify authentication to authenticate ldap users and groups
as well.
fix problem with null checking [23650079]
Merge branch 'feature-23650079_create_bdf_vs_xdf_checker'
Added pyflakes plugin. Fixed django syntax highlighting.
Still trying to make it work with OptiLA.
fix user rights and add relations between tables
modifying ls alias to be more *nix friendly and adding grep options
Update NAnt.build to point to new location of mspec
Removed un-needed function
Added getBlogPage()
Added post uri to RSS feed
Added blog post preview
Added generator tag
Fixed issue with category

stopped draft posts showing up
Updated wysiwyg
Fixed uploader

removed -test from uploaded image
Upped to v0.7.3
missing readme what
Postgres setup complete
Initial commit
create fixture in test
Remove fixture_basee
retrun if not find target file
upgrade package.json
indent
indent
add grunt
merge readme
TRUNK-3594 - adding @since 1.10.0 to ProviderEditor
removed go north from poughkeepsie
Add menu tests
0.10.2a: fixed overwriting files in batch export for chats with identical names.
manage photos updates
Likes class and defined constructor
select photo id also in get_random() function
defined create function
servlet that calls create method of Likes class
added photo_id and data-photo attributes
like_btn click function that requests like servlet
mongomodel insert return id, because can be used for flask-login get_id
make sure the context on a chained router is always set, even when adding it after setting the context on the chainrouter
Revert junit-interface to the published version
Last added link and guide on front page
Merge branch 'last-added'
'Last added link' link linking :) to links list
fix confusing ruby
fix specs broken by fix for #44359
Merge branch 'master' into task_43091
task 55733 - add facility column to journal#show.csv