labofsahil/github-event-dataset-2012 huggingface dataset:
Updated travis-ci URL in README

The old URL appears to be broken, redirecting to https://travis-ci.org//kennethreitz/requests

Also, according to [their wiki](http://about.travis-ci.org/docs/user/status-images/) the *secure* isn't required anymore.
Merge pull request #1007 from passy/patch-1

Updated Travis CI URL in README
Fixed relative import.

For Python 3 support.
Merge pull request #1011 from kuyan/master

Fixed relative import
Fixed a bug where user couldn't add custom headers.
Merge pull request #1012 from bodziec/master

Fixed small bug where user couldn't add custom headers
json errors
keep json None fo row
v1.0.0
Merge remote-tracking branch 'origin/master'
license
remove useless attributes
better docstrings
cleanup
redirects work!
epic redirect generator is epic
history is a tuple, not list
iter_json

Closed #1015
actually honor details
further remove config
Unloved!
Some shit Connor wants
reduce tile loading debugging verbosity
basis modRana page framework
cleanup
improved header text
add a smaller back icon more suitable for buttons
fix back button icon glitching
cleanup
cleanup
initial location info page
load the location page and the speed page dynamically

Like this, the pages are not loaded until needed and as they react on position changes they react only when loaded/visible - this simplifies the page design as the pages can use regular property bindings and don't have to check if they are visible or not. The bindings just won't fire if the page sis not visible as the page would not be loaded.
fixed sound limits
Horizontal axis
Resize windows
Load without deffile
Merge branch 'master' of github.com:MITcolemanc/GF2
add : sencha mobile
[enhance] postgres:  Tidy up. Document. Added cancel/terminate. Added command line options.
Adding the 'showNext' option
Adding the 'order' option for the popups
Version 1.1.0 marker
New Structure / Blueprint added
Minor Graphics Update
Added ConextLogic to CoreManager. Picking up structures fixed!
Merge branch 'madsim'
Stacking Version 0.1 ;)
Saving and loading of World
Merge branch 'madsim'

Conflicts:
	src/app/structures/StructurePool.java
bugfix for new users
Remove top-margin from headings

Don't know how that sneaked in anyway, I hate top margins on anything.
Work on data models.

Defined data models and methods for accessing data.
Remove unused method of XMLRPCEncoder Protcol
changed diaries_controller to require login.
Import in main um creaturspawn ergänzt und creaturespawn um Listener
erweitert ;)
Update all plugin .pot files.
Merge branch 'progval' into core-l10n-fi
[UnrarXLib] check validity of ui ptr before access

Check that pExtract->GetDataIO().m_pDlgProgress is not invalid
before accessing it.
Merge pull request #1331 from frals/headless

[UnrarXLib] check validity of ui ptr before access
[osx] fixed vda with strange strides, we need to make the texture pot then use rowbyte/2 to upload correctly. note do not use GL_UNPACK_ROW_LENGTH here, it will not do what you think :)
[osx] fixed, remove useless GL_UNPACK_ROW_LENGTH, CGLTexImageIOSurface2D does not pay attention to it and it was being used incorrectly as the stride should be in pixles not bytes
[cosmetics] - whitespaces
[osx] - allow external players (reuse code from linux - works fine with vlc)
fix "* All albums" etc and playing all songs from an artist or album (fixes #13276)
smartplaylists: extend to support nested AND/OR rules (only from/to JSON)
jsonrpc: add basic XSP-based filtering to (Audio|Video)Library.Get(Movies|TVShows|Episodes|MusicVideos|Artists|Albums|Songs)
JSONServiceDescription: refactor to be able to handle recursive JSON schema type definitions
jsonrpc: allow more complex XSP-based filters
[openstack] Bump Fog gem version to 1.3.3 for internal use

Signed-off-by: Nelvin Driz <nelvindriz@live.com>
Add User List and Delete User Mocks

Signed-off-by: Nelvin Driz <nelvindriz@live.com>
Adding feature that automatically refreshes the XBMC library when new content is found
Fixed board printing in Derpy
recover ifuse
It can WORKgit add ifuse.c
Merge remote-tracking branch 'origin/master'
Adopt new metadata locating algorithm
Rearrange header files
Rewrite local_free()
Revert "Rewrite local_free()"

This reverts commit 2ed227fcef7be09012ac08bdda77693c33c0e70b.
Changed namespace to be in the classic namespace normes
updated extension builds
updated extension builds
in nightly.sh, don't build extensions unless test:fast passes

to speed getting useful results
Fixed some tracking, should only track program.cs now
Added some formatting for LMEditor prices, not all working
Merge branch 'master' of github.com:NickChittle/bol
Adding step definitions to facilitate merging of multiple consecutive "I (should|should not) see " clauses on single statement, adding one example as well
add mobile conversation
Fix issue #3473 Wrong profile icon size in tag stream
update gem typhoeus 0.4.2
Merge pull request #3495 from movilla/search_tag_images

Fix issue #3473 Wrong profile icon size in tag stream
Merge pull request #3493 from movilla/conversation_mobile

Add file mobile conversation
Merge pull request #3497 from movilla/update_gem_typhoeus

update gem typhoeus 0.4.2 [ci skip]
Merge pull request #3488 from devendram/cukes-refactoring

Adding step definitions to facilitate merging of multiple consecutive "I...
Add Community Pivotal Tracker infos
merging multiple consecutive "I (should|should not) see" lines into one
Merge pull request #3498 from devendram/cukes-refactoring

merging multiple consecutive "I (should|should not) see" lines into one
add poduptime asset
dont beta0fiy users. going all in
 Added private conversation for mobile
dont auto beta flag anyone
Merge pull request #3501 from movilla/private_conversation_new_0

Added private conversation for mobile - #1397 
Small changes in mobile_style
Merge pull request #3502 from movilla/changes_style_mobile_

Small changes in the mobile style [ci skip]
Changing all statements of form "I fill in " to tabular form, helps when there are multiple such statements consecutively. Changed single statements also for clarity and uniformity
Add icons search & contacts mobile
adding temporary files of emacs
adding devise.es-VE.yml es-VE.yml javascript.es-VE.yml
updated 19 locale files [ci skip]
Merge pull request #3517 from ruby-ve/locale-es_VE

new translation
Merge branch 'master' of git://github.com/diaspora/diaspora
[ixp4xx]: fixup typos in the compex patch

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34104 3c298f89-4303-0410-b956-a3cf2f4a3e73
bcm63xx: Enable endian check support for ath9k pci fixup.

Some ath9k caldatas need to be "endian checked".
This patch allows selecting wether to enable endian check or not.
Endian check is disabled by default.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34105 3c298f89-4303-0410-b956-a3cf2f4a3e73
Fixed some bugs. Now the bevel operator works nicely :-)
Added bound checks to rangeToSpan
OhmEye local config for Makefile
commented out a duplicate declaration of g_heater_pwm_val inside a
SD_FAST_XFER_AKTIV ifdef block
don't use xshm
Added SQL Server script for creating and populating with instructions
Merge branch 'master' of github.com:OpenCOP/OpenCOP
quick fix
Merge branch 'matt' of github.com:Orchive/Orchive into matt
Fix dock to screen
Junit test unfinished for CSMR
Major pass on bugs and UI
Updated command parser
minor update, plus some 'fuller' html pages
added more lock cds and buffs, added pala buff
tidied up display validation
moved displays in to be loaded from the settings file
moved display init to after the displays are defined...
added rime+stacks count
layoutEngine: fixed vertical layout not setting width
settings: fixed priest aura locations, removed old shaman spell
tracker: added monk placeholders, primalswiftness for feral
layouts: updated healer layout
Jaspar is back!!! :)

