labofsahil/github-event-dataset-2012 huggingface dataset:
Simpler dependency resolution using Bower API only.
Add more trackers
Refactor name
Fixing IDEA files
improved task attribute setting
Adding shape minstrel for human class
added gitignore
removed cache
removed logs
cleanup
vendors
lots of changes
Adding UAARG airframe configuration file.
adding new dict diff functions
Update emacs config.
use the new version of ruby instead of old one that shipped with OS.
ruby class macros
Merge branch 'master' into class_definition

Conflicts:
	emacs_config/.emacs
study ruby Metaprogramming: Friday--code that writes code.
Quiz: Checked Attributes(Step 4)
Write a module adding attr_checked() to selected classes through a hook.  (Step 5)
study metaprogramming with rails, gonna drop this for a while.
Merge branch 'designofactiverecord'
Merge branch 'master' of github.com:ugoa/ugoaServer
a big collection of emacs config files
Refactored get_jobs_to_queue() to a more generic get_jobs() method that can return all scheduled jobs (optionally with scheduled times)
Tests for get_jobs()
Add docs (readme section) for get_jobs()
Merge pull request #8 from ulope/get_jobs_method

Method to get all scheduled jobs
Small fix
add jz.utils.bytesToString
Merge branch 'master' of github.com:ukyo/jsziptools
added support for ipv6 and multiple bind options
Upgrade to allow private and protected fields.
Do not allow access to the user->status field (make it protected)

Update login functions to set the status properly.
Merge pull request #281 from mfairchild365/develop

Do not allow access to the user->status field
Add actions. Add repeated movements
Added myself to the members, and some tabbing/comments cleanup.

Signed-off-by: Andrei Z <b1naryth1ef@gmail.com>
remove patch level
setup instructions
move footnote
copywriting
copywriting
done list of illustration
footnote style
Almost finished IO metrics

Signed-off-by: Vincent Bernardoff <vincent.bernardoff@ocamlpro.com>
Migrating to git
Added MIMO ML Detection
removed redundant data from BoardPiece
Update submodules
Merge branch 'master' of github.com:carlhuda/janus

* 'master' of github.com:carlhuda/janus:
  Uses https for installer script.
  Add missing git dependency in prerequisites.
Script to build a bootswatch
Add spruce bootswatch to start with
forked Settings app

Change-Id: Iac0dbd929a0212c862e182f81cc6dcc3133fd781
Curl (nettoyageVues&SEO)
added npm and PRO
Support `npm test` command
Merge pull request #85 from ForbesLindesay/npm-test

Support `npm test` command
corrected some errors in a couple 'yield' sections in the examples
quick example of using nib via Stylus CLI, w/out Express
Merge pull request #79 from jedwood/gh-pages

Documentation index page
Issue #20
#14
Not needed at this time
new tests
new model structure (name&message object)
panel outsourced
addcomponent listener for autoresize
actionmethods
componentLister
fixed quitmethod
new layoutmanager
relativelayoutmanager jar
rmv bed smell
new layoutmngr
Layoutmanager implemented
finalize method to close socket for multicast
Issues
#2
#6
#12
#14
#20
v0.1.1beta
opensocket method cutted from constructor
implement sending an id in the slcp protocol
deleted quitbutton from layout
Merge commit '687623ea7803468cee5485a9ad8ac0cf57ad882f'
Add mores test Fx convert
Fix cyclic deps for cairo.  More patches, fixes.
tab to space converted
tabs to space converted
interval in for example in identity column(for Nursultan)
Update scrapeutils.py

Add Nami the Tidecaller
versiunia lui al
menu14
fixed issue where friend request doesnt show requesters name
del one doc
1164 castle
Init themes.
update pfs for java; bug 820729
Disable registration page when BrowserID is in use. (bug 771593)
add new puzzle icons (bug 717011)
Revert "use 32x32 favicon for AMO"

This reverts commit f5f9ac0240b3f6b907236db119df79a763b72d4a.
desktop footer tweaks (bug 811345)
Bug 543047: Prevent editors from deleting reviews for their own add-ons:

 • Prevents senior editors from deleting reviews on their own add-ons
 • Prevents all editors from deleting their own reviews from the editor tools
 • Displays flagged reviews for editors' own add-ons as disabled in the queues.
delete_preview_files needs preview id, not addon id
style post-validation error(s) (bug 813748)
Added developer info to mini-manifest (bug 821174)
Fixed reviewers mini-manifest and install (bug 821473)
depend on minimal gelato.models
Correct reference to Fire
Change heading of 1.3 and arrange into requirements and problems to be analyzed
Correct superfluous commas in reference list and correct alphabetical order
[maven-release-plugin] prepare release emberjs-1.0.pre
network - build (testsuite) fixes

- 0.3.2
Logs stack traces.
Refactoring of library

 * Switch to using "static factories" for list creation
 * Changed so that nil() returns a static nil object for consistancy
 * Added support for generating a list from an array
Error Handler Ready
WIP: Capistrano working; remove spree_product_sort
Done some more work on math lib and base object.
Added new directories for structuring downloads.
Adding new directories and updating index pages.
Update tasks and spec support for new versions of RSpec + Mocha
add some logic about authentication
add view for main page
start resque-web rack app in /resque
add resque_web nginx reverse proxy configs
only generate resque-admin-nginx.config file is passenger-nginx role is present
create apache resque_web proxy config that matches nginx version
Merge branch 'master' into resque_web_fixes
don't need resque_web specific nginx conf file
nginx and passenger_nginx templates get same web_tools index page as the apache one.
no longer need to start resque_web in /resque sub dir.
implemented web_tools proxies with same strategy as apache template.
no need for resque_web specific web tools config in apache either
Merge pull request #176 from messick/resque_web_fixes

