labofsahil/github-event-dataset-2012 huggingface dataset:
deleted dictdaemon,will go to dev branch
clean up test files correctly
Add licenses - gpl v2
style-guide fixes
User Domain Model created + Route design
internal buffer
Added email configuration.
only one like per puzi
Updated gems and .gitignore
Added mongoid entity classes.
NPC 16697 - Remove Script for Void Zone in Burning Steppes
Updated README file to refer myself
Removed dotfiles not used by me
Don't run bashrc on non interactive shells
WORKSPACE env var is not needed
Include bashrc source files in sorted order
Global gitignore based on github gitignores
Better suited PATH for me
My original bashrc split into multiple files
Git settings

gitconfig is missing user and email. It needs to be added after checkout
Added screenrc for GNU Screen
Added Vim's vimrc

Uses vundle for managing bundle (plugin) system.
SCALER: No need to inline interpolate5Line, it just bloats stretch200To240 for nothing
MAEMO: Fix date in debian/changelog
(cherry picked from commit 831cfc89345299034e94160088d2ad3ff20eff5e)
VIDEO: Add support for odd-sized Bink-videos
Give text if erbuis not installed
Another inital commit
fix the quoting of the errors
Work around the fact that NewRelic double-processes routes.

It was causing the route to be re-processed with parsed params, leading to errors.
refine action model
re define Time.now
rename doc to .github to clearly differenciate
syntax fix
Switch between windows more easily
latest stuff
latest stuff
bug fix to render route when no stops
more technical detail in experience section
Align bundle.
Generate serialVersionUID
Make objectd more robust
test gitlink
add images for explanation
グループ：デフォルトフラグ実装 closed #14
デフォルトグループ：メンバー追加不可 closed #11
groups/showにループ追加フォーム設置 closed #13
Topリンク／Topページ修正
削除時に紐付き先も同時に削除するよう修正
レイアウト微調整
set tortoiseGit

Signed-off-by: evstar <evstarcn@gmail.com>
changes varios
cambios varios
OOZIE-882 CoordELEvaluator.createDataEvaluator doesn't set timezone for coord action
version set to 3.2.1
Clone submodules on install
Employee changes again!!!
Highlight variable *names* only
Change line navigation maps

Let's stick with 0 and - for beginning and end of line and let H and L
have their default behaviour.
Make Subject line be highlighted as Title
tw=0 when editing crontab files
No 3rdparty anymore: lastest zsh has all we need

All extensions we used to download from zsh website are unnecessary now,
because the latest zsh we use has them.
パッケージ階層変更 & ソース整理中
Merge branch 'release/0.4.4'
Merge branch 'develop'
Ask travis-ci for a xvfb display. Use allow-hosts to speed up buildout
Use Plone 4.2 for testing
MyProgressBar
be smarter about servers
BASE: Destroy singletons on exit.
GRAPHICS: Don't try to delete static BDF data.
GRAPHICS: Take ownership of fonts passed to FontManager.
BASE: Free TTFLibrary singleton on shutdown.

This uses a helper function because TTFLibrary is internal.
OPENGL: Don't leak surfaces.
DREAMWEB: Move all of the mouse cursor related code into a separate file
DREAMWEB: Slight cleanup
SWORD25: Correct stack dump debug function output.

This was introduced by the change from C++ output streams (<<) to
Common::String output. Thanks to salty-horse for finding this.
GRAPHICS: Fix BMP getPalette function definition.

The BMP decoder getPalette function definition is now identical to
the other image format decoders subclassed from ImageDecoder.
This also fixes a overloaded virtual warning reported by salty-horse.
KYRA: Fix crahes in Kyra 1-3 and LoL when EGA/CGA graphics mode is selected.

This is a regression from 86a817beb5eef248c5f5e28f18133db802a59c2e.

Formerly Kyra always queried the render_mode and initializes its Screen
functionality accordingly, even when the game actually only supported VGA.
While in the "Edit game..." options only VGA was selectable, the global options
still allowed for example EGA to be selected and thus messing up the internal
state. I only check the render_mode setting for EoB 1 and 2 now, which are
the only games which support the setting inside Screen.
Add another English demo version of the Humongous Interactive Catalog.
CONFIGURE: fix typo in --with-freetype2-prefix help message
PS3: Fix build using lastest ps3toolchain
SCUMM: Fix bug #3493317 by removing assert() in detection algorithm.

Bug #3493317 ("SCUMM: Detecting Loom PCE without 16bpp support crashes")
is caused by an assert() in detection algorithm. In case an MD5 is found
the md5table, but the variant from the md5table is not found in
detection_tables.h this assert triggers. However since certain variants
can be left out compile-time this situation can occur. By ignoring
instead of assert()-ing the entry ScummVM will no longer abort but
continue the detection process.
Merge pull request #234 from BenCastricum/master