add new layout
add 1px layout
and more
Not sure, cleaned up and removed some junk to start working on SSA that seems to be eluding our understanding
Started on enabling PID control of the wheels.
Rename it to .template for allowing local settings.
Jellybean for PyroMod
rm .iml file and update version in pom
pause
疲れた
敵途中
Merge remote-tracking branch 'umemura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/Weapon.class
エネミーの攻撃の調整　WeaponManagerの変更（プレイヤーとエネミーのリストを分割）
Merge remote-tracking branch 'kimura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/GameMain.class
Merge remote-tracking branch 'kimura/master'
Merge remote-tracking branch 'umemura/master'
wip
作業中
コンフリクト直しました
fixconflict
CEnemy
まーじ中
エンコードチェック
Merge remote-tracking branch 'kimura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/Weapon.class
	ScrollNinja/src/org/genshin/scrollninja/Weapon.java
Merge remote-tracking branch 'umemura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/CEnemy.class
3日15時マージ
Updated disconnect timeout from 90 to 60
Added support for cmake-mode along with some snippets.
cc-mode header snippets.
listctrl, radiobox and slider: fix key handling return value
Add rtgui_mouse_set_position to set position of cursor.
removed an error
GameRules is now a abstract class
PointGain added as GameRules child
sink Manager with these changes
Make info button visible only when description is not empty
Able to transition to result view
Can popup and hide dialog window
re-enabled animation
fixed info background. Update info information dynamically
Removing uncommented code
Add TippsyRule to result view
Fixed the crash. It was missing self.colorArray. Some confusion with synthesizing. Need to get away from naming different variables with the same name.
Added label underneath button
Toggle shake message
Changed Everybody drinks message
info button hides properly when empty description
Updated the font
merge with switchBetweenViews branch
Fix bug where shake message stays at game over message
Setting base CSS
Fix invalid references to requestOperation. refs #997
First cut at new README.md file for 0.20.x
merge
Merge branch 'master' of github.com:Robotregent/EBP
Bit of clean and polish.
Fixed tests
	modified:   model/hal_test.js
Fixed bug where files where being improperly deleted if clamav was down.
Fixed bug where virus event wasn't being properly added to file event history on clamav error.
Parse a few more AMQP datatypes

Consuming from a RabbitMQ broker that is using the federation plugin
adds an x-received-from: header to messages that currently consists of
an array containing a table that contains a bunch of fields about the
origin broker.

Add support to parse all of the necessary datatypes so these messages
don't generate exceptions.
Merge pull request #36 from bodgit/0.7.x-stable

Parse a few more AMQP datatypes
0.7.9
merge from official 0.7.9 tag
Update JSLint to douglascrockford/JSLint@4f2bf65
Update config

Conflicts:

	config.js
Revert some very strong options, fix other new JSLint errors
allow running the analysis manager program locally rather than on a cluster
import missing module
Merge pull request #134 from vals/master

Hotfix for running manager on local node
Massive restructure of the bot
Timeout should be 300000 not 300
Update gitignore
finished message.js translation.
Improved default line formatter for syslog handler
Merge pull request #99 from aalexgabi/master

Improved default line formatter for syslog handler
A few changes to fix a problem tim ran into with saving sequencer_runs and lanes via portal
Corrected typos an useless whitespaces.
Added normal distribution.
Added swap files from vim to gitignore.
Distributions can be declared by defining only one function.

Previously, you needed to define generate_single_number and
generate_numbers (if needed for performance reasons).

Now, when creating a new distribution it is enough to
define only one of them.
Eliminar páginas

#22 Ahora, a parte de otros mini cambios estéticos y demás, también se
pueden eliminar las páginas directamente desde el listado del panel del
theme.
Промежуточные изменения
Промежуточные изменения
Merge remote-tracking branch 'origin/master'

