labofsahil/github-event-dataset-2012 huggingface dataset:
Make sure last line of send_email() data ends in \n
Merge branch 'master' of github.com:baudehlo/Haraka
Merge branch 'master' of github.com:baudehlo/Haraka
Merge branch 'master' of github.com:baudehlo/Haraka
Merge branch 'master' of github.com:baudehlo/Haraka
Support returning list of MXs, a single MX, or hostname:port from get_mx
Support delivering to an IP (assuming it came from get_mx)
shaders not working yet...
Fixed .gitignore file to ignore the test program.
You can now flip things on on a form by form basis.
Hey I just met you, and this is crazy, but here's the untappd service, so merge me maybe?
Higher buck Volts
more mem for Slim Bean
Simplified ServiceManager to utilise Symfony ContainerBuilder more effectively and reduce duplicated code.
Made the default keyboard shortcut work.
Fix deprecated drawing code.
Made the title label always reflect the document which is open.
Minor UI cleanup.
Make stash return control to the old application when it hides itself.
Make it possible to exit stash using the escape key.
Allow the user to select prefix or contains as the search method.
Updated fileinfo building
Add anonymous functions to the parser.
Intermediate.
Refactor variable reference chains.
Add anonymous function parsing.
Intermediate.
Refactor scopes to support anonymous functions.
Add anonymous function codegen.
Add execution test for anonymous functions.
Add Function-type arg test.
Note to self: Learn how to spell compatibility
Formato de README.md para énfasis y negritas.
Version 3.2.7.1
small documentation corrections, css
add ResultLimit feature, implements ideas from #29
make everything static in ResultLimit
make everything static in ResultLimit
altered "add" logic
iolist support
Quick install and test notes
Minor text change in comment.
Changed name of latest project.
Without fstab csv file P't stops. If UUID missmatch P't will not overwrite original fstab.
Optimize method compilation with/without strict mode.
Update vendors and docs. [ci skip]
add a new test for the stack in messages
fixed a bug in picture.py
fix markup in template spec
update template documentation based on 0.1.0 spec
HKS working and clean enough

Results display has to be improved
add border to hekaya form
Adding debug output to pipedump utility.
Writing initial manage for pipedump.
removing unused struct.
Fixing memory leak.
Removing unused variable for --quiet option.
Adding ability to specify start port for pcap logging.
Updating version number for release.
changing default bio assembly provider to mmcif for now...

git-svn-id: file:///home/svn-repositories/biojava/biojava-live/trunk@9732 7c6358e6-4a41-0410-a743-a5b2a554c398
added title and fixed user link
only show time if it is not a full_day event - fixes #80
Issue #68 tests

* spec/lib/jaribio/execution_spec.rb: implement 2 pending tests
nuke the ffi gem on travis boxes

/cc @bootstraponline @akzhan
Merge pull request #361 from github/travis-fixes

nuke the ffi gem on travis boxes
Gem uninstall does not require sudo (pointed out by @michaelklishin).
Remove empty line.
Add mathjax using SSL CDN.
Merge pull request #354 from bootstraponline/mathjax

Add MathJax (only for gollum, not github.com).
Call page.versions once.
Add --base-path option.
Use grit with force_encoding('ascii-8bit')
Added test cases to test Unicode handling issue.

these test cases will fail on non-unicode testing environment
gemspec rebuilt
restored three missing VB3 files for synthetic data analsyis
Add a title helper
Add Bootstrap framwork and site styling.
dgram: make .bind() always asynchronous
test: suppress simple/test-dgram-pingpong chatter
test: update dgram tests after API change
crypto: add sync interface to crypto.pbkdf2()

Fixes #3766.
node: bump NODE_MODULE_VERSION

Bump NODE_MODULE_VERSION so old modules won't load without recompiling when
the next major release (v0.10) comes out.

This is necessary because the ABI changes between major releases.
node: don't scan add-on for "init" symbol

From this commit onwards, use of the NODE_MODULE macro is mandatory. This lets
node guard against modules that are ABI incompatible.
events: make .listeners() return a copy

Make EventEmitter.listeners(event) return a copy of the listeners array instead
of the array itself.

Fixes #3442.
child_process: improve maxBuffer error message

Mention what buffer (stdout, stderr) overflowed.
fixed: connecting ports from inactive clients is not possible, and there's no way of checking if a client is inactive, so just try to connect the ports every second until it succeeds
fixed: when debug logging is off, only print once if the portconnector can't connect
Adding CONTRIBUTING file
Merge branch 'master' of https://github.com/bobthecow/Ruler
bump version
Merge pull request #9 from cyberdelia/bump

Bump to 0.1.3
Merge files extra_ops/BinCountOp.py and extra_ops/DiffOp.py to extra_ops.py.
Split tests and code for these ops.
Move the tests to tests/test_extra_ops.py.
Create extra_ops/__init__.py
you can now shoot. Fixed a bug with the scan function.
Fixed a bug with GotPart() passing
org & user records inserting & print page
Revamped UI.
cambio en error de dedo
Merge branch 'master' of https://github.com/brass3a4/idheas
[brian2] Made Network.objects store only weakref.proxy objects
Fix check project mutiple objects bug for context processor
blockColor is now Green, made setDie dialog easier to understand
Fixed a capitalization error in an #include
Non-user errors are not shown to API users.
Changed logging to logger in _api.py.
Added missing user specification in _api.py logs.
Changed old references to heavylifter to sisyphus
Limited error information returned to user.

* _get_archive would give the exception to the user, now it just says
  "Internal server error."
Fixed bug in get_archive API call.

* Teacher users would force an error to occur. Glad I caught this...
Fixed edge-case in tar_bulk_submissions.

* If a user had two submissions with the exact same timestamp an error
  would occur.
Merge pull request #1 from brson/master

