labofsahil/github-event-dataset-2012 huggingface dataset:
Alter notifications to not send email to discussion author.
Compare based on class, not id.
Merge pull request #244 from enspiral/feature/discussion_creation_mailer_remove_creator

Alter notifications to not send email to discussion author.
Add the Object class which will become the base class of Declarative.
Initial comming of async base Object refactor.

Not complete, but runs. I'm skeptical about the need for a Session object.
Do we really need to support simultaneous remote connections? It's adding
a bunch of complexity and overhead, for something that may never materialize.
Add wip application stuff
Hookup message passing
Remove unneeded messaging files
Remove mockup files
Update and streamline qt messaging
Start to move the building process somewhere sane
Make building objects sane. Remove old messaging modules
Remove unneeded messenger widget
Update doc string
Update stdlib sessions and runner to use new application
Use Declarative as base class in place of old MessengerWidget
Add missing break statement in builder
Update some documentation
Add deferred calling functionality to the Application.
Remove message_format.js since it's no longer needed.

This refactor removes the need for an explicit message protocol.
It is designed so that use case specific protocols can be built
on top of the current application classes with ease. The builtin
local applications do not need a protocol.
Pass the pipe interface as part of the initialization
Update docs
update tester example
update boxes example
Merge branch 'feature-async' of https://github.com/enthought/enaml into feature-async

Conflicts:
	examples/constrained/boxes.enaml
port GroupBox widget
port GroupBox example
Merge branch 'feature-async' of https://github.com/enthought/enaml into feature-async
correct the ets_toolkit name for qt
updating position functionality to make tagging work
Added AJAX support.
Upgrading version to 1.0.3
Merge commit 'v1.0.3'
Add some comments to coffeecript support file
'ag' removed
Merge with contraction-fix
Site updated at 2012-08-28 12:27:37 UTC
Synthesize accessors.
Esborrar llibreries no utilitzades
continue writing admin controller pages
make the inserts more mongo-like, dict will also store the json
refactor hash_ and make_ds into the Database
add zlib compression
refactor in favour of pymongo
Merge branch 'codec'

* codec:
  refactor in favour of pymongo
  add zlib compression
  refactor hash_ and make_ds into the Database
  make the inserts more mongo-like, dict will also store the json
adding a COPYING file to facilitate packaging for debian
added iterator capability to the FITS class
Improved double decoding performance and added additional tests
fix grep/diff color aliasing
解决浏览器分辩率低时页面显示的问题
解决FCF图型报表没有根据站点统计数据的问题
Goes back to Tomorrow. Heh.
Fix some sns stuff
fix particles texture
changed audio to use physics2
Merge branch 'master' of github.com:expokorea/korea

Conflicts:
	common/src/physics2/RibbonParticle.cpp
correctly merged green highlight with exponential movement
: Mise à jour des classes avec la technologie des traits en POO pour éviter la duplication de code
Merge pull request #40 from falsifian/master

Change the default value of programs.ssh.forwardX11 to false.
rename youdao to yahoo
modify with vg
Update lib/socket.js

Specify reason when disconnecting a client
Added option to exclude dominant substrates for the data exporter
Issue 5520: 	Resetting all options doesn't affect panel orientation
feeds entity and dao
remove scope parameter from deleteApproval function
[fetch] Allow the use of dot.notation for accessing data.
[fix] Stringify default Number values for readline. #49
initial take
[release] maintenance version 4.0.3
check reference
define emtpy array as default
define default function
bullet 2.3.0 in Gemfile.lock
Bumping version to 2.3.1
added loading and generation of JSON structure... apears that no-single-image-transitions is broken for some reason...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
remove shipshow as pick
remove twitter from the intro
disabled non-unicode error for JSON errors
modified working region setting
Item10186:

   * reworked the way other contribs plugin as a theme using config.spec instead of a stylepath preference variable
   * some docu fixes, lots of legacy here
   * some template fixes of unballanced divs showing up now that we're done with the table layout approach
   * removed unused preview template
   * fixed the way %NATSKIN_SIDEBARWIDTH is affecting the css



git-svn-id: http://svn.foswiki.org/trunk/NatSkin@15280 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item12211: Configure saves backups of LSC


Conflicts:

	core/lib/Foswiki.spec

git-svn-id: http://svn.foswiki.org/branches/Release01x01@15929 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item12188: Login template shows NOTE div even when no NOTE defined

git-svn-id: http://svn.foswiki.org/branches/Release01x01@15701 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Fixed bug when escaping a path.
Added succint mode.
Errors are now printed to stderr.
MFC r236847:
Partially revert r236666:
Return PROTO_ATA protocol in response to XPT_PATH_INQ.

smartmontools uses it to identify ATA devices and I don't know any other
place now where it is important. It could probably use XPT_GDEV_TYPE
instead for more accurate protocol information, but let it live for now.
MFC: r238574

Fix a small memory leak in mpssas_get_sata_identify().  The change has
been submitted upstream as well.

Approved by:	re (kib)
Adding Git note for current refs/heads/vendor/tcpdump/dist
If hastd is invoked with "-P pidfile" option always create pidfile
regardless of whether -F (foreground) option is set or not.

Also, if -P option is specified, ignore pidfile setting from configuration
not only on start but on reload too. This fixes the issue when for hastd
run with -P option reload caused the pidfile change.

Reviewed by:	pjd
MFC after:	1 week
Remove unnecessary Xo/Xc.

Reviewed by:	brueffer
remove some extra testing code that slipped into the previous commit

Reported-by: Alexander Motin
MFC r237286, r237523:
	Don't close an uninitialized descriptor.

PR:		bin/167302
Approved by:	cperciva (implicit)
Allow (with a license warning) "options ZFS" to work in static kernels.

The 'make depend' rules have to use custom -I paths for the special compat
includes for the opensolaris/zfs headers.

