labofsahil/github-event-dataset-2012 huggingface dataset:
Bug 798694, part 1: Make it easier to add new pref override files. r=fabrice
Bug 798694, part 2: Move the UA overrides (as they stand now) into gaia. r=fabrice
Bug 808214 -Make email credentials become editable.
Bug 811277 - [Homescreen] Evme - Launching the same app from search should not be loaded again [r=vingtetun]
bug 810825 fix SIM card unlock white screen problem
as well as follow-up bug 806237: add SIM card state on main menu
Bug 810512 - Cancel button added
Merge pull request #6418 from evelynhung/issue-810825

bug 810825 fix SIM card unlock white screen problem
Bug 811691 - [Contacts] Facebook - After importing -> list of contacts [r=jmcanterafonseca]
Change @inputmode to @x-inputmode.
Merge pull request #6428 from mounirlamouri/inputmode

Bug 796544: change @inputmode to @x-inputmode.
r=djf
Merge pull request #6304 from cgjones/enable-ua-override-prefs

Bug 798694: Enable ua override prefs. r=fabrice
Merge pull request #6405 from crdlc/exit-import-go-to-list

Bug 811691 - [Contacts] Facebook - After importing -> list of contacts [...
Bug 804966 - Unlock SIM Card Web activity should be trigger by user action
Merge pull request #6375 from crdlc/bug-811277

Bug 811277 - [Homescreen] Evme - Launching the same app from search shou...
Merge pull request #6426 from lodr/fix-cancel-button

Bug 810512 - Cancel button added
Merge because r+ and blocking-basecamp+
Bug 809279 - [wrapper] progress activity indicator [r=vingtetun]
Bug 812169 - Fixing the empty update notification.
r=kaze
Merge pull request #6432 from etiennesegonzac/bug-812169-empty-update-notification

Bug 812169 - Fixing the empty update notification.
Merge pull request #6357 from crdlc/bug-809279

Bug 809279 - [wrapper] progress activity indicator [r=vingtetun]
Merge pull request #6286 from ochameau/simpin

Bug 804966 - Unlock SIM Card Web activity should be trigger by user action
Commiteando desde la facu, para probar el Git.
better errors handling
Merge branch 'master' into oext
fix bug in favourite
cover help to raw telnet code
Some cleanup to get simplecov and spork working nicely together
DO not allow timeout on big all/1 command
add messages describing the resolution of each cell in the matrix.
complaints and images
has_secure_password should not raise a 'digest missing' error if the calling class has specified for validations to be skipped.
Change AR's CHANGELOG, because it is related to e35c67ae0f920011a2440210041e96659a8de985
Merge pull request #7228 from kennyj/move_to_ar2

Change AR's CHANGELOG, because it is related to e35c67ae0f920011a2440210041e96659a8de985

[ci skip]
Merge pull request #7217 from freerobby/no_password_requirement_if_validations_skipped

has_secure_password should not raise a 'digest missing' error if the calling class has specified for validations to be skipped.
Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."

This reverts commit 3803fcce26b837c0117f7d278b83c366dc4ed370.

Conflicts:
	activerecord/CHANGELOG.md

It will be deprecated only in 4.0, and removed properly in 4.1.
Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.
Add `Relation#load`

This method explicitly loads the records and then returns `self`.

Rather than deciding between "do I want an array or a relation?",
most people are actually asking themselves "do I want to eager load
or lazy load?" Therefore, this method provides a way to explicitly
eager-load without having to switch from a `Relation` to an array.

Example:

    @posts = Post.where(published: true).load
Refactor a bit

This doesn't change the exernal behavior, but it moves some code around
to where I think it properly belongs.
Use explicit delegations

This makes it easier to see what the documentation refers to.

It also means that we are not doing unnecessary work for delegations
that have no args / splats / block / etc.
Add CollectionProxy#scope

This can be used to get a Relation from an association.

Previously we had a #scoped method, but we're deprecating that for
AR::Base, so it doesn't make sense to have it here.

This was requested by DHH, to facilitate code like this:

    Project.scope.order('created_at DESC').page(current_page).tagged_with(@tag).limit(5).scoping do
      @topics      = @project.topics.scope
      @todolists   = @project.todolists.scope
      @attachments = @project.attachments.scope
      @documents   = @project.documents.scope
    end
s/scoped/scope/
Do not consider the numeric attribute as changed if the old value is
zero and the new value is not a string.

Before this commit this was the behavior

r = Review.find_by_issue(0)
r.issue
=> 0
r.changes
=> {}
r.issue = 0
=> 0
r.changed?
=> true
r.changes
=> {"issue"=>[0,0]}

Fixes #7237

Conflicts:
	activerecord/CHANGELOG.md
Added Guzzle/Http as dependency for development. Specified MIT license in composer.json.
Coding Standard fixes.
Zwija wuzeva, nuwoyyi, natini, sane myimawna musza
topbar fix
Merge pull request #244 from bdupree/master

topbar fix
Merge pull request #245 from asocha/master

admin stuff
Merge pull request #246 from asocha/master

more admin stuff
Changes.
Merge branch 'master' of https://github.com/RowdyHowell/picnit
Merge pull request #247 from asocha/master

admin shit
Bug fixes.
Merge pull request #248 from asocha/master

admin stuff
Merge branch 'master' of https://github.com/RowdyHowell/picnit
more css
color change for smalllogo
Merge pull request #249 from bdupree/master

more css
Merge pull request #250 from bdupree/master

change logo color
Merge pull request #251 from asocha/master

WHY U NO DELETE ALBUM
Changed stuff.
Update editor.php
Modified Chat.
Apply patch authored by thkoch2001 to remove bashism in tests/prologue.sh.in.
Modify path of output_file so that .txt test result files appear in the tests/ directory, where they belong.  Running 'make clean' will now properly remove the .txt result files.
Ramona server is now trying to stop all programs when exiting.
Fix ping to work properly on Linux (by alex)
Merge remote-tracking branch 'origin/master' into httpfend
Adding implementation of 'restart' command.
5037 Float left and widen the prefs_tab container
Update mode-gruneisen
added another few tips
made output format and type configurable
process command line options for output format and target type
improved headline depth
improved cli usage information
added methods for pre- and postprocessing stuff, renamed page writing method, added title to page writing method
added pre- and post-processing method calls, added title to page writing method
moved header/footer writing to own methods
Fixed connection state signal handling for serial port.
Added the new connect behavior for analyzer.
Adding passenger config
drop flash
Added new functions, trimmed add function
Minor change to rails 4 slides.
Added the missing favicon.ico
Add defimg support
add flow
Merge branch 'master' into gh-pages
Updated tests
- Changed the setUp method in request to be protected
- CHanged current working directory in application test
Showcase Image and JavaScript Handling
Total redesign of Trio - it's more awesome now ;)
Introduced home activity
New: cards drawable generator
awesomer version
added mavlink defenitions
Remove check of app_env for stats, stats is always on now
Move RooGenCategory to compiled user functions, i.e. remove references to CINT.


git-svn-id: https://root.cern.ch/svn/root/trunk@47426 27541ba8-7e3a-0410-8455-c3a389f83636
Add a few comments


git-svn-id: https://root.cern.ch/svn/root/trunk@47427 27541ba8-7e3a-0410-8455-c3a389f83636
Revert -r47806 which had negative consequences (failing to handle properly #ifdef at the beginning of an unnamed script and making it much harder to update roottest to work around missing feature in cling)


git-svn-id: https://root.cern.ch/svn/root/trunk@47869 27541ba8-7e3a-0410-8455-c3a389f83636
Add error message in case the decl is not a class or does not have definition


git-svn-id: https://root.cern.ch/svn/root/trunk@47870 27541ba8-7e3a-0410-8455-c3a389f83636
We need to analyze the whole transaction. (Thanks Axel!)


git-svn-id: https://root.cern.ch/svn/root/trunk@46589 27541ba8-7e3a-0410-8455-c3a389f83636
From Dario: Fix for dataset manager file permission issue (https://savannah.cern.ch/bugs/?98331)


git-svn-id: https://root.cern.ch/svn/root/trunk@47235 27541ba8-7e3a-0410-8455-c3a389f83636
Test new dynamic library code layout on all platforms.


git-svn-id: https://root.cern.ch/svn/root/trunk@47237 27541ba8-7e3a-0410-8455-c3a389f83636
Fix a few issues preventing proper cleaning of the 'data' directory when running stressProof in Proof-Lite


git-svn-id: https://root.cern.ch/svn/root/trunk@47238 27541ba8-7e3a-0410-8455-c3a389f83636
Temporarily put to-be-removed SearchForAddressOfSpecialSymbol.cpp back int CMakeLists as patch only empties it.


git-svn-id: https://root.cern.ch/svn/root/trunk@47239 27541ba8-7e3a-0410-8455-c3a389f83636
add plugin control
cleaning up for first point release
Specify title and capitalize better
Bump version
- added bundles level configuration and customization support
Move `readContentSync()` method from `Tech` base class to `deps.js` tech
Write docs for .bem/level.js config (russian)

Ref #38
Riscritto updateTotale
changed name of project
lift off
cleaned up and unified lots of the code. about to work on search by likes
got cleaner loop ending conditions
Added Kata DeepFirstSearch
Added first steps

Added random delimiter

Added test to negative numbers and greather than 1000

now the delimiters can be larger
Merge branch 'Katas/String_Calculator' of github.com:biruwon/katas into Katas/String_Calculator
Fix occasional empty quote when there's no nick.
Updated installation instructions
Remove duplicates...leftover bug from sloppy python to php port of Ditto.py
vimrc-from-scratch: remove previous configure
vim: initial basic vimrc
vim: basic framework with unbundle
vim: add colorschemes
vim: add powerline plugin and gui config
revert back: removed a urxvt plugin by mistake
vim: add simple-haskell-mode bundle
vim: initial options setting
vim: add key bindings for quickfix and buffers
vim: Add some useful general purpose plugins

* nerdtree for file system exploring
* tabular for multiple line formatting
* tagbar for tags browsing
* commentary for quick comment/uncomment lines
* fugitive for git integration
* surround for surrounding editing
vim: remove Ctrl-p/n in insert mode, there are completion keys
revert back again: Ctrl-H/L is also used in insertmode completion
vim: add clang_complete plugin
vim: add ghcmod plugins
vim: force ColorColumn HighLight
update docs
merge from vimrc-from-scratch branch
Rename README.txt => README.asciidoc (for github markup)
zshrc: update git_clean function
vim: update bundles
player: start buffering with when player has started
adding sauls original bTweaks
Fixing test autoloader
nuevo sql script
Fix Python2.5 test failures
Fix Jython test failures
Fix Python3.2 test failures
Solved TOURMAP problem of november challenge of codechef
Updated installer link per new name.
removendo classe desnecessária
adicionando layout de single post
old and new code apart
code works! note updated
Slightly improve (and correct) credit charging UI
Reduce saturation for colors of BarButtons and top bar

This should help the main content of the page stand out better.
Move Receipt button from Main Page to Management
Fixed vimtutor copying script
removed some parts in _ferns.cc(main.cc) and added python methods
new git structure
Merge pull request #30 from bvferguson/master

Added Media Album and adjust everything else towork accordingly
Edited event dtails, eventlist, and homepage xmls
Merge pull request #31 from mcscherber/master

Pull Request - MCSCHERBER
completed callender add function and pop up dialogs.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	UltimateScheduler/res/layout/eventdetails.xml
took changes from matt's commit
Renaming readme.markdown to README.md
Refactoring of TaskResults and BuildResults
Commit before profiling of empty compile

Remove TaskError class

Assed time to TaskResult

BuildResult contains all TaskResults
More tests pass
More tests pass
More tests pass
More tests pass
Workflow tests pass
Adding basic model for packages
secure download element
Domain redirection and site rename
First commit of code, halvdan can write text in different colours
Merge branch 'master' of https://github.com/cefyr/halvdan
presentation for SASMC
Options: livereload, jsmin, cssmin
Add JsonArrayRemoveRange
Improve C++11 attribute parsing.

- General C++11 attributes were previously parsed and ignored. Now they are parsed and stored in AST.
- Add support to parse arguments of attributes that in 'gnu' namespace.
- Differentiate unknown attributes and known attributes that can't be applied to statements when emitting diagnostic.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165082 91177308-0d34-0410-b5e6-96231b3b80d8
Some renames to use the 'visitor' nomenclature, no functionality change.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165083 91177308-0d34-0410-b5e6-96231b3b80d8
Introduce ASTConsumer::HandleImplicitImportDecl() callback that is invoked
when an ImportDecl that was implicitly created due to an inclusion directive.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165084 91177308-0d34-0410-b5e6-96231b3b80d8
Add a FIXME.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165085 91177308-0d34-0410-b5e6-96231b3b80d8
Set the file entry for a Module* that was created during deserialization
of a module file.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165086 91177308-0d34-0410-b5e6-96231b3b80d8
[PCH] Fix serialization of an ImportDecl.

ImportDecl's module ID was not written out and the reader accepted as module ID
the serialized:
  Record.push_back(!IdentifierLocs.empty());

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165087 91177308-0d34-0410-b5e6-96231b3b80d8
[ms-inline asm] Rename EmitGCCAsmStmt to EmitAsmStmt and have it accept 
AsmStmts.  This function is only used by GCCAsmStmts, however. Constraints need
to be properly computed before MSAsmStmts can use EmitAsmStmt.  No functional
change intended.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@162776 91177308-0d34-0410-b5e6-96231b3b80d8
Add a warning flag for "'extern' variable has an initializer".

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@159600 91177308-0d34-0410-b5e6-96231b3b80d8
Clang driver support for linking on Android.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155541 91177308-0d34-0410-b5e6-96231b3b80d8
Fix another uninitialized bool member bug found by -fsanitize=bool. This one
appears to currently be benign (we happen to test the flags in the right
order, so we never depend on the uninitialized value).


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170640 91177308-0d34-0410-b5e6-96231b3b80d8
Added in a blog post about watering holes
Added new blog post
added example of extending rsnbl.Application
Playing with GAO
JoinParameter supports withInboundCorrection()
Fixing StereoscopicRendering sample use of 'half' reserved word in shader
change auctionID to auctionName as String
groupbid should now be called correct
Added update method to ObjectHandler backend
Cleanup
cleanup
Fixed re-index of unicode DN entries
Added validator to check for object with a given property
Merge branch 'master' of labs.intranet.gonicus.de:gosa-ng
Document flash
Reload acl when roles are removed
Merge branch 'master' of labs.intranet.gonicus.de:gosa-ng
Catch socket.timeout in URL.open(), catch Bing news authors
Perfect Web Framework is now ready for internal testing!
Wait for rexi_server before adding a node

The race condition between a nodeup event and rexi_server starting was
causing some superfluous errors. This just waits for rexi_server to boot
before notifying mem3_sync_nodes.
Relax the mem3_sync_security fix constraint

Instead of requiring that we only have an empty security object and a
single non-empty version that out numbers empties, we relax the fixable
constraint to be a single simple majority of (N/2)+1 objects of a single
value.

BugzId: 11602
Check security objects during internal replication

If we detect that two shards have different values for a security object
during internal replication we automatically trigger a security object
synchronization.

BugzId: 11602
removing culture part
Meh, without that obviously the mapping fails
zip command use native shell. add config
rename .content -> ._content
refactor
link to devo area
tag em all
README: filter particular specs
Fix: Reinject DATA_FIN also

As empty data-fins are not enqueued in the subflow-send-queue we have to
reinject them.

Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
ListSeqList.java and ListSingleLinkList.java

分别为顺序表和单链表添加 遍历输出功能.
Renaming kernel file in image is no more required.
Update faenza icon theme package.
initial commit for 0.1.x
run now calls commands
update readme
Fixed brightness on clock and added translations to es_ES
demos use Shade.Scale.linear instead of Shade.Utils.linear
handle the bulk change action to null level and null category
fixed S3 admin static file url, improved actionmember admin form, moved facebook init to login_base template
change the prize widget title, close #171
display message in power meter widget when not in a team. close #166
add default value for contact_email. close #163
日本商店页面暂时调整～
Don't need this log
added more comments
added more comments
Add a reasonable readme
fix compiler crash on nested generator expressions
fix compiler crash for generator expressions with a constant False condition
fix update
f
d3.simplify: improve topology preservation.

Instead of using effective areas of ∞ for shared endpoints, we now use
the maximum effective area for each connected component of the topology.
This allows islands to be removed if their maximum effective area is
below the threshold. This also fixes an issue when the projected
features are encoded as JSON, since JSON converts Infinity to null.

Efficiency should also be somewhat improved.

Related: #21.
随手记_1
Raise an exception instead of aborting if a pinvoke method is not found in full-aot mode.
Fiz a domain unload race regarding finalizable objects.

	* sgen-gc.c (mono_gc_clear_domain): It's possible to have a finalizable object
	survive mono_domain_finalize and leak into mono_domain_free, so we make sure this
	won't crash by removing from the fin hashtable all objects that belong to the
	doomed domain.
When cleaning up the finalizers of a domain, do it in a way that reduces the chance of leftover objects.

	* gc.c (finalize_domain_objects): When cleaning up a domain, we run two kinds of finalizers,
	those that have already been queued and those for objects that remain alive.

	A common problem we need to deal is that some finalizers allocate other finalizable objects
	when doing seeminly trivial operations such as String.IndexOf - which might require the Thread
	object of the finalizer thread to be instantiated.

	We handle those new objects by draining the registered finalizers set until none shows up. This fails
	if we run the queued finalizers after that.

	The order onto which finalizers are run on domain unload is unspecified and the new behavior can
	be argued to be more natural.
[Mono.Debugger.Soft] Fixed building of tests
[Mono.Debugger.Soft] Re-added Dispose() method on VirtualMachine for API compat.
Fixed capitalization
Fixes a waring in System.Configuration.
Merge pull request #292 from QuickJack/master

Remaining changes of my corrupted change request #247
Removed code commented
Fix XML serialization of DateTimeOffset?. Fixes #3258

The nullable DateTimeOffset was not properly handled when serialized.
The deserialization changed to work with DateTimeOffset?.
Avoided "i:type" attribute when serializing Nullable type.
Added unit test for the bug #3258 (Serialize|Deserialize DateTimeOffset?)
[System.Net.WebRequest] Implemented new and improved proxy support on Mac/iOS
WebRequest.GetDefaultWebProxy() must not assume the type of the system proxy.
[MacProxy] Fixed refcounting and got rid of unneeded attribute flags
BinaryWriter.Dispose is needed in Profile[1-4] of the Portable Class Libraries. Fix bug #4871
Thread.Finalize is needed in Profile3 of the Portable Class Libraries.
Small adjustments needed for Profile[1-4] of the Portable Class Libraries.
Added call to GC.SupressFinalize() in CFObject.Dispose()
Include config.h and use TARGET_X86 and TARGET_AMD64 instead of i386 and __x86_64__.
Fix race condition in mono_threads_CreateThread.
[perl #112692] perlfunc: waitpid takes two args
eliminate PL_regsize

This var (or rather PL_reg_state.re_state_regsize, which it is #deffed to)
just holds the index of the maximum opening paren index seen so far in
S_regmatch(). So make it a local var of S_regmatch() and pass it as a
param to the couple of static functions called from there that need it.

(Also give the local var the more meaningful name 'maxopenparen'.)
parse router performance counters and compute power consumption by calling a orion2 program
run tests only once during release
remove doclava doclet configuration

It causes problems in some projects due to a bug in the jdk.
update CHANGES
[maven-release-plugin] prepare release 0.54
[maven-release-plugin] prepare for next development iteration
Remove unnecessary deps on ning http client
Remove unnecessary dependency on http-server
Add HttpRequestEvent
Add protocol, referrer, requestContentType and responseContentType to http request event
Ignore private ip adddresses in X-FORWARDED-FOR
Replace ticker with time provider

Since Jetty uses system millis time to measure start of the request,
we must use system millis time to calculate duration.  For testing,
we make the time source pluggable.
Make time to first byte optional
Replace delegation with inheritance
added co_uk ebay parsing patch (usefull for com.au also)
Added stronger anti-spambot measures to email verification. Not fully fool-proof but better.
Imported ido-f3.el
swN2(): more control of derivatives; better docs
moved gameID and SDF info to SERVER_STARTPLAYING / AutohostInterface::SendStartPlaying()
Implement frog callback.
Enable ICCCM in xmonad.hs instead
Clean up neocomplcache settings
Fix array offset
All attachment additions
fix bug 777475: Refrain from parsing empty content with pyquery in include filter
Merge pull request #453 from darkwing/attachments-actions-fix

All attachment additions
Merge pull request #454 from lmorchard/noinclude-hates-empty-content-777475

fix bug 777475: Refrain from parsing empty content in include filter
Added CSS/HTML used by our live examples
Merge pull request #455 from teoli2003/patch-6

Added CSS/HTML used by our live examples
fix bug 775241: Missing slug after redirect processing should be a 404
bug 775590: Annotate links for "new" or "external" pages on document view
Merge pull request #456 from lmorchard/bad-redirect-reverse-775241

fix bug 775241: Missing slug after redirect processing should be a 404
fix bug 777837: Separate apps landing page from waffle switch for apps promo on home page
Merge pull request #458 from lmorchard/annotate-links-775590

bug 775590: Annotate links for "new" or "external" on document view
Merge pull request #459 from lmorchard/leave-apps-page-alone-777837

fix bug 777837: Separate apps landing page from waffle switch for apps promo on home page
fix settings_local MIDDLEWARE for statsd
Namespace globals under DO_

Fixes #47
parse try/catch/finally
fix else parsing problem
fix [] parsing in speculative type detection
parse typeid(type)
parse void initializer
new is now a primary expression
parse new type;
setting up the playing environment
Finished javadoc on Disciplina class
Finishing javadoc on DisciplinaTrimestral
Using a constant to return the creditos
Removed Estado parameter on the constructor (not necessary) 
and finished javadoc
Finished javadoc and added a constant to represent the credits
Finished javadoc and added a constant to represent the credits
Corrected javadoc on Disciplina
Corrected javadoc on DisciplinaTrimestral class
Corrections on javadoc
Removed unnecessary method to add a list of Disciplinas and wrote the
javadoc
Added an application class named GiraHistorico
Corrected Disciplina and it's child classes to use periodo as an
attribute and removed the Estado on the child's constructors to use it
only in the Disciplina constructor
Added a toString method
Added a quantoParaFinal method
Added taNaFInal method
Prevent division by 0
Added a introMenu method to DataHandler which creates an Aluno object
Initial work on the GiraHistorico
Added the menu to the system and a addDisciplinaMenu
vattributes: add more complex test

check that changing the value on the server affects the remote client
Update backbone.validation to 0.7.0
Todo Punk hinzugefuegt
make request sending, close #vkpy-2
Migrate the Network.rack field to Network.racks
[activation_email] Melhorando a correção do erro.
Starting Appliance API.
Adding skeletoned Vuln API, there are missing parameters. Methods should be all there, unless there are some hiding in the code still.
Vuln API mostly complete, minor value correction remains.
Simplifying and trying to make more consistent Vuln API method names.
Adding missing ranges for query_threat, query_score, and query_severity.
Added SourceVuln API. Parameters could use pruning.

Conflicts:
	public/data/whitehat.json

Fixed conflict, previous SourceVuln portion replaced by new & complete SourceVuln.
Updated Site API, required parameters present, descriptions could use some double checking. Optional parameters coming soon.
Replaced Alpine ski-binding ISO8061 with proper ISO8601 representation of dates and times.
Added parameters to Site API GET methods, not sure about parameters for PUT, POST, and DELETE methods.
Initial go at Event API.
Initial go at Asset API.
Corrected reults typo in multiple places and updated Event API display_entry_points_content parameter description.
Populated Page:ordery_by parameters for Asset API, and updated Event API query_type parameter description.
Updated SourceVuln API, removed query parameters from most methods. Not sure about which display parameters to keep, so keeping all but adding notes.

Conflicts:
	public/data/whitehat.json

Removing head, keeping branch changes.
Updated display parameters with notes, a number look good to remove. Switched Vuln and VulnPolicy APIs for alphabetical order.
Fixed misplaced comma.
Removed display_stats, display_description, and display_solution where seemingly unapplicable. Set display_steps to default to 0 to allow larger queries to not freeze, and more specific queries should be okay.
Fixed typos.

Conflicts:
	public/data/vuln_parameter_notes.md

Removed it, not necessary in main branch.
Adding missing parameters to Site API /site & /site/:site_id (get multiple sites) methods.
Sorted query parameters alphabetically for Site API.
Port to use Protocol::Redis
0.23
add1
add2
testbranch added
Merge branch 'test'
Support navigation to collection item type
Display id property when present
Implemented foldl, with tests
Fixed foldl, with test
Implemented foldr, with test
Implemented filter, with test
Added additional error case
Use "clone" for deep copy
Add factorial and fibonacci tests
code recfatory
Added missing relative imports in test files.
Replaced cStringIO.StringIO by io.BytesIO.

Also replaced StringIO.StringIO by BytesIO in some other appropriate
places. StringIO is not available in Python 3.
Removed u prefix on a unicode string.
Fixed #19257 -- Don't swallow command's KeyError in call_command

Thanks Giovanni Bajo for the report.
Metodo getCancion añadido
added global defaults, and fixed positioning reset on close
Commitação
Merge pull request #4 from dmoro/Fodengolengo

Commitação
DOCS: minor improvements (including rewriting of pointer! declaration description in 4.8.2).
[DBAL-335] Fix nasty bug in MasterSlaveConnection, connecting and writing to slave when using keepSlave option.
Merge branch 'DBAL-335'
Fix broken test
Adjusted common version
Release 2.3.0
Bump dev version to 2.3.1
Return `off` from `on`

Subscribing returns an equal and opposite unsubscriber.
Merge pull request #1 from kriskowal/returns-unsubscribe

Return `off` from `on`
Return correct SSO token
schematics: Fix in Rev A
schematics: part list for Rev A + partial suppliers
Merge branch 'master' of github.com:domoritz/S76D
TIL: set title for great success
#1524 done saving containers with existing inode/identier (unit test included)
Benchmarking notes
Merge branch 'master' of github.com:doubleyou/dps

Conflicts:
	doc/README.md
added refresh option to sort
added test for large data sample
refactor GUI update code
Moved unpack processing to its own step
Lots of changes for the compilation test cases
Added width to plothashes
Added summaryDF
Minor style tweak aligning the prompt with the cursor.
Fixing autoscroll for codemirror editors.

The codemirror editor is sized by the codemirror script, after
appendResult() has executed. So, we need an additional css rule to ensure
the container that is appended is the same size as the editor.
gem pg
deleted gem lock
gemlock back
rubyracer
db inorder
h
h
j
jL
l
h
k
almost done
l
j
hj
almost done
remove spurious text
Update styles
Update jquery custom ui
added brdtoperm and converted
fix ranga to xrange
Picking used

When the like methods is called the tree will perform a search
Use correct variables. props batmoo. fixes #20566.



git-svn-id: http://core.svn.wordpress.org/trunk@20664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Moved some classes to web/core
Delete old files
Made remote_address and local_address properties more robust - closes #36
New alias for psql
removed custom sliders, replaced with buttons
adds free size function with check if input != NULL
Remove rails buggy plugin from .vim. Now on bundle
woops, now added the big files
Revert "rehash after installing a package"

This reverts commit e86dafba31d9b8e9946ec09c3c0bef8c2bba4fbb.
rehash after installing and removing a package
Changed render targets from strings to symbols.
Completed functional tests for the comments controller.
Drop dependency accountsservice

which is unnecessary.
Vector instances for V2, V3, and V4.
Fixed shortdescription to new whizzywig2011
Update styler submodule
GeOrchestra Styler now includes fr translations
Remove ununused lang files
Add ommicomplete support for and clean preview
check is supposed to return 0 or 1 not true or false.
First commit
Merge branch 'master' of github.com:emnet/android
Allow turning off announcements
Use maven shade to bundle jruby-complete.jar into purugin.jar to make it a one-drop install like other Bukkit plugins
projet ca, et matrix implementation ALA
CMS-201 LAB: Integrate X-Trace
Fixed failing PortalRenderResponseServerHeadTest:
Renamed and moved it to test PortalRenderResponseProcessor instead, since requires less mocks.
CMS-780 SSB: Unexpected call when not previewing a menuitem
Added Symbols & Structs
Support snippets
Mint parser and database samples added
portability: [[ is not recongised by dash
Full name for Debian GNU/Linux and ’and’ instead of ’/’ between that and Ubuntu.
archive commit
working on MixMC
Adding eSpace logo
Menu file & PDF[0.7.5]

-Pasados los menus a archivo /menu/menu.php
-Incluido en algunos archivos (tambien mod. el link del logo a
index.php)
-Creada carpeta /userinfo
-/userinfo/index.php
-PDF Ordenanzas
move custom CarFactoryException
UI-2027 [PLF 4] Social - Attach Link to an activity
Clear out some cruft.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
lang_c: skeleton dirs and files
finish work to set unit number from server cmd line; moved bus_pullconfig() stuff to rtconfig.c
fix exact match
Enumerable is gone, JRuby is back
Fix imgStyle
Fix getSize()
Minified
Fix style left
Removed demo files
Prevent from closing the connection when in eager mode
merge master
All current tests pass
All current tests pass. commit/push to master
Layouts enabled according hint of Matthew O'Phinney
Added some stuff for hosting the site on heroku.
Replaced the settings-file with a ENV var.
Added a check for the port.
Updated the server info for running on heroku.
again unicode fixes in the cache
Pop placement and size
DB Script changes for PickOneFromPopupGrid
Merge branch 'master' of https://github.com/fomaba/Fomaba
Added FormContainerSortingPaging FieldType
Merge branch 'master' of https://github.com/fomaba/Fomaba
change patch to update
add the restart dict
add the clientd/serverd
int the port
All flag / option work is now done in `AuraFlags.hs`

- Also made `main` a little sexier.
modify airF
rtlib: Check LBound/UBound()'s dimension parameter to prevent crashes
LBound/UBound: no longer treat 0 dimension as if 1 was given
LBound/UBound: Evaluate at compile-time if possible
L/Ubound(array, dim): Return dimTB's size (dim=0) or 1/0 (dim=invalid)

Also, to get this working, array descriptors for unallocated dynamic
arrays will now have their dimensions field set to 0 instead of 8
(FB_MAXARRAYDIMS), although there will still be FB_MAXARRAYDIMS entries
allocated in the dimTB. This makes sense because an unallocated array
uses 0 dimensions, no matter how many dimTB entries there are.
When DIM'ing an array, check lbounds/ubounds against the previous EXTERN
Don't bother symbSetArrayDimTb() when DIM'ing an EXTERN

The EXTERN already has the proper dimensions stored, and since the DIM
must have the exact same dimensions, there is no point in updating it...
Also check lbounds/ubounds of duplicate array EXTERNs
Don't complain about ellipsis ubound when DIM'ing an EXTERN

Since 0786bec0824145d6827e6a21986a28603aee8fa4 removed the
symbSetArrayDimTb() call, the array symbol (the EXTERN turning into
a normal global var) keeps its original dimTB. EXTERNs cannot have
ellipsis because they cannot be initialized.

Thus, when DIM'ing an EXTERN, parser-decl-symb-init:hArrayInit()
will automatically use the EXTERN's original dimTB, no matter whether
the DIM had ellipsis or not.

Since we still check the dimension count and the lbounds, and the array
initializer will ensure to only allow the proper amount of elements
to reach the ubounds specified in the original EXTERN's dimTB,
we can be sure that a DIM with ellipsis cannot have a different
dimTB than the corresponding EXTERN.
Merge branch 'lubound'

Conflicts:
	changelog.txt
	todo.txt
Re-use vtable slots for virtuals overriding virtuals
libs/web: make JS String.format() and String.serialize() available as prototype options, introduce String.nobr()

git-svn-id: http://svn.luci.subsignal.org/luci/trunk@9529 ab181a69-ba2e-0410-a84d-ff88ab4c47bc
modules/admin-full: several white-space fixes for Bootstrap

git-svn-id: http://svn.luci.subsignal.org/luci/trunk@9530 ab181a69-ba2e-0410-a84d-ff88ab4c47bc
Update openstack_cpi
Prepare stemcell builder for Ubuntu 12.04

Changes that affect all builds:
- Use libreadline6-dev instead of libreadline5-dev
- Disable SSL support for monit
- Disable SSLv2 for Ruby

Change-Id: Ie0d048b22754dbf9f5fecb48891b2c1fbddabc3c
Merge "Prepare stemcell builder for Ubuntu 12.04"
stemcell builder: Run apt-get from function

This makes sure that install tasks always run against an up-to-date
version of the package repositories, always use the same set of flags,
and always clean up afterwards.

Change-Id: I578f715fbe3daa1e69fa5830cb5b7627f58f2bcf
Merge remote-tracking branch 'upstream/master'
Update openstack_cpi submodule
Added and updated colours for several settings and scopes.
Cosmetic: fix typos, whitespace, and debug calls

- Remove white space and debug statement.
- Fix typo in comments

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Cosmetic: clean up ws & comments in Pre-Compile.sh

- Remove blank lines
- Align comments
- Update comment used to partition end of vlc_install_object
function.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Cosmetic: declare local variables in Pre-Compile.sh

Follow the same style used earlier in the code and declare local
variables with the 'local' directive.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
VLCKit: exit Configure.sh on error

Make sure that we return the exit code when vlc/configure fails. This
forces the the xcodebuild to fail.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Cosmetic: remove redundant var from Configure.sh

VLC_SRC_DIR is already defined in Xcode. Replace top_srcdir in favor
of VLC_SRC_DIR.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
VLCKit: remove trailing slash in Pre-Compile.sh

Remove trailing backslash from the prefix variable. Other locations
in the code adds the required backslash.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
VLCKit: don't assume x86_64 is the default arch

When referring to the main_build_dir don't assume that the x86_64
subdirectory is a part of the ARCHS that we are building. Grab the
first arch in the list of ARCHS and use that as the main_build_dir.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
VLCKit: make sure that the right archs exist

When preparing the framework, guarantee that the expected
architectures are present. If they are not present, or if an
unexpected architecture is present, then reconstruct the universal
binary.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
VLCKit: install fat binary when needed

If we are only targeting a single architecture, then install the
architecture specific binary files instead of creating a fat binary
with a single architecture.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Fix some common typos.
Fix inverted shell negation "! test" -> "test !"
MobileVLCKit: added support for current iOS revisions

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
MobileVLCKit.xcodeproj: removed weird CPU optimization flag
MobileVLCKit: updated for libvlc 2.0

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
MobileVLCKit: added support for more contrib libraries
MobileVLCKit: updated libvlc initialization to current API

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
MobileVLCKit: enforce the correct aout and vout modules, enable debug messages
ffmpeg options were renamed

ffmpeg modules were renamed too some time ago
macosx: fix crash by dis-ambiguating var names

 .../macosx/framework/Sources/VLCEventManager.m     |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
VLCKit: remove - (id)initWithArray:(NSArray *)array;
indicatormotiondrawing - complete
newalbum - complete
jimmylightning - complete
Removed unneccesary header items, and the need to set AtleastLion.
Separate and refactor string drawing mechanics.
ajout de la classe popupOptions et modification de configVariante
ajout classe interfacePopupOptions
modification de interfaceJeu
Merge branch 'jeu' of https://github.com/garriko/echec into interface
commit pour récupérer les dossiers
modif matin 1812
creation ajouterpiece
Implementation fct gestion
Fichier de test
Merge branch 'jeu1812' of https://github.com/garriko/echec into jeu1812
fct gestionCatalogueRevoir
creation package exception + debut gestionJeu
position equals
test echec
Merge branch 'jeu1812' of https://github.com/garriko/echec into jeu1812

Conflicts:
	echec/target/classes/projet_echec/echec/jeu/Echiquier.class
Modif classe GestionJeu
fonction deplacer
Merge branch 'master' of https://github.com/garriko/echec into interface

Conflicts:
	echec/target/classes/interfaceGraphique/InterfaceJeu.class
	echec/target/classes/projet_echec/echec/jeu/EchiquierActif.class
modif GestionJeu
modif GestionJeu
Moved createForm back into reader
Ensure only valid forms can be constructed
Refactored to use createValue
Print improvements
More consistent error messages
[maven-release-plugin] prepare release 1.0.6.Final
[maven-release-plugin] prepare for next development iteration
Fix displaying python2 version in speed.py
Fix running speed.py with python3
Update libs/iovm/source/IoSystem.c
Merge pull request #193 from kgksoft/master

"System sleep(s)" not worked properly for s >= 1 second
removes anonymous union on objects, and reassigns data pointer macros. Removes data pointer 2.
Merge pull request #199 from jeremytregunna/cleanup-object

Cleans up IoObject
Merge pull request #184 from geekless/speed.py-fixes

speed.py fixes
Remove return statement from void function
Replace IoState_protoWithInitFunction_ with IoState_protoWithId_
Merge pull request #203 from igstan/master

Fixed a few compilation issues in addons (from igstan)
This quote is needed
Merge pull request #204 from AlexGensek/patch-1

This quote is needed
Fixed typo on line 82:
'proto' changed to 'protoId'
Merge pull request #206 from adams164/master

Issue #205: Cairo
Memcached stats method compatiblity fix

The stats method of Memcached is now compatible with libmemcached 1.0+.
Further Memcached compatibility fixes

The Memcached addon is now compatible with the API for libmemcached 1.0
throughout. The stats method also sets the error state if errors were
encountered.
Merge pull request #215 from Hamled/master

The Memcached addon now uses the proper public API for libmemcached.
Remove reference to MD5 in SHA1 example
Curses responds to begin, not init
Change Curses example for something that people can see
arreglos

Signed-off-by: Joaquin Gayoso <gayoxo@gmail.com>
Fix #52: vmc targets should not return an error when nobody is logged in to any known target
catalog layout update (images alignment, overflow control)
Merge branch 'master' into western-layout
Setup infinite loop
Add : way to make statistics from the configuration, and upload it to the hostd.
Add : Timo Veith to the THANKS file.
Fix: revert 790b918: configuration properties value is string only
Fix: satellitemap configuration property: decode value (may have several key=value in one line, separated by a comma)
miss en place du gitignore
Fixed ABCD home page
Get exceptional successor count
Fix break label region detection
Fixed typo
Adaptation page d'accueil

L'emphase est plus claire pour la case qu'on survole.
Les cases ne partent plus dans tous les sens dans Internet Explorer.
Ajout d'une simplification de la prise en compte d'ie. Il y a maintenant
une classe au dessus de tout qui renseigne la version d'ie.
cosmetic changes in qhist()
should not draw invisible points in qscatter()
add mouse wheel support in qhist()
doc of the mouse wheel in qhist()
Fix #386. File view defines its own layout.
add livescript specific tests
Qt backwards compatibility fix
In a messy state right now...
totally removed item. I don't think we ever need it in this fashion anyway.
styling updates to image lesson framework
Merge branch 'master' of https://github.com/gone/tutelage
image lesson styling updates
Merge branch 'master' of https://github.com/gone/tutelage
Hook up link deletion.
layout shared subscriptions page
Made it possible to kill the daemon process forcefully from our fixture code on windows. Some windowses do not support it but the implementation is protected. To avoid hung builds on windows I need to use our ProcessBuilder machinery.
Merged release->master. I should have done it earlier but forgot immediately after the release. Also everyone who makes changes on 'release' should merge the changes to master immediately because things are just simpler that way. The conflicts were resolved by accepting what was in the 'release' branch. I double-checked with guys regarding the particular changes.
Improved the error reporting the daemon presents. This helped me a lot earlier to hunt down the daemon issues. Details:

-When the daemon starts it sends back a message via standard stream to the parent process. Now this message also contains useful daemon diagnostics, specifically the daemon log file and pid. We can use this log file later in case some exception happens. Later on I will use those diagnostics in other places, too.
-Refactored the initialization of the parent process so that the spawning operation can return value. Therefore Factory interface is used.
-For now, we still loop through the all daemons in the daemon connector but I'm getting closer to get rid of it.
-This refactoring is a work in progress. It needs tidy-up. I needed to get this pushed to incrementally improve the daemon.
Refactored and slightly improved the code around simple communication message that is sent from the starting daemon to the parent process via stream. It's very simple and should be good enough until we need something more robust (i.e. when we start passing the daemon address from the starting daemon).
update kalman filter with documentation for code review
Add Thanks section of people who contributed to this release
Add variables and logics for reuse. (grnxx::alpha::BlobVector)
Mais alterações
Criando o redirecionamento correto após o login.
Merge branch 'master' of https://github.com/grupo3rpv/rpv

Conflicts:
	gestaodisponibilidade/application/controllers/AgendaController.php
	gestaodisponibilidade/application/views/scripts/agenda/index.phtml
Alterando o login, quando um usuario selecionar uma URL antes de logar, após o login, o sistema deverá redireciona -lo para a URL Requisitada
Merge branch 'master' of https://github.com/grupo3rpv/rpv
Tighten up shipped HTML; add GA.
Updated model structure and added admin to urls
Add a dummy controller with CPU, and a controller using SSH (untested)
Making it easier to work with exceptions thrown during multi transfers. Addresses #197
Changed the way caching works. Changed the exception we catch when closing HTTP server.
Updated build script to use NUnitLauncher from TeamCity if available.
gate , clb_end refresh method
added new file
Merge branch 'master' of github.com:hanw/vim-chen
修改目录说明
添加角色，武器，魔法目录结构
修改目录说明
修改物件编号规则
adding a message about gravatar
fixing a silly bug
Add some custom icons to various items, also change icon for operation expander
Make instance match expected name

Change-Id: Ic94cf389306ac45679601bcdcfbef98bc83e2453
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
Merge "Make instance match expected name"
Add SecurityGroups to make is easier to use EIP

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Consistently create the db resource entry.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Cleanup db imports (use heat code, don't import nova modules)

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
move the db stack delete into parser.py as it is non-blocking.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Fix the stack.delete() by populating the resource id/state from the db.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Update notes for submitted changes

* Change endpoint service type from orchestration to cloudformation.
Adding stack create test
added folder structure and fake Window class
Added fake Window class to push Play branch (second attempt)
Added a semicolon to the end of the fake Window class package line because I'm an idiot
Added the Window class
Quick change to the package folder heiarchy
Added base files for Components/Entities and their Interfaces
Added 2D vector class and a position component that uses it.
Removed position component because it was pointless, moved Vect2Dint to components because it is one
Removed the "util" folder outside of AGED; it's been moved into AGED
Just a bit of clean-up on the base components/entities and their interfaces
Deleted more stuff, added some new components. LOOK INTO LINKED LISTS
By Lugir: Merge Bug list file.
By Lugir: Add integrate part and design file path.
Merge branch 'master' of github.com:henryhu712/mt
By Lugir: Add status in evaluation list.
Merge branch 'master' of github.com:henryhu712/mt
Added respective data entries to the achievement table views.
Converted the branding of the admin interface into a hyperlink to home.
data migratie Module klaar voor test
Merge branch 'master' of ssh://10.2.12.24/home/git/trunk
Correct deploy seeting
up issue
polished prints and logging
added gitignore
Site placeholder.
Commented 2 Lines on the user model
Wrong order
sun.misc.Signal trumps the shutdown hook. Resurrcting get-key-blocking with timeout to avoid flooding of nil events, so no longer 100% CPU.
获取磁盘总空间和剩余空间
Use Jath for parsing results
Fix crash case Matt found