Update for 0.2
Make rust-uuid portable to other *nixs.
Update for Rust 0.3 changes
unicode no titulo do ebayitem.
removi comentário desnecessário.
arrumei a função setCentralImage.
adicionei função para habilitar/desabilitar spinbox
arrumei o bug do pixmap null.
Complete to location 1688
Ein großer Schritt für mich... ein kleiner für die Menschheit
Added static analysis tools testing
Merge github.com:bskari/sqlassie
Include custom Makefile options at the end so that I can override options
Fixed updating and did some " -> ' cleanup
Added lua source files for gestures to xcode project
Changes to gesture interfaces.
Merge pull request #376 from seanpaultaylor/next

Changes to gesture interfaces.
Merge pull request #377 from seanpaultaylor/next

Added lua source files for gestures to xcode project
Merge branch 'next' of https://github.com/bslack/GamePlay into next

Conflicts:
	gameplay/gameplay.xcodeproj/project.pbxproj
	gameplay/src/PlatformMacOSX.mm
	gameplay/src/PlatformiOS.mm
Adds Pinch/Tap/Slide to iOS Build

- Note: Mac OS Build only includes Pinch currently
fixing stuff for website
Updated about page. Finished styling quotes
parse1
must parse all params-and-bodies with multiple arities
Intermediate state of CSV import service which is unfinished and broken. Check unit test for details (it fails).
Intermediate state of CSV import service which is unfinished and broken. Check unit test for details (it fails).
Fixed a bug with the UserProfile, integrated SSO,LDAP to user creation
now open file will download to tmp folder and then open it
Added more tests.
Updated pre-made jar.
Add submodule commands to README
Removes JSLint warning
GetFeature action automatical deactivation
Use OpenLayers.Function.False instace of create a new function
Add autoDeactivate option
Typo
Merge pull request #329 from camptocamp/disable-on-query

GetFeature action automatical deactivation
small changes, fixed typos, added citations
added some content on implications
Update main page link.
shopping basket with kendoGrid
Translation updates
CasUserBundle changes
trying to fix blog/shared/ issue
Commented out the agenda; put the group list and the main content
together
Merge branch 'master' of git@github.com:caylan/Bulletin.git
Bulletin logo link.
Forgot a semi-colon.
Some preliminary signing and encryption functions
add check_u
Carga de la pcl al arbol
Guardado de la forma
missing comma - railo compatibility
Merge pull request #8 from joebrislin/master

Missing comma in ValidationMessageProvider
extracted rpc encoding selection outside accept for loop
First Text & Button
Add a parameter max random detections to deal with limit in hte number of people one can test simultaneously 
Print plots.
Add MVC

Signed-off-by: chavp <my.parinya@gmail.com>
MVP

Signed-off-by: chavp <my.parinya@gmail.com>
task4 db added, but no actionBar, no notification
diff parser update
trivial change to force a rebuild/redeploy
Move runtime out of the leiningen namespace so it doesnt appear in `lein help`
removed warning for @failed

refactoring @failed and failed? methods to remove ruby warnings
removed warning: assigned but unused variable

refactored variables use in gherkin_builder.rb so that we don't have
assigned but unused variables
rmv  warning: assigned but unused variable - e

small refactoring to removed  warning: assigned but unused variable - e
rmv unused variables in rb_language.rb

removed unused variables in lib/cucumber/rb_support/rb_language.rb:54
and :62 to give better performance and remove ruby warnings
removed unused variables in rb_world.rb

removed unused variable 'e', we were  passing the exception and the the
backtrace into variable 'e' but we were not using it. It was not memory
efficient .
added twitter bootstrap+thematic functions. thanks to binhdo :)
Fixed Sega CD system controller
Merge missing files from upstream
Refactoring OECollectionViewController
Last selected sidebar item is correctly restored. And more code reordering.
This should fix Issue #216.
Merge remote-tracking branch 'upstream/master'
better unicode symbols for indicating relative completeness in content.md
Fix typo in OSX vim installation instructions
Merge pull request #50 from devn/patch-2

Fix typo in OSX vim installation instructions
Remove extraneous malloc, patch leak
updated text def of clavicle. fixes #103
updated text def of ilium. fixes#105

Signed-off-by: Melissa Haendel <haendel@ohsu.edu>
Properly deal with spaces and other special characters in paths.
Working on OneToMany example.
basket ++
sort positioning on categories-5
corrected bugs in code generator
Code reformat
Idle highlight
reformat
SysUserController unit test add.
Fixing merge of timings
Rebuild for version 0.0.3
Updated docs for harmony proxies.
don't wait for DOM to process JS, content init will happen on DOM.ready
return mapal for main.js
removed excess invocation
Added landmark attribute to ignore formatting - useful for formatted numbers to not be parsed as dates
Added 5th function
Merge branch 'develop' of github.com:cpdc1/testTower into develop

Conflicts:
	test.txt