This option will pull in the couple of files that are shared with dtrace,
but they appear to correctly use the MODULE_VERSION/MODULE_DEPEND rules
so loader should do the right thing, as should kldload.

Reviewed by:	pjd (glanced at)
In CTFCONVERT_CMD initialization, check that ${MAKE_VERSION} is defined
before using it. Bootstrap make (as built by usr.bin/make/Makefile.dist)
does not define this variable, but it needs to parse bsd.own.mk in order
to build a complete make.
MFC r238471:
Implement DT_RUNPATH and -z nodefaultlib.

MFC note: The ld_library_path_rpath default value was flipped to true,
effectively reverting rtld back to the pre-patch behaviour, unless
LD_LIBRARY_PATH_RPATH environment variable is set and its value is 0/N/n.
Merge r232054 by kmacy:
  When using flowtable llentrys can outlive the interface with
  which they're associated at which the lle_tbl pointer points
  to freed memory and the llt_free pointer is no longer valid.

  Move the free pointer in to the llentry itself and update the
  initalization sites.
Don't build and install the 07.lpd doc if WITHOUT_LPR is set.

MFC after:	1 week
- Fix an erroneous invocation of the editline.
- Fix wrong scaling in the bc.library.
- Let length(0.000) conform to what gnu bc does.

PR:	bin/159227
Submitted by:	AIDA Shinra <shinra at j10n dot org>
Shorten the name of the fast SWI taskqueue to "fast taskq" so that
it fits.

Reported by:	lev
MFC after:	1 week
MFC r239545, r239665:

Fix/add support for SCSI UNMAP to ATA DSM translation.

This addresses kernel panic observed when sending SCSI UNMAP
commands to SATA disks attached to isci(4).

1) Flesh out callback routines to allocate/free buffers needed for
translating SCSI UNMAP data to ATA DSM data.
2) Add controller-level pool for storing buffers previously allocated
for UNMAP translation, to lessen chance of no buffer available
under memory pressure.
3) Ensure driver properly handles case where buffer pool is empty
and contigmalloc returns NULL.
4) Clear freeze bit in isci_remote_device_release_lun_queue() before
calling xpt_release_devq to ensure that any ccbs which immediately
start during the call to xpt_release_devq() see an accurate picture
of the frozen_lun_mask.  This code path is extensively exercised
when tagged read/write commands mix with non-tagged DSM commands.

Sponsored by: Intel
Wininstaller now uses master branch.
Estatisticas do modelo
report: fix diff generation and printing
灯鹭 PHP SDK 演示站 Init
Signed-off-by: ftwbzhao <b.zhao1@gmail.com>
add release notes.
added clearfix condition
static image to /doc
alligning pading
use request.env to pluck out http headers
Reduced initial distances to allow for overlap resolution.
Ignore images in ack.
acl setup
こんなんでいいのか
[avr_controller] MotorController: implemented (partially) the host side of the controller
and add the form for the image
make the tag search use a boolean AND, not OR (thanks laurent)
allow default tags for a template to be provided via GET arguments
fix c commenter and fix miniBuf multiBuffer error
jenkins-buildsteps.sh.sample
Refactored to better label fonts and added child list styling for categories within the sidebar widget
ヘスペリア
modified the outputSchema - added the Person ID
Chinese transcriptions added to TMOI files

no LaTeX syntax yet
introduce threading for GUI

Signed-off-by: LK <LK@uni>
[S08] Tournament results 50%
Merge branch 'master' of https://github.com/gfduszynski/zpi into giorgio
[S08] Leci bomba...
Merge pull request #126 from gfduszynski/giorgio

Giorgio
[S02] Fix style sheet - login
[S02] Fix style sheet - login part
Merge pull request #57 from gfduszynski/focus

Focus
Merge pull request #114 from gfduszynski/giorgio

[S08] leave tournament fix
tmt creator mods
Merge pull request #115 from gfduszynski/danielengel

tmt creator mods
tmt creator validation
Merge pull request #116 from gfduszynski/danielengel

tmt creator validation
[S08] new news prototype
Merge branch 'master' of https://github.com/gfduszynski/zpi into giorgio
moved old input files into a deprecated folder
removed extraneous input files
added the enrichment input file
updating enrichment facility branch with develop branch
Superior code
edit controller redirect error fix, edit page text_field to text_area
for newline, edit page html modified
fixed organisation of header
Fix typo
Replace StringBuffer with StringBuilder
+ Ajout de Hut
limit column number to prevent overflow
make application name global to silence stupid compiler warnings
Move package installation to an init() function
.config/bash/profile: now my mac needs the monkey patch as well
.config/bash/profile: add if test
Fixed memory leak and origin server timeout.
Simple docktile plugin
Initial groupchat implementation
Compile fix with new qbs
added db-changes and feed parsing for the flattr integration
first rough and uncompleted version of flattr integration
second version of the flattr integration
next version of flattr-integration. Now it's possible to flattr an episode in the shownotes window
layout changes to the flattr button
next version of the flattr-integration
Don't close the Flattr login window immediately