Allow Resque-web admin app to work correctly on instances with web_tools role.
profile info shown
pheew
pheww2
Added svm
Merge branch 'master' of github.com:xamvz/deep_vlom
Small css fix
Rewrite _parser_prepare_field_text_with_summary()
-+write.png
balloon tooltip progress
Fix for black screen when exiting XBMC
pvr: hide video overlay if title is empty
Add more package guesses
disable default vertical vimux setting
修改swf资源地址
remove mobile check (always in mobile mode).fix dict key name error.
add hot keys frontpage
Merge pull request #19 from fanzeyi/master

Add Hot Keys to Index
Merge pull request #94 from xiecong/butterfly

text overlap, line length changed,add internship information
annotation chinamap added
column bug fix
chinamap annotation refreshed
Merge pull request #97 from jdk137/butterfly

Butterfly column interaction bug fix
Merge pull request #100 from TBEDP/butterfly

合并butterfly
Add build scripts
vim: php-snippet and relativenumbers.
Fix issue with duplicate username protection
_with_win_time sends winning time signal; still buggy
si:binhex-decode を呼び出しでクラッシュするのを修正. #45

xdecode_stream のコンストラクタが呼ばれていなかったので、
明示的にキャストするように修正。
si:binhex-decode のテストを追加. #45
Merge branch 'fix/#45-binhex-decode' into develop
setup post.html and page.html

post模板和page模板初次建立
added counts for users and repos to front page #gklst
very small doc changes
Service terminado!
encoding related error fixed
fix deps, go to 0.3.3
Merge branch 'master' into dev
Full update of README, make ts-waveforms script
Added link msg parsing/formatting, buffered writing, handshake handling

Totally untested.
Initialize variables (they may be used uninitialzed further down below)
Prevent a buffer overflow.
utility functions to deal with mplus/prelis output
BUGFIX - Issue #252 - fuzzy match on lvs name returns a false match preventing LV creation
Some changes for testing
Merge branch 'master' of git://github.com/cobbler/cobbler
add create qcow/qcow2 image file.
add qcow2 driver type
Merge pull request #274 from yudoufu/feature-add-qcow2-type

add qcow2 driver type
Merge branch 'master' of git://github.com/cobbler/cobbler
BUGFIX - Issue #287 - patch to allow templar to work without a config, which was breaking the tftpd.py script
Merge branch 'master' into issue_252
BUGFIX - Issue #252 - fuzzy match on lvs name returns a false match preventing LV creation
Merge pull request #292 from jimi1283/issue_252

BUGFIX - Issue #252 - fuzzy match on lvs name returns a false match preventing LV creation
BUGFIX - Issue #272 - allow anamon to log entries when building systems based on profiles (no corresponding system record)
Merge pull request #293 from jimi1283/issue_272

BUGFIX - Issue #272 - allow anamon to log entries when building systems based on profiles (no corresponding system record)
BUGFIX - Issue #241 - adding distro with blank name via XMLRPC should not work
Merge pull request #294 from jimi1283/issue_241

BUGFIX - Issue #241 - adding distro with blank name via XMLRPC should not work
BUGFIX - Issue #285 - update cobbler man page for incorrect options
Merge pull request #295 from jimi1283/issue_285

BUGFIX - Issue #285 - update cobbler man page for incorrect options
BUGFIX - Issue #278 - cobbler import fails for ubuntu images due to rsync args

Removing -L option from RSYNC_CMD in api.py so that links are not followed and are copied as-is
Merge pull request #296 from jimi1283/issue_278

BUGFIX - Issue #278 - cobbler import fails for ubuntu images due to rsync args
FEATURE - adding 'zonetype' variable for DNS zone rendering

This will allow conditional testing during the rendering of zone files so
different options can be added based on the zone type.
Linha em branco adicionada ao fim do README
-- after adding site side for taskman
replace the readme.md with a html
Merge branch 'master' of github.com:ywjheart/Nsis64

Conflicts:
	README.md
New welcome index
1.9.9-2
1.9.9-2
No one wants to go to the website anyway
Remove protocol
(Maint) Simplify CONTRIBUTING.md

The previous CONTRIBUTING.md was verbose and prone to change as branches
changed. After discussion on puppet-dev I've cut it down a lot and changed the
policy for which branch to target to be a "prefer master" policy where it is up
to the merger to make sure it will go on the right branch.
oe
mmm
datele _output in class ZLog
explcit use xparse
chagned version number to alpha 5.9
doc: a few more tags.
Now uses history.replaceState - if present.
doc: Another big batch of filter docs
doc: button scomp
AUI-621 Calendar Localization Issues
AUI-621 Regenerate
AUI-621 - Source formatting
AUI-621 - Build files
AUI-678 - Add toInt and toFloat methods to A.Lang
AUI-678 - Build files
AUI-678 - Updating modules
AUI-678 - Module build files
AUI-679 Scheduler - Make date labels easier to read
AUI-679 Regenerate
Merge branch 'pull-request-64-AUI-679'
AUI-679 Source Formatting
AUI-680 - YUI Loader throws error when calling an AUI module from a non-AUI instance
AUI-680 - Build files
AUI-682 - In IE9, Image Viewer continues to play audio after closing/navigating Image Viewer
AUI-682 - Build files
AUI-683 TreeView - Improve performance
AUI-683 Regenerate
AUI-682 - In IE9, Image Viewer continues to play audio after closing/navigating Image Viewer
AUI-682 - Build
add license to README
Merge pull request #46 from ninjudd/perf

add license to README
mark dynamic vars
use tools.logging
use core.incubator
reference sonatype repository for non-published clojure libs
use algo.generic
use math.combinatorics
remove monlithic contrib
using ranges in tests cause tests to fail in clojure 1.3
update to clojure 1.3.0
Merge branch '1.3' of git://github.com/duck1123/lamina into clj-1.3
update version
update to match changes to logging
update potemkin
math.combinatorics 0.0.2 is out.
Merge pull request #18 from pyr/patch-1

