labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #1 from cordawyn/master

Minor clean-up of tests
constructQuery and describeQuery return RDF, not MGraph. Tweaks to DBpedia test and cabal file
fixed a comment
updated .gitignore
using RDF types from RDF4H package instead of home-brewn ones
Design for vote on poll page

Squashed commit of the following:

commit 8ebdfcb9c9a372dd0c54943135051f9e9a388d8c
Author: Gabe Kopley <gabe@coshx.com>
Date:   Tue Jul 17 16:21:01 2012 -0700

    Touch up other pages

commit 76ec355cbf110082c790b781d041ad121c5d3393
Author: Gabe Kopley <gabe@coshx.com>
Date:   Tue Jul 17 16:08:44 2012 -0700

    Bring back drop shadow

commit dc9d0730699a2df687552286be5ec9dc7ae0ab90
Author: Gabe Kopley <gabe@coshx.com>
Date:   Tue Jul 17 16:07:01 2012 -0700

    Fix 100% height issue

commit 02148342bc83ae96f2fec75d885a9aa2f0cfe193
Author: Gabe Kopley <gabe@coshx.com>
Date:   Tue Jul 17 15:58:25 2012 -0700

    Rescued colors

commit 05223b24cf69532277be7b16a36e6c97d4216a29
Author: Gabe Kopley <gabe@coshx.com>
Date:   Tue Jul 17 15:34:09 2012 -0700

    Colors!

commit 78ec6170210f1d0c044fcb1036e7e346a404bd61
Author: Gabe Kopley <gabe@coshx.com>
Date:   Tue Jul 17 11:36:54 2012 -0700

    Sibling slots trick

commit 997307fd3822c28196fcc2b834516b8a11e372c5
Author: Gabe Kopley <gabe@coshx.com>
Date:   Tue Jul 17 11:22:43 2012 -0700

    Tweak slots

commit 1dd29dc43f9b5fecf31479eb44f0ddff83154cb1
Author: Gabe Kopley <gabe@coshx.com>
Date:   Tue Jul 17 11:04:41 2012 -0700

    Empty slots have empty class

commit 389973d57bece869988869be1603dda00b8b3830
Author: Gabe Kopley <gabe@coshx.com>
Date:   Tue Jul 17 10:35:17 2012 -0700

    Buttons wip

commit ae834265948ca52c7bd116d838d2d142bd5c0e3a
Author: Gabe Kopley <gabe@coshx.com>
Date:   Mon Jul 16 16:49:58 2012 -0700

    Headings for Choices and Ballot

commit 392367536d36f76802bb2aea700c869ec060cbf3
Author: Gabe Kopley <gabe@coshx.com>
Date:   Mon Jul 16 16:14:00 2012 -0700

    Wip

commit 32a647bf4a92d87b2438b3bf43b945d04dd21354
Author: Gabe Kopley <gabe@coshx.com>
Date:   Mon Jul 16 15:32:24 2012 -0700

    Grid layout wip

commit bbc973c0984bccb5c7ced394e78dfc20a8452bf9
Author: Gabe Kopley <gabe@coshx.com>
Date:   Mon Jul 16 14:35:25 2012 -0700

    Forget that last idea

commit 501ab6e7f71ef0f41675fcb3bf9cfb7221621b10
Author: Gabe Kopley <gabe@coshx.com>
Date:   Mon Jul 16 14:27:53 2012 -0700

    Install compass and compass-normalize
Merge pull request #4 from phoustona/cf4d85f65404d13b3323c80d2cec5c596b836ef0

entropy entry
Merge pull request #2 from cpatrizio88/master

virtual temp. and virtual potential temp. added to glossary
internal energy def.
Merge pull request #5 from phoustona/master

internal energy definition added
esat and wsat added to glossary
Update docs/glossary.rst
Merge pull request #6 from vrif/master

esat and wsat added to glossary
fixed typos in glossary
enthalpy added to glossary
wet-bulb temperature added to glossary
Merge pull request #7 from sasaxuan/master

Enthalpy and wet-bulb temperature are added to glossary.rst
tweak python libs
fixed glossary typos
add notes reference
clean up and alphabetize
test math in definition
math in definition
quadratic degrees of freedom and helmoltz free energy added to glossary
with chemical potential added to glossary
wl and dewpoint temp added to glossary
Fixes a description bug
Deployed 0.0.6 artifact to GitHub
better player model
remove Object.keys(key) since it behaves differently than for(var key in target)...
Tidied Menu. About to deprecate skel
new checking procedure for min fixed assignments
cleaned up and faster array mapping functions
Moved modules import at startup
improve pointer usage
add Detection to interface
romove imshow from code
ex2...
httpcomponents-client spec
fixed a bug in the syntax definition, for use with implode, and fixed a bug in serial(Unit u) which forgot to return something, and fixed a bug in Implode, which did not have all the constructors in scope that are needed to build the tree
added missing meta information for building rascal generated parsers
added more meta inf
optimization by avoid the IfDefined operator and using typed variable introduction instead of untyped variable introduction
added types to all fresh variables in function headers, which is required for correctness, and also types to all variable introductions in patterns, which is more efficient in the current implementation of Rascal
new error handling for unknown tvdbid
bug 369
Extracted common greenlet cleanup method in SchedulerService
Finished mandatory exercises of series 4
use sensible default for :max-redirects
Merge remote-tracking branch 'cemerick/master'
Add a test for the default max-redirects option
remove shit;
c
DanOS: improve stage2 loader - not quite found the kernel yet
gc to gh
Download at github
Add vimrc, ssh tab completion
Added styling for product list and partner list.
Multi Lang support on one domain
Update puts.js
created BASH_LOADED variable
removed __git_ps1 from remote servers and escaoed color printing ps1
make sure bash only loads once
created elaborate scheme to force zsh on remote servers

This allowed me to update zsh, because it was horibly outdated on my
remote servers ... without root access it would have been impossible.
commented out 3 color regions that caused errors on remote servers

