labofsahil/github-event-dataset-2012 huggingface dataset:
[FrameworkBundle] switch to parameter for base url to make it configurable for tests and cli as done for host and scheme in d30943c2e86713b32b12cd6e2e2801dac845aee9
[FrameworkBundle] move change note to changelog of FrameworkBundle instead of master UPGRADE-2.2
merged branch dbu/make-baseurl-configurable (PR #5983)

This PR was merged into the master branch.

Commits
-------

d0e5ef1 [FrameworkBundle] move change note to changelog of FrameworkBundle instead of master UPGRADE-2.2
e77ecc9 [FrameworkBundle] switch to parameter for base url to make it configurable for tests and cli as done for host and scheme in d30943c2e86713b32b12cd6e2e2801dac845aee9

Discussion
----------

[FrameworkBundle] switch to parameter for base url

This will make it configurable the same way we have it for host and scheme done for 2.1 in d30943c2e86713b32b12cd6e2e2801dac845aee9

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: (no new test breakage)
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: (none yet. if this is merged, i will happily PR against doc if somebody can point me to the right place)

---------------------------------------------------------------------------

by dbu at 2012-11-11T18:44:33Z

doc will go here once its merged: http://symfony.com/doc/current/cookbook/console/generating_urls.html

---------------------------------------------------------------------------

by dbu at 2012-11-11T20:12:41Z

ok, moved to the FrameworkBundle changelog

---------------------------------------------------------------------------

by Tobion at 2012-11-11T20:34:28Z

unfortunately is naming is so wrong in many places of the Request class and the routing.
`base_url` is just an example. It's not an "URL" at all. It's a path only.

---------------------------------------------------------------------------

by dbu at 2012-11-12T07:47:55Z

@Tobion i saw that, but i chose to be consistent with the method name of RequestContext even if it is a wrong name.
[Form] Extracted FormConfig class to simplify the Form's constructor
[Form] Made PropertyPath deterministic: "[prop]" always refers to indices (array or ArrayAccess), "prop" always refers to properties
[Form] Fixed property name in PropertyPathMapperTest
[Form] Adapted Form to create a deterministic property path by default
Revert "[Form] removed a constraint in PropertyPath as the path can definitely be an empty string for errors attached on the main form (when using a constraint defined with the 'validation_constraint' option)"

This reverts commit 5182a0c2c417f0e10ecec7d5c6c4f8edba362a5e.

PropertyPath instances should be empty. If you have an empty property path string, there is no need to create a PropertyPath instance for it.

Conflicts:

	tests/Symfony/Tests/Component/Form/PropertyPathTest.php
[Form] Tightened PropertyPath validation to reject any empty value (such as false)
[Form] Added tests for the case when "property_path" is null or false. Instead of setting "property_path" to false, you should set "mapped" to false instead.
[Validator] Fixed: @Valid does not recurse the traversal of collections anymore by default
[Form] Greatly improved the error mapping done in DelegatingValidationListener
[EventDispatcher] Added class UnmodifiableEventDispatcher
[Form] Fixed issues mentioned in the PR comments
[Form] Fixed index checks in PropertyPath classes
[Form] Updated UPGRADE and CHANGELOG
[Form] Made $name parameters optional in PropertyPathBuilder:replaceBy(Index|Property)
[Form] Added more information to UPGRADE and CHANGELOG
[Form] Renamed FormMapping to MappingRule and moved some logic there to make rules more extendable
[Form] Fixed: errors are not mapped to unsynchronized forms anymore
[Form] Added capability to process "." rules in "error_mapping"
[Form] Fixed: RepeatedType now maps all errors to the first field
[Form] Fixed: error mapping aborts if reaching an unsynchronized form
[Profiler] relying on config of displayed profile  instead of current config.
generating template names moved out from controller  to another class
properties protected
renamed template to TemplateManager , moved profiler to the deps of manager 
fixed CS
merged branch wodor/profiler_rely_on_profile_3372 (PR #3373)

Commits
-------

1472283 fixed CS
bc73487 renamed template to TemplateManager , moved profiler to the deps of manager
5fd6ed6 properties protected
abd0eb7 generating template names moved out from controller  to another class
6138e80 [Profiler] relying on config of displayed profile  instead of current config.

Discussion
----------

[2.2][Profiler] relying on config of displayed profile  instead of current config

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: code of ProfilerController is not covered by any test
Fixes the following tickets: #3372
Todo: ~

This fixes the exception which is raised when viewed profile has other  data collectors than in config of currently run profiler.
explained here
https://github.com/symfony/symfony/issues/3372

---------------------------------------------------------------------------

by fabpot at 2012-02-16T06:11:00Z

This should probably be done on the 2.0 branch. Also, I think we need to check if the panel is actually available in the current profiler (if not, we won't be able to display it anyway). So, both checks are important.

---------------------------------------------------------------------------

by wodor at 2012-02-18T10:15:40Z

defects mentioned by Stof are fixed
[WebProfilerBundle] tweaked previous merge
Made a correction to zzz.R.
bring virtualenvwrapper and the suiting zsh-plugin to work again
* 残りファイル
Reworking the Entity and Stage rendering APIs
Add stub for a class representing a list of factors
Revert "Add stub for a ground operations class"

This reverts commit 26d090def0621ea1822d129603f13836659428b5.

Conflicts:
	packages/CLPBN/horus/Makefile.in
Add a solveQueries method
Add a getLabel method that is not bound no any Var instance.

It only requires a variable id as argument.
Remove unnecessary methods in Var class
Cleanup the Var class
Trivial
Add tests for response status
Tests for response content
Refactor Bailador::Test a bit, implement response-content-is-deeply and add a failing test for it
fix to manage WHADA+ADMIN+HOGE by WHADA+ADMIN+HOGE holder
fix limited users not be able to login webadmin
Create dgfdf
lazors
javadocを追加
バックアップファイルを無視
バックアップファイルを無視
javadocを追加
Delete gem thin
Merge branch 'master' of github.com:taughtby/caddev
Removed getPageLabel from BasePage
freexl: Update to 1.0.0c
librasterlite: Update to 1.1c
Pow 0.4.0

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Python3: many cleanups and fixes

* fix suggested framework symlink location
* add "python3" executable for --framework builds.
* warn if ~/.pydistutils.cfg is found
* Tk warnings not necessary for Lion.
* Caveats: Fix naming of easy_install

Closes #9869.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Dart 8370

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
socat 1.7.2.1 and 2.0.0-b5

Note that socat 1.7.2.0 had a security vulnerability (see socat homepage).

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
sleuthkit: patch to build against recent versions of libewf

libewf > 20100226 introduced a significant API change that is not backwards
compatible. The included patch for sleuthkit was provided by the maintainer
of libewf. This patch is not needed to build HEAD in sleuthkit as the issue
was fixed in sleuthkit/sleuthkit@7dcf7863b449f6058952489b0367cf0c1fbd0964

Fixes #12628.
Closes #12660.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
freetds: add "--with-unixodbc"

Without this option, freetds will compile against other available ODBC, in
Mac OS X for example, it will compile against native OS X iodbc installation.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
libagg: Fix compilation errors

Remove AM_C_PROTOTYPES from configure.in, which was dropped in automake
1.12 as pre-ANSI C compilers are no longer worth caring about.

Add fails_with clang. AGG tries to return a const reference as a
non-const reference, which is allowed by gcc and llvm but not clang 3.1.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
pipemeter 1.1.3

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Remove ungif.

ungif is a duplicate of giflib.
Since giflib is the upstream project name, keep that one.
postgresql: fix PL/Python build

Fixes #11162
Closes #12134

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
LucidDB 0.9.4

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Point AWS environment variables at LinkedKeg

(rather than the version being installed)

This avoids having to change the variable when a different version is linked.
Also ensure the private key / cert variables point to only 1 file.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
leveldb 1.5.0

LevelDB is a fast key-value storage library written at Google that
provides an ordered mapping from string keys to string values.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
groovy: add --devel

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
openimageio 1.0.7

Upgrade oiio to version 1.0.7.  It passes `--with-tests`.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
bsdconv 7.4
daemonize 1.7.3
testing debian packaging
Use CtrlP instead of LustyExplorer where possible
Add doc image
Change readme description
Merge pull request #1 from teyou/private_dev

Private dev
compact_staging works, store_test too - compact_index has errors...
Added code comments
Some cleanup and fixes
Fixed bullet build/detection and set it to use CMake.
- some commented out lines that aren't needed anymore
- the win32 check for VlcPlugin
+ vlc building on Ubuntu with some of the implementation by evktalo
+ vlc build fixes on Windows
Ported Mumble build on Ubuntu from evktalo's fork. If I'm going to get all these build fixes in, I may as well nail as many as I can in one big pull in order to make merging easier on the RealXtend guys.
correct direction control
- Creating stable version 0.2.0 of androidstoragevault
Fix mistake in accessors docs
add article nav to the article-specific log page
move article navigation to a template
replace output_encoding with decode

"unicode" as output_encoding ends up sending <meta charset="unicode"/>
Set thrift_api, ttypes on KeyspaceConnection
Fix args manipulation in when translating ksdefs
assert module will now panic when assertions fail.
Rename assert.{equal,not_equal} to assert.{eq,neq}
Function declarations don't need brackets around params any more.
Example page layout and style tweaks.
Design updates to example page.
Remove margins from table and nth-omega layouts
Updated the changelog inside of the README file
Updated the version number of the application
Updated the layout for the main fragment
Added another change to the changelog in the README file
Added a new change to the README file
Dropped Android 3.1 - 3.2 support again
Updated the changelog of the README file again
Changed a label according to a suggestion of a Reddit user
Switched back to the Android 4.0 SDK
Switched positions of two labels
Disabled a label which will appear in the next major release
Updated the changelog in the README.md file
Updated the changelog inside of the app
Fixed a bug which caused that no notification icon was displayed

In some cases no notification icon was displayed because of missing
battery statistics. It took some time until a proper icon was displayed
in the notification bar.
Updated the readme file
Updated the ProGuard mappings for the latest version
updated text to try to make it clearer
Add design stuff
Allow a document or document fragment to be passed to all implementations of Sizzle.contains. Fixes jQuery bug #11539. Closes gh-100.
Upgraded getips to python 3
Failing tests for #455
Passing tests for #455
Bumping version number for #455
Merge branch 'hotfix/1.7.2'

* hotfix/1.7.2:
  Bumping version number for #455
  Passing tests for #455
  Failing tests for #455
Updating readme with changelogs
hebrew language
new translate with tests
new translate with tests
Merge pull request #472 from DevelopmentIL/master

New language - Hebrew
Add test case for get week number of the year
fix bug of get week number of a year
Merge pull request #495 from aleafs/develop

Fix bug to get week number of year.

It seems our ISO week number implementation was wrong. Check the wiki page
about it, and the talk section for more details on the current algorithm
http://en.wikipedia.org/wiki/ISO_week_date.
Fixed Bulgarian ordinal numbers
Merge pull request #487 from ichernev/feature/fix-bg-ordinals

Fixed Bulgarian ordinal numbers
Slovenian translation added.
Fixed code style to keep jshint happy
Merge pull request #500 from ichernev/feature/lang-sl

Feature/lang sl
merging master into develop
Merge branch 'master' into develop

* master:
  new translate with tests
  new translate with tests
  hebrew language
Merging in Hebrew lang from master
Fixed bug where backspace would navigate back when selecting control types on IE.
Ajout de méthode et mise en forme
Ajout de ligne vide en fin de fichier
Ajout du switch '-arch' seulement sur Darwin
Simmplification main
Fixed syntax error in admin.py z.51
vesion.1
Drobna zmena v kometarich.
	modified:   index.php
readme from laptop
Merge branch 'master' of https://github.com/tlein/RU-Mingle
some changes
Final changes to the project. a lot of styling
Final Commit!
Initial Commit
Move to an app folder
Merge branch 'master' of github.com:tlunter/Central
adding github issue link support - !issue #issue-id
prelim styles for season page
fixes #7
Merge branch 'stable/essex' of github.com:tmetsch/occi-os into stable/essex
reworked deployment docs
Removed hubot sending the message, it's too chatty since bang is about to put it out there again
initial commit
hue cycle\!
colorsweep hardcoded
fixed deps
0.0.2
docs
adding english dictionary
emacs: testing source code pro font for a while
UI polish
FormBuilder is a better place for this
jakies problemy z plikamy autom4te
Merge branch 'rozproszone_projekt_01' of github.com:torgiren/szkola into rozproszone_projekt_01
Merge remote branch 'origin/rozproszone_projekt_01' into rozproszone_projekt_01
probwa profilowania
dodatkowe zadania
updated v3.4.14-ths
Cleaning up program parameters
Better to use n instead of n_active_particles in future block-time-steps those are not equal
camera: show jpeg sizes
camera: show jpeg size on console

and adjust default quality to 75
camera: prevent the scan queue size going above 30
console: display HWSTATUS.Vcc
fixed typo
console: removed incorrect pitch
console: fixed format strings
fixed some visibilities
Don't try to catch ExceptionInfo on older versions of Clojure.

We had a dependency on 1.4 sneak in here.
Merge pull request #88 from technomancy/13-compat

Don't try to catch ExceptionInfo on older versions of Clojure.
Remove unwanted "raise" statement
Make all of the inlines sortable via drag/drop
Remove original inline -- its redundant
Adjust indention
Remove repetitive label
Change the way the initial Remove buttons are created
Add back missing space
Make sure the required fields from original are displayed

Apparently they aren't *all* redundant. ;-)
Hide the order field using CSS
Move this CSS into a CSS file
Change DB#mysql_root_cmd and privilege-related methods:
Do not supply a schema on command line for DB#mysql_root_cmd by
default.  Make its use optional, and only make the privilege-related
methods use it.  (They need it because filtered replication may be
in use, and we ordinarily want privilege modifications to replicate.)
ignore dumb stuff
This shouldn't be in here.
Fixed spec_helper require
Moving SSDP back to be part of this.
More SSDP moving back
I want this checked in for now.
new compiler: move, add notes, update tests
Ruoran: enable member feature while installation
fixing how we fetch job tracker url
Merge pull request #37 from billonahill/ambrose_36

fixing how we fetch job tracker url
[split] release 5.3.14 of finagle - New release for code in: https://reviewboard.twitter.biz/r/87153

RB_ID=88170
TBR=true
Update internal release version to 1.8.0-alpha20-rvp
Upgrade to querulous 2.7.4
org=com.twitter,name=gizzard,version=3.0.10
org=com.twitter,name=gizzard,version=3.0.11-SNAPSHOT
essai de perrine
Initial commit
commitment
Commit 2
Fixed DBHashMap issues
added permissions that spring need to run, moved servlet-api package to
build conf in ivy
moving the datatables-bootstrap into dt dir

when bundled together it need access to the images directly using
relative paths
财务有权审核/锁定案下收费
删除index.html

这些文件本来用作禁止客户端列出文件夹目录。现在因为apache直接绑定到了/web/下面，因此这些目录无法通过web请求到了，删除之
前端：移入移出任务墙

初步完成。移出时任务块不能即使消失。仍须改变调用逻辑
Add el-spec test cases
robots disallow
stuff deletions
Merge branch 'master' of github.com:ulearn/Aloe-Now
prepull commit
Merge branch 'master' of github.com:ulearn/Aloe-Now
added 2 ruby examples using the blastbeat gem
json syntax fixes
buildIndexes.js
Merge branch 'dev' of github.com:unhosted/ToS-DR into dev
now all correct JSON in points/ dir
add a cacheable url class and have the wdn driver extend that class.
add a cacheable url class and have the wdn driver extend that class.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/UNL/VisitorChat/CacheableURL.php
Merge pull request #131 from mfairchild365/develop

add a cacheable url class and have the wdn driver extend that class
fix URLs in CDN docs
Fixing/breaking some stuff.
OperatorTraits; some renames; pushOperator and pushVariable;
user breakpoints (necessary???)
variableValues property and lazy initialization accessor
remove unnecessary declaration from CalculatorBrain.h
add buttons and action to UI: variables and tests
add implementation for testPressed
adding variableDesc implementation
some breakpoints
move OperationTraits to new file operation.m and add _sel field
Operation is a class
descriptionOfProgram and popDescriptionOffStack working for numbers and operations
add precedence calculation for description
no need to have the Breakpoints list in git
adding multiple items in stack
a debugger folder
add variables
accurate pi and e
add Breakpoints to gitignore
20121009-alt1
gred/simple_viewer: correct initialization of on_drag var
Deleting some unuseful lines on the gtest CMakeList.txt
Object is more correct word
fix Object#type is deprecated; use Object#class
Added connection test for handle($data)
Failing test for Connecton::handle()

Reproduces varspool/Wrench#16
Make sure the loop handles a final complete payload

Fixes #16
Whitespace fixes
Allow using the generic exception
Removed dead code
Deleting print statement.
added user registration and password haching using passlib
Mux: Select the first pane when sending keys
add FavTabViewActivity
small bug fixes in some display variables
Added Tower.Support.String tests for inflection and made Tower.Support.String#pluralize and #singularize use Tower.modules.inflector
Merge pull request #118 from truenorthservice/swap-tower.support.string-to-use-inflector-module

Made Tower.Support.String#pluralize and #singularize use Tower.modules.inflector
move css to base_style.html
siivoilua, Hiekkalaatikon luonti
Curl (Sprites et CSS-Part1)
Modified server.fish
change SIGKILL to sig
Release 1.1.1
Move addon filters into their own subpackages

Addon filters moved into their own subpackages. This keeps things clean
and prevents a "split package" situation with OSGi deployments.
Make scalate-archetypes-itests versions match.
Upgrade to scala-maven-plugin 3.1.0 for incremental compilation.
Merge pull request #33 from vivosys/filter-subpackages

Move addon filters into their own subpackages
Don't depend on backout after fatal errors, it's a Scala bug.

MustacheParser breaks in Scala 2.10 after this fix:
https://github.com/scala/scala/commit/fa3c892017a95dfbb647b382e76f98a7952c6ff0

Because the error is now fatal, the mustache parser never backs out to
give the nested parser a chance to parse the end statement.  This
removes the fatal error from the grammar.
Append _2.9 tag to all artifact IDs to denote Scala binary compatibility.
Pickup some wikitext snapshot changes.
+ sync ...
+ fix merge ...
fixed import conflict
Support Emolett font.
Improve suggest name more carefully.
Removed test statements.
Merge branch 'develop'
Updated gnuplot/PKGBUILD: changed pkgrel

Signed-off-by: Vladimir Lomov <lomov.vl@gmail.com>
Add support for quick rename in CDT.  This matches the 'gR' command in
our JDT plugin.
Got everything to compile but nothing yet tested
Got the MetaGenotyper to work generating similar output as it used to
Restablished the -B option for bindings in MetaGenotyper
just tiny bit of cleaning up code
removed default Downsampling in FragmentWalker
firma2
adding proper cloning of node's Buffer class along with a unit test
fixed absolute dating on comments as well
Merge pull request #166 from robertleeshook/master

fixed absolute dating on comments as well
updated libchromeview scripts
update blaze2 scripts
Implementing web browser, settings class and Russian locale
Added beginning of JavaScript File-Project 1

Project 1 started
change data storage in sampler class
properly display installed patches
roles - fixed validation message - dot (.) is allowed in a role name (bnc#782513)
page header - fixed layout problem when there is small space (bnc#783892)
Partially do strace thing
make checker functionality done.
start doing dep visualization
visualization for makemaker functionality is done
Change 'common' to 'correct' in dep page
update screenshot
Merge branch 'master' of github.com:wenbinf/vizmake into strace
New dashboard chart colors
Fix apparent empty power level
Updated and cleaned up code! Added a couple tests
使用try/except机制
add graphivz-dot-mode
tweak search options
add keybinds for quickly editing/reloading .vimrc
add keybind for opening help in a vertical split
add keybinds for working with git repos (fugitive + vimdiff)
Add a menu option to verify a signed message

(Also move 'setAttribute(Qt::WA_DeleteOnClose)' out of QRCodeDialog)
Prevent tooltip filter from ever causing infinite loops
Only encode IPv4 addresses in IRC nicks
release-process.txt: Add a note to check the download link destinations.
Move help message out of AppInit2

- Solves #1278, attempts to address #1049
- Removes \t's from help message that are removed afterwards anyway
- Moves UI-specific command-line options help to UI code
- Moves "-detachdb" out of #ifdef USE_UPNP
update some strings used as warning messages in sendcoinsdialog.cpp
Merge pull request #1287 from sipa/noirc6

Only encode IPv4 addresses in IRC nicks
Merge pull request #1284 from laanwj/2012_05_helpmessage

Move help message out of AppInit2
Merge pull request #1288 from Diapolo/sendcoinsdialog_strings

update some strings used as warning messages in sendcoinsdialog.cpp
Merge pull request #1283 from laanwj/2012_05_prevent_tooltip_infiniteloop

Prevent tooltip filter from ever causing infinite loops
Really do not consider blocked networks local
Use getnameinfo() to get canonical IPv6 addresses
Merge pull request #1291 from sipa/canonames

Use getnameinfo() to get canonical IPv6 addresses
-onlynet instead of -blocknet
Allow binding to the any address, and report failure
Do not listen on blocked networks
RPC console: scroll to the end when user enters a command

- Ensures that the command and reply is visible
Merge pull request #1299 from sipa/ipv6fixes

A few more IPv6-related improvements
Merge pull request #1301 from laanwj/2012_05_rpcscrolltoend

RPC console: scroll to the end when user enters a command
Merge pull request #906 from sje397/ValidateMessage

Add a menu option and dialog to verify a signed message
removing 3 level nest to simplify app
added github-theme-updater
denied page changed
Turned off bouncing per task request.
Merge pull request #148 from kutecht/18683

Code Review for Job #18683
Fixing statistics.
Stripping BBCode tags without content
Checking if the comment would display as empty on sending comments
hdb后缀访问支持layout，json文件夹
merged
Merge branch 'master' of https://github.com/wujiang/prelude
Merge branch 'master' of https://github.com/wujiang/prelude
Merge branch 'master' of https://github.com/wujiang/prelude
Merge branch 'master' of https://github.com/wujiang/prelude
Merge branch 'master' of https://github.com/wujiang/prelude
Merge branch 'master' of https://github.com/wujiang/prelude
Merge branch 'master' of https://github.com/wujiang/prelude
Merge branch 'master' of https://github.com/wujiang/prelude
not ping
fix modals (undelete scripts that were accidentally deleted last merge)
Changed repo to wyldckat and branch to sandbox-1.4 for testing.
openSUSE 12.2 already uses 5.10 vs 5.8 on 12.1.
Respective updated for previous commit for openSUSE 12.1/2.
Apparently all 12.x use vtk 5.10.

Revert "openSUSE 12.2 already uses 5.10 vs 5.8 on 12.1."

This reverts commit 728bb8be0aea8d1dfcfd06cd816fc3953e258610.
Apparently all 12.x use vtk 5.10.

Revert "Respective updated for previous commit for openSUSE 12.1/2."

This reverts commit 18f28b6f6e912d6f619553b89d9feafdae9e1418.
Upped to vtk 5.10 for openSUSE 12.x.
openSUSE 11.4 now also uses vtk 5.10.
Forgot to add Fedora's 16 and 17 to the output message.
Tweaked Fedora 17.
Updated debian packaging based on developments made on sandbox-1.3.
Tested Fedora 16 and concluded the need for these changes.
Added 'patch' to the dependency lists, just in case...
Fixed missing dependencies for Fedora.
Tweaks made for Debian packaging.
Tweaks made for Debian packaging.
Preparations for Ubuntu 12.10.
Added missing reference to Ubuntu 12.10.
Merge branch 'windows-1.4' into sandbox-1.4

Conflicts:
	build.bash
	debian/README.Debian
	debian/changelog
	debian/engrid.desktop
	debian/readme
correct edges after every reduced iteration
fixed precision problem
Bug 767315 - addressing comments, part 3:
- aModule
Bug 767315 - addressing comments, part 3:
- aModule.__status__
Rebuilding doc
DoubleLaunchLocker
plans
Merge branch 'master' of github.com:xbadcode/Rubezh
renamed dowloader to downloader
CA-96211: Fix return value of system.isAlive.

This was causing pooling not to work, as all connections failed
the 'is_reusable' test in xen-api-libs/http_svr/xmlrpc_client.ml (!)

Resolves: CA-96211
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Merge pull request #956 from jonludlam/CA-96211

CA-96211: Fix return value of system.isAlive.
CA-68648: Copy operation should not be allowed for HA VDIs

Signed-off-by: Rabin Karki <rabin.karki@citrix.com>
Merge commit '7ae78e4f4d42418f4296be2d2e4dfaddd9592028'
What is Cloud?
Merge pull request #287 from ohhun-Kwon/master

과제 제출입니다.
#1072 Recent Topics Category Filter does not work
#1082 #1073 Notice: Undefined property:
Com_KunenaInstallerScript::$_akeeba_extension
Merge remote-tracking branch 'upstream/master' into bugs7
#1084 Php 5.4 : some issues with comprofiler plugin
#1088 RSS Filter: In- or exclude categories does not work. 
When the params.ini file isn't here, show correct message
In search results, add link to profile on username
#1056 Use non-minified versions of JavaScript and CSS if minified files
do not exist
#867 Joomla 2.5.5 adds its own options for username & password change
#526 Add Confirmation Box to Restore Default Settings
#526 Add Confirmation Box to Restore Default Settings
Merge pull request #1101 from xillibit/bugs11

#1056 Use non-minified versions of JavaScript and CSS if minified files
Merge pull request #1100 from xillibit/bugs10

In search results, add link to profile on username
Set version to 2.0.3-DEV 
Added Kunena Plugin for Smart Search Integration

This Kunena plugin acts as an adapter for the Smart Search Plugin that
handles Kunena content. All it does is triggering the corresponding
Smart Search events before/after a Kunena database object is being saved
or deleted.
Improved Smart Search Plugin for Kunena

+ Now using table class to identify db object, since $context variable
is not consistently set, when category tables are handled

+ Added Access level support, if the corresponding category of a forum
message uses the joomla access level system (and not the joomla.group)
to allow access

+ Only works together with the Kunena Smart Search plugin, which
triggers the Finder events.
#1099 kunena.special.js.php generates Javascript warning errors
Merge remote-tracking branch 'upstream/master' into bugs7
#1082 #1073 Notice: Undefined property: $_akeeba_extension
Merge pull request #1104 from xillibit/bugs10

Set version to 2.0.3-DEV
skuska z Idei
Fix: Attribution
Windows 8 で共通設定のフォントタブが表示されない問題を修正 (#363)

Windows 8 でダイアログのデフォルトのフォントが "MS UI Gothic" (12 文字) から
"Meiryo UI" (9 文字) に変更された。

DLGTEMPLATE ではフォント名のあとの要素は WORD 境界に配置しなければならないが、
12 文字から 9 文字に変わったため WORD 境界からずれてしまっていた。

Reported-by: @yasuoohno

参考:

  * http://msdn.microsoft.com/en-us/library/windows/desktop/ms645394.aspx

    > Remarks
    >
    > The menu, class, title, and font arrays must be aligned on WORD boundaries.

  * http://xyzzy.codeplex.com/SourceControl/changeset/f8e69d864693
Merge branch 'fix/#363-windows8-font-dialog' into develop
テキストのサイズがダイアログをはみ出ていたのを修正. #154
Merge branch 'fix/create-shortcut-dialog' into develop. #154
人生、宇宙、すべての答え = 42. #180
Merge branch 'feature/calc-answer-to-life-the-universe-and-everything' into develop. #180
Add nave endwise
Remove UserDecorator
[wip] Just put delay in ActivityCreator already!
CHANGED:added topic name validate handler;
CHANGED:will flag and value with static block initialization;
#33: count bytes sent through
#33: more tests
#33: gracefully shutdown
#33: MainTest, ignored for now
#33: log deps mandatory
iconic spacing
jqueryTabs working
namespace and variable model
variable and namespace view
Fix deferred.resolve translation error.
Added new field in AppData
Vychytavanie chyb v editore
Travis uses HTTPS. [ci skip]
Checking in instable stuff.
Merge branch 'master' of https://github.com/yoddlr/fiskregn
Group is now tagger + data load task creating 10 groups.
Merge branch 'release/0.4.0' into dev
fix doc
* ui > static/timeside
* upgrade SM2
* upgrade js scripts from telemeta
re-add png diagram
update news, go to 0.4.1
Merge branch 'release/0.4.1'
Initialize randk() and startup
Make the SDL sounddriver selectable via s_sdldriver

This is necessary since the default "waveout" driver on windows is
incompatible to Quake II (due to too big output buffers) and "dsound"
can't be forced since it's not available on some installations. The
default driver is choosen by platform:

Windows -> dsound
FreeBSD -> dsp
Linux   -> alsa
Port OpenAL to Windows and enable it by default
Reenable retexturing
Remove support for the Windows clipboard

This was just broken and rewriting it is not worth the efford
Remove Sys_AppActivate()

This code is unnecessary because SDL handles all activation events,
brings the Window into foreground, etc.
Add platform defines for Windows
Work around the missing _controlfp prototypes in MinGW
Clean up the Makefile
Add header guards to new headers
Replace atoi() with strtol() in Windows code
Remove Alt-Tab handling. It's done by SDL
Remove leftovers from the softrenderer
No console window for the client
Add a comment for WITH_SYSTEMWIDE under Windows
Write config data in AppData

Under Windows all config data is written to %USERPROFILE%\AppData\
Local\YamagiQ2. To archive this code was added that translates Windows
pathes with backslashes into Unix pathes with normal slashes.
Remove TODO
added group.label argument to control group order and group selection
documentation for group.label argument + checks
loading external/additional config
git ignoring all *.vimrc files
Merge pull request #15 from mlitwiniuk/master

loading config before anything else and after vimrc
used lock
test array in linux
We now depend on an exact version of sec-wall (1.1)
Added a diagram describing relationships between server threads and components.
Squeezed the diagram elements a bit.
Added a dependency on sec-wall >= 1.1
Merge branch 'master' of github.com:dsuch/zato
Renamed domain to realm to keep it consistent with sec-wall.
Made WS-Security definitions' names consistent with that of sec-wall.
We don't need the auth info.
Don't require tokens.
Updated SOAP security so it matches what sec-wall expects.
Removed files no longer needed.
Moved application context to another module and did away with stuff left over after the move.
Cleaned up imports in zato-admin.
Cleaned up imports in zato-agent.
Cleaned up imports in zato-broker.
Removing xsddef (won't be used for now).
Cleaned up imports in zato-common.
Cleaned up imports in zato-cli.
We won't be preparing DEBs ourselves for now.
Removing old tests.
fix issues in markdown syntax
Testing changes to portal plugin
#3 Доработка функции оформить заказ
Add Locator "gl"

This is bundle for gl mapping in the vim, which show the location of current
file when the command is issued. I combined the pythonhelper and the locator
plugins from vim.org. locator is not perfect yet, especially for the C files.
I will need to work on this a little bit more
Mein Vorschlag
~some fix
+ parsing bad profiles test
+ Exceptions
added main.cpp containing example
Raise z-index on collection-list
Sort the printable list on name_surname by default. Sort argument from the query string is also supported.
Leave small image small. Added 'upscale' to bigger mediaclasses
OpenOffice class init
Fixed a bug with the about page
ebuild -WIP
script - WIP
parser - WIP
01_prepare_fast_storage - WIP
02_generate_new_profiles - WIP
03_patch_profiles_list - WIP
04_patch_package - WIP
07_create_db -WIP
08_fill_db - WIP
01_architectures - WIP
02_platforms - WIP
03_arches - WIP
04_keywords - WIP
05_profile_statuses - WIP
06_profiles - WIP
07_system_settings - WIP
08_sources - WIP
09_eapis - WIP
10_mask_states - WIP
16_categories - WIP
Updated gitignore.
Ignore unneeded project files.
Ignore compiled binaries.
Updated readme.
Initial source files.
Code blocks project file.
Implementation of a simple filter added

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
fix for header winkstart.request obj
WINKSTART-716: fixed a typo
WINKSTART-837: Remove Add btn and change text
WINKSTART-837: Correct info"s"
WINKSTART-837: Remove connectivity
WINKSTART-837: Fix Show advanced
WINKSTART-837: UI Fixes
WINKSTART-798-799: Update of front page with bootstrap
CropSelector实现activate和deactivate方法
add virtual_system description
Tag handling rework, AJAX-based article loading added
publish hello
generated
修改了项目链接地址（googlecode -> github）
.
build 35

also rename ro.goo.rom to aokp for easier
   updating of gapps rules on their site

Change-Id: I6855e0ea74c05f7f23d0d791570f302fd164e3e2
Merge "build 35" into ics
Remove lolcopy overlays, merge manta/grouper arrays into common_tablet

Change-Id: Ia43adff9acdbcf07490c31f2fed51370169adb21
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Merge "Remove lolcopy overlays, merge manta/grouper arrays into common_tablet" into jb-mr1
Modify .bashrc:
Set default editor to vim
New stemcell builder

Change-Id: Idbd75b3146f7767dde81d8e03f7332bb537f49f8
Merge remote-tracking branch 'origin/stemcell-builder'

Change-Id: Ia633fa6f23bca5d0c43dde8eee4745148e59a48e
Adding the ability to base IP calculation in templates on the static IP range given instead of the 'range', to make environments easier to create/maintain for SREs.

Change-Id: Ibc15f4f40c657562da18281c3c5ccff855dcfa73
Merge "Adding the ability to base IP calculation in templates on the static IP range given instead of the 'range', to make environments easier to create/maintain for SREs."
finished basic self tests...
All2one
Minor bug fix in the model code
+ init bureau
print posted data.
implement 31
Gzip fonts too.
Sexy resist indicators.
Use io.BufferedIOBase.read() instead of io.BytesIO.getvalue().

(Newer) WebOb returns different different objects in Request._body_file__get,
i.e. a io.BytesIO if either the HTTP method is PUT or POST or a
Content-Length header is set. Otherwise it returns a io.BufferedReader.

    https://github.com/Pylons/webob/blob/master/webob/request.py#L264 vs
    https://github.com/Pylons/webob/blob/master/webob/request.py#L278

Unfortunately, both Objects have different sets of methods, i.e. only
io.Bytes has getvalue(). However, both objects inherit from
io.BufferedIOBase, thus read() is available on both.

Change-Id: I4a99fef0e6acbf67d9e86ff884f48f5a1cb1bc78
Added "callback_env" parameter.
Merge branches 'dev' and 'dev' of https://github.com/BaiduFE/Tangram2 into dev
修改array测试用例
element、form、async包。老接口全部搬迁完毕。
element、form、async包。老接口全部搬迁完毕。
Merge pull request #61 from wangxiao/dev

element、form、async包。老接口全部搬迁完毕。
splashes deleted expect BB
Forgot to add python test file
Now compiles for all targets. Testing begins here.
add general double initialization error
handle error checking of Map Initilization in the vm
fix some bugs with StopIteration and implement Set using Map
remove the debug stuff from the index
build
update the runtime to make it more friendly to the low level api
fix undefined being treated like a symbol
don't reference properties directly
add createExotic
update ircbot extras
error for missing fundamental handler
fix getProperty in the debug api
fix nodes accidentally being saved for names
build
fix Array iterator
fix literals as object keys
accidental free var
fix index previews
build
Sistema rodando no servidor.

Modificações para acesso, remoção do objeto CONEXAO no config.php (erro de caminho), ajuste para mandar a atualização do ato por e-mail, mudança na classe de EMAIL para usar o email da empresa, ajuste de acentos, TOOLTIP, mensagem de erros, correção de CSS dos input de e-mail nos cadastrors....
Sistema rodando no servidor.

Modificações para acesso, remoção do objeto CONEXAO no config.php (erro de caminho), ajuste para mandar a atualização do ato por e-mail, mudança na classe de EMAIL para usar o email da empresa, ajuste de acentos, TOOLTIP, mensagem de erros, correção de CSS dos input de e-mail nos cadastrors....
Sistema rodando no servidor.

Modificações para acesso, remoção do objeto CONEXAO no config.php (erro de caminho), ajuste para mandar a atualização do ato por e-mail, mudança na classe de EMAIL para usar o email da empresa, ajuste de acentos, TOOLTIP, mensagem de erros, correção de CSS dos input de e-mail nos cadastrors....
Updated hungarian language - thx frodo19
added second iconpanel
... and the rest
home bg fixes + settings improvement
prepared banner layout + code improvements
reworked color selection dialog, renamed diffuse_bar
Merge remote-tracking branch 'origin/3.0.0-pre' into 3.0.0-pre
animation fix for alt rss panel
Added a FirePhp log writer.
Made it possible to enable or disable the FirePhp log writer.
DEBUG priority sends trace information now
Updated the styles of the messages according to how it was in ZF1
fix Fieldset issue
Add strictMode for AbstractOptions
Simplify strictMode to just a property

@weierophinney made a strong point that the extending classes will
probably just set this property themselves, thus it probably doesn't
need to be able to be set from a public scope.
Controller plugin that will help with PRG (see wikipedia link below)

http://en.wikipedia.org/wiki/Post/Redirect/Get
Updated the file and class docblocks in order for them to match the current style.
unit tests for prg plugin
docblocks for prg plugin
docs for prg plugin
Removed the static calls to the FirePhp class.
Removed an unused use statement.
renaming to Config, CS fixes
Remove documentation and composer entry for InfoCard and Wildfire
fixed DbTable gc
refactored manager interface
remove magic
fixed tests
Began object loader code
Renamed everything to 'wander'
Added mouse and keyboard handling code
Moved main HTML file up a directory
Fixed some issues caused by moving main HTML file
3/14 progress, popup panel display, proper panel hiding, search implemented, and more
add MANIFEST and modified metadata
Merge branch 'master' of https://github.com/CJBrew/calculate

Conflicts:
	.project
	.pydevproject
Added stuff for Calculate 2
add executive summary beta
Continuando o projeto
adicionei planeta4
check if _gat exists before including ga.js

This is supposed to allow users to use dc.js with gas. 
They should include the dc.js file synchronously before the _gas code 
snippet.
Adapted UI Tests to new editor functionality, fixed some issues
Added new Bubble graphics and adapted Bubble code
* Tutors have different colored bubbles
* if Tutor is to low in its Y-Coord it switches to low_bubble
Use constant in ProjectHandler to force synchronous saving when under test.
add homescreen and game laucher of first version.
Delete check_isp from do-vh and move to isp.pm
[Fixes #29108699] First commit
Forgot to remove the old primes.h with that last one!
Finished the stripdown of primes.h
Correction javascipt et admin_data
Projekt TULák

Kód a atmel soubor, 10.11.12
Use Lucas's silent ForceKick instead of EnforceBan
Add Admin to REST ban list
Fix arguments property delete
filling out PlayerProfile a bit
Itmages service must have python-gobject v.2.
LeechCraft 0.5.80-181-ge1aa8af.
add user register page
Debug salvage,loot containers
Ship in ApolloApp now can shoot lasers.

Improved error handling for missing textures and texture definitions

Signed-off-by: Dan Albert <dan@gingerhq.net>
removed an unnecessary link
Fixed second run.
0.0.2-0 commit - auth complete & password hashed
added pretty styling for landing page
Add some tests, fix some bugs to the haproxy checks
Changed icon for no action
Added gucharmap & removed acpi-support.
Added "home" link to header
Changed style of header to remove textDec on linkback
Modifications mineures Widget barreMenuFicheClient
Merge pull request #15 from DangeRoots/master

UI Ecran Client
Removed the AuthenticationService project we are going to be a module based solution instead
Merge branch 'master' of https://github.com/Donelle/Sandalio
merge
Get i delete d'usuaris
Basic UI development
condensed the code to use the new operator in the module rather than externally
setting database
changed core.php
Increased version number to 2.0.70
Added solution sorting by sequence size
Added a progressbar for brute-forceing
Replace ÷ with + as a result of pressing altgr. Oops.
speaker patch
+Updated the CLI map
+Refactored the command handlers; page-based list commands now respect a single variable for results-per-page
'\r\n' in single quotes not parsing and send to http server as is. Changed to double-quotes.
Merge pull request #9 from xak2000/patch-2

'\r\n' in single quotes not parsing and send to http server as is.
Merge branch 'next'
Signed-off-by: FRAS1 <459949820@qq.com>
When you restart in the same world, the time of day should reset also
It seems the INSERT function is working...
VDPAU: fix comple error, ugly ...
threads: fix linux thread prio in case user has no entry in limits.conf
Merged gauge repositroy into celia
Fixed goal graphics being too big
Grr upload
Wow, I'm retarded, this is how the registers are being created. Derp.
More formatting things.
Move this over-written function near it's original, and comment out the original.
The InvalidInstruction class wasn't imported, so we prefix the envi module to it so it work alright.
Change __repr__() for vstruct.VStruct class again, spaces are evil in __repr__'s.
Merge branch 'master' of https://github.com/Fitblip/vdb-fork
Fix magic_quotes crap
exclude unnecessary files
exclude unnecessary files
Added secondary widgets
Small report fix.
Thesis
* fix on conclusion
BoundGUI
* jsdoc for UI/main
basic edits
2.1 rewrite and added URL service
fixed ServiceInfo
Merged changes.
Merge branch 'master' of github.com:Gjallar/dotfiles
added application for E_l in chimie q2
In loi de trouton, chimie q2: details added + kJ -> J
small links update
inscriptions: enhanced text-fields
inscriptions: added housing information
inscriptions: added 'atelier' notes
inscriptions: added food information
removed emacs backup files
added stage action into gestion controller - main page: replaced logout button by a logout link
added scope and default_scope to models - renamed gestion/stage into gestion/managed_stage
layout: added title and subtitle sections
layout: added notice and allert notification styles
removed useless comments
'show inscription' page reworked
transmission: fix web ui not accessible with default settings
transmission: bump addon version
vdr-iptv: re-add -skip_header_processing.patch
Merge pull request #699 from stefansaraev/vdr-iptv

vdr-iptv: re-add -skip_header_processing.patch
Merge pull request #692 from stefansaraev/xkb

xbmc-addon-settings: another keymap fix
new package: add package 'prelink-cross'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
scripts/image: prelink bins and libs

Signed-off-by: Stephan Raue <stephan@openelec.tv>
transmission: update to transmission-2.52
Merge pull request #707 from queeup/updates

transmission: update to transmission-2.52
prelink: correct install location
vdr-plugin-streamdev: update to vdr-plugin-streamdev-6a47e20
vdr-sc: update to vdr-sc-613
vdr-addon: bump version
Merge pull request #708 from stefansaraev/prelink

prelink: correct install location
Merge pull request #710 from stefansaraev/vdr

vdr update
xbmc-rpi: add patch to hide unneeded sysinfo output, this fixes #711

Signed-off-by: Stephan Raue <stephan@openelec.tv>
projects/*/options: make prelink support optional

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
create_virtualimage: use the first unused loop device
samba: build as static library, disable debug support, build without sqlite support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
libmicrohttpd: build as static library

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Added negative permission handling
Added links for neo4j, node.js and bootstrap.
Updated the example from dblp.xml to README.md
throw InvalidStateException instead of UnexpectedValue
Sync changes with incrdumpswget.py and adding more globals
лабораторная работа 4
Minor changes to the demo site
Move migration notes into the Breeze.MvcSpaTemplate folder
Moved Docs ahead of Samples in header and footer nav.
Bump version in anticipation for milestone
Added the skeleton of an algorithm.
Added cli shell script

So distutils are not needed if the user wants to call the script
directly
Improved functions with Whiskers & implemented ban command for later on
pull generateTraitMethods() out of generatePrimaryConstructor(), don't inappropriately reuse ExpressionCodegen
don't generate redundant checkcast
remove unnecessary PsiElement check (which doesn't work correctly in case of a multi-module project and separate compilation), use ClassDescriptor instead
Add information about unsupported class for label descriptor
Suppress all warnings for generated test classes
Centralize and cache creating import directives
Store alias name with import path
Remove unused method createPrimartyConstructor()
Debug names for chained scopes in lazy resolve
Create scope with lazy import resolve
Using ImportPath instead of psi for getting imported name
Add test for checking ambiguity for root package and the same package
Tests added for checking two-phase (classes and functions) import resolution
KT-3165 Weird stack overflow in IDE (test added)
BytecodeCompiler - compiler invocation wrapped with try/catch.
Updated _posts/index.md
Add all UIActionSheetDelegate method
Duz
Refactored for composition (baseclass is CCNode instead of CCSprite)
TODO list voor de nabije toekomst.
Correct typing error in llvmstructure.rst
trying to get issue-30 testing...
Switched all dependencies to nuget ones.
renamed the classes to be more generic.  Will be used for all kinds of intrumentation.
Config updates from nuget dependencies.
HTML5 section semantics