update wrong dependencies
correct test case: error-handler in a pipeline only accepts one argument
Merge pull request #19 from dajac/clj-1.3

fix test case
update version for algo.generic
Merge branch 'master' into clj-1.3

Conflicts:
	project.clj
	test/lamina/test/connections.clj
Merge branch 'clj-1.3' of github.com:ztellman/lamina into clj-1.3
Removed the .touch dependency for screen size - no longer tries to identify tablets as a device class
Removed some unneeded old pages
Removed files that are not used
discoupled environment and lts
Implement Emerson-Lei, some refactoring
add express.js example
PASNGR-704 Disable tag replacement in roundhouse when called from Ensconce.
201212: Sereja TLE
201212: Sereja TLE
201212: Sereja TLE
Allow updating of listings.
update ruby to 1.9.3-p194
Correção e melhora na colisão do billy

Feita uma melhora na colisão do billy para que ele não atravesse paredes
ou fique trancado em plataformas que estão no ar, diminui também a
chance de ele chegar na beirada da plataforma, cair e ficar trancado no
plataforma.

Consegui um melhor entendimento das colisões por layer e dos problema
que são causados.
Include tvi settings
Display various metircs on MySQL5 and InnoDB.

Q. Why use mysql command?
A. MySQLdb may be not installed, but mysql command is installed in many cases.
Added disk read/write wait times plugin
add virtual disk devices to dstat_disk_wait
Merge pull request #27 from venturaville/master

Added disk read/write wait times plugin
Merge pull request #30 from Achimh3011/master

Allow specification of command line arguments via environment variable.
Merge pull request #21 from hirose31/mysql5-innodb

Display various metircs on MySQL5 and InnoDB.
author=carlhu - Update plugins/dstat_mysql5_cmds.py -- reset counters to zero.

fixes issue #28
Merge pull request #32 from trinitronx/master

Reworked patch to fix issue #28
Add description of new environment variable (source file).
Add description of new environment variable (generated files).
ok，添加管理员这边ok了。。。。
Update exercicio4/src/br/ufpb/sistemapedidos/ControleDePedido.java
a bit of formatting
fuct tests + css
output test added
Fix de la condicion de equal cuando un extremo es Infinity
Tests de query
added getEmployeeList realisation
Common close connection method with AutoClosable variable
Models 修正
Signed-off-by: zklscut <taitoubiyan1@gmail.com>
Modified screen configuration.
Basic spec.
sigh, guess and check method.
Fix just start path
Show average price of loadouts. Eve schema updated.
Fix: use nickname in export slug for non-API verified accounts.
Fix notice in EFT import.
Make the comment reply textarea bigger.
Fix: incorrect variable name in edit_comment.
Jump to the correct anchor when posting a comment/reply.
Add rudimentary notifications.
Fix: make sure charge volume <= module capacity in invcharges.
Revamp the front page, show popular tags.
Suggest some simple tags at fitting creation time.
Give visual feedback for tag overflows.
Merge branch 'staging-price-estimate'

Conflicts:
	UPDATING
Merge branch 'staging-notifications'

Conflicts:
	UPDATING
	pgsql/osmium.sql
Version 0.3.0.
do some PATH manipulation
better shell etection
fix addons_add to capture heroku-api errors instead of restclient when retrieving releases fails
closes #499
ChangeLog 10.04.2012

Almost Done
[Change] 删除lang下面的demo
Merge pull request #313 from linlingyu/dev

[Change] 删除lang下面的demo
[Feature] 增加 baidu.dom().toggle() demo  修改baidu.dom().data()的，demo
Merge pull request #480 from zhanghongyan/dev

[Feature] 增加 baidu.dom().toggle() demo  修改baidu.dom().data()的，demo
Added extra getters and a find all books function
Initial yesod commit
Added .cabal file
List all books (todo: edit/insert and search)
added downloadable binary and a README
Added Hide item.
Butchering animals now creates hides instead of leather.
Limestone is now a TubWaterModifier that, for now, transforms hides into
leather.
Fix recommended episodes widget title
Fixed extrafanart in playlists
added bannerlist for lowlist
Merge remote-tracking branch 'origin/master'
Switch yes/no label for fanart button
also for video fanart
Switch radiobutton to button in media menu
Merge remote-tracking branch 'origin/3.0.0-pre' into 3.0.0-pre
Fix disable blizzard option.
Version 3.71
Merge remote-tracking branch 'ElvUI/master'
More work on commands

	Install is working now
Remove token, use marker strategy.
Rank suggestions based on match - distance.
Fix bug when entering Ctrl+Space multiple times.
Hookup to onTextInput.
Now better, use onDocumentChange.
simple track built-up
Diagram fixes
If there is no object found, return a 404
A new misc package to put stuff that doesn't belong in one package but is commonly used.
Rip out some color conversion.
The beginnings of a modular prompt package, with an example. The basic design is done, but it needs a lot of care.
Abschnitt Produktionskosten ergaenzt und Excel-Kalkulation fuer renditerechnung vorbereitet
Updating Readme.md and metadata.rb to reflect all the recent changes to this cookbook.
Better documentation on the recipes.
Remove extraneous quotes.
Remove duplicated lines.
Be consistent on capitalization of Redis.
We are not currently dependant on chef-ark.
Document more attribute settings.
Add entry for configure_slowlog and describe required cookbooks.
Specify which distro versions we have tested on.
Specify valid options for install_type attribute.
Give more details on version requirements for slowlog, and reference documentation url.
Merge pull request #9 from CXInc/docs

Updated documentation for Redis cookbook.
modify the article on factory
add login modal
init
ui tests after merge
catroid Tests after Merge
ui tests after merge
merge and new settings menu
remove file
sub-settings fix, new subfont+new xml layout
Merge branch 'master' of git://github.com/siz-/xmplayer

Conflicts:
	source/menu.cpp
Add primaryGenre and trackType members to the track class.
Set the primaryGenre and the trackType.
Re-implemented processor logic