Perhaps dircolors is outdated on remote server, but updating it still
showed errors because it called it before even loading my source files.
therefore, we removed the following dircolors:
- RESET 0 # reset to "normal" color
- MULTIHARDLINK 00 # regular file with more than one link
- CAPABILITY 30;41 # file with capability
Made a 2nd HASH_COLOR/HASH_MOD so that 2 different colors can be loaded
removed dir_coors_other
some fixes in ByteBuffer handling
Handle nick changes in irc.

Why didn't I think of this earlier??!!!?!??!??
Updating the template title var
after fixing, the cache must be renewed
Optional ordered iteration for hattrie (and ahtable). (fixes #4)
don't print annoying messages if no virtualenvwrapper
Controlador CI
Add build for Raspberry PI
write also the error values in polies_.json during the tessellation, #17
prune polygons with small error values when loading the polygon pool, close #17
getTheme
CHANGED: Improved layout of page and products
CHANGED: Added tax field to order items
fix fonts for theme
listing 6.30
NodeContainer 이동 떨림 수정

마인드맵 이동시 떨림 현상 수정.
fps 60으로 변경
Correct example for fakesmsc
added query console
fixed decimal in reports
Merge branch 'tz-faster' of github.com:dimagi/logistics into tz-faster
made into classes
changed the org a bit
put base class for warehouse view in submodule
Merge branch 'malawi-report-ui' of github.com:dimagi/logistics into malawi-report-ui

Conflicts:
	logistics_project/apps/malawi/warehouse/report_views/dashboard.py
	logistics_project/apps/malawi/warehouse/report_views/reporting_rate.py
	logistics_project/apps/malawi/warehouse/report_views/stock_status.py
	logistics_project/apps/malawi/warehouse/views.py
Use string formatting, not string concatenation
add environments to testdata.py
Simplify bundler usage
Use new cucumber step function instead of [WT]hen
Update tests for simplified rake/rspec setup
Use latest bundler
Version bump to 0.0.8
done with report
Merge pull request #2 from dkford670/7_REV02

done with report
Use provided --origin for initial fetch command
Added gems for ckeditor and paperclip
Changed references to */misc directories in unit tests.
CentOS support for install.sh
improved installation instruction in readme
transformed parser unit tests to phpunit
aggirnamento al master per branch fartist1 19/11/12
aggiornamento per allineare il master
aggiornamento per allineare il master2
Set up interfaces and unit tests for grade getting/setting
functionality.
Some implementation, a few more unit tests.
Tweaked the unit test conditions a bit.
Going green, one assert at a time...
Added a few more tests.
Round out unit tests heading into implementation of grade setting.
Setting grades is green on dao; now for the service.
Setting grades is fully green.
decent first crack at URI::di

--HG--
rename : URI/data.pm => URI/di.pm
Bumped version to 0.1.8. Fixed forwarded headers. Now depends on http-proxy 0.8.3 and node 0.8.x
Removing directorie: doc. Documenting the project with sphinx.
added pass-thru for adventurousness
Better matching between file-system paths and workspace resources.

A file-system path may correspond to several resources in the workspace. We used to choose
the first one, which lead to build errors being attached to the top-level project in nested
project setups, even when the error belonged to a nested project.

Fixes #1000734, #1000621, #1000881. Should be back ported to 2.0.x
Formatting changes.
added the ability to add equipment from single view
fixes color sprite priority
convert value to String.  Makes much more sense for functions, undefineds, etc
testing dropdown quase final
chunks import script
barebones documentation
Updating repo to latest vim environment
Quantum common configuration support.
This ensures that devstack will work with the Quantum versions and ini files prior
to, and after, the above mentioned changes.

Change-Id: I18da8febf808c4752330ad1699a079c1d0a544fa
Merge branch '8176' into dt-test
Fixed bugs in "catch" and "fdoc" snippets.
Add snippets for zsh

zsh is a seperate filetype from sh in Vim. This uses the sh snippets
while changing the shebang-related snippets.
Add test to determine shell

The 'sh' filetype in Vim covers sh, bash and ksh. This function looks
for declared variables that results from Vim's own test. The global
variables are checked first since they are typically specifed by the
user in .vimrc
Change snippets to use getShell()
catch snippet fix, assert snippet improvement.
Add comments to shell detection functions
Add Øystein Walle to contributors list
Merge remote-tracking branch 'osse/master'
Added a "union" snippet.
Synchronized with source branch
Fixed a typo.
Fixed the Par: snippet.
Syntaxhighlighting for clearsnippets by Aaron Schrab
Fixes and improvements to snipmate conversion util by Steve McKinney
Avoid repetition in creating SnippetInstance

There's no need to use different code to create a SnippetInstance based
on whether or not there's a parent. The arguments passed either way are
the same.
Add has_option method to Snippet class

Encapsulate the fact that options are stored as the original string that
was pulled from the definition.  This will simplify things if that ever
needs to be changed.
Make Snippet object available to SnippetInstance

When a Snippet object creates a SnippetInstance it should pass itself as
an argument, so that the instance can later get additional information
about the snippet.
Add option for stripping of trailing whitespace

Add "s" snippet option which, if set, will cause trailing whitespace to
be stripped from lines before jumping to the next tab stop.

When used with a snippet like the following this will allow the text
from the $1 tabstop to be removed and have the space in front of that
automatically deleted when the user jumps to $2. This will work even if
using the same key for snippet expansion and jumping to the next
tabstop, whereas if the space was manually removed the key would cause
the snippet to be expanded again.

    snippet do "do block" s
    do `!p snip.rv = "|" if t[1] else""`${1:args}`!p snip.rv = "|" if t[1] else""`
    	$2
    end
    $0
    endsnippet
Fixed pythons rwprop snippet.
Merge remote-tracking branch 'aschrab/trailing' into trailing
Added joule and dated the Algorithmic Skeleton reference
Return both static and proc graphs from coop
enabled recent result display
added recent result display
nothing done
added encryption
fixed a bug - adding random lib
encrypted the html page sources, but pages are not displayed properly
nothing has changed
the logo is displayed
wrong...
logo fully displayed
working logo displayed
working logo display
clean display
final version
voting app with secure IDs
Merge branch 'master' of git://github.com/hackerjim/hd-vote

Conflicts:
	main.py
	models.pyc
	templates/issue.html
	templates/overview.html
A PollPresence should be sent when a new Room is created
Need to display the room name to differentiate presence messages (and a way to do it)
added XML classes needed for JSON library
Upgrade to 1.9.3-p125 for rb19
generating min js
add art_pen example
HTMLEncode function created. testHTMLEncode added. Also includes other incomplete and/or untested additions(unfortunately)
Skeleton for filterCSSProperties added
.gitignore added
fix x dimensionality
Fixed that watchers delete links are escaped on the issue view (#10932).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9700 e93f8b46-1217-0410-a6f0-8f06a7374b81
Albanian translation added by Dimitri Toslluku (#10875)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9666 e93f8b46-1217-0410-a6f0-8f06a7374b81
set svn:eol-style native to Albanian translation files (#10875)


git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9667 e93f8b46-1217-0410-a6f0-8f06a7374b81
Ability to add non-member watchers on issue creation (#5159).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9254 e93f8b46-1217-0410-a6f0-8f06a7374b81
Slight changes to diff/file/annotate styles.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10432 e93f8b46-1217-0410-a6f0-8f06a7374b81
Getting a basic "Hello World" working.
Set search DataTable metadata
Put DataTable info in the header (with the search box)
Change 'got' by 'showing'
Removing trailing 'nodes'
Merge pull request #52 from edelight/fix-datatables-search-strings

Set search DataTable metadata
Abstract LC data loading
Fix popupmenu style, exitting on game
No need to sort here.
fix insert-line-numbers+
Remove BugZilla
Git class changes
Merge pull request #1 from ehird/master

Speed improvements
cleanup for release
polish for release
default-language required for cabal 1.10
removed haddock formatting on README
constraint example cleanup
Simpler and faster unsafeCoerce implementation
change alert::clear() use childre.clear()
Take the fog into account when caching renderers
added bootstrap starter template for internal use
added bootstrap templates for internal use
initial homepage
new favicon
fixed pagespeed issues
js and css loading order
add readme
fail with an error if the file of the calling stack is not found
missed a log message
enable smtp
Upgrade OpenLayers/Format/SLD to v1_1_0_GeoServer.js in the client's build config. This is needed to solve an issue with the styler not showing control buttons.
Fixed typo in SLD version.
Updated submodules
Removed lambda _ function that was not used in settings.py
Removed DEFAULT_LAYERS_OWNER setting that was not used in the codebase
Fixed values of STATIC_ROOT and MEDIA_ROOT in development to better match the production ones
Removed LOCALE_PATHS from settings as they have been consolidated in one place and that setting is not needed anymore
Removing AerialWithLabes as it was causing problems - references #244
Removed the TEMPLATE_LOADERS setting that was just being set to the default settings Django comes with
Set current version to 1.2-alpha5
Removed redundant and obsolete settings from geonode.local_settings
Removed ADMINS and MANAGERS from settings
Added comments and reordered settings.py
Added LOCALE_PATHS to point to locale folder in project dir. Autodetection was deprecated in Django 1.4
Added SITE_NAME and SITEURL parameters to the GeoNode specific settings section
Removed GEONODE_UPLOAD_PATH from geonode.local_settings
Bumping version to 1.2-alpha6
Do not download geonetwork every time paver build runs
Removed dependencies from README that were not needed anymore
Updated directory structure in README
edited header layout
init
base struct
orbits
Moving and hovering
options and clicks
Last fixes
New popups
add weighted pagerank example and test
Fix typo in output message.
Merge pull request #23 from azymnis/develop

Fix typo in output message.
some cleanups of Operations.scala
Merge pull request #24 from johnynek/develop

Cleanup Operations.scala
take care of review
Merge pull request #25 from dongwang218/weighted_pagerank

add Weighted pagerank example and test
fixing running with sbt 0.11, where scala distributive is placed in /home/whiter4bbit//.sbt/boot
Merge pull request #26 from whiter4bbit/master

scala home location for sbt 0.11
Merge branch 'master' of github.com:twitter/scalding into develop
Refactors TupleConverter to apply with TupleEntry
Merge pull request #28 from johnynek/develop

Simplifies TupleConverter
fix java class path to enable running local mode on windows platform
Merge pull request #29 from rore/master

Run scald.rb in local mode on Windows
Merge branch 'master' of github.com:twitter/scalding into develop
Merge branch 'develop' of github.com:twitter/scalding into develop
Implemented Mode.fileExists to facilitate checking for files across
filesystems in different modes.  Added support to test modes, and
JobTest, for registering mock filenames.  Minor refactoring of JobTest
to improve code reuse across run(), runWithoutNext(), and runHadoop().
Minor tweak of hadoop fileExists.
Merge pull request #31 from mjahr/mjahr_fileexists

Implemented Mode.fileExists.
Rasta class generator can now generate classes with empty methods. Relates to #61.
Added Hub git client wrapper
added ruby/rails aliases
studyka emacs configuration :/
ContainerViews should invalidate `element` on children when rendering.
Continue to flesh out the initialization process

We are moving towards an initialization that is
bootstrapped via app.initialize(router), and
that:

* Instantiates all controllers and two-way links
  them to the router
* In ember-data, instantiates the store and gives
  it to the router
* Triggers the router to start

This system also allows other packages or
third-party tools to participate in the
initialization process.
[bucket, github] fix typos
[url] Properly port to the new Config api
[bomb, etymology] Remove ._meter, make .ety documentable (and add docs)
Usage sample fix.
bugfix iterator no UI
add tmux setting
remove bug
Restructured layout of the code. Added 02_triangle_mesh example.
first commit, working code, no permalink for posts, next feature
Version beta.
working coffee script refactored
sending clear on end
src/common.h : Change 'typedef SF_CHUNK_ITERATOR { ... } SF_CHUNK_ITERATOR'
into 'struct SF_CHUNK_ITERATOR { ... }' to prevent older compilers from
complaining of re-typedef-ing of SF_CHUNK_ITERATOR.
configure.ac : Fix if test for empty $prefix.
corrigido para retornar apenas 8 items no jogo
Merge branch 'master' of github.com:erosario/top-top
Added: Caja Host Runtime
Added: Nexmo Library in Go
add option to hide wp feed discovery
auto-activate podlove web player
configurable web player formats
settings: improve button placement
add support for podlove web player
moved loadState to CLCGVC
renamed "recent" functionality to a more generic "highlighted"
renamed to avoid conflict with UIKit highlighted property
2012/09/10 US Mkt final
criacao dos models
Revert "criacao dos models"

This reverts commit a58ae8cbe31683e5136488b02241a3a3c4b6c0c2.
Revert "criacao dos models"

This reverts commit a58ae8cbe31683e5136488b02241a3a3c4b6c0c2.
Added README for rebar.
edit by zhangfei v2
Added pretty_puts function
Refactored default output
not implemented operations are removed from menu; "Edit" operation is not visible for images; cosmetic fix "Edit" textarea
1) сделан последовательный вывод пути в хлебных крошках
2) исправлено исправление в файле forum_content.php
Removed problematic non breaking space
removed ruby entry, added paredit
narrow-to-region
fixing the overall sorting by type using css and id='size_content'
602687
adding setup.py so it can be pip installed
adding __init__.py to test directory to keep setuptools happy
Merge pull request #1 from sajal/master

adding in a setup.py so that i can pip install it
reviews for 10/18
and the actual reviews
[add_feature] Add play control feature (play & pause)
Make ETIMEDOUT #define conditional to avoid duplication.

Old Windows didn't define it, new one seems to.
Merge branch 'master' of github.com:felix-lang/felix
Add new dynamic linkage routines to dynlink.

And test in webserver.
added READMEs
removed uncompleted questions
Cheered up the user
Added a profile-scope in the top right corner
issue6059: use Promise
Merge remote-tracking branch 'upstream/master'
Better code formatting (related to issue 5878)
Merge branch 'master' of https://github.com/fflorent/firebug into issue5878
Acomodando facturas
Cambios en vistas y traducciones
移除AuctionFilterPlus
lower case classes
refactor some ibOrderSenderHelper func
add WEB-INF to kernel
Added note about AppCode
Changed Readmefile
Fixes an issue with invalid users in streams core

When the user field type was retrieving a user it presumed that it was
found and attempted to return the data, this simply puts in a check that
data was found and returns false if not.
[api] allow a custom respond method to be set when using restful as a flatiron plugin.
Merge pull request #26 from nrw/master

Allow a custom respond method when used as a flatiron plugin
Fix #78.

It appears that Object#__method__ is already a Ruby method. Who knew!
Bump version to 0.11.3 and prepare for release.
list cotations
default=0 to avoid None on exceeding
describe reason and all while listing appointment
widget
Merge branch 'master' of github.com:fnp/wolnelektury
opds fix
bumped mongo-java-driver to 2.9.2

no code changes required
added a CHANGELOG
Throw exceptions rather than swallow in RegionCoprocessorHost.
refactor the switch type helper, controller and  view
mac80211: rename a misnamed ath9k patch

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34463 3c298f89-4303-0410-b956-a3cf2f4a3e73
mac80211: refresh patches

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34464 3c298f89-4303-0410-b956-a3cf2f4a3e73
try to add nodejs mode but not working
merged
Changed variant::detail::apply again to not use size<>
Logo fix after commit d5b351937a92d1dbc8976145f7a1078c54a087ad in xbmc.
delete UB*REF/* implementation; import the symbols from nibbles instead
Added data population method to ArticleViewController.
Added simple example that unpickles a document.
Codeforces Round #144 Problem AB
Codeforces Round #144 Problem A Cycles
Added die command in case no encryption types are found

If you run 'deduce_and_set_enc_types', and no encryption types are
found, it doesn't behave properly before this set (it tried to use an
undefined variable).
added some pandas from the original mozhunt to fill in as tokens for now
Merge pull request #223 from galthaus/c69a5d35de2fda12743b4e068ae1fd00acdfe77c

Update glance image import to work correctly. [2/2]
Merge remote-tracking branch 'dell/release/essex-hack/openstack-os-build' into release/essex-hack/openstack-os-build
Include nova scheduler fixes.
Merge remote-tracking branch 'origin/release/essex-hack/openstack-os-build' into release/essex-hack/openstack-os-build
Merge remote-tracking branch 'dell/release/essex-hack/openstack-os-build' into release/essex-hack/openstack-os-build
fix image uploader path
fix配置载入失败
dubious spec refactored
database#reset removed (concurrency problems)
Documented previous successful change.
add duplicate BIT b,(IX+nn) opcodes
Implement WOS API integration
Better perfil_usu.html
separate tests from the rest
fix mistake
fix warnings
Sorting the scenario name by first appearance.
Sorting the request names by first appearance.
Second commit. I forget what I changed.
fixed site observation forms
fix grammar typo

fix libsqlite3-0 (http://packages.ubuntu.com/precise/libs/libsqlite3-0)

add tip for Kegbot home directory

fix export command typo

update database user to match documentation

remove MySQL-python. os installed dependency.

redundant directory.

explain virtualenv directory location

Add section for Kegbot media and static file configuration.  Update various pykeg references to Kegbot Server.

grammar typo.
Dopping pin

You can add a new building,  drag it, then when you click on it, you
have an infobox that has an input feild to type the name of the
building.
pagination image changed
added pagination
Lots changed. Add meeting view controller now makes more sense with a modal transition. Changed some things on the detail view controller.
Created basic interface for next meeting in Meetings Table View Controller
xs: update libgit2
xs: update to new libgit2 API
Changes: update
TODO: update
Changes: improve wording
Quiz: moved function loadTab into VISH.Utils
Quiz: added options button
Urls and Symbols to config
1) help window 2) opacity slider 3) layer dragging 4) PDF export aka print function 5) Windows sign on experiments
Merge remote-tracking branch 'thok-zxl/master'
Merge remote-tracking branch 'origin/master'
Add-Migration  modify_product_warning
日结核对功能完善
Signed-off-by: Endis <369029432@qq.com>
日结核对界面修改
Signed-off-by: Endis <369029432@qq.com>
界面调整（日结核对）
Signed-off-by: Endis <369029432@qq.com>
车载系统升级工具到2010；并修改车载部分BUG，及修改车载对应服务器方法获取明细BUG；
条烟柜层数改为0，与电子标签系统分离；不再关联；
删除无用文档；
Merge remote-tracking branch 'thok-zzb/master'

Conflicts:
	code/Authority/Wms/Web.config
测试修改。实时出库；自动刷新；
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
综合数据查询添加打印功能
Signed-off-by: NameJun <122419795@qq.com>
+ pakload
Added pub icons for all pubs, sigurd/a-fiket icon not found!
Changed names on icons
all icons photoshoped, majority are now transparent
all icons is changed to cubic form, added snoopy

- changed all icons to cubic form, x and y dimentions are equal
- added snoopy as sigurd/a-fiket icon, their patron
added icons to drawable folder
Merge remote-tracking branch 'origin/pubinfo' into Branch-for-theMap
Add scrolloff=999
ajout couche service

couche service + exemple service RechercherStagiaire
repository: minor refactor
Merge branch 'master' of github.com:globocom/gandalf
Adding missing .exists method to the mixed storage
newestim/haskell backend works, print output
Display all blog posts on /archives.
Set home page link text to 'Home'.

Requires latest version of Nesta to work, just sticking it in now while
I remember.
Fix specs
Tweaks to breadcrumbs.
dpkg requires gnu-tar (not bsd tar)

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
rubber: improve shebang replacement pattern

The old pattern assumed that python was installed via homebrew, which is
not necessarily true.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
igraph: added patch to fix issues with llvm-gcc

* Also added support for --universal

Closes #7570.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
blast: add option for dynamic linking, support -Os

fixes to 2.2.25 acknowledged upstream by Aaron U. per email

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
dpkg: mark as fails-with-clang
skktools 1.3.2

Closes #9376.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
gptfdisk 0.8.2

GPT fdisk by Rod Smith, rodsmith@rodsbooks.com (GPL Version 2)
Formula by Tim Mecking, tim@mecking.net, https://github.com/sptim/

Closes #9629.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Squid: warn if bdb 5.x is installed
Redsocks 0.3

Transparent redirector of any TCP connection to proxy
https://github.com/darkk/redsocks

Closes #9987.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
use make from path
Fix Dependency equality
ipbt r9253

This is a new formula for ipbt. It plays back recordings made with
ttyrec.

Closes #9948.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Rakudo Star 2012.01

Rakudo Star comes with its own version of Parrot that is designed to match the
target release of rakudo, so I am removing the Parrot dependency and having it
build against packages version of Parrot.

Also, having it install all of the tools, this includes parrot, nqp, and all
of the modules that come with Rakudo Star instead of just installing the perl6
executable.

Also added caveat about installing parrot and rakudo side by side.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
csscrush 1.4.1

Closes #10098.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
jigdo 0.7.3

Closes #10000.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
mpd: add --HEAD

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
virtuoso 6.1.5

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
csup 20120305

* also moved head to bitbuket

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
brew fetch: show downloaded path
Mapserver: update to 6.0.2 and fix clang build

Fixes #11066.
Closes #11118.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
try to fix canvas issue
ssh: fix launchpad ecdsa workaround
Adding travellers
update used libs
fix existing tests
start adding customization gui
save user preferences to datastore (no validation yet)
submitted command word length verification
finish command customization validation
clean
fix command customization (use correct commands for users, not commands of a logged-in user)
style tweaks
change gae version
Deploy with correct cache headers.
Merge branch 'teamcity' of github.com:guardian/pasteup into teamcity
- Add and config backbone-validation
- Add backbone functionality for create a new product
lots of stuff, not much time (products is ready)
- margin top fileset label dialog print
- body overflow y is now disabled while dialog open
store the values in the struct
Removed the message from README
fixing line number resolution for PS 2.0 (ie pretty much everyone)
sqare-multi in mathutil
Smushed sprite image from 1560 to 559 bytes
Merge pull request #486 from binarycode/master

Smushed sprite image from 1560 to 559 bytes
change config fabfile.py
this might actually work.
First commit

Added, gitconfig
Domain class renamed
Domain object moved and updated to hold the domain in parts.
Fixed login with non facebook username; updated the importer
make tabs work again on main menu
optimize dish order queries a bit
tidy up query
changed rvmrc to use global gemset
Updated Bundler.
add line_edit_history (non-implemented)
Merge branch 'master' of github.com:hiairrassary/fry
add line_edit_history (non-implemented) v2
Rejestracja chyba działa, wypada dodać email, oraz być może zmienić z
zapisywania użytkownika do bazy na tworzenie za pomoca metody
create_user or sth
vimproc, vimshellを有効化
Signed-off-by: hisasann <hisasann25@gmail.com>
" :Multi ^ or :Multi $ or :Multi hoge
Signed-off-by: hisasann <hisasann25@gmail.com>
Update Happy
Working on general project settings
require fullpath
Implement oauth2 authentication
version bump
Minor readme update.
Typo in unittest importing.
Resizing.
Credits.
Nose's data added to .gitignore.
Refined packaging etc.
Cache and config with tests.
Figures for X,Dic3,Dic4 added
Merge branch 'master' of https://github.com/hoqqanen/euterpe
fixed the sounds to the best of my ability remotely, i.e., haven't tested with the ambisonic sound system. i added the shaker cues for the ground rolling for ambisonic system
fixed a merge conflict i had with myself?
fied the conflict again
e
fg
minor, provide ploff slot for a header's ploff in native endianness

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
chore, hygiene, kick useless ute_hdrcz()

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Merge branch 'core/file' into next

* core/file:
  chore, hygiene, kick useless ute_hdrcz()
  minor, provide ploff slot for a header's ploff in native endianness
favicon added
Merge pull request #1 from comzeradd/favicon

favicon added
added vim-align
初始化后提交项目所有文件
change relationship of travel, added hotel object
添加“正则表达式”到 Clojure 笔记的”基础类型“部分
从 Clojure 笔记的“复合类型”中删除错误的 cons 用法
添加“序列”到 Clojure 笔记
添加“命名空间”章节到 Clojure 笔记
Merge pull request #1 from hugoroy/master

An attempt to add source for ToS
Merge branch 'master' of git://github.com/pde/tosback2
typo
Add disassembly for lot of cop1 instructions
cpu1 view. Overall layout needs tidying
Remove debugging for DIV/DIVU
fix for warmup
Use of strings for keys
Initial commit of project. Defined interface for TV controller
Merge branch 'master' of github.com:iThompson/TvCtrl
Sliding insertion/removal animations.
Code formatting, and clean up so that xhiccuped is only handled in case the pipe isn't terminating
Remove unnecessary condition in assert
Added a new dependency, and fleshed out the description/summary
started environment-mount file for diff env check
removed PFunc (obsoleted by PMap)
Get the linux headers building.
Beware, linux get doesn't work with bad connections
Implement table (and sequences) renaming
Implement rename_column
Implement remove_column
fixup rename
Implement change_column and DRY it up with remove_column
Reorder code
Implement change_table and change_column_default
Hijack column defition and primary_key fetch, and refactor its passing around as pk columns are cached anyway
Let RETURNING be the last stmt in the INSERT rule

In the psql console, even if the RETURNING is not last, an INSERT
RETURNING query on the view correctly returns the requested value,
when invoked via the PG library and AR with prepared statements,
no value is returned.

So, the RETURNING has been moved last, returning data from history
that'll contain the same data anyway. If the queries were to be
inverted, concurrency issues would have arisen and convolution as
the sequence would have need to be queried.
The final Gemfile for the sample application
Adicionados mais arquivos temporarios para o gitignore

Iniciada conformidade com PEP8
Modificacoes que que refletem as partes 1 e 2 do tut.
Added friendship app
Added friendship app-deleted .pyc
Added friendship app-deleted .pyc
Merge pull request #5 from mtotti5/master

Friendship app added
change google analytics acount
Completed Exercise 10.4
Fixed link to 0.0.5
1154 cpio needs a quiet option
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Approved by: Richard Lowe <richlowe@richlowe.net>
212 Atheros AR8132 / L1c Gigabit Ethernet Adapter
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Approved by: Dan McDonald <danmcd@nexenta.com>
3013 ifconfig with no args should list all interfaces
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Approved by: Albert Lee <trisk@nexenta.com>
Document: ignore . and .. in listings
changed picture and true po files
Force incuna.com email addresses for auth
completed cascading dropdowns
Merge branch 'master' of https://github.com/invoketech/store.git
ah, si j'ai trouvé !
Ajuste/reposição de material esquecido/apagado..
Pushing new changes
Pushing new changes
Pushing new changes
Pushing new changes
Pushing new changes
Pushing new changes
Pushing new changes
Pushing new changes
Pushing new changes
Updated
cli opts and stuff
Fixed some of the search filters so that they do what the side text says they do.
Merge branch 'master' of https://github.com/isenseDev/iSENSE into search
Merge pull request #300 from jdalphon/search

Search filters changed
fixed thisArg for modelFetchComplete
Slide display changes
Added .gitignore
Added the rabbitmq formula
Merge pull request #2 from skottler/master

Add RabbitMQ to available formulas
Added getDirRestorer.
Added a restore command.
Moved restore flags into a flag set.
Improved error message.
Did the same for save.
google-js-test 1.0.8
added basic doc for Connection
Add HtmlParserSharp as submodule
Start building out CSS object model
Creando Search
Add MacOS 1.1 theme WIP.
Add tagline and proper theme switcher to MacOS theme.
Refactor quote centering.
Tweak taglines.
Add bottom margin after quote.
readme.md file added
Accounting Model Updates

Tighter Coupling between GL and COA
deleting js from bronze, renamed it
modified:   page-home.php
	deleted:    scripts/nivoslider/demo/demo.html
	deleted:    scripts/nivoslider/demo/images/dev7logo.png
	deleted:    scripts/nivoslider/demo/images/nemo.jpg
	deleted:    scripts/nivoslider/demo/images/toystory.jpg
	deleted:    scripts/nivoslider/demo/images/up.jpg
	deleted:    scripts/nivoslider/demo/images/walle.jpg
	deleted:    scripts/nivoslider/demo/scripts/jquery-1.7.1.min.js
	deleted:    scripts/nivoslider/demo/style.css
	modified:   stylesheets/master.css
Cleanup identifier and pattern types
Just messing around
Yet Another dependency analyzer
WIP
Simplify stuff
Work a bit on new runtime
WIP
Stuff works now (somewhat)
Various things...
Refactor logger a bit
Proper logging
Return proper exit status code

Closes #94

Conflicts:
	src/Hakyll/Core/Run.hs
Script de batería compatible con mi otro ordenador.
Los ficheros SQL no se incluyen en búsquedas de ACK.

Me estorbaban muchísimo :), y nunca me ayudaron.
Un negro no tan fuerte para el estado en tmux.
Resto de colores más definidos en tmux.

Un poco menos coñazo hacer cambios.
Comillas adecuadas para evaluar variables.
[JBTM-934] JacORB throws TRANSIENT if the target is unreachable whereas the SunORB throws COMM_FAILURE
JBTM-934 Allow the script to run a specific QA target
Removed jQuery UI reference in config
Use emacs auto-fill-mode in magit-log-edit-mode
Fixed STATIC style for exit() and abort() callback hooks.
Implementation of the parallel Gauss-Seidel algorithm in progress and definitely not working.
Parallel Gauss-Seidel seems to be working! :)
V1.0 ?
Some logic should be inside startRun() instead of initialize().
Remove some duplication from TestCase#metadata().
Add 'spec' and 'error' reporters.
fixed jquery selector glitch
changing sqlite to try to get heroku to work
Automatic commit at Tue May 29 13:00:01 MDT 2012
Automatic commit at Mon Jul  9 21:00:01 EDT 2012
Automatic commit at Tue Jul 10 15:00:01 EDT 2012
Merge pull request #13 from jecollins/master

#489 - controllable capacity tests pass
Added error catches to prevent the weather repos from being used before the weather service is called
remove unused exceptions
Merge branch 'master' of github.com:powertac/common
Merge pull request #14 from eonarheim/master

Defensive programming fix around the weather service
update recycle to match initial state
#503 - switch to RuntimeException, emit error message at site of error
#431 - report total production and consumption per timeslot
#360 - simplify TimeslotUpdate message format
readability
#505 - re-work tariff-revocation processing; simplify testing
Merge branch 'master' into jec-master
#505 - CustomerInfo now has a single PowerType
minor cleanup to remove compiler warnings
#512 - use login messages to convey secrets
#512 - copy over broker queue name when creating message
Merge branch 'master' into controllable-capacity
#518 - update CustomerRepo to handle updated CustomerInfo semantics
Merge branch 'master' of github.com:powertac/common
#517 - correct sign of charge for production tariffs
made some adjustments for SBPkb2
add envoirement variable for compiling kivy
getting tips
added self contained analysis.R for running simulations on CHPC.
better ignor for harvestr-cache
added more instructions to the array implimentation.  which has been outdated by the spawn version.  Committed for completeness.
Added Sabre PCC to initialization
Cursored strings.
We need EIEIO.
MMI-16,MMI-13: removed core schema field When/objectComponentInformation from UI
piechota przeciwlotnicza
Strip out experience
Update shotgun.min.js
Organization: renamed mcu codebase to emulator
Unused: updated #ifdef guards for new directory structure
Makefile: adjusted targets and rules for new subproject names
TODO: ffclk optimization, stack traces, uart flow control
BIOS: added fast/slow POST option to the plan
Boot Process: noted to put dram test code in the boot process during post
Hardware: added some mass storage hardware possibilities
Update .gitignore.
Remove files I won't be using.
Update test suite.
Refactor code and add in fabio specific code.
Update package.json.
trollop version
Album.count*
Moved userlist into the view
teste
teste
subindo
teste
Add store.{Lock,Unlock}()
[fix] AirTunesServer changed to comply with the new CThread constructor requirements.
Update utils/install
Merge pull request #6 from jinglong/master

added error_page default
bugfix: if you have not added the processes block in your conf file, you will get a coredump when you call ngx_proc_get_conf or ngx_proc_get_main_conf.
delete the blank
Merge pull request #7 from yzprofile/dev

bugfix: if there is no processes block defined
1 fix bugs of the limit_req module(please read this issue https://github.com/taobao/tengine/pull/1).

2 add test case for limit_req module.

3 refactor some code and fixed code style.
Merge pull request #9 from monadbobo/topic2

fix bugs of the limit_req module 
fixed compile warning.
Merge pull request #10 from monadbobo/taobao-topic

fixed an compile warning with limit_req module.
merged changes between nginx-1.0.15 and nginx-1.2.0
fix the incompatible code in upstream check module with nginx-1.2.0
Merge pull request #2 from yaoweibin/check_shm_bug

Check shm bug
add docs of backtrace and limit_req module.
Merge pull request #13 from monadbobo/taobao-topic

add docs of backtrace and limit_req module.
Merge pull request #12 from zhuzhaoyuan/nginx-1.2-merge

merged changes between nginx-1.0.15 and nginx-1.2.0
bump version
Merge pull request #14 from zhuzhaoyuan/bversion

bump version 1.4.0
add document for ngx_http_user_agent_module
modify the document
Merge pull request #15 from dinic/master

modify the document
update the docs for ngx_http_user_agent.md
Se reviso la interaccion con el DaoContribuyente.
Merge branch 'master' of https://github.com/jion/licenciator.git
remove folder SW
update patch_template.xml
update cic.rb
pulling for annotation error fix
Merge branch 'master' of https://github.com/jku6/bartorville
Merge branch 'master' of https://github.com/jku6/bartorville

Conflicts:
	config/database.yml
getting a check
just before branching
users controller
Merge branch 'master' of https://github.com/jku6/bartorville
Merge branch 'master' of https://github.com/jku6/bartorville into jon
jons changes to session
remove .vecAdd: duplicated by .plus/add
v0.0.53 - Cleaning up the slop
replaced Command-T with ctrlp
added pickling functionality
instruction how to add files changed
adds Property(TVShow_Thumb) to listitem + player
[art] use a fallback map for art to generalise the fallback for the 'thumb' type, and set outside of CGUIListItem
[art] adds a param to AppendArt to specify the prefix, and utilise for setting art for children of tvshows, seasons + albums
[art] use artist.fanart for artist fanart, and add fallbacks for fanart->artist.fanart and thumb->album.thumb for albums/songs
[art] adds fallbacks for fanart->tvshow.fanart for episodes/seasons, and container.thumb->(season|tvshow).(poster|banner)
[art] don't add art from parent items when setting art on children in the database
[art] cleanup - no need for convoluted resetting of thumb now that it's just a fallback
[art] set all art on the trailer when playing from video info
Fix fclose outside of file loop

Closes #307.
Merge branch 'master' of https://github.com/PromyLOPh/pianobar
[AS7-4628] JMS bridge

Add manage JMS Bridge to AS7 messaging subsystem

* update messaging subsystem namespace and XSD to 1.3
* <hornetq-server> is now optional (so that an AS7 instance
  can host only JMS bridges)
* define JMS Bridge using SimpleResourceDefinition
* add integration test JMSBridgeTest using in-vm source and target
  resources
* add management operations start, stop, pause, resume
* add org.jboss.remote-naming to org.jboss.as.messaging dependencies
  to be able to do a JNDI lookup on a remote AS7 instance
  to set up a JMS bridge
* add module attribute for external broker dependencies
* add dependency to HornetQ's JMS service only if one of the JMS resource is looked up locally
* start/stop the JMS Bridge service asynchronously
* add a dependency from org.jboss.as.messaging to org.jboss.threads module to
   create the executor in charge of starting/stopping JMS bridge services asynchronously
[AS7-4628] JMS Bridge

* use server-wide shared thread pool [AS7-4934] instead of private executor to
  start/stop JMS Bridges
don't fast foward merges

Signed-off-by: Joel Nimety <jnimety@continuity.net>
BusinessList controller associated to its screen on storyboard
prettying up registration
Add 1.2.2r2 manifest

Change-Id: I34be1a19d3c9939430727e8df16b9063250fd629
Additional note on Edarbi example
Merge branch 'develop' of https://github.com/gertvv/addis into develop

* 'develop' of https://github.com/gertvv/addis:
  Additional note on Edarbi example
More understandable parameter names for RateMeasurement
Fixes to ClinicalTrials.gov import (story #572)
De-static ClinicaltrialsImporter, import results PMIDs (story #572)
Allow import for PopulationCharacteristics from CT.gov

Disable import of FrequencyMeasurements (these do not properly map as of yet). Story #572
Renamed 'tests' folder to 'test'
Corrected README
ASGARD-917 - Change availability zone select to show 5 zones at once
Merge pull request #50 from jgritman/zone-select

ASGARD-917 - Change availability zone select to show 5 zones at once
Update plot_network() name in README.md link
Added some data-missing safe-guards in plot_network
Merge pull request #111 from joey711/AddSpeciesDistance

Replace plot_sample_network with plot_network. Support species/taxa-based networks.
Updated the EARM2 model overview figures
Check that no task is left in a pending state by a worker thread.
Add extra debug printing when operations are completed and events are generated.
xenopsd: 'xn diagnostics' dumps the list of tasks; calls to TASK.signal log the task state.
CA-77202: don't regenerate the VM's last_start_time on migrate/resume. This would have the side-effect of occasionally blanking the VM guest_metrics, causing operations to fail with VM_MISSING_PV_DRIVERS

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Adding cwd to terminal title.
Commit before merging all NotifyErrors
Map and Contacts working
ajax functionality made simpler
Added javascript and css directories ready to make nicer image viewer UI.  Renamed config.php to config.php.template to avoid local modifications being committed.
'passing' published test case for statistics
Update innodb/my_processing.sh
Add solution and a bunch of empty projects

All the projects have been left exactly as VS2012 created them
Add references to NUnit and Moq, and remove reference to EF
Enable NuGet package restore
Target .NET 4.0 in the WebApp
Merge branch 'feature/set-up-solution-etc' into develop
irssi

add new default channels and change theme
vim

move back to default of 4 spaces
zsh

* add hamachi list alias
* remove python server alias
* add python server function
Merge branch 'master' of github.com:jonyamo/dotfiles
remove accidentally commited undo files
Fix documentation issues.
Fix documentation issues.
Refactor exception handling in Shift.Interchange.
Rev 0.0
Merge branch 'master' of https://github.com/jorgen-k/fmckapp.git
Add lucene-facet dependency
Add Lucene taxonomy support. Upgrade default Lucene version to 34.
Add a default taxonomy configuration.
Fix exception.
Add draft implementation of faceted search widgets.
Lucene faceted search. Removed GeoServer.
Merge branch 'master' into feature/lucene-facet

Conflicts:
	web/src/main/java/org/fao/geonet/kernel/search/LuceneIndexReaderFactory.java
	web/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java
Indexing errors / flag common types of errors.
Add support for numeric value boosting.
Add a chart example.
Move summary config to LuceneConfig.
Properly close/commit taxonomyReader/Writer with Reader/Writer.
Move summary config to LuceneConfig.
Properly close/commit taxonomyReader/Writer with Reader/Writer.
Add new examples.
Update to Lucene 3.6.1 API.
Add support for more than one facet on a field.

Do not display a facet if part of current filters.
Add client side configuration for facet to be displayed.
Fix CSW paging when summary is computed.
Add a specific logger for facet.
Add creation and revision date year and month index fields.
Index need to be fully rebuilt for taxonomy to be refreshed.
Use Lucene terminology in configuration for facet sort options. Improve good defaults for easier configuration.
Add facet switcher.
Preserve mtime to force recompilation in case of failures
fix for hex numbers
add crud for news
add crud for discussions
crud for proposals
Merge branch 'master' of https://github.com/jparbros/pp_peru

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/news.rb
updated git_branch_dirty for new git output
Use 'abbreviation' in scraper classes, rather than LEVEL_FIELD
Merge branch 'level-field' into develop
Restore note.js
Slider: Remove uses of self var; use new APIs or that var.
Question Distribution is configured via json file
Ensure that QuizView can be manually tested