BUGFIX: double-release
Nguyễn Đức Vượng
update gem2ruby
Go on with the controller
Validation language lines for emails
Choose different validation methods for different entities
Sticky form
Improved web frontend
Implemented penalty system for hints and implemented hints in the swing view
Changed to Dropbox deamon
Ignora arquivos que não são do projeto
All your base are belong to us
Fixed most test cases to work again with new platform system
added another test to make sure we dont worry about commas not inside values
BUGFIX: misspelled symbolic constant (credits: Albert Tejera)
- SI4735_[FA]M_TUNE_STATUS --> SI4735_CMD_[FA]M_TUNE_STATUS
Added mapsApi JS test code/file
rework authorize UI
install.sh now accepts the usage CZHOME CZCOMMONPROFILE(=cz) CZPROFILE(=profile_czlinux)
Forgot to add file
Minor improvements to device discovery performance
Minor fix
setting up some todo's
change config from properties file
Roles are now implemented (not fully...)
User have to be authentified to access Dashboard
Fix 0 size README
Finished dept sorting
corrected vim bundle cloning
preparing for submodules
added submodule, commented out broken stuff
Django 1.4 project layout
updated ubuntu, implemented multiple images for guests, consolidated jetty and enforced masters creation on itests
removed mac osx reference
added unit test for defaultimagespredicate and corrected preseed
reverted the preseed and corrected a test to account for multiple masters
updated readme to include paswwordless ssh requirement
fixed tests to not taint static credential cache
Issue 894:update to guava 12
don't consider field equivalence when using ofApi
Issue 896:ec2 doesn't pay attention to api version property
Issue 895:add openstack-nova-ec2 api
Issue 895:add openstack-nova-ec2 api
Issue 888, 895: temporary workaround to stop openstack-nova-ec2 from using # characters
refactor out test session to exist on the suite scope
ensure tests are tidy, consistent, and clean up after themselves
Controler renamed to controller
Add '%char%' as pattern to match in Token::Match.

All and only those single characters enclosed in "'" are accepted.
#3874 added missing testcase to avoid false positives
Correct typo flatter -> flatter
Add sample rate is 48000 test
Add tests for audio-format, twelth root and queueing of data
Add tests around audio loop control
format
Test ordering of data and switch implementation of joining

Using concat instead of the naive cons and flatten approach
Make write-to-audio-loop return nil and add new test for agenting a line
Add midje support
Start converstion of clojure test to midje tests
change divs to table
添加Functions类;添加tostr、tohex函数；
添加getDBObject、getDBType、getObject、getNewPK等函数
更新项目文件
Added Directory basic object
update: examples
Updated to recent version of Vim-R-plugin to make Mountain Lion work
added state to this repository
A bunch of lint cleanup.
Zalążek połączenia socketów
Abs table view controller
Table view controller added
ExerciseManager.sqlite added
MainStoryboard had the cell Identifier blank.
Abs exercises are being listed properly.
Added generic view controller for all exercises..
Wrote EMSQLManager class
-Changed UI of the table to add accessory type.
-Screwed up the Abs table view controller
Not tested daily logger of exercises.
Able to select exercises and store it in database..
Deletion not added
Changed the manner in which body parts are displayed.
Single Generic view.
Lot of things
Body exercise load from database
Almost all functionalities are complete
Major changes
- added meter
- added switch for weight meter
semiworking
semiworking
Layout Changed
Fixes
exercise row gets checked when the weight is none zero.
calendar broken
Revert "exercise row gets checked when the weight is none zero."

This reverts commit 47f428c7c2654036282bf652f1b7f3017542190b.
不必要な設定項目を除去.
from rails guides
fix filename sanitising regex to strip multiple leading/trailing dots
startversion
trying to restore files may have to start again
Return type for 'window.callPhantom', in case no handler is set, has to be 'null', not '0'
Adds a simple BillboardTest with back to front object sorting and visibility testing.
Merge pull request #606 from seanpaultaylor/next

Adds a simple BillboardTest with back to front object sorting and visibi...
Merge pull request #605 from dgough/next

Fixed DebugMem and added Stream interface
Fixed bug where FileSystem::fileExists was creating an empty directory on Android.
Updated CHANGES.md
Changed the lua sample to use ScriptController::loadScript instead of dofile.
The reason for this is because on Android, using dofile resulted in the file being copied to the SD card in order to use the standard file reader. However, ScriptController uses gameplay::FileSystem, which doesn't need to copy the lua source file to the SD card.
Fixed minor warnings and converted tabs to spaces.
Remove DS_Store
gitignore DS_Store
Trying WindowTester
Sort out driver responsibilities
More tests working under windowtester
Total method count column
More tests. Can't CMD-click yet.
Clean up access to column values
Clean up table cell DSL (needs more)
Figured how to CMD click.
Update Hartley library
Fixed an extra forward slash in the process definition
Prevent duplicate tab entries
Use call_queue_config, agent_auth in sup web con
Merge pull request #88 from dhubler/extra-fwd-slash-fix

Fixed an extra forward slash in the process definition
Merge pull request #89 from jvliwanag/tabsfix

Prevent duplicate tab entries
Merge pull request #90 from jvliwanag/supervisorwebdb

Use call_queue_config, agent_auth in sup web con
add jain to OF plugin deps, link all jars in sipXopenfire/lib
Updated xmonad script to manage mpc
fix flash in account
改变书写easyui treegrid方式

改变书写easyui treegrid方式
add form to view to form helpers
stop parsing the themes' pdf folder in the Front-Office translations
Merge branch 'master' of https://github.com/djfm/PrestaShop

keep up
3d dock, larger icons
Append high-level message transfer Events to a non-blocking circular buffer
fs: satisfy blkback with an attached but not activated disk

I believe blkback needs to know the size of the disk in sectors
before completing the hotplug action, otherwise it immediately
unplugs. Therefore supply blkback with a tapdisk containing a
correctly-sized disk, which we immediately "pause". In activate
we "unpause" with the real disk, once it is ready.
fs: make sure VDI.deactivate, VDI.activate works

VDI.activate expects tapdisk to be in a 'paused' state, not a 'closed' one.
load_function.psp
Merge branch 'master' of https://github.com/dkundel/jmarket
load_function.psp
add price to display
Reinstalled 1.7.0.2 for fix, price indexer still broken
Updated with formatting.
Refactored everything
Refactored everything
Refactored everything
Fix "rogue" slab atoms bug.

Adds a small amount of floating-point slop
to comparisons when comparing atoms at
unit cell boundaries. Fixes the "rogue atom"
bug where edges of the slab weren't always
uniform.