Conflicts:
	Sources/ALog/ALogger.pas
Закомментировал равномерное строительство.
Багофиксы
Оптимизация отправки армий.
Мерж в Мастер
Merge remote-tracking branch 'origin/master'
Unskip test.
Removed Debug.WriteLine statements.
Dispose of the subscription when the connection goes away.
Shortcut the acks for samebox cases.
Adding debug to ijod
jerky even on an iphone
jerky even on an iphone
Re #57: DoseComparison.s4ext disabled until dependency to Plastimatch is not solved properly (http://www.na-mic.org/Bug/view.php?id=2222)
vpis ocen
merger
Some Address fixes and a new model... still lots to do though
Merge remote-tracking branch 'origin/staging' into staging
Readded main class.
Continued work on backwards port.
BlockTickSelectors now version independent. Continued work on meteor backporting.
BlockSelectors work fully! Meteors work! Snow works!
Added sanity check for TPacks in pre 1.3.
Full of bugs, eagerly waiting to be fixed.
Config files are loaded when world loads. All commands cancel additional events when they occur.
BlockTickSelectors work with 1.3 too. For real, now.
Use a collection for worlds instead of hashmap. Addresses Storm - #27.
Meteors finally work on 1.2.X!
Check for world key in fire HashMAp before adding. Fixes Storm - #2
Check for world key in fire HashMap before adding. Fixes Storm - #2
Refactor and add sanity checks to wildfires. Fixes Storm - #3
Using BlockFace.DOWN now for acid rain. Fixes Storm #5
Merged branch backwardscompat into master.
Switching all prebuilts to AOSP

 <3 you Github :)

Change-Id: Ia266e9d9c26057327eaec684546fb91f75efb0e2
Underp manifest

Change-Id: Iea6380bb80b15e186ffd05708c2ffb5ed84d6c30
Of course we still need the Darwin toolchain.

Change-Id: I38706c2a7894d5e09ca62ef84a69b187330dc588
update

Change-Id: I91eb8ac2b044282ecc9569b23a12b6c88d2d6486
Made some monk-specific things not get called in the priest calc
Merge pull request #458 from fat/assignment-entities

Assignment entities
fix minor directive parsing bug
fix regression on url.js
fix comments in operations (ex: *height: 2px * 4 /* ie hack */)
Adding support for absolute paths on Windows.
Updating Makefile to not add a redundant header in the minified javascript.
Merge pull request #492 from fat/operation-comments

fix comments in operations (ex: *height: 2px * 4 /* ie hack */)
Add yui css compressor on lessc for better compression. Call with lessc
--yui-compressor. If -x and --yui-compressor are present, it will only
use the YUI compressor.
Add rem dimension support
Remove debugging statement.
Remove useless variable assignment.
Updated lessc require from sys to util for nodejs 0.6.*
Pass current sheet's path to the new Parser.

This fixes relative @imports from LESS files in subdirectories.
merge named-colors patch
merge named-colors
Merge pull request #507 from garth/master

Fixed lessc require('sys') for nodejs 0.6.*
add ceil/floor math functions, refactor.
Merge branch 'master' of https://github.com/Glench/less.js into yui
(minor) ws
support -ms- vendor extension
version bump to 0.3-SNAPSHOT and updating to scalaz7-M3
Uh... sendfile is slightly different on FreeBSD.
Update artifact cards, closes #78
Angular once again happy with meteor
Fix homepage page-classes edgecase
Empty update.
s/product/dataset - a product is the physical file, not the metadata
restored the BaseCatalogueTraverseHandler class
store locally the Catalogue refernce
added method to retrieve the OpenSearch Description
started implementing the traverse opration
added url-template module
initial checkin of appenders for text fragments
start defining the UrlTemplate class
added junit as test scoped managed dependency
added parse template method implementation
first checkin on UrlTemplate test case
added method to get the original template
toString() representation returns the original template
added fluent interfaces to generate a new url from the template
initial checkin of UrlBuilder default implementation
UrlTemplate now allows generation of new URLs from the template
added variables interpolation test case
fixed variable interpolation, it used to replace the variable name with
the variable name itself
added test that verifies not interpolated variables
forget to commit the junit dependency in pom for tests
added URL template package descriptor
Added Apache License 2.0
Merge pull request #12 from glombard/master

Added Apache License 2.0
static Parsers
Initial commit of xbtit 2.2.2
build system or custom webkit
fix kroll conflict
Fixing mac build for php_module
OverviewActivity:
neues contextmenü
button entfernt
Version 0.45
Version 0.46
Version 0.47
tutorial vervollständigt
regular sensing 10s
Add padding to index.gsp.
Delete padding from body.
New imapcopy config writer
fixed two typos in estDailyWithoutNormalization
Fixed bug that was causing Daily dataframes to return the whole dataframe as NA if there were individual NA points.
Logging for quality inspection.
fix dts server log destination
Merge branch 'target-4.3.14' of https://github.com/Unidata/thredds into target-4.3.14
added missing dependency
removed not required dependencies
application core depends on micro plugin
AllContributors is in micro plugin module
The Interface to load module by is in the micro core module
Moved the base module class to micro core module
A draft for the the extension point mechanism
removed not required inheritance and classes
added ExtensionPoint as class to collect extension registration logic that someone can extend who wants to provide an extensionpoint
deleted dead code
deleted dead code
Filter for LogLevel and Thread works
Added syncronize block
Change error handler
kjshgsdfg
Extend type system to specify min args in AC terms
Minor filtering options
update templates
Add new function displaySingleUrl()
Add function customFind
fix bug if no taxonomy requested
Renamed Grid.hpp
Fixed Demo CSS file
Added native property getter/setter mapper, fixed  add() to allow for array of objects, added garbage collection of subelements, added custom complex fields to forms
fixed degraded profile module's "ja_utf8" language files after added CSV upload function
profileモジュールのCSVアップロードで言語ファイルの配置ミスでデグレードされていたのを戻した
修改一些fvwm的配置
Added gem and updated device initializer.
Added link and updated user model.
Added callback-route and and controller
Omniauth using google works now.
attempting to put new images in
trying to commit buttons
Merge branch 'master' of git+ssh://git@github.com/Yky/Frescompare.git

