labofsahil/github-event-dataset-2012 huggingface dataset:
Fix users who verify an email address but are not authenticated to the correct credentials.

* No longer set a user's authentication credentials to "password" if the user completes an address verification.  A user who is authed to assertion level and verifies on a second browser must still verify their password.
* When the polling wsapi completes, if the status is "complete" but the user's auth level is not "password", change the status to "mustAuth" which will force the user to enter their password if they have not done so already.
Merge commit 'd02820f03b328053b61507a2ffa39e6a0b2acdb1' into issue_1682_verify_authentication

Merge of user.js and its unit tests.

Conflicts:
	resources/static/common/js/user.js
	resources/static/test/cases/common/js/user.js
Update the comments.
Merge remote-tracking branch 'origin/dev' into issue_1682_auth_after_verify

Conflicts:
	resources/static/common/js/user.js
Fix IE failing when authenticating with IdP from main site's /signin

* window.name is used to keep track of where to redirect the user once authentication with the IdP is complete. IE was losing window.name when redirected to the IdP because it was set from within the dialog.
* Set the window.name to auth_with_primary when window.open is called.
* Update WinChan to use the version that allows the setting of window.name
Change all references of en-US to en
add missing placeholder on INSERT statement for adding test users
statsd module should log uncaught exceptions

Fixes Issue#2440
Adds a 'base' module which should provide lowest level features
while server is starting up.
Uses winston in addition to statsd for capturing exceptions.
updating ejs to needed version for client compiling
/common/js/templates.js gets built dynamically in dev

The list of templates gets pushed onto a single file, with the EJS pre-compiled
into functions. Then, in the Renderer, the functions only need to be invoked,
meaning we no longer need the EJS client lib, and don't eval code.
updating templates, since <%= escapes content by default now
adding /test/mocks/site-templates.js route

this returns compiled site templates, similar to the dialog templates,
which are needed by the test suite to test the site works!
remove last instances of EJS on client-side

manage acct page uses a template, but has no
need for EJS to parse it, since it's plain HTML.
remove _.template usage

_.template uses new Function, which means evalling code
evalling code is bad. so now we don't do it.
compileDebug should be false is minified
update static resources test since ejs is gone
resolving merge conflicts
review fixes

- dont escape siteName, we escape it right when we get it
- no longer need site views symlink
- remove ejs lib from /test
split up create_templates script into a lib file
update ejs@0.8.3
ia nouvelle génération (Elie et Vins depuis Mirage)
Ready to update shortened links.
Further hopeful streamlining, getting right result for question.
Fixed illegal data pattern in LiteralConverter.
redactor plugin added
Bring over win32 pthread from Anope
Mark Aechtler
Grüße
just greater than
add patch for workaround wrapped gc delete
Fixing bugs here and there. Also added a timeout for trying to stream a station by applying what I learned from an old BUILD video: http://channel9.msdn.com/events/BUILD/BUILD2011/TOOL-810T
PlayToController now SHOULD check if the station is streamable.
pulse2-inventory: Fix left menu

with last commit, menu is not displayed correctly
update gemspec
init
Add lintstack error checker based on pylint

Add a new silent test target lintstack based on pylint in Jenkins.
lintstack will compare the pylint errors between HEAD and HEAD~1,
filter out known false positives and report violations in pylint
original parseable format for Jenkins to consume.

Change-Id: Ic2962cb42a174bfe9535aea88475ff4ede3bf9ff
Correct live_migration rpc call in test

self.driver.compute_rpcapi.live_migration should be the correct
way to issue live_migration call instead of
compute_rpcapi.ComputeAPI.live_migration, because the ComputeAPI
is a class, not an instance of the class.
This technically does not matter because the method is moxed out
anyway for testing, but still it is confusing.

Partially fix bug 1037183

Change-Id: Id41520a44fb9cfc19e269427ee42493e5dc52f5b
Add ops to aggregate_instance_extra_specs filter.

The following operators on instance_type_extra_specs were added in
aggregate_instance_extra_specs filter. Fixes bug 1037090.

= (equal to or greater than as a number; same as vcpus case)
== (equal to as a number)
!= (not equal to as a number)
>= (greater than or equal to as a number)
<= (less than or equal to as a number)
s== (equal to as a string)
s!= (not equal to as a string)
s>= (greater than or equal to as a string)
s> (greater than as a string)
s<= (less than or equal to as a string)
s< (less than as a string)
<in> (substring)
<or> (find one of these)

If the first word in the instance_type_extra_spec is not one of the
keywords above, a default operator "s==" is used.

E.g.: ">= 5", "s== 2.1.0", "<in> gcc", and "<or> fpu <or> gpu"

Change-Id: Iee9bf68011738aab146e6311a17cb3c673d7a392
request_spec['instance_uuids'] as list in resize

Wrap instance['uuid'] in a list when building request_spec in
compute.api before sending it across to the scheduler on resize

regression introduced in I63bbc98c285faebec53f8e62857c01548807db68

fixes bug 1041351

Change-Id: I7cad8316171798e240bf78999cb94730c587a904
Merge "Add lintstack error checker based on pylint"
Merge "request_spec['instance_uuids'] as list in resize"
Add the self parameter to NoopFirewallDriver methods

Following the Python coding convention even though the current
code works with the *args magic.

Part of bug 1037183

Change-Id: I2be815a098913b5879d0d9b3563a55431408431c
Correct utils.execute() to check 0 in check_exit_code

If a process exits with returncode 0, the function always returns without
raising a exception, regardless of whether its check_exit_code includes 0 or
not. This patch fixes it; if check_exit_code does not includes 0 and a
process exits with 0, ProcessExecutionError is raised.

(No change required to caller-side since no one misses 0 in check_exit_code)

Change-Id: I824a9bc5e42038e27df6757cd47c06073681c342
Merge "Correct live_migration rpc call in test"
Merge "Add the self parameter to NoopFirewallDriver methods"
Merge "Add ops to aggregate_instance_extra_specs filter."
Allow admins to de-allocate any floating IPs