This avoids a segfault when trying to destroy the
window while the WebKit callback is still in progress.
Fix updating podcasts with Flattr integration
code cleanup and new features for the flattr integration
1. implemented the auto-flattr feature (flattr when a episode playback starts)
2. show flattr button in the podcast channel window
again some code cleanup after the review from thp
changed the return value of flattr.set_flattr_button. No it's only true or false
delete http_last_modified and http_etag information on all podcast when upgrading the database schema to force an update on all episodes to parse the flattr information
add flattr button for gPodder to the about dialog
pythoncomplete and syntax file
add and rm some add-ons
Adding PascalScript from REM Objects / acknowledgement

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38409 4005530d-fff6-0310-9dd1-cebe43e6787f
IDE: changing control selection to another lookuproot: update hook.lookuproot

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@37917 4005530d-fff6-0310-9dd1-cebe43e6787f
TAChart: Fix crash when the tool is activated while zoom animation is in progress

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38862 4005530d-fff6-0310-9dd1-cebe43e6787f
TAChart: Fix drawing of out-of-extent function series with +Infinity in domain exclusions.

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38863 4005530d-fff6-0310-9dd1-cebe43e6787f
DBG: Dialogs, don't give help related commands to IDE. They will be ignored

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@37697 4005530d-fff6-0310-9dd1-cebe43e6787f
codetools: linkscanner: add link for skipped code

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38525 4005530d-fff6-0310-9dd1-cebe43e6787f
Adding listfield and multibutton entry
Using scroller in terminal
Small cleanup
Allow assigning widget when declearing field
Tiny clean up
Adding filter form
commit a8de199e4b1728d435c15dceebf60a0141c92f8b was lost
igmp: Allow igmp to start with phantom interfaces.

Basic idea is to dummy out the interface if it doesn't
exist, creating a fake if-index as needed.  Add logic to
hopefully deal with this properly if/when the interface
appears.

Signed-off-by: Ben Greear <greearb@candelatech.com>
pim: Allow pim to start with phantom interfaces.

Basic idea is to dummy out the interface if it doesn't
exist, creating a fake if-index as needed.  Add logic to
hopefully deal with this properly if/when the interface
appears.

This is basically cut-and-paste of the same logic that
was just created for igmp.

Signed-off-by: Ben Greear <greearb@candelatech.com>
fixed registration template bug
add gundo module
Version 0.3.1 fixes
GRIFFON-592 make sure service instance is properly initialized; don't forget to sanitize errors that might occur
Fix typos in guide
Add OSGi headers to griffon-rt
Filtering/replacing text tokens on binary files is not a good idea. Splitting how files are copied into the final binary distro in order to avoid this problem
Better return an empty Map instead of a null, we don't want NPEs rearing their ugly heads at runtime
Upgrade plugin & archetype releases due to changes introduced by i18n and actionManager API
Update sample apps with changes cascading from i18n & actionManager updates
Updated

Change-Id: I710f4e60bdc75682491520950401281e61a0e707
Remove unused magic.h.

It was included from two places, but neither used its contents.
There was one use of GROMACS_MAGIC in the source, but that file did not
include magic.h, instead defining it itself (to a different value).

Change-Id: I6404419387a170f34ddd25e56fb17b5f71d1dff2
Merge "Remove unused magic.h."
Add pdbname selection keyword.

As a supporting change, remove trailing space from t_pdbinfo.atomnm, as
the trailing whitespace does not seem to be used anywhere.
This makes it possible to use it easily in the selection code.

Fixes #1007 in master, will backport to 4.5 branch separately.

Change-Id: Iac36bda8a84d0a6c131445e7f47ad91d7209fb10
Use "finish" instead of "finished" for event type

on_test_finished ->
on_test_finish
suggest: move pre_events to learner
Add missing curr clear
Add a wrapper of grn_win32_base_dir() for plugin