Conflicts:
	res/layout/layout_frontispiece2.xml
Added attributes-mini-list to the player search and age display
mini list has a single example tooltip implemented
[Relooking] promise.js: Handling the case in which resolve is called first with a promise and then with something else that can be computed faster.
host conf fix
removed junk files, added gitignore
заглушка для сохранения задачи
adding the new module
Fixed dict author and reviewed desired functionality
added unit tests and made stuff organized into interfaces
unignored the diskbackbundlecache tests
removed note about wrong timestamps from README
database structure
drop table
moved status to index controller
Updated the documentation to reflect the updated appserver paths. Also, removed references to the MIDHT project.
top navigation bar looks correct on tablet and smart-phone screen size.
new minor version
Regenerate gemspec for version 0.0.11
MDL-35198 replace key_exists by array_key_exists
MDL-35655 Navigation - Generalized fetching method of navigation object and renderer in navigation block
MDL-34367 core_message: removed the call to $PAGE->set_popup_notification_allowed from message/lib.php
MDL-27309 Blocks: command node is taken from dockitem during restore
MDL-32218 Blocks: allowblockstodock is also checked for region dock status
MDL-34228 Completion: Add capability that controls if a user is shown in reports
MDL-32184 - Course - Fixing incorrect redirect when toggling course edit while inside an activity -- Patch provided by Kanika Goyal
MDL-21801 Lesson Module: Removing import power point functionality
MDL-32148 Backup: Adding config settings for skipping courses in automated backups
MDL-32148 Backup: Simplified and improved submitted patch
MDL-32148 Backup: Improved check for last backup successful or not
MDL-35563 - Description field in all system setting pages should have "right margin" set properly, in RTL mode
MDL-35583 - blocks header and footer right align fixes, profile picture right align
MDL-35583 - Forum's discussion table header right align fix
MDL-32092 Remove dead code from profile_field_textarea
MDL-35661 Add functionality to plugininfo_base to load settings and check the settings url

- added plugin_manager and plugininfo_base::load_settings(), get_settings_section_name()
MDL-35661 Loading of plugin settings for modules (plugininfo_mod)
MDL-35661 Loading of plugin settings for blocks (plugininfo_block)
MDL-35661 Loading of plugin settings for auth plugins (plugininfo_auth)
MDL-35661 Loading of plugin settings for enrol plugins (plugininfo_enrol)
changed implementation to word-wise substring detection
local storage + server upload
Add a mute wrapper for testing. Capture output and use it for assertions. Closes #28
removed download-doc from postinstall.sh
script for plotting EOS
add search page inside favorite
Fixed entity removal completely
working tests of filledcontours, contours, barbs, vectors for structured grids
removing requirements example for install methods
moving numpy to top of reqs, according to the internet, this still may not solve requirements.txt problem
update TokenMetadata in support of many tokens per node

Patch by Sam Overton; reviewed by jbellis for CASSANDRA-4121
classes missing from previous commit

Patch by Sam Overton; reviewed by jbellis for CASSANDRA-4121
fixing even more merge errors
Fix broken merge in ConfigHelper one more time
Merge branch 'trunk' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4123/01_replication_strategy
Merge commit 'refs/top-bases/p/4123/01_replication_strategy' into p/4123/01_replication_strategy
stress tool to return appropriate exit code on failure
patch by Tyler Patterson; reviewed by Pavel Yaskevich for CASSANDRA-4188
merge from 1.0
merge from 1.1
Add support for ReversedType in CQL3

patch by slebresne; reviewed by jbellis for CASSANDRA-4004
Add timeuuid type to CQL3

patch by slebresne; reviewed by jbellis for CASSANDRA-4194
Minor fixes for CQL3

patch by slebresne; reviewed by jbellis for CASSANDRA-4185

- Fix float parsing
- Refuse more invalidate create statements
- Fix count in select
- Disallow counters in primary keys
Fix CQL3 prepared statements in BATCH

patch by slebresne; reviewed by xedin for CASSANDRA-4202
Merge branch 'cassandra-1.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
Less strict validation after #4004
Merge branch 'cassandra-1.1' into trunk
CQL3: make some keywords unreserved

patch by slebresne; reviewed by xedin for CASSANDRA-4186
Fix having committed the wrong (old) patch for #4185
CQL3: move {max/min}_compaction_thresholds to compaction options

patch by slebresne; reviewed by jbellis for CASSANDRA-4187
include tombstone size in ColumnFamily.size
patch by Andriy Kolyadenko; reviewed by jbellis for CASSANDRA-3741
Merge branch 'cassandra-1.1' into trunk
fix merge
Merge branch 'trunk' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host
Merge remote-tracking branch 'refs/remotes/origin/p/4121/01_support_multiple_tokens_per_host' into HEAD
Merge commit '51a5f0fe0712c63f6057310426eeb6daa8881aab' into p/4121/01_support_multiple_tokens_per_host
calculate pending boostrapping ranges one node at a time instead of token
put back memoized sortedTokens
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
removing references to InformationTheory
removing references to InformationTheory
All the metrics work, but untested
Crude support for separate training set

* Can be done by using training_evid[file=...,...] where all other options
  are the same as the evidence file options.