SCUMM: Fix bug #3493317 by removing assert() in detection algorithm. 
AUDIO: Fix seeking in QuickTime files with multiple edit lists
SCI: Add the French floppy version of SQ4 (bug #3515247)
SCI: Add a hack to fix the cursor colors in Longbow (bug #3489101)
SCI: Fix for bug #3522046 "Detection of SQ4CD as Windows breaks Music"

Fall back to the DOS soundtracks in Windows CD versions if the user picks
a non-General MIDI music device, as the Windows tracks only contain MIDI
music
COMMON: Use the file cache in ZipArchive::listMembers for performance.

This avoids a new iteration through the .zip file for every listMember call.
Instead it uses the "_hash" HashMap, which already contains all the filenames
and is filled on initializing the ZipArchive by unzOpen.
Fixed up min-height
Added basic HTML scaffold for playing with javascript
Playing with Tkinter
Some fizzbuzz examples
support screen name with at mark in :message command
Merge pull request #129 from takkaw/message_with_atmark

support screen name with at mark in :message command
support screen name with at mark in :recent command for private account
Merge pull request #130 from takkaw/recent_with_atmark

support screen name with at mark in :recent command for private account
Refrains from getting gist API twice.

As the json that Gist API v3 returns contains raw code in itself,
don't need to access API twice.
Merge pull request #132 from morygonzalez/feature/refrain-from-getting-gist-twice

Refrains from getting gist API twice.
refactor
change to not escape the message to notify
change to print errors to console
Merge remote branch 'jugyo/master'
Update metadata in headers
Clean up unused HTML
Fixed Bug #1733
Fixed WorldEdit.getBlock() not supporting custom blocks when they are returned by ServerInterface.resolveItem().
Added new items for 1.4.6
Fix permission for other help command (why are there two?)
- Made registerhelp read from yaml (not that the setting does anything)
Added an option to override data value limits.
- This should fix some mods which use data values above 16
- May cause issues if set to true and people mess with vanilla data values
Add support for skull blocks. Currently untested. Try //set skull:1|notch,3 or something in that format.
Add rough draft of Learning page
Change function call semantics.
Simplify object indexing.
Oops, fix lambda.
Made Primitives.Dimension components Natural; dimensions can be (0,0)
Added a graphics context type for use in drawing operations
interfaces for plugin system
added VersionFormatException
documentation fixes
EQL: Add for-each execution test.
EQL: Add variable initializers.
Properly handle commit author info
Disable click on gravatar if the commit author login name is null
Changed README.markdown to README.rdoc
update CLVStarChatAPIClient
added funWindowLast1Halo*
added attribute help
fixed attribute help
changed output and reformated
unit tests for opdWindowLast1Halo*
Merge branch 'master' into Thomas
new
new
merge file op code
Update Gamma tunning to meet with new kernel work on gamma

Change-Id: Ia021ddad5b7c559dea85d4b27bc72c7d37c63b0b
add support for Xiami
Xiami: enable metadata fetching
Moved PHP Maven plugin configurations to parent POM.

[Issue(s) CIAPI-138]
Updated to PHP Maven version 2.0.0.

[Issue(s) CIAPI-138]
検索機能を廃止
dbに易しい設計
Site updated at 2012-07-18 09:01:08 UTC
Compes → Comps
comment todos
Load more babushka
Adding PYTHONPATH to fix brew meld
Remove checking of username as this is already done by validateUserRecord()
Add feature to mass-change users' preferences
adding tests for url
Made the unit tests pass.

Tests that did not pass:
tests/core/ArchiveProcessing.test.php
Tests are failing, because of (possibly) a  bug in pdo-pgsql which is truncating
the string "test \x00 null" to "test" and
"\x00\x01\x02\0x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f" to ""

tests/core/jsProxy.test.php
This is failing because Piwik_Tracker_Db_Pdo_Pgsql.php is not able to find the
Piwik_Tracker_Db_Pdo_Mysql class.

tests/core/Segment.test.php
This is failing because of string comparison. To extract hour from timestamp,
mysql has the "HOUR" function. With postgresql we have to use "EXTRACT (HOUR FROM ...)".

Code that has been modified to make some of the tests pass:
Test_Piwik_Segment and Test_Piwik_SegmentExpression:
Added the "Piwik::createDatabaseObject();" to the setUp. Piwik_SegmentExpression is
using Piwik_Db_DAO_XXX_Generic class which needs the database connection.

Test_Piwik_TrackerAction.php
Added a function to the Piwik_Config with name "appendToLocalConfig" to append
configuration to the existing local configuration. In Test_Piwik_TrackerAction::setUp
function $config->setTestEnvironment($userFile) is clearing the existing configuration
information which is causing errors as previously available configuration information
is lost. Replaced $config->setTestEnvironment($userFile) with
$config->appendToLocalConfig($userFile).
The error because of the setTestEnvironment:
Test_Piwik_TrackerAction.php: config/config.ini.php has database_test section that
has postgresql info. config/global.ini.php has database_test section that has mysql
info. When "setTestEnvironment($userFile)" is called, database info in config.ini.php
is not available. When Piwik_Config::getInstance()->database is called next, it reads the
info in the global.ini.php file, thus trying to use mysql connection when it has to use
the postgresql connection in the config.ini.php
18th July, 10:00
Added valuable text
added testimonials styles
added testimonials script
added testimonials post type & shortcode
Fixed shortcut to reflect removal of CommandT.
add: full documentation
adding cmake build
adding examples
adding fixed_size and static_assert
more updates to img extentions and new description text
before changes
changes to work with cakephp2.2
[Backend] added static connection getter
kollar så det fungerar
Merge branch 'master' of https://github.com/stefanln/ustage
Add tests for screen config sections in the screen tests.
test for writes on disabled clusters
Moving dev changes to a branch
Slowly bringing ioc upto speed
More changes to the package name in ioc and errors
Starting to add future
Implementing templates
client server communication is GO
client server communication is all set, just have to fix sync lag now hm
adding in event manager
more refactoring to MVC
even more refactoring to MVC
Item selector should be undefined by default.
READ
Move everything static to a `static' directory
Add `resumable.js' as submodule
Node install instructions
Basic node.js server init
Use `express'
upload/encode
Dependencies
context init params are all string now; all the changes were just to make it easier to strip whitespace from config parameters
context init params are all string now; all the changes were just to make it easier to strip whitespace from config parameters
add node name to output
add node as result for add command
rework and clean-up
new file
Modified POM to use noe4j-rest-binding from structr repository.
remove draw, visit, add addRenderPair in wyNode, refactor render process based on render pair
missing reset blendmode in reset method
Experiment with icon font
Broke it down to make it at least create the tar archive.  It does NOTHING else right now!  By typing: $ python setup.py sdist.

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/branches/geps@19127 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
5676: Crashed when verifying
  data

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/branches/geps@19454 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
5621: cleanup, documented classes

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19041 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
simple update to help with book report messages display to console


git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/branches/maintenance@19439 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Merge pull request #4 from sunryuan/master

refact taurus agent and frontend
bug fix
Merge branch 'master' of https://github.com/ainilife/taurus
fix build bugs
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
fix bugs
Merge branch 'master' of https://github.com/ainilife/taurus
add db connection pool
add generated-code
add hostdto
fix connection pool
add host and pool related resources
Update taurus-agent/src/main/java/com/dp/bigdata/taurus/agent/AgentServer.java
Update taurus-agent/src/main/java/com/dp/bigdata/taurus/agent/AgentServer.java
modify taurus frontend
Merge branch 'master' of https://github.com/ainilife/taurus

Conflicts:
	taurus-restlet/src/main/java/com/dp/bigdata/taurus/restlet/shared/HostDTO.java
Update to be valid with cocoa pods v0.6.1
Vim: Add haskell indenting plugin.
Fix inspector hook in V8Test.OnUncaughtExceptionDevTools (issue #736).

git-svn-id: http://chromiumembedded.googlecode.com/svn/trunk/cef3@913 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
added Compiler.getDisplayPos (fixed issue #1180)

git-svn-id: http://haxe.googlecode.com/svn/trunk@5397 f16182fa-f095-11de-8f43-4547254af6c6
minor fix : we might have an error outside of type_module (because of type passes)

git-svn-id: http://haxe.googlecode.com/svn/trunk@5604 f16182fa-f095-11de-8f43-4547254af6c6
fix bug with big 24 bit PNG decoding (2048x2048)

git-svn-id: http://haxe.googlecode.com/svn/trunk@5605 f16182fa-f095-11de-8f43-4547254af6c6
new modules and some minor fixes
Language fixer job
workbench media
[Process] Add output / error output incremental getters
merged branch romainneutron/ProcessIncrementalOutput (PR #5546)

This PR was merged into the master branch.

Commits
-------

b89e413 [Process] Add output / error output incremental getters

Discussion
----------

[2.2][Process] Add output / error output incremental getters

Bug fix: #4999
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT

Travis fails ; tests are ok on my local clone but upstream symfony master is currently broken

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

by stof at 2012-10-13T21:20:47Z

@romainneutron is there anything left before merging ? And please open a PR to the documentation to document the new feature
[Process] updated the CHANGELOG
[Process] fixed previous merge
[FrameworkBundle] Allow to set null for the handler in NativeSessionStorage
merged branch drak/nullhandler (PR #5290)

Commits
-------

8e11aaa [FrameworkBundle] Allow to set null for the handler in NativeSessionStorage

Discussion
----------

[FrameworkBundle] Allow to set null for the handler in NativeSessionStorage

Bug fix: no
Feature addition: yes (ok for RC)
Backwards compatibility break: yes
Symfony2 tests pass: yes
Fixes the following tickets: 5267
Todo: ~
License of the code: MIT
Documentation PR: ~

Refs #5267

Adds the following configuration

```
session:
        handler_id: ~
```

Which allows the configuration of the session not to use any save handler and therefor just use whatever save_handler is set in `php.ini`

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

by dlsniper at 2012-08-17T17:24:37Z

:+1:
[FrameworkBundle] restricted the type of controllers that can be executed by InternalController
[FrameworkBundle] added support for URIs as an argument to HttpKernel::render()
voxoz -> synrc
hwdb: OUI - use ID_OUI_FROM_DATABASE=
udev: update file headers
udev: hwdb - search parents for 'modalias' and data
udev: net_id - add builtin to retrieve data for network devices
util: various additional modernizations
util: more modernizations
Fix DXF import resolution
Merge branch 'develop' of github.com:t-oster/VisiCut into develop

Conflicts:
	src/com/t_oster/visicut/model/graphicelements/dxfsupport/DXFImporter.java
LibLaserCut-Update
Removed unnecessary compiling in distribute script
Updated LibLaserCut, Added missing Libraries
fixed category tree and monthly page design
etsiUusinretti lisätty
add assembly.patch for merging assemblies
first commit
tanotest
Merge branch 'tano'
"minor XSS work" is not good.

$approveImmediately was not defined properly, and could return "NULL"
and output notice error
Test: add warning_exit_code option

we consider a special non 0 return code
as warning, instead of failure

This is useful in case of some tests are not yet fully stable, you can still enable them
in the CI without breaking acceptance, and make statistics on the warning counts

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
trigger: add transfer_properties parameter

This parameter is mainly used for cascade build stop

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
cascade stop: Stopping parent build will also stop triggered builds

A long running request from users, when having a process heavily using
Trigger steps, is to be able to cascade stopping the builds

There are 2 cases here:

- Either the buildrequest is pending:
    then we simply cancel the buildrequest

- Or the builds are already started,
    then, we cancel the builds if possible (i.e on the same master)

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
OPTICKS-1404: Copy function only works from the top most annotation layer

git-svn-id: http://opticks.svn.sourceforge.net/svnroot/opticks/trunk/future@17375 6d0fddd1-9640-0410-91f9-aa98d5e64d34
Added .gitignore files to match svnignore properties
Login working
Converted to new ServiceStack
Prepare Web
Merge branch 'web' into api
update cookpad
update Tests
update Tests
update Tests
update Tests
update lockerz
optimizations
Merge branch 'master' of https://github.com/temas-hub/sc2BO
works awesome but footer is broken in IE 8
entrega 3  v1
Possibly cleaned up layout again
Use CakeValidationRule instead of array in CakeValidationSet::setRules()
Users can now log in via Facebook
UserMessages and events stuff
Initial commit after init of Boilerplate Backbone
Add data files and initial models to the project.
oops forgot the merge
Now the config file is an option parameter... the default value is
config/config.yaml
Fixed output files handling; Make html output more readable
Removed the "." from the clearfix rule

The "." creates content which prevents collapsing margin. Something most users would not expect.

Signed-off-by: Thierry Koblentz <thierry.koblentz@gmail.com>
fix check_sig bug
Identify serialized data types, fix iterator key packing

Fixes #77
Add column_slices example script
Revert "Change scm loading to be more powershell-like"

Didn't work out for git

This reverts commit f2b5eed096db880aeb2e10a6838068fb120d7ee9.
re-release 0.2
Lowered the Android requirement to version 3.2
Implemented a method which is not available in the Android 3.2 API
Updated the CHANGELOG
The code will required Android 4.0 again
Added the title indicator for the new UI
Removed the in-app billing stuff (will be integrated at a later time)
Added some more important changes for the next release
Implemented the first version of the new fragment layout
Added a padding to all fragments
Removed the title of the graph
Update src/common/luaforge/core/proxies/ClientProxy.java

Fix in reobfuscated environment - tried telling samrg on IRC, but he must have been away :P Please test - done entirely from within github so there may be errors.
Merge pull request #7 from Cloudhunter/patch-1

Update src/common/luaforge/core/proxies/ClientProxy.java
Fix jar name
Added Firefox-specific CSS-rules.
tweaks for celebration scene
fix for stiff bg/slowed some scenes down
Total revamping of the ajax unit tests
Fix #12959: Optimize library-wide patterns
Greatly simplifies ajaxTest
Removes unnecessary closure and apply
Fix #12959: Optimize library-wide patterns
Merge branch 'master' of github.com:jquery/jquery
Use strictEqual rather than equal
sandboxes start for real this time (fixes test failures in IE)
Don't let removeClass create attributes
save a byte
Fix #12957. Simplify wrapMap, it doesn't need end tags. Close gh-1044.
Alias options.method to options.type. Fixes #12004.
Unit test for #12004
Simplifies how url is kept devoid of anti-cache parameter for ifModified requests. Also, renames ifModifiedKey to cacheURL so that it now conveys the variable's nature rather than its purpose. -5 min/gzipped.
Fixes awkward spacing
keep manipulation.js assertions consistent
Fix #12989. Remove ajax "global" event behavior.
Followup to #12989 fix, improve unit test resiliency.
Don't really want to expect any global events here.
No ticket: improve global variable/ajax request tracking
Changed 'implements' by 'extends' because AbstractSchemaSynchronizer is a class not an interface (and Eclipse PDT shows a warning that say that "The type SQLAzureFederationsSynchronizer must implement the inherited method processSqlSafely, processSql" but those methods are already implemented on AbstractSchemaSynchronizer).
fix DDC-1978
Merge pull request #189 from mdaloia/master

Changed 'implements' by 'extends' on SQLAzureFederationsSynchronizer
Add the in and notIn methods to Expression builder. Unit tests applied.
Fixed the test.
Changed the file mode back.
Merge pull request #192 from Xobb/master

ExpressionBuilder in and notIn methods
Merge pull request #190 from FabioBatSilva/DDC-1978

Fix DDC-1978
Use dropAndCreateDatabase schema manager function in test initialization instead of individual versions of each.
Based on whether we are on 32 or 64 bit platform, postgres will return a string or an int for the expected php type of a bigint that is > 32 bits.
Remove un-needed require_once directive.
Update fix for issue with bigint type to work for both postgresql and mysql.
Simplify fix for test issue with bigint type.
[DBAL-339] Prevent PDO API failure in setFetchMode()
Merge branch 'DBAL-339'
Merge pull request #194 from posulliv/small-test-fixes

Small test fixes for PostgreSQL
Added third an optional argument `types` to use prepared statement
An argument "types" has been moved to the end
Fixed method signature
Merge branch 'master' of https://github.com/timoshenko/dbal
Set sample port to 22
Added *.suo
Added initial solution.
Add tmux.conf
Add tmux settings
log view + keys
moved from ~ to /var/www
Google version 2.0.0.5888
reduced Vt
Add getifaddrs() impl
commented on why null check is not needed, fixed imports in searchterm
Merge conflicting updates
findPictureName method, minor bug - files 'picture.dat' cannot be found
now.
setpixels
Fixed #18 -- class= isn't added if the language is not specified
Fixed mistake in github codeblock test
Fixed #20 -- Github style codeblocks can now start the parsed string
Added quotes around language class attribute on github style codeblock
Added test case for github codeblock at start of string
Fixed #21 -- Github codeblocks can now contain back ticks
Fixed #17 -- Github style codeblocks now escape HTML properly
remove A2
Updated to follow latest RTP receiver changes.
Consolidated test files to thor tasks
Made more readable and fixed authors array
Fixed yardoc errors
More info on tests
Updated for up-coming rtp
Turned logging off by default
Fixed spacing
Updated docs for RTP 0.1.0 compat
Log response before parsing the response

If there's a bug in the parser and it crashes, you don't get to see
what the parser choked on--now you do.
Separated out integration tests from unit tests

Also moved private methods to be private
Ensure teardown after tests
Fixed rtp dep to be 0.1.0
Cleaner use of Client.log
Bumped version to 0.4.2
More doc cleanup
core: add and use cons
reader: fix wrapper handling, add unquote splicing wrapper
Send simple mail if we can't send it as complex
Added events
Added economy support (basic)
Updated XMail.java to meet previous commits
Added ability to clone mail
Check if someone is online before we complain
Because GIT said they changed?
Refactor
schema rapportage vernieuwd; correctie rx_datum2029
fix commented out posts. hopefully.
Implemented data sinks
设置窗口分割方向
Add the classpath configuration and option
Fixed missing : CLASSPATH on build_job_jar
Remove jdk specification, hopefully fix travis builds.
Make readme version be 2.9.2
Merge pull request #165 from melrief/develop

Add the classpath configuration and option
Merge pull request #167 from azymnis/feature/fix_travis_typos

Remove jdk travis setting and change README
Add test for c++mode.
Change to call lookup-key instead of key-binding because it should search key from local map only.
- Временный коммит
Adding more copy to contextualize listserv signup
override more mc css for embedded form
Merge pull request #12 from trevormunoz/gh-pages

More copy for landing site
Update fortune vimtips.
Update festoon colorscheme.
enabled using methods as handlers
typo persistent
typo 'sollicit'
Work around a bug in FindOpenSceneGraph from CMake libraries.
Fixed a shadowed variable, found by clang++ compiler.
Got rid of a warning in clang++
redesign post table
add getHots
fix a triangle bug
Upgraded python-quantumclient
tmap: fix typo
Resolved a bug in ContentSMLFilter.
Shorttag creation and management
Fix for commit de8291
Merge remote-tracking branch 'andrea/master'

Conflicts:
	SMLFilter.php
Refactored filter class hierarchy.
big refactor Day logic and free/work user time
Do not specify reason phrase when replying unless it differs from the standard
option on/off wifi added to AsyncTask
tell coffeecup to use coffee-script >= 1.3.1
Replaced 'Gauges' for 'Timers' in timers datatype definition
eclipse show-view key added
alter todo capture template
Normalize line endings to work better on windows
Removed slightly excessive comment
Merge pull request #54 from Tuskan360/patch-1

Normalize line endings to work better on windows
Added callback for createWorksheet
fixed settings edit for ampm
Removed Useless Secruity Settings
Merge branch 'master' of github.com:vlara/Ultimatum
Examples from Martin Odersky's Scala presentation
Scala/Java cross compilation by Gradle
HSPA allocated RAM Tuning.
Redused NR to boost file transfer over USB.
STweaks XML corrections by big_bum@xda
Merge remote-tracking branch 'dorimanx/master'

+ ...
+ for me this looks better ;) but I can't start "ExTweaks"-App anymore :( :( -> "No compatible interfaces detected"
make outflow module compile; started work on the geom module
info library for OpenCV added.
fixed bugs #2300 (Vector::dot) and #2467 (build with Xcode 4.5 with --stdlib=libc++)
Merge pull request #123 from asmorkalov/manager_static_lib_info
another fix to make OpenCV more friendly for iOS developers. We now use libc++ instead of libstdc++ and clang instead of gcc to build opencv2.framework.
Merge pull request #126 from vpisarev:bug_fixes3
remove a few things
Default API docs to Ember and add page titles
added missing view template
added global "rake osc_submit" to submit all plugins to OBS
html_helper.rb - removed excessive </p> tag from report_error() helper
run some tasks in parallel

(use rake multitask feature)
status - fixed test, added nil check
Merge branch 'master' into token_auth
Plugin interface update.
Updated README from My Computer
Some slight modification
Bug 752900 - Change 'already killed process' notice from error to informational message r=whimboo
Bug 757495 - Bring back the shebang feature to executable mozbase modules. r=jhammel
Bug 751108 Remove access to app.ini in runner because we don't need the information anymore r=jhammel
Bug 758250 - testprofilepath.py deletes the mozmill and jsbridge extension; --profile is dangerously b0rken for mozmill (and mozbase?);r=AutomatedTester
Bug 758864 - If no destination folder is given for the installer on Windows use a sub folder. r=ctalbert
Bug 759840 - mozprocess should copy os.environ at instance-creation time, not at module load time;r=wlach
Synchronize mozdevice with m-c
Fix silent installer bustage due to testing code.
Bug 759836 - setup_development.py doesnt always actually setup for development;r=carljm
Bug 757411 - Add Installer/Uninstaller improvements from Mozmill automation scripts to mozInstall. r=jhammel
Merge branch 'master' of github.com:mozilla/mozbase

Conflicts:
	mozinstall/mozinstall/mozinstall.py
支持Mac

目前的问题：木有声音；不能启动服务器（可以连接）
add spail page
Added OpenPB, which runs pb script, uploads url to tabspire, and then fixes the url insertion with undo.
limiting previews to 3 lines.. using a fade out gradient.
Merge pull request #51 from andrewhammond/18128

Code Review for Job #18128
merging per Nick
Fixing informations page, removing tools page
added test for AbstractStroke
登录带pToken
rails new jc; import into eclipse
db config; modeling; load data into db
1st version
jc freeze
change country and club form type directory
Signed-off-by:Wojciech Wójcik <wojtaswojcik@gmail.com>
add some description for wsgi.py
turn proxy.ini appid back
removing filter buttons
made a script to cleanup duplicate tags
багфиксы пять

поправлена анимация выставления цифры
Added post edit feature
Validation service
Added OldId column to Firesec.sdf database
일부 모듈, 애드온 등 기능 제거
오래된 업데이트 코드 제거
firephp 업데이트. v0.3.2
Merge branch 'byebye' into olleh
What_is_Iaas_PaaS_SaaS
Merge pull request #323 from 9010ss/master

“IaaS,PaaS,SaaS”
Match URLs after PageLoad (instead of Pre).
Fix various compilation issues
add bin and lib directories
update hello message test with custom swtich
delete trash-file
Merge remote-tracking branch 'userlocalhost2000/hello-test' into develop
Merge branch 'develop' of https://github.com/trema/trema into develop
Merged #222 and fix some errors using cucumber/aruba
Deletes unused cucumber step definitions (refs #222)
Deletes unused cucumber step definitions (refs #222)
Deletes unused cucumber step definitions (refs #222)
Deletes unused cucumber step definitions (refs #222)
Deletes unused cucumber step definitions (refs #222)
Refactor features/step_definitions/stats_steps.rb (refs #222)
Refactor features/step_definitions/send_packets_steps.rb (refs #222)
Refactor features/step_definitions/misc_steps.rb (refs #222)
Deletes unused cucumber step definitions (refs #222)
Set invitation "from name" to event owners name
Change OpenGraph object type to "poll" from "file"
Add NewRelic gem and config file
Remove extra commas from emails
Remove double negative
removes orange color from share URL
Send emails asynchronously

* Install delayed job
* Disable delayed job in tests
* Use delay instead of deliver on mailers
Add DelayedJob migration
Index foreign keys and searched attributes
Remove db/schema.rb from .gitignore
Remove db/schema.rb from .gitignore
Set assets host in production
Fix duplicating users bug

* In Sessions Controller, search by uid, not access token, which resets
* Also memoize Event#Show events and suggestions to improve performance
* Fixed to_s error
Update action mailer assets host
fixes overflow issue after resizing page from narrow back to wide
Refactor YammerInvitee

* Refactor and remove YammerInvitee
* Replace create_yammer_account with mock_yammer_oauth
* Rename create with auth for helper methods
* Moved invite_from_params into invitation
* Remove Inviter model
* Improve performance using eager loading, indexing
Add to_s to yammer_user_id when called in User

* Patches staging server type mismatch error
Change data type; Remove to_s
Correct string-integer mismatch issues
Set access_token on login with oauth hash

* When a user is invited, their access_token is borrowed from Event.user
* This token is used to retrieve Yammer user information via API call
* On authentication, the access_token is reset using oauth hash
multiline textbox will add additional spacing for below so just remove line break then everything become normal.
Added:
webserver.py - easy web server on python
sql.py - renamed Mysql.py
classtools.py - various utilities and tools for working with classes
__init__.py is empty
.gitignore ignored *.pyc, *.pyo, __pycache__
Checking in changes prior to tagging of version 0.04.

Changelog diff is:

diff --git a/Changes b/Changes
index 14153f3..0846344 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for Perl extension AnySan

+0.04    2011-12-29T17:40:35+09:00
+        - add interval option on IRC ( for Excess Flood defender )
+
 0.03    2011-10-24T12:32:31+09:00
         - fixed IRC send message reverse FIFO queue bug.
Merge branch 'master' of github.com:yappo/p5-AnySan
move queue data to context
add connect_cb and disconnect_cb option to pod
Checking in changes prior to tagging of version 0.05.

Changelog diff is:

diff --git a/Changes b/Changes
index 0846344..c6f8829 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl extension AnySan

+0.05    2012-02-06T17:14:42+09:00
+        - add connect/disconnect callback option (kazeburo++)
+        - send message buffer move to context
+
 0.04    2011-12-29T17:40:35+09:00
         - add interval option on IRC ( for Excess Flood defender )
change name of connect/disconnect callback option name
Checking in changes prior to tagging of version 0.06.

Changelog diff is:

diff --git a/Changes b/Changes
index e0a4f94..8bc473b 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,6 @@
 Revision history for Perl extension AnySan

-0.06
+0.06    2012-02-06T17:31:23+09:00
         - change name of connect/disconnect callback option name

 0.05    2012-02-06T17:14:42+09:00
change join channel timing, join channel on connect to IRC Server
Checking in changes prior to tagging of version 0.07.

Changelog diff is:

diff --git a/Changes b/Changes
index 8bc473b..9f22eb7 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for Perl extension AnySan

+0.07    2012-05-19T17:38:36+09:00
+        - change join channel timing, join channel on connect to IRC Server
+
 0.06    2012-02-06T17:31:23+09:00
         - change name of connect/disconnect callback option name
test polished
#16: reproduced in test
#16: fixed
scroll fix
scroll fixing next
test script
styles test
come back !
Revert "reformat"

This reverts commit 19cb9d0a5725685c95548f05e93cec9987a7ba0c.
Revert "Revert "reformat""

This reverts commit c4fab54a9e4757a4034b4676d70b39ed714a976d.
finish
clear
big version yes
finish js ok
version 1.0 beta
Fix incorrect translation.

1. bind.htm
2. unbind.htm
Fix associations with groups for users as member and admin
Text is not generic - only available in TextContent
Allowing count parameter db_load_data.rake, in order to avoid "[warning] Database disruption imminent, row limit exceeded for dev database on Heroku app". Count 10 => load approx 150 % above limit for free heroku.
using /static/favicon.ico
add some modules as "SEE ALSO"
profile.sh fallback and CMakeLists.txt install rename
* build-emacs: new debug build
Completing README [ci skip]
Correcting routes
Adding travis button to readme
Updated: 2012-11-28 15:09:00 +0000
version 0.0.55
remove bogus privileged check. fixes #148

This check didn't actually do anything beside checking the Process.uid.

So we simply remove it to let users run bluepill together with their
deploy user which should be the default anyway.
remove log_file support in favor of syslog
use bluepill as syslog ident and process name
remove unneeded local-bluepill helper
use ~/.bluepill as default base_dir for a better UX. fixes #144

Since bluepill should not be run as root by default, simpley use
~/.bluepill for state data to make it work out of the box and create a
better user experience.
use proper logger
use application specific syslog ident
Started with users, not ready yet.
新增HZTI项目代码

2012-12-22
新增HZTI项目代码
Profile page:
+ Added empty class ControllerProfile
+ Added empty class ViewProfile
+ Added empty class ModelProfile
Several modifications:
~ Cookie lang in ControllerMain is now set for '/'
~ In case of wrong login name or email in authorization process to admin
or main page, your login or email will not be deleted from input
BLACKTIE-411 update to fix thread to set exit value.
BLACKTIE-412 fix to use multiple instances of the matcher
JBTM-890 update pom.xml and add a profile to run tests with aruqillian.
JBTM-939 QA build can now run a single method of a single test
JBTM-1156 Make sure IPv6 opts are passed to surefire
JBTM-1156 Make sure IPv6 opts are passed to surefire
JBTM-939 Increase wait period for replay completion
Merge branch 'JBTM-939-qa-crec'
JBTM-940 Increase wait period for replay completion
JBTM-1156 add runtime env only on IPv6 builds
JBTM-934 fix stray localhost
增加外链显示的小图标
add https a links style
update all html
笔记备份2012/08/22_20:48:13
解决daemon encode error
Fix editing keyword collections
Fixes for backup restore.
Dynamically calculate the ebin dirs when compiling .erl, to ensure deps/ ebin dir existence.
Merge branch 'master' of github.com:zotonic/zotonic
added variables for ipad arrow colors
Added an active state for flyout ULs in the navbar element
Updated plugin and template classes to output generation time, changed layout in CSS, and removed try/catch statements for GET handlers for now
增加数据基础类和部分界面
create a new board on post margin
Fixed uncertainty calculation
好的，广告详情banner部份的设计搞定，到时候要重新ps一张图片。。。。。
Moving a lot of the HTML formatting into a new template.
Añadida clase para obtener localización
added automatic hessians and MP2 calculations on each step
More powerful import
Fixed: Some AI issues
Fixed: Ranged mook death animation
Changed: Reduced sprint speed to 1.5x walking speed
Fixed: Stunned should now die right away
Fixed: Typo on melee weapon animset
Removed: Default inventory
Fixed: Slowed bots now move at 50% speed instead of -4900%
Fixed: Some AI issues
Fixed: Ranged mook death animation
Changed: Reduced sprint speed to 1.5x walking speed
Fixed: Stunned should now die right away
Fixed: Typo on melee weapon animset
Removed: Default inventory
Fixed: Slowed bots now move at 50% speed instead of -4900%
Allow user to enable or disable libproxy support explicitly using --enable-libproxy or --disable-libproxy
Fix HTM config dir handling both on Windows and Unix
Add note about special folder
Add support for backslash as drive root for full path logs
Merge pull request #102 from Arnavion/allow-configure-libproxy

Allow user to enable or disable libproxy support explicitly
Merge remote-tracking branch 'upstream/master' into htm-mono
Factor all colors in one sass file.
Use a darker colorscheme.

Also spice up some things with gradients.
Added some useful links to the readme file
add interested and uninterested user list to article_model and modified markRead to record interest
added classifier object field and made feed_id required
Added a test classifier
added intelligence
renamed test_classifier and handled the fact that there can sometimes
can be no classifier
Merge pull request #32 from ajy/add_intel

Add intelligence
Fix bootstrap conditional
Completada navegacion personalizada en las paginas de la materia: noticias, recursos y vista de recursos.... pasando los atributos en la URL....
Readaptado el modulo de recursos con estos cambios....
Ya se pueden visualizar tambien videos...
Falta corregir un error al "solicitar" la vista de un recurso.... solo abre bien en una pestana nueva
Merge branch 'master' of https://github.com/Avangarde/gnosis.git
Implementada la vista de las materias desde la pagina de busquedas....
Personalizados botones y titulo de la tabla...
Eliminado TableBean, se usa el searchBean
SearchBean
searchBean
Recuperado SearchBean
Solo un pequeño arreglo en la vista de la busqueda
Changement pour pouvoir selectioner directement dans le tableau
Changement pour pouvoir selectioner directement dans le tableau
Changement pour pouvoir selectioner directement dans le tableau
forbid setting a group's parent to itself or its descendants
Modified transform calculatoins, added boundingBox
pvr scrollbar fix
confluence template for dialogmediafilter
bg and bg overlay fine tuning
slower scroll speed
dutch translation of new labels
added characterart to dialogvideoinfo
started widgetlist for include checking (WIP)
Slightly bigger now playing
musicvis label fixes
added factory girl
init commit
added basic models
migrate
gallica_backup contains the version of gallica that has an updated sidebar
Mod in common to strip leading "+" and " " from params to make it ok to make query="cat, title=cat", before had to have NO space after coma
Merge branch 'params' of github.com:Blanko2/vic-mdid into params
Fix chat fade option and disable it by default
NO!!!!
Support queueing of versions on recv side
Fix unit test: don't sync to VERSION_FIRST
Fixed some bugs

* Fixed a set 0 bug which caused a user to have that item
* Fixed a bug in the mine command which allowed a user to
  mine non mineable ites
* Improved the English in the !sell command
* Added a dragon pickaxe with a quality of 55
* The rune pickaxe now has a quality of 25
* Added mithril and adamant bars
* The mining chance is now calculated using the quality
* Changed all the qualities
* Fixed a bug in the buy and sell commands
Added directory provider binding to the public router
Inet struct members were renamed at 3.0.25 kernel version
Fixes issue #2053

Shuttle doors now close just before the shuttle leaves.
testing TrakerSelector.js
Remove extraneous quotes.
Add libRaster_io
Merge remote-tracking branch 'origin/master' into
FormulaEditorFragments2

Conflicts:
	catroid/res/values-de/strings.xml
	catroid/res/values/strings.xml
Merge remote-tracking branch 'origin/master' into
FormulaEditorFragments2

Conflicts:
	catroid/src/at/tugraz/ist/catroid/ui/ScriptTabActivity.java
	catroidLicenseTest/src/at/tugraz/ist/catroid/test/code/CheckForAssertionsTest.java
	catroidUiTest/.classpath
	catroidUiTest/src/at/tugraz/ist/catroid/uitest/ui/MyProjectsActivityTest.java
	catroidUiTest/src/at/tugraz/ist/catroid/uitest/util/UiTestUtils.java
if/else bricks and functionality
If/else brick logic and test
Merge branch 'FormulaEditorFragments2' into
FormulaEditorFragments2MultiLanguage

Integrated if-then-else bricks into multi language formula editor

Conflicts:
	catroid/res/values-de/strings.xml
	catroid/res/values/strings.xml
	catroid/src/at/tugraz/ist/catroid/ui/ScriptTabActivity.java
	catroidLicenseTest/src/at/tugraz/ist/catroid/test/code/CheckForAssertionsTest.java
	catroidUiTest/.classpath
	catroidUiTest/src/at/tugraz/ist/catroid/uitest/ui/MyProjectsActivityTest.java
	catroidUiTest/src/at/tugraz/ist/catroid/uitest/util/UiTestUtils.java
rebuilt my first commit from Issue56 branch
forgot to add files
7.40c: refactoring tests
Task 7.37/Issue 216: change list view feedback --> bouncing
acceptance changes according to Kaufi
7.23C: start writing testcase for problem when brick is added while
other one is still hovering
7.23C: finished test
7.23C: issue182 fixed - hovering brick is added to list, when other
brick is added
7.23C: refactoring to remove OutOfBoundsException
7.23C: adapted License text
7.23C: remove method from UiTestUtils
7.23C: adapt assert-messages
Merge branch 'master' into DragAndDropRefactorBranch
7.23C: adapt to dimmed background, when brick is hovering
Windows: In-depth cleanup (see details)
�Fix x64 builds for Windows. Now all configurations compile.
�Remove the non-working rebase stuff.
�Remove the Windows fork hack and instead use FreeConsole() to emulate the behavior. This directly allows us to compile with ASLR, which is turned on now.
�Remove the old IPC mechanism for the removed GUI. This is not needed anymore as the GUI wasn't ever supported on anything newer than 1.2
�Remove the WIN32/WINDOWS macros. _WIN32 is supported on all x86-based VC++ targets, so that's what we need.
�Enable optimizations for release builds.
�De-duplicate printf_c(), it was previously copy-pasted into colors.h for configure
�Add the VC++ specific bad files in .gitignore
�Disable PID writing on Windows. This is only making sense for *nix builds.
�Replace the CPU usage retrieval with an algorithm analogous to the *nix behavior. Also supports separated now/total values. (Tested with a dummy busy loop - seems working)
�Removed certain unused functions and variables
�Remove stdint defines from the windows wrapper
�Remove CRT debug alloc. This is a bad idea as it would define a macro to replace free which breaks builds.
�Re-evaluated the warnings list, commented it.
�Moved inspircd_config/_version to include/ to match *nix
�Removed the creation of inspircd_se_config, as it isn't used at all.
�Made non-git builds show as "r0" instead of "r" (thanks to @SaberUK for pointing this out)
�Fixed up m_spanningtree's project paths. Now all configurations (debug/release x86/x64) have been tested and build properly.
�Moved FindDNS out of the wrapper and matched its log behavior with *nix. (It's pointless having it in the wrapper after the recent slimming down)
�Replaced random/srandom wrappers with a mechanism that tries to use Windows' Random API first is no SSL module is loaded.
�Removed more old junk from support for compilers older than VC++ 2010 (we don't have project files for these, so compiling them would be hard anyways)
�Removed the unused ClearConsole()
�Removed unused includes from the wrapper. Also, do not include psapi.h here if we don't link psapi.lib. This should be done where appropriate.
�Made inet_aton an inline function for increased performance
�C4800, performance warning about bool forcing, resolved at all occurrences.
�C4701, uninitialized variable 'cached', resolved at all occurrences.
�dlerror() was migrated out of the wrapper for more thread safety (no global buffer being shared) and increased performance.
�Removed the wrong CRT debug flags. This drains a lot of performance.
�Removed the clock_gettime/gettimeofday wrappers
�Replaced all TCHAR/ANSI mix-ups of functions with the correct respective function.
�Added a block of C4355 for < VS2012
�Update project files for c8707149b2a9a1b9774457c2d1629d37920b9f74
rebuld all generated files

fix reference to README.rst while rpmbuild
You can now ignore by host
Std clause all to main
Add "How to contribute".
Accidentally the cmd executor
LeechCraft 0.5.75-194-g31f5105.
LeechCraft 0.5.75-209-g7c26b0c.
LeechCraft BirthDay Notifier.
LeechCraft 0.5.75-270-gcaf3381.
LeechCraft 0.5.75-287-g722e780.
Added property to microdata attrs.
raw version of registration
Support providing a filename containing a coverage threshold
Allow options specified in ./.cane to be added to a rake task
Use httplib2 instead of urllib2 for http service check
Merge branch 'master' of github.com:DataDog/dd-agent
[win32] add xslt to template confd files as permanant
[win32] in xls, copy the File tag on templating
[win32] add building powershell script
[win32] rename build script with the right extension
fix checks.d tests
remove `with` for compatability with 2.4/2.5
support < python 2.6 in the cassandra dogstream parser
abstract the subprocess terminate so it works on 2.4/2.5
just use os.pid to get the current pid

multiprocessing module isn't in 2.4/2.5
remote string.format() from memcache tests
missing import of `signal` to kill subprocesses
remove another `with` from the nagios test
use backward-compatible isnan() in cassandra check
fix cassandra dogstream to use new parse_date func
[win32] minor syntax changes to nsis build script
[win32] pass version into makensis
[win32] a couple more tweaks to the windows build script
bump to version 3.2.0
include conf.d in the rpm
include the aggregator in the lib package instead of the base
Add a test to the service checks, improve code readibility
Adding performance benchmark task.
Don't import module when parsing dogstatsd point.

Drops benchmark time from ~18s to ~15s.
Add sets + a float value to the benchmark.
A pstats convienece rake command.
Fewer runs in the aggregator test.
Inline the cast_metric_val function call.

Before: 11.572s
After: 10.059s
Formatting clean-up.
Share test run data between types.
Removing unused variables.
Test tags + sampling in the dogstatsd benchmark.
Removing ununsed value.
Fixing half finished comment.
Merge branch 'performance'

Conflicts:
	.gitignore
	Rakefile
	tests/performance/benchmark_aggregator.py
One more crack at logging.
Remove silly 'encryption' nonsense.
Added Themes support