The processor didn't work how I intended it to, so I reimplemnted it
using the original recursion idea. It seems reliable and can complelely
solve Sudoku puzzles in a short amount of time.

Don't forget to add the sudoku_values.txt to the Sudoku project's folder
in Eclipse, otherwise it won't be recognized.
Tweaked some data files
Add more interface to jsprimitive
move handling code to out of switch
add aero::OP::GetLength
resolve jump target in compile time in aero-jit
Ooops, missed one more instance of self._D that needed to be replaced with discount()
Add missing test for neighbors edge cases (literallly)
Various concept edits for packageKernelConcepts
Various concept edits for packageKernelConcepts
Merge branch 'patch-1' of github.com:Dachande663/core into 3.3/develop

Conflicts:
	guide/kohana/conventions.md
"Updated gem file for Heroku"
Use latest Beatstream-client
Add yalr to Procfile. Update Beatstream-client
clean up
jitsu moved to global
Added missing metrics, log if a metric is not found
Updated logging
Tests for elasticsearch plugin
Skipping .gemspec in git too
Added FPS Counyter
Added an Input Handler
Made the box move
Changed FPSCounter into Counter for all counting things
Removed off focus render break
Removed off focus render break
deleted
Major .vimrc update :thumbsup:
Les instances de BDD sont correctement détruites lorsqu'on quitte l'application (fixes #18)
test_binomial.py
Incorrect column name in Notification::get
Missing SQL parameter in Notification::markReadForNotifier
Static functions should be static
Revert "I"

This reverts commit 4ffb9d26ba6faba403656adde1efb5c1da292fb5.
II

II
Remove insert_head() from Entry.

There is no reason why we should have such a function, since it's always
preferred to use List functions where possible.
Finished accounts list popup view implementation.

Fixed visualization & account selection.
even more logic fixes to generate blocks of text
Change folder for files, because of Eclipse. Delete unneeded files.
worked on item list
zotac remote, squash me
Updated level 4 to be compatible with doubling
natrix set
sidewinder set
sirius set
stardust set
Adding readme to stop this page from looking so naked
Remove PHP 5.3.3 build as it's too buggy, fuck it
Fix tests on PHP 5.3
Added page images plugin, finished portfolio index and portfolio page
Adds missing new JavaScript method
Make pkg/kernel remove include/linux if it was improperly installed as a symlink.
Disable line ending normalization for this repo

Looks like this repo was created with autocrlf=false, go ahead and keep
using that setting, but check in a gitattributes to make it explicit
compila, pero no funciona
Merge branch 'master' of https://github.com/HenrYxZ/tarea2ds

Conflicts:
	src/main.cpp
Addded support to specify custom data range and pass it using the API parameter "chds", as well as supporting Numerical and Percentage Marker Type
Changed Draw Image command to set the coordinate and size.
Added supported for Strontium (Sr).
Added filters for rmsd and pdbqt2csv.
Fixed a segmentation fault bug when the number of heavy atoms exceeds 100.
Added ligands query
NamingConvention class documented
OOZIE-563 Missing dependencies shows wrong values
Add timeout support to connect calls

This commit makes sure connections to a server also honour timeout
settings, unlike before where a connect call could block forever.

Change-Id: I1c0939f13fc55f95d0212587e92df163a7ba4d85
Fixes: ARAKOON-294
See: http://jira.incubaid.com/browse/ARAKOON-294
Hospital version 1.2
Merge branch 'master' of github.com:Innogms/hospital
Hospital version 1.3
OSEF JE FAIS UN TEST !!!
Latest updates for Program/Speakers
Latest updates to parser script
Removed System.Json package.
Better literal.
Moved RestfulLink down to REST0 level and included it as part of JsonRootResponse.
foto and estado civil
adds accounts controller specs
adds operations controller specs
Gitignore.win
Week 4 AVF

Added 2 mashups also Geo, network, contacts, accelerometer, compass,
twitter
Added highlighting for local variables.
Added highlighting for properties depending on their container and presence of backing field.
Added highlighting for extension properties. Fixed a couple of property-highlighting problems.

Made visitProperty() recursive to avoid skipping getters/setters parsing.

Tuned style for properties with backing fields a little.
Made styles for properties cascading, and therefore easier to tune.
Replaced "local var" and "local val" styles with "local variable" and "mutable variable/parameter/property".
Replaced underlining with light purple background for properties with backing fields.
Added highlighting for parameters.
merged with Andrey's changes
made ResultSet.map() lazy by default - to save blowing RAM by always making a List of all results
KT-2128 Code completion after number with dot - don't complete on '.' only in ".."

 #KT-2128 Fixed
Add private and protected in algorithm/compressor
Addressed issue #7- documentation for the AU port- and went ahead and did the same for KY.
Addressed issue #8, the dire need for an official open-source license.
initial commit
Clean up

Added subscripting categories for old SDKs,
Rename UIColor category
Added overall header
Agregado archivo README.md
added error class
implemented simple DNS support
added /bin to gitignore
dd
Merge branch 'master' of ssh://git@github.com/Juanxo/learn-git.git
Merge branch 'feature' into deploy-2012-03-28
foo
Merge branch 'master' into feature

Conflicts:
	README
Merge branch 'master' into deploy-2012-03-28

Conflicts:
	README
update .travis.yml
Merge branch 'master' into feature
Adds rake task to find functions without corresponding test functions.
Updates Travis to fail if there are untested functions.
Adds and cleans-up functions that having missing or mis-named tests.
Updates test data to reflect added tests.
Merge branch 'master' of github.com:Katello/runcible

Conflicts:
	test/fixtures/vcr_cassettes/extensions/repository_associate.yml
	test/fixtures/vcr_cassettes/extensions/repository_create_with_importer.yml
	test/fixtures/vcr_cassettes/extensions/repository_dissassociate.yml
	test/fixtures/vcr_cassettes/extensions/repository_extensions.yml
	test/fixtures/vcr_cassettes/extensions/repository_unit_list.yml
	test/fixtures/vcr_cassettes/repository_support.yml
	test/fixtures/vcr_cassettes/task.yml
Version bump.
Updates to fix missing cassette and switches each content type to extend Unit resource.
Merge pull request #22 from ehelms/master

Addresses untested functions by creating a rake task to locate them and adds those missing tests.
Fix bug in vtkPVDataInformation::GetDataSetTypeAsString()

This fixes a bug in the GetDataSetTypeAsString() method of the
vtkPVDataInformation class in which it would pass an invalid
data type id (-1) to vtkDataObjectTypes::GetClassNameFromTypeId()
which would then return a value from invalidly-referenced memory.

Change-Id: I9e612a44e24261b0b0057dc0136e6b8c3423f2da
Merge topic '13517-fix-pv-data-information' into next

ac99660 Fix bug in vtkPVDataInformation::GetDataSetTypeAsString()
Fix warning

Change-Id: Ia317690371632ac70dcd081576ef9600ee3a565a
Ignore Qt plugin warnings

Change-Id: If5cb59a021c4e2b085d91d8d09a89d838cac6b77
Merge topic '13674_fix_static_qt_plugins' into next

1669c6d Ignore Qt plugin warnings
aaa1b85 Fix warning
Add the center of rotation to the WebGL exporter

Change-Id: Ifdfe14ac9998f97917b9042f49d0436fbd50a90b
Merge topic 'fix-center-of-rotation-in-WebGL-exporter' into next

9be529f Add the center of rotation to the WebGL exporter
Scroll the color presets list to the top when opening

This fixes a small bug in which the color presets list in the
pqColorScaleEditor dialog were opened to the middle of the list.
Now the list is scrolled to the top when displayed.

Change-Id: I2a6212c715f336125d9ee22343fd293f5f0c7da8
Merge topic '13353-color-presets-scroll-to-top' into next

5404cdc Scroll the color presets list to the top when opening
Use pqFieldSelectionAdaptor for field selection properties

This changes the pqStringVectorPropertyWidget to use a
pqFieldSelectionAdaptor instead of a pqSignalAdaptorComboBox for
string vector properties with a array list domain and a field
list domain.

This fixes bug #13535.

Change-Id: I39a1e34839113d86975fa230904107b4ecb7da16
Merge topic '13535-extract-histogram-panel' into next

3d76c1e Use pqFieldSelectionAdaptor for field selection properties
Fix include file order for Python.h

Change-Id: Iceb571ecd25df367b964aa03852a23100b09d32f
Merge topic 'fix_python_include_warnings' into next

6c38858 Fix include file order for Python.h
Fix a lot of things for float boxes
Update the sample PDF file (now with bookmarks and hyperlinks!)
Mention the source on /install/
sozdanie users
Done with the demo app
minor useless and feble attempts to salvage pretty version for web
window settings remote host
Updated TODo after removing entity class
Reverted lookAt modification

actually it represented the glu lookat method but still lead to bugs right here so i reverted it
moved mostly to fragments, for a faster change between different items
correct .zsh folder
Lam committed
with new fabfile
xuzan
We want '!'!
No longer needed to build Cygwin
tweaking how threads are handled
Small change in collision routine. More accurate velocity limiting.
Animation with blocks.
revert wrong justification
Prepare for release from github
submodule update: ultisnips
improved zsh config :

1. use many files (cause it is cool, ok)
2. added many aliases & functions from grml :>
Moved back old device files
Sobre livros Pokémon (Traduzido por Linklamuryah)
added viewport functionality mpace
error checking updates
Merge branch 'master' of https://github.com/Max00355/OmenRAT
fixed ZH-HK lang bug (forgot to close bracket)
updated tutorial description
Added two fragments to SolveArtifact.
Updated deDE locale.
Fixed PetBattle error.
Merge branch 'master' of https://github.com/Shestak/ShestakUI
refactoring some code
Merge branch 'master' of https://github.com/MesaCart/artshop
phase correlation
phase_correlation.cpp works perfectly
README demo merge
settings initialisation
Added much needed .meteor dir
testing J! comittability
Signed-off-by:Bear <Bear@192.168.1.39>
setings umgestellt
Added --force to rdiff-backup --remove-older-than to prevent endless loop when quota was already exceeded.
Disabled the MOTD less stupidly, fixed voting, and commented out some non-functional code for the mean time.
Categories are now expandable in XGUI
MOTD has been re-enabled now that HTML is working properly
Maps menu now shows the correct map icon, or shows noicon.png correctly
Fixed miscellaneous XGUI errors
Merge commit 'd432673d0168a96bd3798d0687068ea98c7f5c9a'
Added new function: dt_clear_cache(); (Clears RTC)
Don't include pyc, (python compiled), files.
RunningHuh
Fixes #2856 Display the "delete a node" button outside a popup
Ref #2816 fix javascript for policy server form
including spotify addon
bugfix spotify addon
fixxing directory node album spotify addon
libspotify.dll include
del appkey
Add loadSync helper
Audio can now stream, loading music files will not result in 2-300 mb memory usage
Just remember to set streaming = true on the soundfile entity
Tuned ai chaser code a bit
Conditions Generales - V01
fix product_list model - number pages
implemetovano brute force
vytvorene soubory prodalsi algoritmy
fixed bug in applyColorToAllComponents + added RefineryMenu to mainFrame
RefineryMenu: left half half done (infoPanel)
Die, apple!
updated APPBlah to Approval Blah
added Authentication builder class and tests
fix up footer links, change slideshow indicator to yellow...
add belong
belong.class.inc
Belong.class.inc
BelongModel.class.inc
Y U NO?!
fix wrong call of ModUtil
minor typo
Change how ticket string format is handled

This new method should allow for greater flexibility when certain fields are missing
Handle from_line in new ticket formatter
Handle requests for non-existant tickets
Adding handling of CTCP ACTIONs
Remove old help file
Add action handling
Merge remote-tracking branch 'rita/development' into development
Revert "sadsdsdaassaddsasad"

This reverts commit 24ad4dd3d38b2c7c2469f74c43a1d1f3b27356d1.
Added whispers
Fixed whisper message registration
Merge pull request #2 from AWA500/master

Added whispering
Merge pull request #83 from Randgalt/master

New queue features
Issue 82: Generalized (and deprecated) nonNamespaceView() by adding the usingNamespace() method
to allow getting a facade of the client that uses a specified namespace.
Merge branch 'master' of git://github.com/Netflix/curator
* Fix JSON unicode handling (see http://pocoproject.org/forum/viewtopic.php?f=10&t=5686)
* Added unit test to JSON unicode change
Merge pull request #45 from RangelReale/jsonunicode

* Fix JSON unicode handling
My Changes to James' code
Same changes again.
Merge branch 'MyJames' of https://github.com/Retsam/JBAndroid into MyJames
Merge branch 'master' of https://github.com/Retsam/JBAndroid into MyJames
Merge branch 'MyJames' into James
Food reconciliation report.
feature: new cabal file, new dir structure.
Improvement of Serial Monitor
Derp
Merge branch 'master' of git@github.com:RobzInadE/Jungle.git

Conflicts:
	Jungle/src/Tree.java
Merge
Merge branch 'master' of git@github.com:RobzInadE/Jungle.git
Stuff,
Updated src/Three20UI/Sources/TTTableViewDataSource.m

Removed createNewCellWithClass:identifier method
Updated tableView:cellForRowAtIndexPath:
- Load nib if it's found. otherwise, create original object
Updated tableView:cellClassForObject:
- return object class rather than TTTableViewCell
colorv upd
Added map scale and scale bar to the status bar of the map [#35 state:fixed responsible:none]

Also fixed issue with the JasperReports map print config files.
Added GeometryUtility from Samoa project
Merge conflict
just completed collection design
Fleshed out AccountResource, test coverage.
Merge branch 'master' of https://github.com/SaymV/diabolical
fixing .htpasswd file path
remove unused/unfinished Durable.InMemoryEvents project. Update (c) dates
Add whitelist to the classmap generator to allow skipping of Test files
modified:   CMakeLists.txt
	modified:   src/Main.cpp
	modified:   src/core/SCPU.cpp
	modified:   src/core/SCPU.hpp
	modified:   src/emulator/Emulator.cpp
	modified:   src/emulator/Emulator.hpp

	src/assembler/
	test.asm
	test.scpu
- Improved profile behavior.
- Improved profile behavior.
- Improved context behavior.
Merge branch 'master' of github.com:Shougo/unite.vim
- Improved documentation.
Added ability to delete activities
Adjusted the Screen constants for new tool bar.

Added 50px to each Y constant
Bugfix in tICA.py
Testing
Merge branch 'master' of github.com:Soarez/Meetoring
Fixed flatworld, some work on making snow handle right. Also, renamed
shovels to spades.

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Various fixes for prefix add in web UI

The "Add Prefix"-page in the web UI now works. It lacks a lot of
functionality though.

Part of #214
Various small fixes...

Part of #214
Extended unit tests

Added XML-RPC unit tests to test adding prefixes to VRF and some pool
tests.
trying to draw jpg
whydothey is now a mostly finished chapter
Let's care for minify another time
修改预警信息提示错误
Signed-off-by: zqloon <zqloon@gmail.com>
Merge remote-tracking branch 'zql/master'

Conflicts:
	code/Authority/Wms/Web.config
fix prob d'include.
Added a small ruRU locale update and error fix (thanks to Shestak)
[397] LorrisAnalyzer: show maximize btn in SourceEditor
[357] Rework jostick a little

* new closeJoystick method to script
* new signals
remove posting before signin
[version 2.16]

[ New Implementations ]
-added working address label to home map display

[ Bug Fixes ]
-removed broken back button functionality for the allergies display
检查 peakVic
Update query::debug()

- Code simplification
- Better debug::dump() implementation
Adding Context, Views, and CTools
remove some styles.xml
node.gyp: actually use the js2c "inputs" array
docs: add documentation for `process.config`
Rebuild Oleg's generator
i18n: Updated German translation
i18n: Updated Russian translation
i18n: Added Swedish translation
controllers/files: Added file download fallback

In case the webserver isn't setup to serve /files/ directly
files: Moved IGC file download path to /downloads/igc/ instead of /files/

Attention! production.ini and server config needs to be adjusted!
SCP Update
Merge branch 'master' of https://github.com/UPCnet/max.ui.js
#6: Refactored attributes a little bit.  Added the style.self and style.heir capabilities.
#6: Added the ability to specify a default layout type from a LayoutContainer subclass
#6: Forgot these classes when committing the style.self and style.heir commits.
#6: Forgot this with the default layout commit
#6: Added the button type.  Not really implemented yet.
#30: Got style.self and style.heir working in the new hierarchical attribute architecture.  Along the way (but unfortunately not in this commit), I had to rearchitect style dependencies such that I'm pretty confident #31 is fixed (it definitely didn't work right before).
With artists
restructured,
with JSF 2
Integer Loop methods...
Handle constants as variables

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
добавил обновление сообщений сразу при входе в систему
Code refactor. Provided Sofin installer.

* New change in
* sofin-install is now official Sofin installer.
* Moved shared sh functions to sofin.conf
* Slightly different approach to debug()
* Improved README

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
Reimplemented the Pearson coefficient as the determinant for the normalizatio
test
Added content to the readme
test
Added the following:
mapView maps each deal as a colored icon.
Opening an InfoWindow in mapView opens a full ListItemWidget listing of
the deal.
The map in listView will be automatically sized to fit all deals in the
case of location and filter search.
bumping ack-and-a-half version since this one modifies default-directory
jmp fixens
added option to config files for using commas
add line break in phenotype column title
Updated for papers with merged_into tag
* add history widget
* add status to call-out box
* add Note with a link to the new paper
* #421
Bug fixes.
* link tag
* hide comment... not sure if it's supposed to be hidden??
* #479
Bugfix - gbrowse linking
Remove human diseases from homology
* #248
Merge branch 'master' into acecouch
code cleanup - best_blastp_matches
Merge branch 'master' into acecouch
Get author order from xapian
blinn-phong, terrain specular
animated water
Revert "Begin writing virtual memory"

This reverts commit ba60d130ea134356fad8522bff8f9d983e591a81.
[Expo]  More fine-grained sorting of windows in non-overview mode.
Merge branch 'master' of https://github.com/linuxmint/Cinnamon
Updated translations
1.6.3
[Alt-Tab]  A little bit quicker dim of the old preview.
Merge branch 'master' of https://github.com/linuxmint/Cinnamon
Merge branch 'master' of git://github.com/autarkper/Cinnamon into autarkper-master
Fixed bug on the registration page
Fixed youtube tasks #1220
Merge branch 'master' of github.com:Zeega/Zeega-Core
Super comment
Some changes
Added Testing Poject
added hasCycle
added ability to have empty strings
Issue #61: updating tests
Issue #62
Issue #26
Issue #54
Removed guard-markdown; unused
Removed guard-markdown; unused
Merge branch 'master' into dev
Adjusted paths to speed up loading of the app
Updated favicons and added apple-touch-icon
Removed unneccassary gem guard-markdown
Added downloaded but customized color picker
Updated ArticleFeaturesControllerTest; moved all action except index to individual controllers; created index view
Now automatically starts spork after deletion of unused PID file
Merge branch 'master' into dev
Created controllers Colors and Materials; added routes; added first tests
WIP
1) Changed the project file to choose the auto profile
2) Updated call for All deal fetch
3) Changed the logic to update the notification count on landing page
4) Took care of releasing communication manager, activity model, activity controller, deal model, deal controller, activity cache, dealinfocollection on log out
Fixed Bugs and Performance Improvement @ DefUse
use std.conv.to instead of parse.
Implemented procfs_open/close routines. Support for multiple threads is dicey
fix viewmode hand
russian sample text showing up
implement O_TRUNC for sqlfs_proc_open()