starting on create changes
Fix a test broken by addition of private-data in [bad32c11b904c961b6ea16c9b29835ff7160645c].
[flattr] since alignment doesn't work put the button in the table for now
introduce read consistent demongoized cache fixes #2002
Fixed comment in add function
红藕香残玉簟秋
篡改GPL协议
Merge branch 'test' of https://github.com/ailue/Shuihusha
V3.2.5 Happy Girls Day!
March 7th, 2012
Merge branch 'test' of https://github.com/ailue/Shuihusha
补完水浒杀新3v3
完善诛杀
Merge branch 'pass' of https://github.com/ailue/Shuihusha into test
一方同步⑥AI篇，头大- -
一方同步⑦0404
体力流失效果
小养由基庞万春
乱七八糟的东西，看看就好……
Merge branch 'test' of https://github.com/ailue/Shuihusha into test
神算子蒋敬
用qdialog也许实现的会更完美些
水浒杀V3.4.4
天算……只能这样先将就了
加西门庆头像
修正巧斗敌方已翻面人物
满头包加入吹牛大王
静默摸牌接口
完善吹牛提示
[Cleanup] Changes params
Moves image processing methods to the object classifier class
Removes the autogenerated pb files
Merge branch 'master' of https://github.com/akerbos/ltx2any
Testing user settings.
Merge branch 'master' of https://github.com/akerbos/ltx2any
/app/webroot/filesを追加
added ResolveRouteTest to test for # of events fired when resolving the route. Added first resolve route test under shared in hello example
a bug fix
a bug fix
Added #1 Post!
update tag class
try kort thumbnail in gallery
Merge branch 'master' of github.com:alarie/Hofnahrr

Conflicts:
	hofnahrr/public/css/style.css
themes for Gametech.ru - RC1
[fix] Rename the folder
[node] Added server
[node] Working version of standalone version
[node] Added package.json with appjs dev
[fix] Removed #tuktuk dependency
[dist] Added options page
[uns] changes
mellhorei o readme
updated a bug in the topscores
nix
Merge pull request #3 from plsdevelopment/master

sdasd
Drop Python 2.6 support
Add support for Python 3.2
Add Python 2.6 to Travis CI config
Fix list of supported Python versions in setup.py
Merge branch 'feature/python3' into develop
Remove uppercasing and colour on format label
Fixed another exception syntax issue.
Fixed problem:
If the a user is removed or added to a session while the session-details is open, we need to reload the store.

Server.js
- Reload store on add and remove of devices

ConfigureController.js
- Reload function added

App.js
- Only close the session-details when the session is deleted
now with markdownize
Oh man! Markdown, universal login Checker! Madness! MADNESS
Rename files for rename
Rename HasBitmaskAttributes -> Bitmasker
CSPACE-4611: Initial pass at concept authority ui
CSPACE-4611: Add namespace option to pageBuilderIO in concept.json
Merge branch 'master' into concept
CSPACE-4611: Add message bundle strings for concept instances
CSPACE-4611: Add a few more fields to concept form
CSPACE-4611: Add advanced search form for concept
CSPACE-4611: Add test payloads.
CSPACE-4611: Add identificationNumberRequired message
CSPACE-4611: Include concept authority in some tests.
CSPACE-4611: Add ConceptTest.
CSPACE-4611: Add reporting.json for concept.
Merge branch 'master' into concept
Merge branch 'master' into concept

Conflicts:
	src/main/webapp/defaults/js/Demands.js
Merge branch 'master' into concept
Merge branch 'concept'

* concept:
  CSPACE-4611: Add reporting.json for concept.
  CSPACE-4611: Add ConceptTest.
  CSPACE-4611: Include concept authority in some tests.
  CSPACE-4611: Add identificationNumberRequired message
  CSPACE-4611: Add test payloads.
  CSPACE-4611: Add advanced search form for concept
  CSPACE-4611: Add a few more fields to concept form
  CSPACE-4611: Add message bundle strings for concept instances
  CSPACE-4611: Add namespace option to pageBuilderIO in concept.json
  CSPACE-4611: Initial pass at concept authority ui
NOJIRA: Added changes to schema to be able to display concept locally. Fixed issue with primary for auths.
Merge branch 'master' of git://github.com/collectionspace/ui into CSPACE-4446
Khushal: Changed Database.ymal.sample file
remove path override from zshrc
Use dark background in vimrc
Remove editor setting in .gitconfig
increase useability of admin gui, and delete repetitive method
doing away with stilgar (and yueh)
Don't clean out Ubuntu One
Setting up puppet cronjob
Creating basic dropbox (cli) module.
enabling dropbox cli module on halleck
add dash of ajax
Added Character, Advantages, Skills, Combatants and Battles
Merge branch 'master' of github.com:andrewogg/Arena
Clarified code for netchan formatted channel
Ensure that each node has at least one client
Improve job browser color scheme
locals.py file added
all reductions moved to locals.py
Added sorting for lists
Add include for PCH dependencies to makefiles
add note about HashSet for future maintainers
Make hostvars work post refactoring
Merge remote branch 'origin/master'

Conflicts:
	component/erlang/buildout.cfg
Add spidermonkey component
Add icu4c component
Diagram and style
re-named base module ; added collectd config
Modify Theme picture image.
thumbnails are now filtered
rendering data from database
Don't build the deploy in debug mode.

Debug mode turns off all optimisations. This make PhantomJS considerably
slower.

Instead, we build in 'release' mode, but generate debugging symbols at
the same time.

This may present some problems analysing crashes, if the optimisations
make that difficult. However, in my testing I was able to get useful
debug output even with optimisations enabled. So we should see how we go
- if it becomes a problem we can produce seperate debug binaries with no
optimisations.

https://code.google.com/p/phantomjs/issues/detail?id=599
Fix symbols generation on Linux