grn_plugin_win32_base_dir() is added.
Remove a deprecated example
vm/dispvm: use of user-provided DispVM settings (#651)

When /rw/home/user/.qubes-dispvm-customized is present use /rw/home/user
instead of default /etc/dispvm-dotfiles.tbz. Also make sure that /rw will not
remain mounted during DispVM creation.
version 2.1.2
dom0/spec: remove obsoleted patch_appvm_initramfs.sh

For a long time dracut module is used instead.
dom0: use default user in "DispVM: Web browser" launcher (#577)
dom0/dispvm: enable use of default_user setting for DispVM (#577)
dom0/appmenus-receive: use common API for running commands in VM

Do not use qrexec_client directly.
dom0/core: API CHANGE: pass username as keyword param to vm.run() (#577)

Get rid of ugly embedding username into commandline. This will make much easier
avoid hardcoding username in dom0 code.
Currently dom0 is free of hardcoded "user" username ("root" still is used).
makefile: generic rpms-dom0 and rpms-vm targets
spec: extract core libs from qubes-core-vm

This libs are required by both dom0 and VM so it's better to have it
separately. Previously in VM it was separate package, but dom0 have them
embedded in qubes-core-dom0, but qubes-core-vm-libs package was used to build
qubes-gui-dom0. Now we do not build all packages for all distros (especially do
not build core-vm package for dom0 distro, so gui-dom0 build fails), so make it
explicit which package is needed by which system.
dom0/u2mfn: fix compile warning
makefile: update-repo-template target
version 2.1.3
vm: release 2 yum repository and verification keys (#671)
vm: remove qubes-upgrade-vm after upgrade
version 2.1.4-vm
vm/core: use mount --bind instead of symlink for /home

Many applications doesn't like /home as symlink ($HOME differs from real
location).
Merge branch 'master' of git://git.qubes-os.org/marmarek/core
version 2.1.5-vm
Merge branch 'master' of git://git.qubes-os.org/marmarek/core into pvusb2
Merge branch 'master' of git://git.qubes-os.org/marmarek/core into pvusb2
mail and skype now in same workspace
version bump
debug output in --run command
support tls and user auth for outbound connection, ssl for imap
connection
fixed bug in mod function
added virtal env activation code to install file
- Fixing returning types of Map and Filter
- Added new functions: Union and Intersect
New functions: L (convenience for NewWithElements) and ElemIndex
New function: SortWith, to sort a list based on a function
Normalize style. Merge good.
added reducify.  closes gh-13
Merge pull request #14 from hughfdjackson/master

here's your reducify :D
GEM:34 test commit
gem:34 so
Fixed memory leak with jpeg files (http://www.cocos2d-x.org/boards/13/topics/9347)
Fixed wrong touch screen location when window is scaled (http://www.cocos2d-x.org/boards/13/topics/9227)
Fix fly false-positive while crouching on stairs. Addresses issue #58
Fix for bugs #40 and #41 - fixed false positives on normal ascension (ladder and swimming)
making magic canvas work
添加jquery 测试相关的data
一覧にボタン追加
Merge branch 'master' of github.com:hanasoo/vis-asq
Update musl files, including inclusion of musl ./arch
Merge branch 'master' of http://github.com/hardbol/spitbol
wip: workspace
Support for internal referrers in get_next_url()
Revert "Add missing import on Windows"

This fix was incorrect and broke the build.

This reverts commit 87c3baa0350502fa2882c30fe048961aad792bd4.
Second attempt at Windows build fix
+ ‘SparkleShare (Hylke Bons, Apr 18 15h04) copy 4 (3rd copy) copy 2.txt’
+ ‘SparkleShare (Hylke Bons, Apr 18 15h04) copy 4 (3rd copy) copy 3.txt’
+ ‘SparkleShare (Hylke Bons, Apr 18 15h04) copy 4 (3rd copy) copy.txt’
Namespaced properties work now.
Merge branch 'master' of github.com:hcatlin/libsass
Added support for m3u playlists again using new content type,
makes icecast hosted streams work again.
add getACRate show
a lot has been done with py, django next
Make sure tests are run before building tarball.
Make safer for parallel build.
Added optional logging of all property accesses.
Update to new boost for bugfix, minor parser fixes.
replace_url_tag_images!
search for src="/images*" instead of src= to get better results for js image replacements
added nonfree repo
git submodule-rm: also remove from working dir and .git/modules

Inspired by the fork at https://gist.github.com/2984077
Dynamics for toltree closer
而是一下not fetch
add eclipse files to ignore
Unit tests for jsonp support
check @BadgerFish annotation
Avoid class_exists to autoload the class.

(when we try to detect Composer).
Use https, not http, for repository access.
More selectors tests.
m
git-bfc => git checkout -B
Add vim sessions extension.
support shopper flow testing
https://issues.jboss.org/browse/HORNETQ-1058 /
https://issues.jboss.org/browse/JBPAPP-10236 HornetQACtivationSpec has
to implement Serializable
Merge pull request #717 from clebertsuconic/Branch_2_2_EAP

https://issues.jboss.org/browse/HORNETQ-1058 /
robust synchronization: use CountDownLatch instead of wait/notify.
Fix findbugs warning about inconsistent synchronization
(should not have practical consequences (for as long as code usage does not change!)).
remove unnecessary method, making synchronization consistent
Fix warning: RunnableException did not extend "Exception".
Make hashCode and equals consistent, fixing contract.
TokenBucketLimiter is meant to be used in a single thread. No point in having 'volatile' fields.
Fix compilation, remove usage of old logging system
Merge pull request #82 from FranciscoBorges/master

Robustness: Use CountDownLatch instead of wait/notify, address other concurrency warnings
Failover on Server Shutdown avoids threads locked trying to get permit from InVMNodeManager
Merge pull request #269 from FranciscoBorges/nodeManager

Failover on Server Shutdown avoids threads locked trying to get permit f...
HORNETQ-1007: Multi-protocol consumer test/fix from https://community.jboss.org/thread/202607
Merge pull request #417 from clebertsuconic/master-justin

HORNETQ-1007: Multi-protocol consumer test/fix from https://community.jboss.org/thread/202607
refactor and simplify broadcast group configuration

* removed all implementation classes from the api and put them inside
  API classes
* JGroupsBroadcastConfiguration can takes either a jgroups fileName
  string or a JChannel object
Merge pull request #543 from jmesnil/broadcast_configuration_refactoring

refactor and simplify broadcast group configuration
Refactor some similar code together.

No functionality changes, just moving around.
Fix crash loading bad png file in savedata.
Fix a couple warnings on 32 bit in savedata.
Fix another potential png load failure.

Also, rename func for consistency.
Protect against an unlikely buffer overflow.
Simplify reading/writing in one shot.
Make sure sceUtility funcs all return error codes.

Right now, everything is 0, but before it wasn't returning anything.
Returning 0 actually made some games start working right.
Oops, need to use saveNameList when specified.

Mistake from 6f165cfbe46ead77e3b4e99fe18ee1609188cf9c...
Fix potential buffer overflow.

Detail can be 1024 already, I guess.
Correctly fix incorrect save directory being used.

Darn, should've caught this before when I refactored wrong.
Merge pull request #251 from unknownbrackets/save-fixes

sceUtility / savedata fixes
Booking code is now also generated automatically.
Clearead whitespaces.
添加入门使用文档
Fixed HeaderCollection::getFirstPartialMatchHeader()
jobs page patch
Added dataset for HW2.
Correct _Ratio pattern to _Rational

Also slightly rewrite kdiv expansion rules.
add avatar in data_init.sql
Updating the rack version requirements and changing the default title attribute to title rather than name
added gradle wrapper
working gradle
Enable mouse for vim on everything
On remote hosts make PROMPT always RED.

In absence of $the_hostname, or its setting to the "correct" value,
make the PROMPT always RED - whether we're root or not.
Adds "options" method to the documentation.
Integrated CI-2.1.0

Integrated CI-2.1.0 (downloaded at 2012-03-17 05:28pm) into branch origin/codeigniter
Merge branch 'codeigniter' into develop
GFFEntry
added a certFile option
Merge branch 'master' of github.com:ijiraq/cadcVOFS
added auto_cache as option, so changes outside the FS effect cache
added md5 check during the open to verify cache
まだ全然途中、コンパイルエラー出まくりなので注意。
a little request
1. Under development;
	modified:   Makefile
	modified:   vans-alsa.c
	modified:   vans-net.c
Add lab5 question 3
handle on->on triggers
Lazy star is lazy now
debbox commit
AndroidCaptureImpl

added capture implementation for android not tested yet
unstable 2
Added a few more attachment tests.
Added a rakefile for running tests.
Andre non viene.
only add quotes around xunit-file on Windows
Merge pull request #2050 from minrk/xunit-quotes

only add quotes around xunit-file on Windows

because it uses os.system. We can trust Popen to handle spaces in the string on other platforms.
Small doc updates, near final release.
Removing plugin module and its tests.

When we refactored the core we created a plugin system, but we
don't use it for anything and it is completely redundant (we
already have extensions).
Cleaning up extensions that used plugins.
Merge pull request #2291 from ellisonbg/rmplugin

Remove old plugin system
アンケートセンタリング
error list customer

Signed-off-by: irwan subaya <subayairwan@yahoo.com>
Layout for list schedule
* Don't send email on Accept (bugfix)
 * Add immigration link
 * Add text if no assistance has been offered
Merge pull request #187 from iseppi/proposal-accept-workflow

Speaker offer workflow
 * Fix typo in else
Merge pull request #188 from iseppi/proposal-accept-workflow

 * Fix typo in else
 * Correct path to URL validator
Merge pull request #189 from iseppi/fix-url-validation

Fix URL validation in event
Update to 2.10 RC1.  Switch to Akka threads.  Clean up the actor and threading code.
fix python interface of IOFactory.load
Merge branch 'master' of github.com:isis-group/isis into gmaster
made loader green
removed configuration code from gridengine::master recipe
Misc change(formatting)
started on GUI logic
merge conflict and worked a bit on view models
made more changed to viewmodel
fixed merge error
made more changes to viewmodels and views
merge conflicts and more changes
commiting to pull
fixed merge problem, finished initial version of viewmodels for users and fixed some code issues
minor change in build settings for test and client projects (ignore warning 1591) and refreshed service reference on client
[jmdb] Adding the basics
[jmdb] Got cleaning and output directory working
[jmdb] Got listing of all java files working
[jmdb] Compilation seems to work
[jmdb] Basic Jar creation going on
Improved the way nodes without IDs are handled using data- attributes instead of searching on html/plain text
Poprawki na ten cały bajzel zmian.
extend jack_control to have parameter reset commands
unknown updates?
FontAwesome Icon preview
Send library name and version as User-Agent header to server.
Este es el primer archivo desde mi computadora
Merge branch 'master' of git://github.com/jadesoft/Prueba
removed queue attr
use Mojolicious for detect version on debug screen
Fixed RSS styling
Tweaks to flash rendering to prevent pop-in when video is loaded
Fixes to client-side device registration process.
Merge branch 'master' of github.com:jamalex/ka-lite
turnos rev. 2
Added coffeescript syntax file

This enables highlighting of coffeescript
Merge pull request #802 from ultimatebuster/coffeescript

Added coffeescript syntax file
Couple of bug fixed
Merge pull request #804 from diegosarmentero/master

Couple of bug fixed
chinese lang added
Merge pull request #805 from diegosarmentero/master

chinese lang added
new version
Merge pull request #806 from diegosarmentero/master

new version
adding more tests, fixing bug where inherited properties were being ignored
Update _layouts/post.html

update
added pom.xml and changed directory structure acording the maven Standart project structure
added findbugs
specify compile version
fixed findbugs problems
removed WA - ok with maven
fine tunning pom.xml
Code & slides
Update paramiko/file.py

Added a closed property as an alternative accessor to BufferedFile's _closed property.
Make send() and recv() fail when channel is closed

``sendall()`` was checking if the channel has been closed, 
and failed accordingly, but ``send()`` and ``recv()`` did not.
This meant that ``chan.send("foo")`` when the channel was already
closed, just blocked forever.
Forgot to import errno
Somehow missed a pretty important change in the changelog
SSHClient: add 'sock' parameter to connect() for tunneling

Re #77

This parameter, if set, can be used to make Paramiko wrap an existing socket
connected to a remote SSH server. For instance, you could set up another
SSHClient directly connected to a "gateway" host, and then create a direct-tcpip
tunnel to a "target" host directly accessible from the gateway's perspective
(e.g. think of trying to establish an SSH connection to hosts behind a NAT).
The gateway host would then establish a TCP connection to the target host
directly, and a channel is exposed on the client side. This channel could be
wrapped by an SSHClient class using the connect() function, avoiding the need
to establish a new TCP connnection.

This effectively allows you to create tunneled SSH connections.

Based on work by Oskari Saarenmaa <os@ohmu.fi>, in Paramiko pull request #39.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Tweak docstring re #77
Changelog re #77
Add in big attribution big in prep for having ProxyCommand done
More attributions
Add failing test(s) re ProxyCommand config parsing
Fix ProxyCommand equals splitting.

Uses regex approach from @lndbrg
Initial port of ProxyCommand class from @clarete
Post-import edits
Import BadProxyCommand
Post-import edits
Bubble up ProxyCommandFailure in packetizer
Formatting
Implement (& test for) ProxyCommand interpolation.

Forgot this earlier.
One more patch from @clarete's work
Changelog re #97
change text in similar groups
Fix issue with notification looks broken when appear as last item in the chat
1，修改最新样式
2，增加打点后，鼠标经过改点，显示对应商品DIV
3，增加了打点时，鼠标经过改点，不显示对应商品DIV
4，修改淡入淡出效果
fix
timeline bundle
vim: Set backupdir for swp and ~ files
Tried to export project
Changed scrollScrollViewAllTheWay() implementation as getMaxScrollAmount only returnes the max amount of an arrow event
Overriding some methods in OpenGL-Window
mySqlDbTst
mySqlDbTst
Fix annotation processor version
Add Cult of Mac review to about.
Ignore .rbx & .sass-cache dirs
Adding xclip alias
Removed BitSet from Cassovary
Addressed comments - refactored SimulatedCache
[maven-release-plugin] prepare release jclouds-1.5.0-beta.7
[maven-release-plugin] prepare for next development iteration
adminVdc client w/get adminVdc
Merge pull request #430 from danikov/vclouds-director-admin-vdc

Issue 830: vCloud director Admin vDC
attempt to clear fuzz from cloudservers
Don't pass hostnames in usernames when calling the backend.
fix a compile fail if no libtiff

compilation failed if libtiff-dev was not found, thanks Martin
sdzsave fix

if dzsave was running a scanline at a time and height was odd, the final
set of tiles were not being written -- thanks Martin
fix .dzi format string

dzsave left the save options attached to the Format string in the .dzi
file

also, version bump
Merge remote-tracking branch 'origin/7.30'
dzsave can write zoomify and google maps

use "layout" to pick the directory layout, deepzoom / zoomify / google
all allowed
Merge remote-tracking branch 'origin/7.30'

Conflicts:
	ChangeLog
	libvips/foreign/dzsave.c
fix compiler warning
openslide2vips uses multiple parallel osr reads

open a separate openside_t for every read thread to try to get some
parallelism in decode

works, but no faster overall, since we don't ensure that each osr tile
is only fetched once --- threads need to synchronise and not overlap

we need:

- some way to get tile geometry from osr

- a threaded tilecache aligned to the osr tile boundaries

the tilecache needs to have locks and semaphores on every tile,
something like:

class tilecache:
  def generate(region):
    # lock all tiles we need, make a list of the ones that need
    # calculating
    work = []
    for tile in region:
      tile.lock()
      if tile.nodata():
        work.append(tile)
	tile.set(:in-progress)

    # calculate all empty tiles we need
    for tile in work:
      tile.calculate()
      tile.set(:data)

    # some tiles may be being made by another thread,
    # wait for them to be done
    for tile in region:
      if tile.in-progress:
        tile.wait()

    # should all have data now, paste to output and unlock
    for tile in region:
      tile.paste(output)
      tile.unlock()

    return output
add a threaded tile cache

seems to work!
 ove the thread thing to tilecache
TODO update
various small bugfixes

now works
add a @background option to embed and dzsave

you can now set the background colour for edge tiles in dzsave and embed, eg.:

vips dzsave k2.jpg x --background "1 2 3"
look for tile-width and tile-height properties

get tile geo from openslide
Merge remote-tracking branch 'origin/master' into parallel-read

Conflicts:
	ChangeLog
revert to sharing an openslide handle

openslide master now has locking around tiff access
test files
fix assert in openslide read

one of the asserts was broken
Merge remote-tracking branch 'origin/master' into parallel-read

Conflicts:
	libvips/foreign/openslide2vips.c
oops
Initial Skeleton for iSENSE on Rails!
Merge pull request #2 from hmcq6/HM_Skeleton

Initial Skeleton for iSENSE on Rails!
Took care of all the ugly things and linked register and login.
Login is now kinda in the right place!
Fixed CaSe SeNsItIvItY on login
Properly handles cAsE sEnSiTiViTy in login
Merge pull request #5 from hmcq6/HM_bug_3

Fixed CaSe SeNsItIvItY on login
Merge pull request #4 from hmcq6/HM_CSS_And_Login

Hm css and login
-Reworked user validation to give meanful error messages (including about need username and/or email).
Merge pull request #6 from mmcguinn/customUserValid

-Reworked user validation to give meanful error messages (including abou...
Jim's bad at commit messages
Added an APK re-signing utility
- move Log Viewer client here from dropped repair module
  (bnc#787070)
- 2.23.11
Merge pull request #23 from jsuchome/master

Bug 787070 - (Miscellaneous+Start-Up Log) is missing from YaST
move RegistrationStatus.pm from wagon to yast2 (fate#312712)

This module is of general use and not specific to wagon
As it needs to be enhanced on behalf of fate312712 it easier to maintain
it in its new position.
Increase max-nofile in the smoketest.
Don't create an ip-id map if one hasn't been configured.
adding error handling and tests
adding tests
Added a bracket so that the else is ended.

Signed-off-by: Daniel Josefsson <dannejosefsson@gmail.com>
Move Expr up to the top instead of specifying the start manually.
Basis of XPath data model.
Faq example update and the follow the leader project.

Signed-off-by: J. Renée Beach <splendidnoise@gmail.com>
Typo corrections
Merge pull request #1 from jeandek/master

Quelques petites corrections orthographiques pour tester la fonction "Pull request" de Github ^^
Adds vim and new aliases
Show that current_release can be overridden.
Always access the registry with the system class loader
Some more namespacing movement.
Added advanced help module
Added jquery jplot library
Additional styling for gallery slider and removed junk files
Styling on the river warning.
Text in the RSVP section.
TicTacToe domain to use new homogenous gene evaluation.
db_criteria_selected_tables, bug with spaces is fixed
グラフ詳細からユーザ詳細ページへ遷移するリンク書いた
コメント消した とか
switch to aesKey rather than password
Added ssl support
Deleted unnecessary files.
SSL tested with client.
added some env vars for java and and and added paths for macports
Se agrego la vista A, se le agregaron acciones a los botones.
Add normalized_path tests, "." tests
Put / in front of absolute normalized_patterns
Modified layout for fyp and changed to nodemon
Added markdown and server function
Added Juneau County Weather Forecast Compare for WXsim
use of ST2 language definition to determine whether R script

this approach has the advantage that you do not have to save the file
as .r to send selection
adding shortcut to cd into dotfiles directory
making verbose output optional in mockbuild
Started merging the old main page code into the scaffolding code for geotrack.
Update PATH to use 'brew' python installations
vim: ignore build directories everywhere
vim: spell file additions
vim: improve statusline, removed fugitive info and added syntastic feedback
- merged copy-pasted functions into a generic one
- changed host detection, which was broken after plugin rename
- fixed some typos
Cleaned up variable resolving in preparation for global intrinsics
Added a qualification to requirements
Formatting issues
try a querypoints object
Fixes for better API docs
Updated doc generation
Fixed code samples in docs
Updating Ember.String documentation
Merge pull request #494 from frodsan/docs_ember_string

Updating Ember.String documentation
Ignore docs folder
Merge pull request #496 from frodsan/update_gitignore

Adding docs to .gitignore
Updating array docs
Merge pull request #499 from frodsan/docs_array

Updating array docs
Updating Ember.Set docs
Fix typo in Ember.MutableEnumerable#addObjects
Merge pull request #500 from frodsan/docs_set

Updating Ember.Set documentation
Collection itemViewClass itemHash bindings should be resolved in the proper context.
Add pointer to website repository
Evaluate tests in string mode for better debug info

When evaluating as strings, we can use sourceURL
to provide more helpful debug information.
Merge pull request #503 from joliss/docs

Add pointer to website repository
State manager should raise if an event is unhandled

By default, the state manager should raise an
exception if it is sent an event that it cannot
handle. This can be turned off by configuring the
errorOnUnhandledEvent property.
Fix path resolution for states

The name property of states was busted. We now
have two properties--name and path--that describe
the individual name of the state, as well as the
path to it from the root.
Allow classNames to be a computed property - Fixes #490
Revert "Allow classNames to be a computed property - Fixes #490"

Using a computed property prevents the 'ember-view' class from
being added automatically. This breaks event handling. I'm
reverting this fix until we find a solution for this.

This reverts commit eef385cbbc77c57aed92477bac1ba17fd065ebeb.
Add support for modelType in the router

If a `modelType` is specified in the router, the
router will automatically convert routes to
objects and vice versa.

For example, if the modelType is `App.Post` and
the state's route is `/posts/:post_id`:

* if the user navigates to `/posts/1`, the router
  will automatically look up `App.Post.find(1)`
  and pass it into setupControllers. The router
  figures out the dynamic segment based on
  naming conventions (App.Post => :post_id)
* if the app programmatically transitions to
  the post state, passing in a post whose `id` is
  5, the router will automatically set the current
  URL to `/posts/5`. Again, this works via naming
  conventions (the router looks up the `id`
  property on the model and serializes it into
  the `:post_id` dynamic segment)
Implement modelType guessing.

The way it works is:

  if you have a single dynamic segment in your
  state (e.g. your route is `/posts/:post_id`),
  the router will remove the `_id` part off the
  end and convert the remainder into class form.

  in this case, that would be `Post`. It will then
  look up the class on its `namespace` property:

    router.getPath('namespace.Post')

Also in this commit, app.initialize(router) sets
the router's `namespace` to the application.
Initial implementation of outlets

This feature allows you to leave a placeholder in
your template that will be filled in by the
current view's controller.
Whitespace
Add Ember.Controller and `connectOutlet`

The goal of `connectOutlet` is to make it easy to
fill in a Handlebars-specified outlet with a new
view.

It also connects the view's associated controller
to the view's `controller` property, if an
associated controller can be found using
conventional naming.
Doc fix.
Merge pull request #842 from jbrown/refactor/docfix

Docfix
Check that tests don't leave open RunLoops behind
refactor global test teardown
Additional runloop/testing fixes
Fix tests to use already declared global var
refactor run loop in connect test
cleanup tests
Merge branch '0-9-stable'
Merge branch '1-0-beta'

Conflicts:
	packages/ember-application/lib/system/application.js
	packages/ember-runtime/lib/controllers.js
Debug on for now.
Renamed interfaces folder to serverinterfaces
implemented raque destruction
Readme para probar usuario mio
cleared
2012-03-27 04:29:32 -0700
Update header link, stop indexing of our pages
mobile revisions

Signed-off-by: joshua <joshua@joshuas-Mac-Pro.local>
Added Video and Entrance Delay
comiteo esto a ver si lo logra ignorar
Added a better installation title
宣传首页
MIFOS-5643: Fixed, displayed validation message, added acceptance test
viimeisin xml-versio
Fixing Transitions.
AJAX for locations
Improve subject search
Tweaks
Tested recent changes.
fixed the ARM example
Added Ubuntu font.
Micro blog.
use math classes in surface normal, update one baseline.
initial commit
amended author
Merge branch 'master' of github.com:jsucsy/learning
Fix phantom 'use' requirements.
tesing loading my temp to the ipad. it works!!
fixed escaping issues in formatters
Se actualizo la clase Bloque.java. Se limpio el codigo y se adecuo para el nuevo proyecto.
Merge branch 'release/0.3.1'
Fixed make check.
Added #include <cstdlib> for free(3).
Merge pull request #101 from pepshiso/free

Added #include <cstdlib> for free(3).
Merge pull request #99 from pepshiso/makefile

Fixed make check.
Merge branch 'master' into develop
Merge branch 'master' into develop
Removed license.txt and append it in readme.md
fixing yui build
Merge branch 'master' of github.com:jupiterjs/canjs
removing logger that breaks the make script
Merge branch 'master' of github.com:jupiterjs/canjs
Incorrect dependency location for ejs_test fixed.
Change to global can.Control
compresses all at once if possible
fixing css packages
Fix line ending normalization
Fix plugin build script

There was a bad comparison between a boxed string and string primitive
on line 92, which was always resolving to false. This was causing the
plugin file itself for standalone plugins to be ignored as well,
effectively leaving you with an empty function in each standalone built
plugin.
Added brackets to force precedence for coercion

Some brackets were previously missing around the type coercion fix,
still causing it to fail. ( Which is very strange, considering operator
precedence, but whatever...)
Merge pull request #92 from rjgotten/pluginbuild

Fix for plugin build: all plugin files are empty functions
fixing css build for packages, updating test
Merge branch 'master' of github.com:jupiterjs/steal
Envjs shares global namespace, so build.open cleans it up in case of multiple opens
fixing build tests
fixing CSS path so it doesn't load twice
calling steal.executed instead of prototype version, so that .executing = true is set on the steal (to prevent less from loading in production mode)
all steal/build tests passing
removing dead code
Merge branch 'master' into amdify
build can build amdish
update test and fix list.
add list io to test...
Added clade probabilities and table tooltips.
Whoops. I forgot to change AddEdge on graph to use Idables.
Removed unnecessary code from acprep
Sets Pry's default editor to TextMate™.
Reverted monkey's mistake :(
clouds
fix styles
formatting numbers
design fix
search page fix styles
Pelinappulat ja toiminnallisuutta
Poprawki w mechaniźmie menu
Move files.
Basic loop functionality.
css, navbar .brand, in-context-edit!
oip-module-blog-view.txt

the oip-module-blog-view.txt is now linked:
oip-account/AaltoGlobalImpact.OIP.Blog_DefaultView.phtml -->
../oip-containers/oip-container-blog-edit.txt-->
../oip-modules/oip-module-blog-view.txt
blog view page

the oip-module-blog-view.txt is now linked:
oip-account/AaltoGlobalImpact.OIP.Blog_DefaultView.phtml -->
../oip-containers/oip-container-blog-edit.txt-->
../oip-modules/oip-module-blog-view.txt
oip-layout-groups-view.phtml
activity summary index also fixed
updated test file to use {dolStatistics.mediaTypeName}
updated release tag for kWiget mixed content fix
fixed user check
Added option to keep overlay on screen when closing alert (keepOverlay
property)
Changed error messaging to use displayAlert
When iPad in fullscreen we must remove the overlay, to enable exiting from
fullscreen mode
Added KalturaSupport locale reference
Removed unnecessary padding from overlay
Added more messages to KalturaSupport locale
Added support for setting and displaying error title
Followup to 86646df
* Seperated getters for error message body and title
* Added a generic error message fallback
Followup to ca5e707:
* Centered alert container
* Changed button and alert styling
Added support for alert with no buttons
Added .error class to error message
Fixes feature test file CustomMessageAccessControlKS
Followup to 777dd06 - Ported no sources error to use showErrorMsg
Moved alert styling to generic player css
Removed data-playerError and data-playerErrorTitle attributes
Added internal playerError object to hold both error message and title
Merge branch 'customLocale' into newResourceLoader

Conflicts:
	modules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
	modules/KalturaSupport/resources/mw.KWidgetSupport.js
now delete all hooks that look like ours (in case of multiple we don't have to choose one to update and delete the rest so we don't get extra signals on each event
minor test
Merge branch 'master' of https://github.com/katarinakyh/cc7
remove
some tweaks for travis
add Iterator::operator==
More vim files
structure for jar
Turned on xterm function-key emulation in tmux. We prefer xterm-style escape codes b/c they're used in zshrc for things like jump forward/backward word
got rid of extra scripts
Added Yawgatog's oracle text.
Initial steps in templates
Implements partially applying from right.
Bumps to 0.1.3
Revert "user register complete"

This reverts commit ee665d0384a54e5f9704037fe15024d8420733d5.
30% complete
check words from one user
Use Django-resgistration Module
Fix CCE bug
Fix potential NPE
Make DamageCause an interface, split up to avoid abusing generics
Send meta by default for creatures.

This fixes official client crashes.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Resends inventories after a world change
Adds PlayerAbilityMessage support
- Adds component to store current status
- Adds ProtocolEvent when updates occur
- Permission check is still required
- Packet is resent when world change occurs
-- flight status perserved on world reload
Forces offset for world shifting to be an integer multiple of the step
Chickens now lay eggs again.

Signed-off-by: fr1zle <f@br0tbox.de>
Merge pull request #425 from fr1zle/master

Chickens lay eggs again.
Refactored EntityHealthChangeEvent and EntityDamageEvent, as well as
implementation of EntityHealEvent.

Signed-off-by: Charlotte Mattier <halfbloodpokemon@gmail.com>
Merge pull request #426 from Mattier/master

Another pass at entity health events.
Cows now fill buckets with milk

Signed-off-by: fr1zle <f@br0tbox.de>
Merge pull request #427 from fr1zle/master

Cows will now fill buckets with milk.
Add map manipulation methods to TestCommands
Implemented CombustCause for EntityCombustEvent.

Signed-off-by: Charlotte Mattier <halfbloodpokemon@gmail.com>
Improve model rotation support and add torches

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
Merge pull request #428 from Mattier/master

Implemented CombustCause for EntityCombustEvent.
Few small updates

Signed-off-by: Jack Huey <kitskub@gmail.com>
Request ID 1765
Added json response to login.
Merge branch 'master' of github.com:kmatzen/Labeler
Small changes to test script.
More ideas for test script
switched to new paradigm where gpib address is passed as an argument to eprologix modules.
Move processing of white and blacklist to TestSuite for 3.6 support

PHPUnit 3.6 removes the singleton CodeCoverage_Filter so whitelist
and blacklist has to be configured within the TestSuite::run() method
where the filter is available through the result object.
Only assign filter to valid coverage object in Unittest_Testsuite

Thanks to @namtabmai for picking this up
Merge pull request #19 from acoulton/feature/4323-support-phpunit-3.6

Support PHPUnit 3.6 by moving Code Coverage filtering into the test suite
Merge remote-tracking branch 'origin/3.2/develop' into 3.3/develop
Fix more -Wall warnings.
added log to Engine.new
Tests fonctionnement de base
Cambios en la carpeta Symfony
Tidy up
Gemfile update
Initial gitignore
MIT LICENSE
Initial .editorconfig
initial package.json
Merge pull request #1 from krux/repo_setup

Repo setup
2011/06/15