When opening an existing file and O_TRUNC is specified, the file will be truncated
to 0 length as per FUSE api.
Fix code in reply to comments:
- add an explanatory comment
- remove useless code
africa talking transport
Update python/requirements.txt
test
Merge branch 'abidTest' of https://github.com/abidur/Prototype
added more
Merge branch 'master' of https://github.com/abidur/Prototype
fix ontology browser link issue
* still has hyperlink to path issue
Human disease widget
* show all data in human diseases widget
* split between curated and automatically inferred
* use data from Database tag for inferred OMIM links
* issue #248
Remove Sequence Known column form Alleles table
* fix #564
Minor correction to the docs
Do not insert terminal and syanpse classes in new projects
Fix neuron catalog to display neuron views again without annotation domain information
Refactor zookeeper autodiscovery module
Watch znode and autoheal when the znode is deleted (i.e. the server is down).

Note that this autoheal process is triggered by the event that "znode has been deleted" instead of "dnode disconnected", which hook.io originally uses. Specifying both "z" and "autoheal" options will cause these 2 mechanism both enabled and the result is unexpectable.
service php file add
demo for ian
Fix documentation for contours argument

Setting the number of contours to zero is actually invalid.
The documentation incorrectly stated this would disable contours.
Allow setting a list of contours for a contour surface