We are linking against e.g. libQtCore.so.4 rather than
libQtCore.so.4.8.2, and this affects symbol generation. (I am not sure
if this changed at some point, but this change should make it generate
the correct symbol files regardless.)

Also makes it less dependent on the Qt version.
Fix the top-level folder name in the packaged symbol tarball.
Use zip for the OS X package

Requested by @ariya, who was concerned that .tar.bz2 might be confusing to
OS X users who are not well-versed in UNIX.
Merge pull request #285 from jonleighton/deploy2-1.6

Deploy fixes
Fix new Twitter API url.
ignore LWS after field-content in headers
Replaced Assert.IsTrue(x) with Assert.That(x, Is.True) for readability.
Replaced Assert.IsFalse(x) with Assert.That(x, Is.False) for improved readability
Replaced Assert.IsNotNull(x) with Assert.That(x, Is.Not.Null) for improved readability.
Replaced Assert.IsNull(x) with Assert.That(x, Is.Null) for improved readability.
Moved the parameters around so "expected" and "actual" are placed correctly in the assertion
Expanded parameter names for readability
succesfully capturing opponents cells when placing a new disc on the board
Fixed paths for gh-pages to use git:// read-only URI instead
Increase candidate-number-list to 15. Grab only spec files for helm-rails-specs-c-source.
removed gaussj
+Linked IRC message events to UI
+Linked up message sending
all now added

i was experimenting how what 'commit' and 'uncommit' mean. now i have
added the latest and greatest source code.
Fix typo with nbsp. Fix dash handling
hosts: add w back
deb-packages: add git-annex
nwmon: add nil check for GUI parameter.
wakame-vdc.spec: add vdc-hva-worker.conf.
add a default value to the ip_assignment column of network table
fixed the display of the instance details.
add kmod-openvswitch-vzkernel to 3rd party rpms.
add kmod-openvswitch-vzkernel to hva-openvz-vmapp-config sub-project.
speedy: use single linebreak before talk notifications

Per request on WT:TW, pending further investigation.
consola y error de autenticación
Merge https://github.com/babcca/Barborka
cupon system + css
change slider time, cupon admin CSS
cleaning :)
commit
translations
translates, css, email
page content edited
Opraveno ziskavani kuponu
predpocitani ceny jiz zahrnuje slevove kupony
Chyba s vypism: dve promenne se stejnym jmenem. Pridana podpora pro jazyk v mailu, prekladani true false
Preklady pro true/false
Pridan cas prijezdu
Zakazano vkladani duplikatnic kuponu
Zapnuti posilani emailu
"Invitation Sent" instead of "Invitation Message"
10-12
TouchDown is now caching the handled state of the event, before the
event gets freed.


git-svn-id: https://libgdx.googlecode.com/svn/trunk@4383 6c4fd544-2939-11df-bb46-9574ba5d0bfa
0.2.4 pause menu and camera mode toggle
Optimize brushed.png
Minify prettify.css
Rename public/images -> public/img
Use trunk8.js for sidebar
Add trunk8.js and combine it with other Javascript files