Change-Id: I195601f786ef9a9e8cb2546a50edc0971d72bbbf
Automated update of translation templates (POT) using latest strings.

Change-Id: I30dffaf9ac5e7f592e611ecead27d42e4f030af6
Merge topic 'fix-slab-rogue-atoms' into master

16719106 Fix "rogue" slab atoms bug.
Some templates.
Started filling in some templates
Moved the config parser to src, so that it can be imported from other packages.
Added a message for activating grippers.
Added gripper topic for opening and closing the gripper.
Text Editor saves when pressing cmd+s.
Move ASP.NET related code into a separate library dotless.AspNet. Change dotless.Core to target .NET 3.5 Client Profile. Added class AspNetContainerFactory that inherits ContainerFactory and registers the ASP.NET specific services.

Add Generate-Assembly-Info to build script for dotless.AspNet project.
Fix msbuild call in default.ps1 to allow spaces in paths.
Inlcude asp.net in dotless.Core and create a new dll with client profile containing the compiler
Recurse down into trees with transparent positions.

`ScalaMatchLocator` should continue to look for matches in subtrees of trees with
transparent positions.

Better logging in case matches are skipped.
Conflicts:

	org.scala-ide.sdt.core/src/scala/tools/eclipse/javaelements/ScalaMatchLocator.scala
Remove call to flatten array parameters.

getElementType of an array is returning the element type of the array. So any
method that takes Array as a parameter would never pass the `sameParams` test
(such as `main`).

May not be a full-solution, someone needs to write a test and make sure I don't break something else.
Remove `lazy` local variables.

They seem to exist only for debugging, but they're useless unless they're strict. When
sitting on a breakpoint on the last line of the method, all of those lazy values are not
yet evaluated. Once you step, you're out of the method.
created "bin" folder and shifted files
import source of k3flasher

http://www.mobileread.com/forums/showthread.php?t=184310
continue dump if file exists

This was somewhat userful to me to dump full rootfs on flaky usb cable
which interrupted huge transfer several times
Merge branch 'master', remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
metomi/rose#163: fix array widget bug
Merge branch 'master', remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge branch '157', remote branch 'upstream/master' into 157
metomi/rose#157 ROSE_ENV added to rose-task-env

 * rose-task-env help updated
 * web pages updated
 * suite_engine_proc.py code for ROSE_ENV added
Merge pull request #172 from arjclark/157

metomi/rose#157 rose task-env: ROSE_ETC
Merge remote branch 'upstream/master'
metomi/rose#167 Initial splash screen implementation.

Rosie go now has a splash screen.
Splash screens now have the rose icon in the taskbar.
metomi/rose#167
metomi/rose#167 Narrowed down icon load exception.
metomi/rose#167 Correction to exception.
Merge pull request #174 from arjclark/167

metomi/rose#167: rosie go splash screen

Looks good - closes #167
Support `cylc get-config -a`.
Support `cylc get-config` None output.
cylc get-config output parse: None and newline.
初步ogre封装，便于使用
Localisation updates from http://translatewiki.net.
Fix #14842: Incorrect matching of versions in print_version_option_list

When comparing versions to determine which ones have already been added
to the select list, a loose comparison is performed, so '1' matches
'1.0'.