The surface module sets auto_contours to True by default, as opposed to
the iso_surface module which has it set to False.
This meant that passing a list to the contours argument when creating a
contour surface did not work unless auto_contours was also set to False.
To fix this, when setting a list of contour values, make sure
auto_contours is set to False so that the list is used.
added missing field encodes (float, no-field), added missing field decodes (short-string, short-short-int, short-short-uint, short-int, short-uint, long-unit, long-long-int, float, double, no-field)
allow additional connection properties to be set by the user
Various Mass Changes
began converting application view to slim
style fixes and make lc4sim compile
Update README.mdown

Added a note for iOS users
changed head rotation
Normalize all physical quantities for SO learning, fix output rate encoders "insufficient resolution" bug when running two epoch not one after the other.
renamed mklinks.sh -> install.sh
awesome > rc.lua: minor changes
emacs: turn evil and key-chord back on
Release 0.4.3 version
stages masks
study action and small fixes
application title
Upgraded bundled Jasmine.
Removed describe.only.
wrong folder
added last name to step complete
bug fix
colord 0.1.13-4 x86_64 by aix27249
digikam 2.9.0-2 x86_64 by aix27249
kipi-plugins 2.9.0-2 x86_64 by aix27249
libkface 2.9.0-2 x86_64 by aix27249
libkgeomap 2.9.0-2 x86_64 by aix27249
libvkontakte 2.9.0-2 x86_64 by aix27249
sane 1.0.22-3 x86_64 by aix27249
xsane 0.998-3 x86_64 by aix27249
xsane-gimp 0.998-3 x86_64 by aix27249
kde-networkmanagement 0.9.0.4-1 i686 by aix27249
test-inet 0.0.1_git20121127-1 noarch by khvalera
Fixed handling of optional arguments
Keyword support in Lexer
Assignment compiling with test
Вылизан код третьей программы.
shift leader score - reports -init
Make docs conform to `local` behavior re: `env.path`