Minify and combine with bootstrap.min.js, prettify.min.js
ignore erlang
improve simulation mode by stop parameter
just less info logs
make all glm tests running to branch for glm_refactor
add image to master
"don't be a dick" message
Added keyboard font linking and added moz sans section in uitests
cleaned routing
added milestones and edit func
Update documentation for chanset 'voice'
Enable Monolog provider
get spinlocks in same place as android 3.4 common
More efficient GPU policy check
Experimental tweaks
adding back, with Accounts.password check. still debugging though
Replaced ThreadLocal.set(false) with .remove() to prevent thread leak (https://issues.jboss.org/browse/JGRP-1500)
Set version to 3.0.12.Final
add documentation for connection query parameters and transportations parameter, fixes #47 and #41
Merge pull request #8 from Jorge-64/master

Now attempting pull request
Removing test files for pull and fetch tests
Merge branch 'test'
Test commit
Test commit
+i1
Added package devecot-core.
Fix: forgot a small word addition in resource name Exec[]
Added option to install alternative LDA for postfix (on the mailserver).
Fix: forgotten 'fi' in script and updated cron.d for new file names (logcheck.logfile lists)
Tweak `_.sortedIndex` for Chrome optimizations.
Simplify dependencies in build.js.
Bump to v0.3.2.
Update vendor/underscore to v1.4.3 and update the Underscore build compatibility.
Specify more method's chaining behavior.
Tweak method's chaining behavior.
Update vendor/underscore.
Make `_#bind` return non-wrapped values and cleanup a `_.template` unit test.
Allow build "plus", "minus", and "include" to accept case-sensitive category names.
top.features function added
Wrote a function top.features to calculate the difference between subtypes and mean (or median, max, min) of other subtypes for each gene pair.
Will determine top 10 gene pairs for each subtype tomorrow.
fixed
Users controller added
Users views started
typo fix
Refactoring views
New routine model and migration
jquery
Merge branch 'master' of github.com:biao166/biao166
Created a change log.

Closes #32.
Merge branch `changelog` into `master`.
update:  second extraction
update: stem bromelain
Trim trailing whitespace for src/*.{h,cpp}
Test 3

En ny mapp och en uppdaterad fil
Final (for cse622) version of LocationManager.java
Ok cguru
Add utility functions in manage.py
Resturctured frontend.

 - index.html: add instructions, link to summary;
 - summary.html: overall status of the jobs and items;
 - refractored code
Move these files to other locations

Better site structure.
Site updated at 2012-04-26 05:21:32 UTC
Refactor tests
Add basic signup function
Merge branch 'filling-in-layout'
removed old subtree
Nice progress. Fixed menu and ordering.
masonry-rails
masonry-rails
css
config.assets.compile = true
css
css
env
css
css
css
css
Fixed #18078 -- Linked more prominently to the removed features in the release notes. Thanks ptone for the text.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Fixed a typo in an example in the timezone docs.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Fixed #18041 -- Removed support for Markdown versions < 2.1, following the 1.5 deprecation timeline. Thanks Ramiro Morales for the review.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Converted more test assertions to assert[Not]Contains.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
refactored plugin/bim.vim
renamed autoload/bim.vim -> autoload/bim/engine.vim
refactored plugin/bim.vim
few changes
made changes according to comment after first presentation
work done on sept 26
PHP syntax check, stolen from @stilldavid

https://github.com/stilldavid/home/blob/master/.vimrc#L73
Allow alternate binding as options 2nd block argument
Include Object.constants in candidates even if :: prefix not present
Added revised comment
Get physics lists better understood.  They still need work.
imported refactoring branch
added pecl extensions to travis configuration
fixing travis pecl memcache command line issue
fixing travis pecl memcache command line issue
fixing travis pecl apc command line issue
fixing travis php extensions installation
updated travis link
Merge pull request #42 from brickoo/dev

restoring master branch
Comment for products, My positions
tratata
check
checks

sdf
check

check
Changed code to compile with changed interface to HashTable.  But code doesn't yet really use new HashTable code.
changed the SendingStrategy to a abstract class instead of an interface. Moved all logic which is shared between this the different strategies to this class, template method pattern
Modified BackgroundSengingStrategy to instantly remove the ActivityData after the post was successfull
We reload now the CoreData-Object if we create a new thread or change between foreground background. The reason is that NSManagedObjects are not threadsafe, which cause serious issues. Doesn't work atm, but seams to be on the right way
archiving old34
committing a bunch of files
Try hader to shut down Postgres.

Use `pg_ctl stop`, as it seems to be more reliable: I kept seeing postgres
processes running after the tests exited. Also, add a DESTROY to be sure to
shut them all down before exiting.
Registration Changes
Gemfile Edit
Merge branch 'master' of github.com:isenseDev/iSENSE
Fixing issue #51
Remove initialize by moving to accessor setup
Automatically handle PUT requests

make the following "just work"

    curl -X PUT -d foo=bar http://...
Updating outdated layout file in skeleton
after correcting nld the iso standard should be enforced for all languages
doc block correction
Merge pull request #874 from dereuromark/2.3-languages

after correcting nld the iso standard should be enforced for all langs
Update version number to 2.2.0-beta
Fix sorting empty data with Hash & Set.

Fixes #3420
Update TLD validation to accept gTLD variations

The upcoming gTLD extensions will allow much more variety in TLD names.
Loosen the validation to better accept different length TLDs.

Fixes #3414
Merge remote-tracking branch 'origin/master' into 2.3
Work of 27_06_12
Anchor the main window to mappanel's body
Don't keep old results
Typo
Close the grid if there isn't any results
Select tab only on first received pack
Don't display features without attributes
Don't destroy original themes
Remove dobble space
Better select first tab
Remove dobble loop
Remove jslint warn and trailing whitespace
Merge pull request #221 from camptocamp/dont-keep-old-results

Don't keep old results
deployed config files
Fixed the foreach iteration.
Fixed the cutoff of the comment input box focus styling.
blat failing on new bacterial fa file so trying blat35.
added commas
modified comment
remove warnings in the split-by-weight routine
the new input files must have positions in cm, no more in micrometers
Use machine epsilon in Fm()
Print in us
Added ability to change speed and css improvements
Adds Ember examples
1.适应360云盘新版本自动签到
SINAAPP

Signed-off-by: myname <chenckang@139.com>
Merge pull request #248 from chesles/master

wrap error callbacks in Pouch.replicate
Merge pull request #249 from chesles/213-remove-metadata.deleted

remove references to metadata.deleted (use metadata.deletions[rev] instead
Changed build system to gruntjs

- Externalized saucelabs-qunit and node-qunit.
- Build runs on travis, change .travis.yml
- Changed webrunner.js so that browser test results are saved properly
Cors server takes command line arguments

Example - grunt cors-server:2000:http://axe.iriscouch.com:5984
  runs a cors server on port 2000 of the local machine and redirects all
  traffic to axe.iriscouch.com:5984
Merge pull request #252 from axemclion/master

Added Grunt as the build system
README updated and bundles. Bundles .vim files needs to be placed in the autoload dir
pointing download path to fly.thruhere.net
Merge branch 'master' into gh-pages
Switch fully to new-style static support.

The new Djblets release will be fully moved on top of Django's static
media support, with a heavy preference toward using Pipeline. Since that
gives us file versioning, there's really no need to require MEDIA_SERIAL
anymore, so long as we properly use {% static %} when we want to
reference a file.

So now all MEDIA_SERIAL usage is gone. The functions that generate the
media serials remain, as does the context processor for getting it,
but they're entirely opt-in now, and deprecated. They may end up raising
deprecation warnings later.
reset default thumb value
Add SipHeaders and SipMethods
halfway to working implementation
replaced it's with its, thanks Marcus for pointing it out.
rework code, integrate unit test framework, expand tests
Fix Graphite Templates

  * Removed additional / in Graphite templates
  * Added {}-quoting around variable names to make the templates more robust
Fix : (from Nicolas Boos) output an error at setup if the lsb_release is missing.
Fix : python2.4 compatibility restored.
Dynamic reload of widget after save.
Merge pull request #611 from rsauvatinet/master

Add ajax reload of widget on the dashboard page after saving. 
Set scheduler.ini to INFO until #583 is resolved
Merge remote-tracking branch 'upstream/master'
Add: Rémi SAUVAT to the THANKS file.
Add : first try of a migrate option for the Arbiter, so the raw configuration loaded will be pushed to another modle, like the mongodb one. Work with skonf, but it is not finish, and things will surely changed in id management especially.
Merge pull request #589 from chris81/graphite-templates

Fix Graphite Templates - Issue #588
Thanks to chris81.
Stop the scheduler after dependents
Merge remote-tracking branch 'upstream/master'
Add discovery packs for ibm storage management and beginning of clustering solutions discovery
Add discovery packs for ibm storage management and beginning of clustering solutions discovery
remove existing static/ files, add 404 and 500
Integrate mptt for sub-menus
Clean up mptt merge
Minor revision to .gitignore
Item6952: Add VarINCLUDEXML

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@23451 a00a5322-12db-0310-a70b-8735589c885e
Item6953: Add VarJIRA

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@23452 a00a5322-12db-0310-a70b-8735589c885e
Item7000: /cgi-bin/view/~jsmith to be redirected to /cgi-bin/view/Main/JaneSmith

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@23696 a00a5322-12db-0310-a70b-8735589c885e
Renamed headers (broken)
Finished renaming source files (works)

File renaming only: class and method names need to be changed
Added working Xcode project, test everything with both autoconf and Xcode,
and everything is working now for both projects
Tab -> Spaces global conversion

Updated copyright headers
parsear accesorio
Add a simple utility to dump events as they happen
Ignore callgrind output and parsertrace
Updated to account for refactoring.
fix regex when using model.fn with components: escape $
clean up error check
replace global
Merge pull request #49 from codeparty/component_regex

fix regex when using model.fn with components: escape $
create File Explorer project
Add miui FileExplorer source codes and resources.
Revert "Add miui FileExplorer source codes and resources."

This reverts commit 5bd2e15644c1ef42dd0c7277e34cd2623e3b61c7.
Add FileExplorer's source codes and resources.
Add license and change version name.
Change FileExplorer's license to GPL(General Public License).
clean up useless import and code
FileExplorer: fix the bug that couldn't delete the sdcard items in action mode.

Change-Id: I9ae32ce8ebc2c95e2038b47c94a838fa5387bd21
Cause: 执行删除操作，弹出确认对话框，退出ActionMode,会运行clearSelections().导致点击确定时，没有删除东西。
FileExplorer: support copy the path of file(s) or directory.

1. 长按或者ActionMode中的选项都添加“复制路径”;
2. 只有选择一个文件，才有“复制地址”;

Change-Id: I9675384f9800e2cbe3855163618109a3ebf2fbfa
FileExplorer: clear selection when destroying ActionMode.

Change-Id: I4fd2eb3b428c28c03e8dfc4905e81fabe491f448
Add category tab, support landscape orientation and some improvements.

some improvements:
1. when exiting the app, remember the tab index in order to enter the tab next time;
2. when in muti-selection mode, diable entering into the next level directory;
DEV: enhancements: 1. add two menu, one is Preferences, you can setting your home folder and is read root in here, other one is Exit. 2. something display tuning, like SD Card to  File for 2nd tab name.
DEV: fix typo and do better check String isEmpty.
Merge pull request #3 from usc/master

Enhancements
Resolve ant compile errors

Unicode mark (BOM) is added in these files, some editors
(eg: editplus) try to be smart to add them. but it causes sun's
jvm "illegal character \65279" compile errors, it is a wonder
that it will be ok to compile with eclipse.

Signed-off-by: John Hsing <tsyj2007@gmail.com>
Merge pull request #5 from tsyj2007/develop

Resolve ant compile errors
Fix apk icon load issue.
Format code.
Clean Debug info.
Fix the root floder display issue.
Switch libraries from snapshot to their future stabilized version
[maven-release-plugin] prepare release codjo-pom-2.34
[maven-release-plugin] prepare for next development iteration
Fixed date parsing issue, which was causing the fetch rake task to fail.
Adding the first couple slides of our presentation
aplb
Updated npm_link alias.
Disabling scroll animations to make tests exponentially faster.
Remove dead statistics from Plot3Chunk
Tweak Plot3Chunk
Create rudimentary Plot3 class
first commit
Merge https://github.com/crdueck/LifeSDL
Updated routes
Updated views
Documentation
Updated paths
Easier access to full name
Getting users for the 'edit' entity
Fixed bug!!! :) Make sure you add a trailing slash
Updated views for users module
Added important documentation
Changed method name
Path name update
See user functionality done
Add magit to MELPA packages
Updated README.md with how to use the new hierarchy.py.
memo lisa
Merge pull request #1 from crzkloi/lisa_branches

memo lisa
Adds first draft of the concept--perhaps a little overdramatic
fixes name
grammar fixes
Merge pull request #27 from cs181f/concept

Adds the concept plan to our master repository
fixed end of level chest spawn bug
Merge branch 'master' into dev

Conflicts:
	bin/Pirates.swf
	src/PlayStateLevelOne.as
updated dev. merged
Added ranged enemy that throws a boomerang.  added end of level chest. fixed some bugs
vimrc colorscheme miko.
added event map support
Bulleted links.
Return notes from play# so that we can always see what we just played. Impure, but good for demo.
Enforce unique affiliations
Disabled a bad migration
moved Navigation ViewHelper plugin config
muro destra
Added the execute method that should get rid of get_post_response, get_get_response ...
refactored connect to make it easier for new classes
added a watcher class - theres much to be done though
Documentation
More documentation
! Connect returns a Jirarest2::Result object now to keep the HTTP statuscodes
cleanup
! Added the watchers to the mix. create_issue can work them now.
- Return status codes now work as expected. (They are strings after all)
Update to 0.0.2
code fix in 0x3018
Site updated at 2012-12-06 06:10:29 UTC