This causes issues when editing a bug having a version currently
obsolete matching another, previously displayed version. In that case
the obsolete version is not added to the selection list, causing data
loss when the bug is saved (see issue #13096).
Localisation updates from http://translatewiki.net.
Localisation updates from http://translatewiki.net.
Fixes #14869: Provide a simple API for outputting JSON
fixed bug: ProgramOptions, problems with spaces in filenames
AudioDeviceInfo::privateId_
more styling tweaks
app resources override framework resources
resolved issue of mojits that come from multiple sources (such as HTMLFrameMojit with overrides in the app)
add dummy map'
ugh merge
make demo installation to use human task war and hornetq as default transport
fix incorrect default hornetq port for human task war
fix incorrect default hornetq port for installer's console properties
ensure that jboss configuration directory is correct for both as5 and as7
- VPS in HT Async Handlers
BZ825191 - Malfunctioning Signal Events
added support for conditonal boundary events
added support for message boundary events
- changed way of comparing content type to avoid test failures in case of different order
added FourCC to OpenCV export
removed unneeded include-dirs directives from cabal description
Added instructions to clean input file
Added instructions to clean input file
implemented search_tmdb method in Movie model. added settings table to store app config
tabify output CSS
Stones now appear behind panel after being placed on the board
Stones snap to the grid and resize properly
Detail view cleanup RT469
Fix setup_develop
Cache downloaded images in $DEST/images
More higher resolution dungeon tiles.
Added the option to set a value for the CSS property z-index
add minimum font sizes as config option
FBReaderJ: add reader menu dialog
.aliases: Add `map`

Ref. #157.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  .aliases: Add `map`
ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.

Setup the DSS pin muxes to enable display functionality.

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
keyword generator started in wn folder, all c files are modved to C api
Revert "new"

This reverts commit 36e44f269dfafc70702d1ffec6f5a09fb6a0b539.
Bingo Law Completo 1.0 .
Se implementa método de guardar citas como estático
Las citas se guardan desde la pantalla principal al crear la actuación
Better connection check in RequestHandler
Override dict.copy in HTTPHeaders to return the correct type.

Closes #519.
Merge remote-tracking branch 'ei-grad/master'
Extract constant, add comments
Merge pull request #514 from ahassany/fix-connectin-check

Better connection check in RequestHandler
Delay check for socket.family (and make it jython-friendly).

Now HTTPConnection.address will always be the socket address,
and the fake "0.0.0.0" IP is only used in contexts that want an IP
(i.e. HTTPRequest.remote_ip) but the connection is a non-IP socket.
IOStreams now save the exception object that caused them to close.

Closes #494.
Connection errors can happen here too.
Remove use of string exceptions in gen_test.

These lines are not reached, but if they were they would fail with
a less clear message than intended.

Closes #520.
Another round of minor whitespace cleanups from autopep8
Add future import to this new file for consistency
Remove unused variables
Release note updates
Doc updates
Fix zope.interface/py25 dependencies for other tox.ini files
Quick hack to make this test pass on cygwin
Set version number to 2.3rc1
Restore context for all read methods.

Prior to 2db0aceb32f5c042f5306e72a4679580b4359f34 this was being done
properly, but the refactor removed stack_context.wrap causing some issues
in our upstream context managers.
Merge pull request #521 from yoinc/master

Restore context for all read methods
Final 2.3 release notes
sprint file added
fix new/list thread in document viewer
extract pdf in asynchronous mode
Basic Layout Complete for Home Page
T1
T1
comment eff plot
lumi
list of funcs from patches
proceed with T1
c vs l
point replacement; tweaks
clone graph
T2bb
T2bb range
tweak
y axis range
T2bb point
keyPresent
switch on presence of effMuon
logy ranges
move process stamp
use processStamp
legend pos
add needed key
Oops, I forgot change email in README
Eva's modes now use a game-level based architecture instead of being their own Panels. This allows all the modes to reside in the same panel and makes switching modes much more thread-safe.
Merge pull request #100 from Cazra/master

Eva modes architecture changed
Fix the input data mechanism for the git-update.sh script
* helm-files.el (helm-ff-directory-files): Don't try to remhash dir entry in ange cache at first connection.
Refactor bit cross building for esp
Update MPR and HTTP.
Better anchor creation
Initial work on configuration utility
core: Add a proper string representation of WeakMethod objects

Closes #1438

This also adds forward compatability with Python 3 by using
__func__ __self__ and __class__
[docs] Added screenshot
Translating comments in english.
Fix for Issue #47
Merge pull request #48 from energia/issue_47

Fix for Issue 47
check_hb bug fixed
fixed a typo/bug: @group instead of group
can now leave group
minor css tweak
Added unique usernames column
Added migration to create unique usernames for all current users in db
Added at-who gem for at.js @mention functionality
Added route and action to users controller, ajax for request
Modified route, added template file for json
Added cucumber specs for @mentions
Fixed merge conflicts
Added json template for mentions, modifications to js
Work on invitations.
changes to js
Changes to discussions js
Merge branch 'master' of github.com:enspiral/loomio into feature/invite-system

* 'master' of github.com:enspiral/loomio:
  Added mini profiles to all usernames in discussion history
  Added mini profiles to the membership list
  Fixed mailto link/anything else inside popover clicking, now wont hide popover by default
  Refactoring hide/show popover into a method
  Popovers now hide and show correctly
  added some additional fixed
Merge branch 'master' of github.com:enspiral/loomio into feature/invite-system

* 'master' of github.com:enspiral/loomio:
  Improve test wording.
  Improve wording of example discussion.
  fixed list styles on context, discussion, and proposal
  text edit for tests
  included test
  fixed urls
  add mascot to group request page

Conflicts:
	app/models/group.rb
Merge branch 'master' of github.com:enspiral/loomio into feature/invite-system

* 'master' of github.com:enspiral/loomio:
  Increase capybara default wait time.
  Increase capybara default wait time.
Migration modal and code for limiting add member
undo commit mistake
more undos
Changes to js, added rabl for json data
Removed gem, added lib files
Added twitter-text parser gem, added parse mentions def to comments controller to extract users who are mentions for notifications
Handle errors and restrict filetypes for paperclip.
Clean up XY plot demos
Add  font. Adjust layout. Adjust list line-height
increase list line-height a tad more
Rewrote the data-proxy in coffee-script.
Improved the readme.
Upgrading version to 2.0.0
Upgrading version to 2.0.1-dev
Update API tool manifest to indicate that API documentation is for 2.1
'c' commented a bit
Fixed NULL integer values in install.php
фиксируем
update application/tango same commit as for master branch.
4 done!
修复文章中的Total字段为空时发布错误的问题
节点频道可进么发布操作
use 'install -D'

this way you do not need to run 'install -d' to create directories
first.
install man page to /usr/share/man/

man pages are architecture independent data and belong to
/usr/share/man/

http://www.pathname.com/fhs/pub/fhs-2.3.html#USRSHAREMANMANUALPAGES
Sets jade indentation to 2 spaces
Migrate from maven-scala-plugin to scala-maven-plugin
Fix maven-scalate-plugin
Adding xcompmgr -c to the xinitrc
Removed marker support.

This was annoying with the new string formatting in python 2.6+
Plugin settings for CtrlP, SQL and PHP
Plugin list updated.
Removed old ignore rules for Blaise.
Fold block comments & modeline no longer needed.
This background was annoying on multiline strings.
This file is no longer needed.
PLF-3925 :[Common][SharedLayout] Adapt the sharedlyout to follow the new page structure
PLF-3925 :[Common][SharedLayout] Adapt the sharedlyout to follow the new page structure
Merge branch 'feature/navigation' of github.com:exodev/platform into feature/navigation
SWF-2169, SWF-2170 : create dedicated dir with 777 permissions to allow to store data from apache in it
Migrated from current dev branch
Update built files
Add fix for mouse events
Added soundname enums
downgrade solarized
check on max record size; sizeof function for composite signatures; replace magic numbers with sizeof(T)
Use pg for heroku.
Updated gitignore to not ignore all the wordpress files since we are only making a theme, and not hacking the core.
Bare minimum requirements for a WordPress theme.
cambio archivo Gemfile
Merge branch 'master' of https://github.com/fddayan/Blogger
Fix Conflict Gemfile
Implementacion Close
Modified the precompiled header name.
Merge branch 'master' of github.com:feg/WorthyPower

Conflicts:
	source/Engine/Audio/Audio.h
	source/Engine/Audio/AudioDevice.h
	source/Engine/Audio/AudioException.h
	source/Engine/Engine.vcxproj
	source/Engine/Engine.vcxproj.filters
	source/Engine/Exception/Exception.h
	source/Engine/GameEngineStd.cpp
	source/Engine/GameObject/GameObject.h
	source/Engine/GameObject/VisibleGameObject.h
	source/Engine/GameState.h
	source/Engine/Math/MathStd.h
	source/Engine/UserInterface/WindowEvent.h
	source/Engine/Utilities/File.h
	source/Engine/Utilities/Time.cpp
	source/Worthy Power/Worthy Power.vcxproj
	source/Worthy Power/Worthy Power.vcxproj.filters
	source/Worthy Power/WorthyPowerStd.cpp
1

Signed-off-by: zfk <zhfk930129@gmail.com>
Merge branch 'master' of github.com:feipu123/NoBees
1

Signed-off-by: zfk <zhfk930129@gmail.com>
1

Signed-off-by: zfk <zhfk930129@gmail.com>
1

Signed-off-by: zfk <zhfk930129@gmail.com>
1

Signed-off-by: zfk <zhfk930129@gmail.com>
1

Signed-off-by: zfk <zhfk930129@gmail.com>
Merge branch 'master' of github.com:feipu123/NoBees
1
finish iterator
Rename reader to decoder
More rename
Decoder be gone
Better
- Added all Ufopaedia entries.
- Eliminated XcomRuleset class.
- Eliminated UfopaediaSaved (merged with Ufopaedia class).
- Moved loaded rulesets to options.
Merge branch 'master' of https://github.com/SupSuper/OpenXcom
Added avatar handling to user page
Point links to stable repository

The stable repository was moved under fubaz.
s/login_info/admin_login_info/
s/search/admin_search/
s/search/admin_search/
s/title/admin_title/
s/apps/admin_apps/
New setting: Typus.admin_title_link
s/display_flash_message/admin_display_flash_message/
'Add New' becomes 'Add'
Fixed return_to.
Applications is now Site administration
issue 5725: fix error when clicked on scrollbar of commandHistory popup
Link to a bug report
FBTest: temporarily disable first two test (to avoid a lot of failures)
Issue 5497 (FBTest fails: css/computed/5449)
http://code.google.com/p/fbug/issues/detail?id=5497

Not just fixed but also enhanced by checking if expanding props works
FBTest: fix for net/5742 test, tooltips are displayed asynchronously
派发确认信息更新。
可疑禁忌物品导出修改
可疑禁忌物品导出修改
Merge branch 'master' of git@github.com:firefoxmmx2/jdy.git
Add IDEAS and a TODO
Give the option to avoid using ByteBuffers in codecs.
Some ideas about key formats
Add working test for non-revisioned reads
Merge branch 'f/key-formats' into develop

Conflicts:
	project.clj
	src/jiraph/masai_layer.clj
	src/jiraph/masai_sorted_layer.clj
	test/jiraph/formats_test.clj
Make historical reads faster (hopefully).

The codec_length and revision fields in protobufs must now
be repeated, and protobuf formats ill do historical reads
by reading the whole thing non-historically, then looking at
the length notations to see how much to read, then doing
another full read of that "chunk".
Never finished writing this test, apparently
Add sequeue
alpha1
new upstream version 1.7.27
Helicopter Safety Pilot Code
Extra Fixedwing Tuning Parameters: Now you can tune it all from scratch in a single flight
Precision Timing Catapult Launch System with Highspeed Module <-> Flightplan interaction
Commenting
add an option to only show FP of the selected aircraft
Updating the LPC21 bootloader make file so that it works with the new compilers.
Merge branch 'dev' of github.com:paparazzi/paparazzi into dev
replaced a few more cpu_time_sec with sys_time.nb_sec
gps: uint32_t for last_fix_time, and read sys_time.nb_sec instead of old cpu_time_sec
some more minor fixes for sys_time: send time in TAKEOFF message as uint16_t
Merge branch 'master' into dev
* nav_catapult
* more fixedwing tuning params
* helicopter safety pilot stuff, stabilization_none
fix makefile for lpc21 bootloader
gps sim nps: fix typo
Fix SD cards connected to SPI port 0 for logger mass storage usage,
auto start drivers for UART.
Add support for the Sparkfun Logomatic V2.6 logger.
fixedwing control new: fix guidance_v_n after Christophe made min/max auto cruise throttle vars to set via settings
renamed last occurences of Ms2001 to Ms2100
rotorcraft guidance_v: some doxygen comments and readability improvements
gps skytraq: added computation of utm pos for fixedwing gps skytraq subsystem
gps subsystem: define GPS_FIX_x in implementation header file instead of gps.h
[maven-release-plugin] prepare release callme-1.1
Merge pull request #64 from floppym/master

A couple of build fixes
Add compatibility with GTK2
Merge pull request #65 from dupondje/master

GTK2 compatibility
Remove unused functions
Numlock and Capslock state are not used
Add missing config.h include
porting some functions to gdk/cairo
Add RemoteFX support (Using GDI) and add Numlock & Capslock Sync
Also add SCROLL_LOCK state and fix GTK2 compatibility
Add cursor support
Also open connection on return and enter
Fix compiling on GTK2
Merge pull request #67 from dupondje/master

Porting to Cairo and some bugfixes/new features
Cleanup unused includes/function
Issue #68: Notify user when host key changed
Change date in copyright dialog
Add a quick connect bar
Issue #42: Bump cmake required version to 2.8
Merge pull request #95 from dupondje/master

Multiple fixes + Quickconnect
Closes #77: Close the SSH tunnel after the connection has been closed
Updated logs with direct link to record
Tested Permissions
added functions for user to manage own account, outside sqarab permissions
Update master
Merge pull request #18 from obfuscurity/patch-2

Update master
Update setup.py

fix for win64 detection - platform.architecture() returns table 
Merge pull request #53 from Rav3nPL/patch-3

Update setup.py
Item11610: 

   * fixed unblocking the ui on a validation error
   * fixed not validating the form when cancelling 



git-svn-id: http://svn.foswiki.org/trunk@14433 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item12180: Improved detection, diagnosis, logging, display

git-svn-id: http://svn.foswiki.org/trunk@16172 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11998: tell the user if Empty* is missing too (could be git per Contrib problem, or could be I'm running from foswiki/core dir..

git-svn-id: http://svn.foswiki.org/trunk@15245 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11998: don't add single quotes around the name of the extension wherever we're replacing the Empty* name (pm's everywhere) that  breaks everything

git-svn-id: http://svn.foswiki.org/trunk@15246 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
more
Merge branch 'master' of github.com:fpando/mayacode
fmin107 : pattern decoration
Merge branch 'master' of https://github.com/fpetitdemang/M1
- Eliminate initializations if global variables.  Compilers are not
  required to optimize these so it may result in larger binary size.

Pointed out by:	kib
MFC r219241 (by mjacob):
Don't automatically send a START UNIT to sequential access devices --
this might cause them to load the tape unintentionally.
MFC r235783:
Add the code for new Intel GPU driver, which supports GEM, KMS and
works with new generations of GPUs (IronLake, SandyBridge and
supposedly IvyBridge).

The driver is not connected to the build yet.
MFC r235846:
Add 'drmn' device as another drm child, to allow drm2 drivers to live
in parallel with drm1.
Don't use C++ comments.
Merge recent vendor changes in ZFS.

Illumos issued covered:
2811 missing implementation: zfs send -r
3139 zdb dies when it tries to determine path of unlinked file
3189 kernel panic in ZFS test suite during hotspare_onoffline_004_neg
3208 moving zpool cross-endian results in incorrect user/group accounting

References:
  https://www.illumos.org/issues/ + [issue_id]

Obtained from:	illumos (vendor/illumos, vendor/illumos-sys)
MFC after:	2 weeks
Add a new ioctl for ath(4) which returns the aggregate statistics.
Flesh out 'athaggrstats', a utility which will display the aggregation
specific statistics for ath(4).
Add athaggrstats to the ath(4) tools build.
Switch some PCI register reads from using magic numbers to using the names
defined in pcireg.h

MFC after:	1 week
Change semaphore to merge waiter bit and count in same word, this allows
us gracefully to destroy semaphore, also remove rmb() ambiguity.
Use version 2 of semaphore provided by kernel umtx code, now if there is
no waiters, we still increase and decrease count in user mode, once there
is a waiter, sem_post will enter kernel to increase count and wake thread
up, this is atomicy and allow us to gracefully destroy semaphore after
sem_wait returned.
Only spin on SMP machine.
Use boolean expression.
Too eliminate overhead in revision 233103 which enters kernel to unlock
a contested mutex which results holding mutex too long, we use 3 state
simple mutex when possible, it is purely implemented in userland.
The unlocking thread only wakes sleeping thread up but not writes memory,
the error in kernel caused by memory error can be safely ignored.
Use optimistic version of THR_LOCK_RELEASE which is better
when lock is contented.
Add support for host mode to the DWC OTG controller driver.
The DWC OTG host mode support should still be considered
experimental. Isochronous support for DWC OTG is not
fully implemented. Some code added derives from
Aleksandr Rybalko's dotg.c driver.
Allow for a default GPIO pin "high", which is required for some boards
which tie the USB device enable to a GPIO line.

Submitted by:	Stefan Bethke <stb@lassitu.de>
Add PCI IDs for various new High Point RocketRAID 43xx and 3xxx devices.

Obtained from:	FreeNAS
MFC after:	3 days
Updated Audio module to play multiple sounds
tes2
vvvv
ttt
version keepassx config
fix memento mori
Variable caching for loops and scope
code highlighter did not work with tohtml.vim 7.3V_1 or later
Added import for ZkDefs
Merge branch 'master' of github.com:fusesource/fuse
Merge branch 'master' of github.com:fusesource/fuse
Added OSGi process service manager, configure command support
Merge branch 'master' of github.com:fusesource/fuse
Tweak product name styling a bit
[ENTESB-416]fix warn log from MavenRepositoryURL like "This is deprecated & discouraged & just evil."
Add for refrence and add some questions
111
111111111
Don't ack through ctags files
Syntax error.
Require helpful gems when available.
Export and import to WAV, screenshots
Merge pull request #174 from galstrom21/master

Merged automatically by jenkins after successful build test
[DEFECT]: nova consoleauth was not installed and started on rhel installs
Merge pull request #175 from rackerjoe/rhel63

Merged automatically by jenkins after successful build test
End of sprint version bump.
[FEATURE]: add chef boolean attribute for nova-volume support

* enable by setting nova->volumes->enabled to true
* you must create a nova-volumes vg
add procmon support for volumes
fix a typo
stop nova-volumes service when disabled
[BUG]: nova migrate failes with strict host key checking
add iscsitarget as a package dep for nova-volume
change the ubuntu iscsi service to tgt
Merge pull request #179 from rackerjoe/ssh

Merged automatically by jenkins after successful build test
Merge pull request #178 from rackerjoe/volumes

Merged automatically by jenkins after successful build test
Adding dhcp_domain as a nova.conf template field
Merge pull request #181 from hubspotdevops/dhcp_domain

Adding dhcp_domain as a nova.conf template field
adding dual support for essex/folsom
prevent credential caching from being attempted with novaclient
Merge pull request #183 from mancdaz/folsom-updates

Merged automatically by jenkins after successful build test
[avr-controller] NThreading IO system: commands and responses happen asynchronously in the background now
Added genres and middle names, removed requirement for last name linked stories to genres and fiction/non-fiction, setup south.
the latest web server
RETURN OF THE ACK
Escape special characters to make them visible in markdown
removed createFeatureActions when not applicable
Use the locked package for the update operation
better rename reliability on Windows - a workaround for random "Access denied" errors
Merge remote-tracking branch 'mheleniak/rename_reliability'
Show warning if the svn binary is missing
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'cs278/issue/879-dev-autoload-definitions'

Conflicts:
	src/Composer/Installer.php
Issue #10 fix for runParalanaMT.py
Issue #10 fix for CombineEDIs.py
Issue #10 fix for RunBIRRPSingleStation.py
Issue #10 fix for wsmt_pv.py
Fixes #10 (entry_points needing main)

Remove the ``:function`` part of the setuptools script specification like
``some.module.path:function`` to distutils-style in the user's home directory.
``some/module/path.py``
Updated zshrc to remove rvm in anticipation of rbenv. Eeeeeee! Exciting! Scary! Ooh! Ahh!
premières permissions cartes
Merge remote-tracking branch 'origin/master'
Added test that vis_sim should raise ValueError if beam_arr is passed without being of float32 data type.
Merge branch 'master' of git://github.com/ghsyu/aipy_cuda
Started adding beam array to unittest.  added interp3d function, with some (trivial) tests.
Merge branch 'master' of git://github.com/ghsyu/aipy_cuda
Added beam calculations to the testing program.  Untested.
basic template cache
config module
basic include functionality
modified config/deploy.rb
config/deploy.rb modified
config/deploy
add key in config/deploy.rb
add z to number 10

add z to last line
Specs for contacts router
Workouts => CompletedWorkouts

step one of database new schema
Document flakiness
Document workaround
Current Gnus settings on OS X.
Add my-personal-defaults in Dropbox.

 - Rename my-work-defaults for consistency.
Refactor dired config in to init-dired.el.
Add defun to split window and show most recent buffer.

Bound to M-9, which is kind of consistent with my M-1..M-3 bindings.
Also bound M-0 to 'delete-window.
Add emacs-w3m extension.

 - Install emacs-w3m with el-get.
 - Defun to call find-file-at-point, optionally using w3m for URLs.
 - Bding to `C-c f' and drop old `C-x M-f' binding that I never used.
Refactor isearch config.

 - Fix bug with empty search (e.g. type `C-s RET') in my-goto-match-beginning.
 - Change my-isearch-yank-region-or-word to use thing-at-point.
 - Drop `C-o' binding for occur; just use the default `M-s o' binding.
   That has the advantage of invoking occur regardless of whether
   you're in an isearch.
Windows + Cygwin: Quote process args for bash.
Fixed subclassing issue by having the reader and writer use interfaces instead of concrete classes.
Parser keeps a char count of where it's at.
Added tests for files with only a return in it.
Added configuration to quote all fields when writing.
Updated version number.
Added ability for using alternative names for headers in the configuration.
Better error messages. Now shows type, row, column index, column name, and column value; along with the original exception message.
Cleanup
Added ability for using alternative names for headers in the configuration.
Writer overload for shouldQuote when writing a field.
Updated version number.
Fixed error messages issues.
Parser can keep track of the byte position using an encoding so a user can seek to a stream and start reading from there.
Fixed issue where parsing was incorrect when the last row didn't have a CRLF at the end.
add string.Format support to CsvWriter
got parsing like excel working
wip
merging
Cleanup.
Throw excpetion when inconsistent column lengths are detected.
Don't break smart window placement when the windows are as tall or wide as the screen
Ignore rows with too few fields to avoid violating callers' assumptions later on
Set tmux version to 1.0, accept semicolong followed by optional args
chmod +x
Merge branch 'master' of github.com:goagent/goagent
add gevent.pool support
Project 03
Ajout de documentation, et modification du .gitignore
文字コード確認テスト。このファイルはUFT-8です。
Only add GOsa users to groups
Rename file
Updated for new database formats.
0.2.4 with coffeescript tag
made c_code_cache_version work with GpuCAReduce
added some cases and formatting to the test
updating version for phpsh
Decode enclosure filename properly (bug 1663)
IDE: setup dlg: fixed fpc src thread to not alter the environment variable

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@39344 4005530d-fff6-0310-9dd1-cebe43e6787f
InstantFPC: added localization, patch by Marcelo B Paula with some changes, part of bug 22393

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@37898 4005530d-fff6-0310-9dd1-cebe43e6787f
InstantFPC: added Brazilian Portuguese translation by Marcelo B Paula, another part of bug 22393

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@37899 4005530d-fff6-0310-9dd1-cebe43e6787f
InstantFPC: added Russian translation

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@37900 4005530d-fff6-0310-9dd1-cebe43e6787f
lazreport: add option roHideDefaultFilter to hide default filter (.frp). Disabled by default. Remove conditional define used previously

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@39369 4005530d-fff6-0310-9dd1-cebe43e6787f
lazreport: save Picture in a local variable. This should produce smaller code

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@39370 4005530d-fff6-0310-9dd1-cebe43e6787f
Assets loading and encoding added
GRIFFON-551 fix platform specific packaging in single jar mode
Force single platform choice (no longer mix 32bit and 64bit options for same base platform)
kernel_main() draft. Time for proper virtual manager implementation.
doc: add about cast

But it's empty for now.
test: use #include functionality of grntest

refs #1362
rpm centos: add logrotate.d conf file
rpm centos: fix init.d for groonga-server/groonga-httpd package
doc: remove unused messages
doc: update po
doc: update translation