Fixes #659
Merge branch '1.3' into 1.4
Merge branch '1.4'
Add *.egg to .gitignore; these will get downloaded by `python setup.py
test`
Add tox.ini
Merge pull request #660 from msabramo/gitignore

Add *.egg to .gitignore; these will get downloaded by `python setup.py test`
Merge pull request #661 from msabramo/tox

Add tox.ini
Rename README to README.rst so it renders nicely on GitHub
Merge pull request #662 from msabramo/README.rst

Rename README to README.rst so it renders nicely on GitHub
Documenting how to not create a backup with `sed`

Really, this is documented in the `sed` command line utility man page,
but I still think it's a valuable piece of information to add to
fabric's documentation.
Merge pull request #663 from JensRantil/sed_doc_no_backup

Documenting how to not create a backup with `sed`
Remove out of date MANIFEST.in line.

Fixes #668, thanks @techtonik
Remove out of date MANIFEST.in line.

Fixes #668, thanks @techtonik
Remove out of date MANIFEST.in line.

Fixes #668, thanks @techtonik
Merge branch '1.4'
Merge branch '1.3' into 1.4
Rewrite _get_system_username into more cross-platform way while keeping fallback into PyWin32 library under Windows. Add .idea/ info gitignore file.
Update _rc_path method. Fallback into PyWin32 library only if os.path.expanduser method returns unchanged path.
Fix #671, trap unknown-hosts exceptions
Merge branch '1.3' into 1.4