Fix bug 1045508

Change-Id: Ie5be3748c16a592209934cc85777f534e84842bc
Escape ec2 XML error responses

Fixes bug 978439

XML error responses to ec2 calls include user supplied data that is not
escaped. This could result in returning invalid XML.

This is addressed by using utils.xhtml_escape() on purposeful eC2 error
responses and when handling webob.exc.HTTPException.

Extended the tests for utils.xhtml_escape() to cover '&', '>', '<' and a tag
look-alike. These conversions are implicit to saxutils.escape().

Change-Id: Icb3e861c6c06c0d9c3b9e2ab1a658581a0fb39c6
Add scope to extra_specs entries

Do to conflicts between different scheduler filters it is necessary
to allow an optional scope for the different keys.  This scope is a
leading string followed by a ':' character, e.g.:

        foo:bar

is the `bar' entry with scope `foo'.

The Trusted filter will now use the scope `trust' and the
AggregateInstanceExtraSpecs and ComputeCapabilities filters will
check against any unscoped keys in the `extra_specs' table.
Any new filters that utilize the `extra_specs' table will need to
use a unique scope string for any keys they require.

Resolves bug 1039386

Change-Id: I2466dc3d4de8e9aeb76b294eeda1c939c0413366
Signed-off-by: Don Dugger <donald.d.dugger@intel.com
Merge "Add scope to extra_specs entries"
Merge "Allow admins to de-allocate any floating IPs"
Merge "Escape ec2 XML error responses"
Replaced coffee with mini cooper icon

Also named JFrame title "Car Store"
Moved in a bunch of uncommitted code, as well as began working on the game setup page.
Fully disable evil-mode because it was getting activated somehow in find-dired buffers
Version issue
test
Fix huge breaking bug with offsets in structs and arrays
Experemental!
9-path test
StrictMode enabled
Hardware acceleration enabled
Crash after click "info" fix && some refactoring
added empty properties file for plugin1
Added tests for non-entity controller methods
added linked elements
auth: use encoding.binary
Merge pull request #1 from tones111/auth

auth: use encoding.binary
basic app stuff, webfinger template
Merge branch 'master' of github.com:CBiX/ownStatus
Update RaaS/src/main/webapp/dataenrichment.xhtml
Barcode class finally finished.
Started data integrity report and updated some tests.
Merge branch 'Murphy' of https://github.com/CS340Group/hit into Murphy
Started data integrity report and updated some tests.
Many bugfixes. Fixing syntax for tests. Updating the integrity report.
Merge branch 'Murphy' of https://github.com/CS340Group/hit into Murphy

Conflicts:
	DataIntegrity.md
Merge pull request #27 from CS340Group/Murphy

Thanks for the note, Nick! ant clean did the trick.
All HTML reports are hooked up to the GUI
Merge pull request #143 from CS340Group/murphy

All HTML reports are hooked up to the GUI
A reason why the lambda calculus cannot reference itself in C++0X
worked on Map class
Fixes
Merge branch 'master' of github.com:ClubEngine/gj4
Make the JSON mapping be "command: url" instead.
Update install.sh for compatible with Linux and MacOSX
ImageManager interfaces refactoring
Added verification of cache directory, closes #13

Added comment and force clear of LruCache if DiskLruCache is invalid
locked camera to ball
Remove #cgo line from everything except sdl.go.
Salto calculado, debe mejorar
pomin9v
Merge branch 'master' of https://github.com/EHER/my-puppet
Merge branch 'master' of https://github.com/EHER/my-puppet
added 'elf' command to kshell
Tries to address 'jitsi uninstaller can not remove autorun registry key' reported by Alexandros Papadopoulos on the dev mailing list.

git-svn-id: https://svn.java.net/svn/jitsi~svn/trunk@9715 198c5059-ef06-4ec0-9a75-fdd6b0ef00a6
Adds log information when the computed RTT > 60 seconds.

git-svn-id: https://svn.java.net/svn/jitsi~svn/trunk@9716 198c5059-ef06-4ec0-9a75-fdd6b0ef00a6
Updates Ice4j to svn revsion #313: Corrects disable IPv6 properties variable name (StackProperties) and its use (HostCandidateHarvester) as reported by Daniel Pocock.

git-svn-id: https://svn.java.net/svn/jitsi~svn/trunk@9717 198c5059-ef06-4ec0-9a75-fdd6b0ef00a6
Fixes the switching of the playback device in calls upon hotplugging.

git-svn-id: https://svn.java.net/svn/jitsi~svn/trunk@9718 198c5059-ef06-4ec0-9a75-fdd6b0ef00a6
Fixes showing today's messages in history window.

git-svn-id: https://svn.java.net/svn/jitsi~svn/trunk@9719 198c5059-ef06-4ec0-9a75-fdd6b0ef00a6
Moves the ConfigurationService and FileAccessService implementations from Jitsi into libjitsi. Silences handled exceptions in libjitsi by converting them into Logger informational messages.

git-svn-id: https://svn.java.net/svn/jitsi~svn/trunk@9720 198c5059-ef06-4ec0-9a75-fdd6b0ef00a6
Tries to fix the build (tests).

git-svn-id: https://svn.java.net/svn/jitsi~svn/trunk@9721 198c5059-ef06-4ec0-9a75-fdd6b0ef00a6
Tries to fix the build (tests).

git-svn-id: https://svn.java.net/svn/jitsi~svn/trunk@9723 198c5059-ef06-4ec0-9a75-fdd6b0ef00a6
add readme
Merge branch 'master' of ssh://TCXGithub/Echo-tcx/Jitsi
added homepage editing via admin
dummy
ICal
Create/Add new script to find the ID of Mozilla xpi extensions.
directory re-working
mockup - profile, users
Mistake corrected
Description of private and group call
Merge remote-tracking branch 'origin/master'
search function update/overview layout update
Fixed minor spacing issue
Another minor thing
small fixes with the layout
Lägger till permission och google-maps bibliotek
Made changes in SendtoDB, how the exernal database is connected and added parsing of response
Přidána první část řešení druhého úkolu
Modify Main work flow
Added VFS_CHMOD, VFS_CHOWN, VFS_UTIMENS
Merge pull request #3 from fingerco/master

merging in cory's changes
Fixes copy and copySpan to keep tag of copied list.

Quality:
Compiles with no warnings or errors.
All unit tests pass.
100% code coverage.
fixed update cbdata time relation callback error!
Update to activity unit serialization tests to include properties in the examples
Move service dependency functionality out of modules and into the services war, so localised, as won't be used elsewhere. Also added more exclusions to ensure common jars are picked up from the as7 modules area
etapa 2 começou
Adds the tell plugin with very basic functionality.
Enable "sync -c" default for repo

There's no need to fetch every single branch

Change-Id: I48861c2b46e5d9d94c478fa78e2724546f71ddf1
Add CMFileManager

Change-Id: I54d5e29517610b6c218f93f5ed7490ff1fc7b9dc
Update default.xml with Quarx2k's transition to the CyanogenMod Holo-themed file manager
Add: cool filtering with legends
new default content
fixed quote width
Vim modeline
Fix parentElement => parentNode in onstage.html
Implementation of new protocol messages
Add START and END messages with new key behaviours
msg args handling : argv/argc, encode/decodeURIComponent and postMsg helper
Add URL parameter support
Add parameter autoplay=0 handling
Add poster attribute on video default content
Correct regression with this.count, introduced by 618074f9
Patch replace the inline-SVG code by UTF8 characters
Add view mode.
Update patch.
View mode shortcut is “O” instead of “Esc” and it can be toggle, complete support of IE in the CSS and match coding style of @paulrouget.
Use event delegation and update performance.
Fix scrollIntoView when toggle view mode.
Merge from @paulrouget.
Update README with PowerPC specifics instructions.
adding field template for new url field in master cal nodes
Merge branch 'master' into test
fixing title url template
Merge branch 'master' into test
changing title url field to display 'More Information'
changing title url field to be strong
Merge branch 'master' into test
adding an inline style to location url field to hide overflow
Merge branch 'master' into test
changing default text of location url field to say 'Location URL'
removing strong tag from location url
Merge branch 'test' into prod
small changes
Merge branch 'master' of github.com:Idol-IT/yiiSEO
Fix stage landing page, added image styles, apply it in front and stage pages, fix conflict in features
Deleted file from feature
Merge remote-tracking branch 'origin/dev-line' into case-672
Forgot to bump date on PSCx to 9/19/2011 for 2.0.0.1 Beta 1
- Added HTTP POST verb support to DumbDownloadModuleFromWeb, DownloadModuleFromWeb

- Added parsing of XML psget:properties / psget:verb if it exists, to allow the directory Xml to say that some downloads are via POST
- This is mostly a work around for CodePlex license agreement checks which break standard HTTP semantics (they require a post to the Url, set some cookies and redirect to a GET to ensure the license has been agreed to - yuck)
edit improve emails
Adder afegit (inacabat)
Multiplexor arreglat
Alguns canvis de noms
[Fix] Div width wasn't large enough creating 2nd row of stars
Issue #5. Correct CSS
메모리 관련 오류 모두 수정
added removeLastChannel. Not working, m_Channels in Song doesn't seem to resize properly when you remove a channel
Pow config file
Removed date amending (was not working)
Enable git rerere
Git alias lsmy
Git tree state
Refactored git prompt
Added the Attachments.php file as well as a number of bug fixes and a few other changes.
DataReader could be stopped while reading file by setReading(false).

Signed-off-by: 核心力量 <kernelforce@gmail.com>
keybinder: make it work

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
basename: fix for path without /

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
dirname: be more complete

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
commit 2
commit 2
commit remove main2.cpp and change main.cpp
Added podcast item sorting (rhi)
Pfad zur less.js angepasst

get_stylesheet_directory_uri() --> Pfad zum Child-Theme
get_template_directory_uri() --> Pfad zum Parent-Theme
Commit doublie dadd ^^
Add bat file. Check username. XML
Add Download XML File
Add XML Parser
Minor fix
Remove pymongo lib
Fix check for errors
Check Server
Get Api Key
Add Exit. Fix
Add JSON Parser. Fix
Secret API
Fix str
Fix style code #1
Fix style code #2
Fix style code #3
Fix comment
Add JSON Parse
Remove files after parse
Print information. Unixtime convert
Clear some code
Added find() funct. TODO :Consider friend class for some private methods :/
Practica RAKEFILE
Change README copy for clarity
Should fix a NullPointerException
Fixed a bug with the ctype library.
minor formatting updates for CWTask
3D

Add 3D mod
Labels now support atlas sprite rotation

The formula in FFont for laying out the char uvRects correctly is one of
the most confusing things I've had to write in a long time, but it works
great!
Aesthetic code change
all to serialize
Changes to zshrc
Re-fix Email after merging master
Add to Vimrc for coding standards
Merge branch 'machines/protec-desktop-four' of github.com:Mezzle/configs into machines/protec-desktop-four
use double instead of int
Separated interface and implementation.
Fixed a slight error.
resolved notice, needed isset
assign config data objects to vars before trying to access properties
assign config data objects to vars before trying to access properties (more)
return null if init item does not exist
args is an array, not an object
export refreshes should be tied to enqueue actions, not theme setup actions
Jasig CAS Server 3.5.0 issues tickets with periods.

This is a violation of at least two specifications:

1. section 3.7 of the CAS 2.0 spec
2. "CAS Clients written for older versions of CAS will work with CAS3
   without modification"

(point #2 is from
https://wiki.jasig.org/display/CAS/CAS3+Design+and+Development)

but whatever, we have to live with it.
Remove Udaeta.

It doesn't work on Ruby 1.9 (specifically, the Camping version of
RubyCAS-Server doesn't), and I'm not at all inclined to keep it around
when there's far better process control mechanisms available. (Like
Procfile and Foreman.)
Unlock all development dependencies.

I think enough time has gone by for the errors that forced locking to be
worked out.  We'll see if I'm right.
New autotest/rspec init mechanism.
Simplify Cucumber test support code.
Too many assumptions.
A script to download Jasig's CAS server.

Also ignore extracted products.

Next up: the real fun.  (How do I set up valid credentials?)
This was a nice fantasy, but I can't use Ditz.

I'm too lazy.
Remove unneeded tasks.
Rename integrated-test-ssl.{crt,key} to test.{crt,key}.

It's shorter.
Move fsm.rake under lib/tasks.
Jasig CAS and proxy callback startup scripts.

Also add a CAS proxy callback server.  It was stolen from Aker.
Add server Rake tasks to main Rakefile.
Update Cucumber world and hooks for new test code.

Yes, this is a mess.  I'll clean it up later.
Move MechanizeTest out of its enclosing module.
The credential setup isn't needed anymore.

I'm just going to go with the Jasig flow and say username = password =>
good, username != password => bad.  More configurable CAS servers can
adapt to this scheme.
Consolidate "Given a proxy callback" steps.
Update credentials for tests.

The Jasig CAS server ships in a mode that accepts (username, password)
where username = password, and rejects everything else.  (It might also
work with blanks; I haven't tried that.)

Anyway, configuring the Jasig CAS server to do otherwise is terribly
tedious, so I'm going to just go with it.  Servers that are not quite as
massively overengineered can probably be adapted to use this scheme.
Reinstate the "given a proxy callback" step.
The #cas accessor no longer exists on the world.
Fix offset Height issue
1. 添加“专家列表”频道
2. 添加“下滑翻页”功能
3. 样式调整
Added support for limited number of commands in specific time. IMDb support (expermimental)
Bot now allows entering channels with and without #
2 new commands related to time limits
No major changes, now when urlib encounters error while trying to open goo.gl and shorten the link the error doesn't crash the bot
Updated readme
Allow more flexible config specification (as per wm) for client configuration loading (url/file/resource)
adding Matlab fortran parser and openmp generator
removed set_offset from all op_plan related function calls and structs
added non-hdf5 MPI aero code
Fixed MPI bug due to setting the dirtybit immidiately after halo exchange. This should be done only after the computation on the data sets have been completed
Merge branch 'merged_mpi-rebase' into aero_vector_SoA

Conflicts:
	op2/c/Makefile
	op2/c/include/op_seq.h
Add content length header for every type of request if it has not been set.
Merge pull request #8 from Obvious/sho-multiple-json

Add content length to DELETE requests
Added boombox
Feature #892: remove unexisting method
Add ozones-server.error and sunstone.error paths for system wide
(cherry picked from commit 777c194075c46f66e0a53c3bff1d908c9db12004)
open.framework.Graphics2D/3DFramework / コメント編集
Cours konig
ISO 8859-1 in UTF8 konvertiert.
Jetzt kann man Umlaute und Sonderzeichen direkt im Quellcode verwenden.
Excluded "glossaries" index Files and pdf.
Added glossar,symboltable and acronymtable capability.
Replaced obsolete parameters.
Some minor tweaks on ngerman usepackage parameters to get umlauts
working.
Added glossaries package.
Simple "how to add new glossary entries" and where to do it file.
Converted ISO 8859-1 to UTF8 -> You can use umlauts within sourcecode.
.
Dodanie ikonek. Zmiana sposobu wczytywania obrazkow
testinge
Ajout quelque bib (surtout des vidéos)

Code édité en ligne non compilé --> A VÉRIFIER
v1.1.5 (Update toggle also effect console message now, irt. change in
bukkit policy
Moodle 1.3.4 - 11 August 2004
Add "py33" to tox.ini
Add .travis.yml for Travis CI (http://travis-ci.org/)
Add "Marc Abramowitz" to CONTRIBUTORS.txt
Remove blank line from .travis.yml
Merge pull request #616 from msabramo/testing

Add py33 to tox and add .travis.yml for Travis CI
[28] damnit tcl

Signed-off-by: Chiruclan <pascalvahlberg@yahoo.de>
fix compile errors
fix compile errors
added stub method for SQS
added stub method for DynamoDB
Merge branch 'master' of github.com:Qalqo/aws4dart
update TODO
0.62 to 0.75 in README, remove trailing whitespaces
added ability to use rails migrations
Added a method in Areas.Area to spawn things.
Added a method to spawn things.
First level fix for #11 : uses BasicQuery when forged id doesn't match
effective obejct one (mostly due to the fact that stored object is a
subclass of that service one)
added smart toString methods
added a primitive covnersion method allowing float->long conversion (as
a typical example)
Fixes #11 by optimizing queries at their best, making sure the result of
findById are correct, and repotimizing queries once again !
[maven-release-plugin] prepare release gaedo-0.2.27
Update src/Nest/Enums/TextQueryType.cs

Fixed Enum values so PHRASE and PRASE_PREFIX would work
+ flashVars.scale = enum(exactFit, noScale)
* multi resize
* fixed flash.getInput & _getUrl
* upd: micro bug fixes
Updating to newest tilemaps
add flatGet to PersistentStore. increase visibility of InMemory : wrap. clean up
- Fixed g:vimproc_dll_path conversion.
Bugfix, SVN recursive copy is fixed
service and about page
Merge branch 'master' of https://github.com/ShuoLi/blanket
allow delete in the query or body, fixes #521
dawg bugfix from old variable
check statusCode on fitbit and error is not 200.

This will make us a bit nicer with their rate limits (but we'll
still hit them :().
try not to go over the fitbit rate limits.

Keeps track of API calls and pauses just under the limit.
Merge pull request #588 from Singly/fitbit-rate-unlimit

Be smart about staying under the FitBit rate limits
Started implementing SQLite, MySQL Soon.
Finally Implemented SQLite.
Allows for exchanges to persist, even after restarts.
Still spams the console with errors when the DB is changed.
Keeping Legacy ArrayLists for now, Until MySQL is implemented and Spam is fixed.
Little guy now animates and a little bit of ui
Rename printLevel to printDetailLevel.
Deleted the stray 's' from one file, fixed the warnings (which probably reflected a serious fault), and butchered the Makefiles to get the wretched system working with Boost. The Makefiles will all need fixing.
Merge remote-tracking branch 'origin/master'
Removed GC.disable accidentally left in code.
Merge branch 'master' of github.com:Spooner/ashton
Couple of corrections to make it more consistent with other Ashton code.
Added a RectangularPacker to pack multiple textures into one combined texture. The texture can be generated with RectangularPacker#packTextures.

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

Added a rectangular packer to pack textures into one texture
Silly @Olloth
Altered region entity manager to use message buffer

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

Altered region entity manager to use message buffer
Revert "Cleanup of SpoutEngine. You are welcome @RoyAwesome."

This reverts commit 751169a6b7f0a7840fc65388d6fe5593f4bcbdf8.

Conflicts:

	src/main/java/org/spout/engine/SpoutClient.java
	src/main/java/org/spout/engine/filesystem/FileSystem.java
	src/main/java/org/spout/engine/filesystem/path/JarfileResolver.java
	src/main/java/org/spout/engine/renderer/GL11BatchVertexRenderer.java
	src/main/java/org/spout/engine/renderer/GL30BatchVertexRenderer.java
	src/main/java/org/spout/engine/renderer/SpriteBatch.java
	src/main/java/org/spout/engine/renderer/shader/variables/ShaderVariable.java
	src/main/java/org/spout/engine/resources/ClientTexture.java
	src/main/java/org/spout/engine/resources/RenderMaterial.java
	src/main/java/org/spout/engine/resources/loader/RenderMaterialLoader.java
	src/main/java/org/spout/engine/util/RenderModeConverter.java

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Reverted changed due to formatting ... and some formatting changes
More revert fixes.

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Previous/next functionaliteit geupdate. 't Einde is in zicht, joepie!
Typo fixes & plugin installer.
mongoid git to https
Fix: Line break bug when using markdown
re:publica
Added mot mode dropdown

Also changed Salvager:Start to only queue if its state queue is empty
Removed HasOreHold variable from obj_Ship

Replaced with new MyShip.HasOreHold member
Need code to remove said save spot after it is used
add uwsgi-vps.yaml
Update french translation of examples.txt and template.txt in mapfile.po
Lots of fixes and more logging. Device now starts and announces, subscriptions do not yet work
fixed CS and minor tweaks
przywrocenie wersji gwt-maven-plugin 6.0.1
add checklogic to template
BRD cleanup, Moved to new Eagle 6 Format again, Reference Designators Updated in XLS files
AirspaceSorter: Added AirspaceSelectInfo constructors
AirspaceSorter: Implemented lazy GeoVector calculation
make the funnel page sexy and also allow for session by session break down, which to be fair, is clearly the coolest addition to this tool
Merge branch 'master' of github.com:UniCow/trapyst
Added a couple of files I forgot in last commit, and performed a little cleanup.
Update for new system. Installer bug fixes.
print just status in header
Merge branch 'master' of github.com:WPN-XM/updater
no underscores
no underscores in downloaded files
Added a quick test of looped element methods
Used a better scope for the element list methods.
Added tests of contains
Added a note about my Django inspiration to the readme
Updated the class example in the readme. Now works with the new class format.
getStyle now allows you to fetch multiple styles at once. Should also support margins and paddings better.
Added border to the list of directional values.
Fixed getStyle, actually getting the right directions now.
Improved getting some more, just need to get the deepest values now.
Gave the prefixCheck regex a better name.
Simplified Element again. Trying a different approach.
Wrote a working version of the shortcut CSS. So now border will return the border size.
getStyle now returns an array when multiple are requested.
Okay, getStyle now returns an object which contains an array
Removed a stray z. BAD Z
Now replacing the values in the getters with a $, so I can set things like border radius later.
Added a test of multiple style values.
Added the shorthand tests. More to come in the future. Maybe when requested. Might automate it too.
Removed clone from Element. No longer used.
Added the empty method.
Profilfoto
check for used elements
/usr/bin/env shebang
Updated modules to newest versions
Trying clockworkraven and setting up mongo
update language text
Tidied up the compile script
Started to debug WCET calculation through IPG
Adding first documentation files to the extension
tig: testing optional deps
Add support for optional deps
commenting out bootstrap data creation
Fix issue #1383 by moving the bullet-proofing code to close() function.
Merge pull request #1445 from adobe/rlim/code-hints-issue-1383

looks good
partialfunction during typing of match
towards generating partialfunction implementations during typer
to repro the try typed args is ok assert
flags for dynamic
user manual: fix typo
HOTSTUFFS [GIT] commit 28ab4343: Update script EmptyTrash, update logs.
Integrated server, client, gameboard, and GUI
Remove redundant overload
ortest: enlarged TEST_NGINX_SLEEP further for the "h" testing mode.
ortest: updated the whitelists to reflect recent changes.
openresty-tester: build valgrind under /tmp/.
back-end v2.0, now returns list
updated with refactored code
added images, changed homepage
re-added setting encoding for shell runner
Merge pull request #1653 from ajaxorg/fix_broken_project_zip

re-added setting encoding for shell runner
Fix tour for collab
Fix parser_test & remove from blacklist
Fix colorpicker_test & remove from blacklist
* fix for "On first join of read-only mode, ux issue with revisions"
* fixes ajaxorg/cloud9infra#2293
NPM commands discovery Consistency with the terminal way of doing it
Remove processTypes - only treat supported runners based on their message type string format
Add runnerTypes to process-manager API
* fix after review
Merge pull request #2116 from ajaxorg/fix/liskov-tests-2

[Liskov] Fix some tests
Reduce documentation popup delay
Show documentation popup on mouse over nearly instantly
Delay showing documentation popup after typing

(but not cursor key usage)
* fix for "Fix the way the collab not signed in state looks in firefox"
* fixes ajaxorg/cloud9infra#2552
cleanup
Merge pull request #2152 from ajaxorg/smith.io

Smith.io
Fix TypeError if no editor open
Merge pull request #2156 from ajaxorg/fix/cannot-read-editor-property

[Liskov] Fix TypeError if no editor open
Merge pull request #2155 from ajaxorg/reduce-documentation-popup-delay

[Liskov] Reduce the documentation popup delay
capitalize & default in createProcessLog
Upgrade packager
Merge pull request #2150 from ajaxorg/remove-process-types

[Liskov] Remove processTypes
updateds for tabs, navbar and filemenu
* Removed large amounts of cruft
* Refactored some method names
* Decreased coupling within the controller/routing system (reduced coupling to Response, Layout, View)
* Made has_many relationships more efficient
Fixed issue - controller args were not resetting per contorller
Fixed wording in model contract, and bug when using magic find with more than one parameter
Added utility methods to model collection
20120601 Backup
Camera working, added background and new art
Trying to set up the zoom transition.
Added what exists of the camera system to the engine.
Added get requesting users macro.
Merge branch 'master' of github-akiii:akiii/meshi365
Update setup file

db fix and query addition
Cambio en el config prinpical desde portatil
Cambio en el config prinpical desde portatil
move integration stuff to tests/js
update broken system tests
Merge pull request #5 from lightsofapollo/integration-tests-for-all

Rework file layout in integration tests
Added "initial-scale" viewport property
Merge branch 'github-main' of https://github.com/plomino/Plomino into github-main
Merge branch 'github-main' of https://github.com/plomino/Plomino into github-main
Load overlay popup in iframe to allow Javascript code execution
Include Plone css and javascript in OpenBareForm
Identify OpenBareForm's <body> so that diazo themes can conditionally enable transforms on bareform too.
Choose the right iframe in the (still failing) test
Ensure hideWhens cconsistently get the same kind of object
Forgotten test file supposedly included some commits ago
Working (and tested) dynamic hideWhens in overlay form
Fix Whitespace
Ugly but working solution
Enable overflow in iframe to make FF show vertical scrollbars
Make jslint happy. No semicolon left behind.
Update the datagrid as our last operation, so that Plomino users can build hooks on the DG and manipulate field contents.
Also for update and delete: update the datagrid as our last operation, so that Plomino users can build hooks on the DG and manipulate field contents.
use unified in travis
Merge branch 'github-main' of https://github.com/plomino/Plomino into iframe-overlay
again
and again
Merge branch 'github-main' of github.com:plomino/Plomino into iframe-overlay
fixed documentation missmatch for ORB
fixed undefined behaviour in image codecs initialization
fixed typo in SURF detector #2149
Fixed typo in Java wrapper for FetauresDetector class
show detected keypoints in feature_homography.py
Changed DetectionBasedTracker a bit to make its method addObject to return an integer value -- the id of the new added object.
One more fix for zlib search #1902
LBP classifer moved to ptr from DevMem2D
LBP classifer moved to ptr from DevMem2D
LBP: switched to texture implementation
update the docs for cvExtractSURF and initModule_nonfree()
mdot function in common.py
fixed doc #2152
fixed #2155
fixed vfw (#2156)
refactored GPU LBP cascade. Added support for big images. Fixed bug in connected components function
LBP: minor changes
updating include dirs to make CDT project in Eclipse happy
more doc details for #2152
fixed #2159
Fix the schema and upgrade datanucleus-appengine
Fix: Avoid deadlock during cleanup of entrypoint

Invoke cancel_blocking before calling the
cleanup portal of the rpc_entrypoint. If a rpc_entrypoint
is blocked in a semaphore the cleanup call gets
stuck forever.
Added a simple piece of text that shows if there is no file specified.

If there is no file specified in $_GET['i'], then it shows "Welcome to
ezHTML. Click here to view 'red'." This can always be changed without a
problem, it is up to the user of ezHTML to do it. As of right now, it
shall stay.
iss3: update 2012-09-13 17:32
endment
Add EVP cipher listing for BF and CAST5

Exposes EVP functions for accessing BF and CAST5 cipher algorithms.
yet another try at MySQL
Add a bit of vimrc config
First attempt of a makefile to install vim
Share src themed fix
query API supports string comparison (sql 'like' statement actually)
Ignore temporary files
Git ignore list
Update lyahtheme/cover.html

Se corrigió un error.
Merge pull request #1 from ricciardelli/patch-1

Update lyahtheme/cover.html
Correction windows
adding AbstractCzekanowsyDice, RACzekanowskyDiceHashSetInt, TestCzekanowskyDice and TestTanimoto
Update chrome/views/style.css
Have to pass argv argument to nose.core.run.
Add lyx filter. Make latex docs show up in output/
account: Correct can_wiki permissions for trac.
Trac requires None to map to False, where as in new wiki it maps to True
wiki: Fix create redirect when no page name is specified
middleware: Add missing error code 409
wiki: Correct mod only editing mode ignoring page editors.
wiki: Correct error on content length error on wiki revise.
wiki: Properly render revision user.
wiki: Use ThingJsonTemplate for wiki json.
wiki: get_editors should return a list, not dict.
wiki: Use WrappedUser for wiki page settings.
wiki: Do not bother listing deleted editors.
wiki: typo.
wiki: Add requirement for alloweditor action to be del or add.
subreddit: Change logic for detecting a wiki friend page action.
templates: Use None as a default instead of {} for extra_config.
subreddit: whitespace.
wiki: Replace wraps_api with wraps.
wiki: Allow admins to create restricted pages, and mods to edit them.
wiki: Make settings for restricted pages less confusing.
wiki: Ensure that page names which can not be accessed are not created.
wiki: 'max_separators' should be lowercase.

down
Fixed colwise and rowwise in gglayout
support nativeClassName and property getter/setter in HaxeExternWriter
Added comments to replays for admins and CMs
Organized assets folder and fixed paths
Add New Method
TokenBucketLink abstract class for all token related book keeping.
env aliases
Merge branch 'strangelove' of github.com:apavlo/h-store into strangelove
Quick fix for TransactionInitQueueCallback
Add OpenIndiana to operatingsystem and osfamily, as well as check
/etc/release for Solaris rather than just falling back to it.
prevents broken xcs from being rendered
prevents broken xcs from being rendered
images now fit to width
Merge branch 'master' of github.com:apgoetz/bottsy into spliceTesting
Styled reddiquette notice. Reddiquette? Sp? Fixes #61
Merge branch 'master' of github.com:aphoenix/r-wow
Merge branch 'master' of github.com:aphoenix/r-wow
Updated announcehead.png
Merge branch 'master' of github.com:aphoenix/r-wow
TISTUD-1198 Update update text
Merge branch 'development' of https://len-am@github.com/aptana/studio3.git into development
TISTUD-1817 Update callers to MessageDialog to use
UIUtils.showMessageDialogFromBgThread()
APSTUD-4193 - Add functionality to open the help in the internal browser.
APSTUD-4193 - Apply review comments
Move base methods to the utils library
Use utils
Rename tests for utils
Merge pull request #1 from aratak/utils

Utils
1. set session permanent; 2. auto close error dialog
Edit Pin Merge

includes modification of model to include srcUrl and change url to imgUrl.
you must migrate for model changes
Add better queue size debugging
Removed GAE sourcecode
Merge branch 'develop'
CSPACE-5271: Added test for building Contact sub-resource URIs.
Redirect from root to /Home, fixes #250
[Fix] Inline latex formula alignment

Fixed an issue of latex inline formulas not aligning correctly with
the text. The fix is a ruby translation of the Perl code described in
http://tex.stackexchange.com/questions/44486/pixel-perfect-vertical-alignment-of-image-rendered-tex-snippets.
This code calculates the alignment of the generated image depending on
the image size and the size of the white space between the formula and
the margins of the image.

The alignment now is nearly perfect, however the new rendering comes
with a performance impact because of the increased number of operations.
To reduce this impact, the generated images and calculated values for
the alignment are now cached in `~/.cache/gollum`. The caching is done
per formula and not per page, thus avoiding caching the same formula
twice.

The Readme and tests have been modified accordingly with the new tool
requirements and expected markup.
[Removed] Unnecessary `require 'time'` line.
[New] Support `$` and `$$` as formula delimiters.

Although the standard formula delimiters for latex formulas is currently
`\(` and `\[`, the `$` syntax has an advantage from the point of view of
writing speed, very important if we intend to use *gollum* as a writing
tool.

The code includes support for escaping of the `$` symbol by using the
gollum syntax `'`.
[Fix] Replaced random escaping of `$`

The `$` symbol is now escaped by replacing it with a static string.
Hacky fix for encoding issues
Fix #386. File view defines its own layout.
Update livepreview for new Ace.
Update readme.
Update Ace.
Fix for 1.8 versions of ruby
Fix #389.
Set page name correctly on preview.
Enable MathJax for live preview.
Merge pull request #377 from pipex/latex-align

[Fix] Inline latex formula alignment
Merge pull request #379 from pipex/latex-dollar-sign

[New] Support `$` and `$$` as formula delimiters.
Make the Sinatra app directory aware.
Re-work the compare URL matchers so that CGI escaping etc shouldn't be so needed.
Merge pull request #393 from nature/dir_support

Add Directory Support.
Remove #head boarder in /pages because it's now defined by .breadcrumb.
Work around #363 (grit is broken).
fixed bug in google_form plugin
added message to google_form
thorify install script: can now install just vim part of dot files
Fix incorrect definitions of WORD64 and LONG64.
Merge pull request #10 from edmccard/master

Fix incorrect definition of WORD64 and LONG64.
Merge pull request #9 from arukuka/master

Fixed Xlibint.d and make install
Starting support for cmake
Updated Makefile, supporting MacOS, until cmake support works.
Added forgotten lines for mac support
Adds Doxes utility to construct SmartDox document in program.
Change how FOV is drawn on TrackerControl so it more accurately displays FOV lines
[async] removed: __version__
Modify the docscrape extensions to handle arbitrary headers

Still todo:  Make it render subheaders differently, e.g.,

Header
======

Subheader
---------
- updated database doctests
- wrote documnetation for database module
- fixed case on refernces to SQLAlchemy in documentation
- recreated stack diagram with inkscape
- renamed rulesets to rules
- started writing test.py unittests
- updated setup.py so that tests can be run without installing test.py
Tests to improve performance of data reading
FileJournal: use DSYNC for directio path

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Using *all* embedded versions for TheSpace items.
Fixes for v4 schedule end-point
Refactored Path creation into the "model" so other things can use it.
trivial server
Exposing todo on window (for now)
Changing the logic by which we determine the presence of child <c> nodes
add some informations to java interface
ff vim submodules
owner name
Merge branch 'develop' of https://github.com/ayau/amplifyme into develop
Two tests (one passing, one failing) to illustrate issue with null documents
Failing replication test
Allow bundles to explicitly state that they are doing work and that the database shouldn't be shut down
Merge branch 'master' of https://github.com/robinminto/ravendb
Merge branch 'ReplicationTest' of https://github.com/robinminto/ravendb
Fixing namespaces
Preventing an issue where an attachment / document can conflict with itself
Minor changes to tests
Return the etag of the newly created attachment
Move to an optimized version of the call
Fix an issue with empty attachments
Fix an issue where we would read the attachments out of the etag order
Fixing namespaces
Add debug headers
Move the take to the method signature
Minor
Now supporting more line this on indexes with / in them
Merge branch 'master' into 1.2

Conflicts:
	Bundles/Raven.Bundles.Replication/Responders/DocumentReplicationResponder.cs
Making sure to call put triggers as part of the bulk insert operation
Making sure that bulk inserting document in munin will increment doc count
Much smarter hilo capacity auto tuning
Update Commit

- allow another 3 baudrate settings (only using command line)...
updated for version 7.3.532
Problem:    Compiler warning from Clang.
Solution:   Use a different way to point inside a string. (Dominique Pelle)
Added tag v7-3-532 for changeset 9755d151c749
updated for version 7.3.533
Problem:    Memory leak when writing undo file.
Solution:   Free the ACL. (Dominique Pelle)
Added tag v7-3-533 for changeset 74d51b51f3e6
updated for version 7.3.534
Problem:    When using an InsertCharPre autocommand autoindent fails.
Solution:   Proper handling of v:char. (Alexey Radkov)
Added tag v7-3-534 for changeset 65f905eb14cd
updated for version 7.3.535
Problem:    Many #ifdefs for MB_MAXBYTES.
Solution:   Also define MB_MAXBYTES without the +multi_byte feature.  Fix
	    places where the buffer didn't include space for a NUL byte.
Added tag v7-3-535 for changeset f52d2ea0f81c
pravki33
header logo inlarge
adress1
Entities copied
Top bar icon size
Removed commas from log_message formats
simu tp3 doxygen
style de guide
modif in utils
Merge branch 'master' of ssh://github.com/bagage/travail
Can now user <Enter> to remove search highlighting
new testdata
visualisation script for comparing different series
Commituje coś tam
Add 'NoDefaultValue' to NSTableViewDelegate and NSOutlineViewDelegate.

This is not complete yet, I only did it for methods which don't have
any reasonable, simple default implementation.

Ideally, we should make this the default on all the optional delegate
callback methods.
Tinyxml build fix
Bump to 2.0.13 release
Show how different HTTP request methods can be used in a route pattern
Allow positional and named parameters as elements in the filter array itself
restructured project folders to make room for iOS sources
Update French translation
Updated Hungarian translation, WIP
fix wrong filename in .gitignore
[make] updated makefile
Support building a zfs-modules-dkms sub package

This commit adds support for building a zfs-modules-dkms sub package
built around Dynamic Kernel Module Support. This is to allow building
packages using the DKMS infrastructure which is intended to ease the
burden of kernel version changes, upgrades, etc.

By default zfs-modules-dkms-* sub package will be built as part of
the 'make rpm' target.  Alternately, you can build only the DKMS
module package using the 'make rpm-dkms' target.

Examples:

    # To build packaged binaries as well as a dkms packages
    $ ./configure && make rpm

    # To build only the packaged binary utilities and dkms packages
    $ ./configure && make rpm-utils rpm-dkms

Note: Only the RHEL 5/6, CHAOS 5, and Fedora distributions are
      supported for building the dkms sub package.

Signed-off-by: Prakash Surya <surya1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #535
Added .gitignore
build: install lib to a given PREFIX
User manual introduction

Adding instructions for getting started with simple example
cases
Get rid of non-incremental scalac.
new function: pyregexp-query-replace, provides functionality of query-replace-regexp
Removed custom fact, use parameter to define user home directory
Pre-compile the internal `forEach` method.
changing the pubsub_client publish() print to a logging
SHIVAReady message in Draw
reduce polymorphism annotations thanks to jackson 2.0
Changed uses_ranks parameter for continuous_estimator to decide which
estimator to use between continuous features
Allow to configure debian files

Add possibility to define init, default, preinst, prerm, postinst and
postrm files.
Start using bundle identifier
fixed mobs attack range. implemented a basic way to handle with shield skills. implemented inventory lime limit and warehouse lime limit to 2.100.000.000. fixed the npc shop when buying items.
fix paas error

https://github.com/goagent/goagent/commit/10671ff2cbe6a59d72bfe10fd40df7d6ca6205ca#commitcomment-2313185
got it working!!  HOORAY!!!
fixed: reset scroll offset when song changed
README: add hint to try "make help"
Merge pull request #4 from ploxiln/readme_make_help

README: add hint to try "make help"
Improvements to support BlackBerry 10 WebWorks

git-svn-id: https://nekonme.googlecode.com/svn/trunk@2105 1509560c-5e2a-0410-865c-31c25e1cfdef
remove bootstrap theme, tweak admin links in layout
Revisit README.
* Changed documentation wording.
Getting event content function with use of Facebook Batch API
Don't throw errors when raphael isn't loaded.(on browsers that don't have vml or svg support)
DF reset
@andreas_blixt => @blixt
push.default=simple isn't supported in 1.7.10 and earlier
proximity: Only Read RSSI if connected

RSSI values are read using a timer. The timer is controlled by Device
using Property Changed signal. The timer is stopped when "Connected"
property is "false" and restarted if "true" is received.
specifies files with array of strings rather than FileList
UI changes and populate script updated
included jargon
jargon graphs
Remove redundant alias for 'windowlist'
*5723* Removed dead variable
SAKIII-5998 set default permission on dropped content
Merge pull request #2451 from jsloane/SAKIII-5998-2

SAKIII-5998 set default permission on dropped content
SAKIII-6154 Page revisions timestamp broken in IE8
https://jira.sakaiproject.org/browse/SAKIII-6154
Organize the project frameworks
Flask skelleton
Added logger, some code clean, change task attribute 'help' to 'usage'