Conflicts:
	fabric/network.py
competitions index design valmis
Users can now click a tag's name to go to a page show all tickets for it
Added gotchas to README.
Read and write adjusted code_item. Instructions still need more work.
Added the deploy.rb (with a change to use https access to github) -- hope it works
Merge branch 'master' of https://github.com/alneberg/pfitmap
Added a TO_DO file.
Changes to pfitmap.dia.
New class in sequence_inclusion.dia -- data about sequence databases.
Added a to_do
Merged populateProtein to master
Changed back to ssh instead of https
Enabled ssh forward agent
Pagination on sequence_sources show
Added some new to_dos
Taxon index page should not load all taxons
Started on protein_counts_by_taxons
Added delayed_job to gemfile
Generated delayed_job
Added a new to_do, evaluate incorrect
Logging to all logs from evaluate method
Enabled multiple best_hmm_profiles possibility
Added test for evaluating with double best_profile
Fixed rest of code to adopt to new multiple best profile
New To_do task
Tests and fix for error in db_sequence_best_profile stats
Teleport player to a lower point.
One last test

Testing one last time.
Fixed assertion when attempting to remount a drive that has been deleted or could otherwise not be resolved.
specs working, updated keys
some use cases and a roadmap thingings
Update zotonic-addsite to use gmake or make set up in zotonic_setup
Merge branch 'master' into updates-for-non-linux-systems-1
Restore zotonic/dh_date submodule
Some slight decomp, helps preserve the vector of songs
File tree cleanup.
update identify
Raytracer included as cuh header file, compiles without warnings
Raytracer now working
log dev stress vs void ratio plot added to walls visualization
Do not increase cycle count on '[PC++]' for skipped instructions.
Merge pull request #39 from teoryn/patch-1

Do not increase cycle count on '[PC++]' for skipped instructions.
disasm refactored to allow disassembling of single instructions; dcpu16.py makes use of it when tracing
a terminal for debugging terminal output
Add curses-based terminal
Gracefully shutdown terminals
Merge pull request #40 from swarmer/video-qt

Qt-based terminal
ignore colour rather than crash
Merge pull request #41 from matze/curses-terminal

Curses terminal
Merge pull request #43 from andre-d/fixed

Terminal related cleanups
Added a plugin system
Basic execute message being sent
Didn't fix problem but added exceptions to make problem more obvious.
Bringing branch in sync
Merge pull request #6 from emtwo/fixing-zero-port-issue

Fixing zero port issue
Fix Makefile.
Move FD_ZERO & FD_SET.
Start rpcInit work.
Merge pull request #7 from emtwo/rpcInit

Rpc init
TODO: multiple methods
routr.exc: fix bug with exc adaptation
0.1.8
az keyconfig settings.
Move locale setting to general rc
Gutted of outdated code. Started adding new Lua-based wrappers.
replace feed with job in channel names
added _blocking container and _get_blocking_redis method
add config & create scripts
remove node-redis. add redis. readability
give args friendly names. conform returns to contract
flesh out most of the functionality needed in the Job JS wrapper
turn on job testing and refactor tests as necessary
Retractify!
Add timestamp to retry
Add id to error return on cancel
fixed some global variable bugs
return false rather than nil
remove debug publish call
replace nil with false per redis type conversion rules
add getNumOfFailures and retract tests
Add cleanup for blocking redis connections to quit method
Add handle_event, remove old event code
corrected job.finish publish payload
corrected a typo and separated test paths to different jobs

the inner get from item3 was getting stomped
by the item4 get.
Major cleanup operation.  Pushed module into its own dir with an __init__.py, renamed file, numerous changes to make module more pythonic.
Added weighted values
AlarmManager added
Refactor starting of cab and passenger threads in order to avoid
exceptions. Add new init state for threads. Rename Taxi formatter. Add
comments.
moved SimpleLoadObserver.java to levelLoadSave
Redis 2.4.15.
Merge remote-tracking branch 'origin/master'
plugin info preamble.
smalled up the size of the inbox.
removed unused buttons
remove value/data madness
whitespace
?
config
Cambios en la interface y nueva manera de exponer los datos
n.a. parse error
Added setting to process a batch of unrelated XSD
Merge commit '8dd99fa6b0ef2086a572e8b18be6dce51de3f590'
simple validation for vehicle
Add original prototype plugin

- Development on a new version of the TallyTree plugin now begins!
Added first implementation of the caching/threading system.

This doesn't work yet, since I didn't connect the UI with the
backend yet.

Signed-off-by: Nils Hasenbanck <nils@hasenbanck.de>
Combined UI and new backend.

Some bugs are present:
    - listView and pathList are in different order.
    - the cache of the images can get too big.

Signed-off-by: Nils Hasenbanck <nils@hasenbanck.de>