labofsahil/github-event-dataset-2012 huggingface dataset:
resolving commit resolution.
commit after resolving issues.
Task #50: Domain Entity and domain services
are completed.
In SiteUIManager.java  domains table added

Conflicts:
	cmsadmin/src/com/contento3/web/site/SiteUIManager.java
	core/src/config/spring/spring-hibernate-context.xml
siteuimanager
changes to image ui functionality.
committing group entity, dao, dao impl

Conflicts:
	core/src/main/java/com/contento3/cms/security/group/dao/GroupDao.java
	core/src/main/java/com/contento3/cms/security/group/dao/impl/GroupDaoHibernateImpl.java
	core/src/main/java/com/contento3/cms/security/group/model/Group.java
Recents changes .

Conflicts:
	cmsadmin/src/com/contento3/web/content/ImageMgmtUIManager.java
	cmsadmin/src/com/contento3/web/layout/LayoutUIManager.java
	core/src/main/java/com/contento3/cms/page/category/service/impl/CategoryServiceImpl.java
	core/src/main/java/com/contento3/cms/page/model/Page.java
	core/src/main/java/com/contento3/cms/page/service/PageService.java
	core/src/main/java/com/contento3/cms/page/service/impl/PageServiceImpl.java
	core/src/main/java/com/contento3/common/service/Service.java
adding Layout HtmlResolver from sites project.
New git issue resolution.
cvbcvbvcbc
adding stuff for porting mongs into web.py
move r15b03 override manifest file to toy folder

Change-Id: Ic0ac76eb6b0ba9fe808a17b146743cc6d0c21b78
Reviewed-on: http://review.couchbase.org/23466
Reviewed-by: Farshid Ghods <farshid@couchbase.com>
Tested-by: Farshid Ghods <farshid@couchbase.com>
Updates from branch-2.0.xml

Change-Id: Ic4b124c149a9496751d356ee1032c75afb7fa72b
Reviewed-on: http://review.couchbase.org/18602
Reviewed-by: Jin Lim <jin@couchbase.com>
Tested-by: Jin Lim <jin@couchbase.com>
When descending on a view, start is past the end.
Set a lower limit on the "used space" indicator.
Split the file treemap into separate javascript file.
Minor file size refactoring.

Killed off a small global function that was only used in one place.
Use common initAndRefresh.
Fixes from internal review
Added DNS prefetch and IE9-specific features to HTML head.
Facebook OpenGraph attributes added to HTML head.
Extra head items commented out.
humans.txt added, and link added on webpage.
Base stylesheet updated to cover browser inconsistencies (html boilerplate).
Added media=... attributes to stylesheets in webpage.
Print stylesheet added.
Stylesheets renamed.
Updated list of dmenu apps
Initial commit eibd, addons, rcswitch/wiringPi
aded a TODO
Choose existing album when taking a picture from the main screen now works
Mucked with EditAlbumActivity, created layout, changed Photo to
Photomanager in EditPictureActivity
More better than EditPictureActivity
usage includes checkers
updated error section
ignore
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:cse332labs/reversi
makes game function - Mason
Merge branch 'master' of github.com:cse332labs/reversi

Conflicts:
	Checkers.cpp
	gamePiece.h
removed duplicate #include and method stub
Merge branch 'master' of github.com:cse332labs/reversi

Conflicts:
	Checkers.cpp
CLC-78 Use SPECIFIC_USER for path
Order channel navigation properly when there are more than one server
Line ending normalization
Updates to code signing
Merge branch 'master' of github.com:cwensley/JabbR.Eto
update references
Initial version
Updated the README file with an svg illustration.
Stuff
htaccess
Updated w/ ADA language
Fixing missing space in header
user loading support, small scripts cleanup, files reordering
Hopelijk werkt dit
Modified maaltijd
v0.21
> lib
> elements
InstallMembership should be parameterless
New readme
OS X added a .DS_Store file
halb fertig!
cialis for three seperate Cialis IVAs
Removed broken istatd symlink
Added move_to_git script to easily add files to git repo
Added Initial set of config files
Merge pull request #1119 from daviddavis/content_views

Merged pulpv2 into content_views
Content views: worked on api controllers and perms
Content views: fixing api controller specs
Merge pull request #1115 from daviddavis/cv_controllers

Content views: hooked up permissions to api controllers
Content views: fix add_repo bug
Fix CMake for Tests.
fixed a typo in the Camera manifest
Merge pull request #882 from fabi1cazenave/l10n-zhTW

[l10n] fixed a typo in the Camera manifest
fixed bidi/lowercase issue
proper alignment of the homescreen in RTL mode
proper alignment of the homescreen in RTL mode (small screens)
Merge pull request #883 from fabi1cazenave/l10n-arabic

[l10n] Arabic locale
Settings: backout pull #854
Merge pull request #884 from fabi1cazenave/settings

Settings: backout pull #854
Setup to SignalRify.
Add SignalR to the project.
Change: Minor cleanup (remove unused package, TODOs, etc.)
quick hack in java to prevwnt 600sec timer going past -1 seconds, and draw 0 seconds left in red
Implementied a working IR protocol, changed the names of functions to be more descriptive
Prelim implementation of tweetsBySearch.
xmlvmSubclassResponsibility provides negative value - the error is much better when not defining the base class methods at all
release resources in playframework plugin
add some more info on failure
Checking-in ivy files. Removed all the jars as ivy will download all the dependencies
Changing the ivy file to include guava's 11.0 version
modifying configurations
moved files from input to output folder and exclude log4j bindings
Commiting the ivy.jar and changed the build.xml to not download it at build time
Merge branch 'master' of https://github.com/easility/playorm
added logging info to return msg client
InputDriver::Twitter: extractStatusesFromWorkerData() is now public and meant to be overridden if necessary. Refactor convertNormalStatus(). timeStringToDataTime() is now public.
Implement InputDriver::Twitter::Search.
Don't enable the back/next buttons unnecessarily when the calendar is created.
Added part command and updated version
[TU-210] generalisations=1, Links=1 changed to show url instead of count
Kohdistettu mukaan, että saadaan merahti rahtikirjalle.
Myyntisaamiset tiliöinti bugfix
Orin sulut kuntoon!
Ei tallenneta tuoterivejä joiden kappalemäärä on 0 kpl.
Viimeiset tapahtumat myynnissä.

Näytetään 5 viimeisintä laskutus-tapahtumaa myynnissä (pikatilaus, rivisyöttö ja reklamaatio).
Lajilisät
Kardex-keississä ei muuten tarvita keräyslistaa!
wrongly included of jQuery update
fix tech info link styles
Made getVertexShader return void.
Mapa power
Unify interface for function and module verification.
Added documentation for analysis methods.
Improved docs for pass managers.
Make pass manager do_(initialization|finalization) methods protected.
Friendlier output for @LLVMinst and @LLVMpass.
Detailed documentation for building instructions (incomplete).
Use module_function in type.rb.
Dropping support for the 'va_arg' instruction

* Without direct access to intrinsics, this doesn't provide any value.
Mark Phi as private

* Phi behaves just like another instruction
* Its extensions are only used within Builder#phi
Fairly complete documentation for LLVM::Builder

* Renamed a couple of parameters for consistency
* Using YARD's type notation when applicable
Simplified Builder#switch interface

* SwitchInst is marked as private
* Builder#switch is documented as returning an LLVM::Instruction
* Builder#switch takes a list of (value, block) pairs instead of a number of cases
* SwitchInst#add_case is used internally, rather than being a part of the public api
Simplified interface of Builder#phi

* Expects an array of (value, block) pairs instead of an alternating list
Fix documentation for invoke, gep, fp_ext, call and dispose
Builder#switch and #phi accept hashes instead of lists

* Both functions now take a hash mapping a basic block to a value
* This is reverse order of the LLVM phi instruction's syntax, but is semantically clearer
* Simplifies parameter parsing for phi
* More Ruby-like api
Bitcode support.
Use delimited MemoryPointer api instead of Buffer
Use (IO|Tempfile)#path when possible, fixes JRuby
Module.parse_bitcode accepts a MemoryBuffer or path
Added better pointer handling in GenericValue.
Remove LLVM::NATIVE_INT_SIZE, add workaround for platforms w/out FFI::Platform::ARCH
add mopd_isac & mod_timerfd
Use %1.15e for double strings, fix base IRI handling.
Implement fromRDF and toRDF.
Fix adoption practice chart url
Using force index on (village,date) to make queries faster
Merge branch 'myisam_experiment' into test_server_alt
Disable publish when no track.  Move sound mgr out of model.
add download users feature
Merge branch 'staging' of github.com:dimagi/commcare-hq into staging
removing extraneous commented out decorator
made updates to prime views based on reports couch views restructuring
- reports/weekly_notifications not used
- reports/all_submissions -> reports_forms/all_forms
update submodule refs to corehq, hsph, mvp, and receiver
update submodule ref to payments
updating submodule refs to corehq
update submodule references to corehq, payments, and phonelog
update submodule refs to corehq
Merge branch 'master' of github.com:/dimagi/commcare-hq into div2-reports
remove a bunch of unused code
update submodule refs to corehq
update submodule ref to corehq
Merge branch 'master' of github.com:/dimagi/commcare-hq into div2-reports
update submodule ref to corehq
Merge pull request #63 from dimagi/cz-dev

fix admin media root
Merge branch 'mwhite' of github.com:dimagi/commcare-hq into rosetta
add rosetta to requirements, urls, settings, and update corehq
FormCompletionTrendsReport -> FormCompletionTimeReport, DailySubmissionsReport + DialyFormCompletionsReport -> DailyFormStatsReport, and then some reordering of reports
update submodule references to corehq, bihar and phonelog
update corehq, payments
update corehq
update corehq
add storage defaults and utility functions
add prepare_download task
Merge pull request #2 from dimagi/storage-defaults

add storage defaults and utility functions
legend
Merge branch 'master' of github.com:dionyziz/beautiful
Add spec to exported function
Add spec to exported function
Introduce a type and one new spec
Merge pull request #315 from kostis/add-specs

Add specs
rolled back previous udpate; updated checkin model save method to silently ignore attempts to save non-unique instances (candidate fix for #17)
added blurb to about page; added instructions to feedback form; tweaked styles; rebuilt testing and production manager
Schema change to the DB.  Should now be in 2NF.  Add comments to this
particular commit if the DB is in 3NF, or edit commit message.
added akismet to package
Basic styling skeleton
Admin Sale Item Pop up

The edit a product pop up overlay
links to further reading
0.0.1
Search results now include location of the item.  Fixes #21
Also - tidying up the 'missing' / 'present' UI elements - doesn't need to be separate anymore - using the serial number wrapped in a label instead.
fixed width issue on mobile
fixed gitignore conflict
renamed index.html to main.html
renamed index.html to main.html
beginnings of html head
moved stylesheet
moved stylesheet
html head
top nav bar
main content tag
featured listing vertical
powered by tag
featured listing vertical
removed humans.txt and robots.txt
featured listing vertical
scrapped the vertical featured listings idea
search result table
dropped-in pagination code from twitter bootstrap. needs to be actually coded to work now
added next_prev_bottom.html
pagination!
added default search_page_default.html
added REAL default search_page_default.html
Governor: Smartass V2
create widnows keymap from OSX map
Redundant code removed. Added used space to SD.

Redundant code removed. Added used space to SD. Static "GB" letters are
now dynamic with the correct measures.
Nao lembro mais

Signed-off-by: Douglas Drumond <douglas.drumond@y-max.com.br>
fixed a bug where opening a directory would incorrectly treat the directory like a file
Merge pull request #147 from agtorre/master

Fixed bug when opening a directory for writing and incorrectly treating it like a file
added a new mlog option for POSIXIOStore, and added enter/exit logging to all of it's functions. Also fixed the symlink rename issue #142
Merge pull request #150 from agtorre/master

Fixed issue #142 and added logging to PosixIOStore
fixed a case where mlog would incorrectly modify errno and potentially confuse higher level functions
added some patch strings to git ignore
Merge pull request #152 from agtorre/master

Fixed a case where mlog would incorrectly modify errno and potentially confuse higher level functions
update gpsd to head
IMPORT (kilobyte): Fix monster weapons not showing on hits not from afar.
Update the fruit descriptions to indicate their use for Fedhas followers.
IMPORT (MarvinPA): Fix compilation

Oops\!
Use actual pathfinding to determine length of time for monsters to reach staircases, not just a difference of coordinates.
some adding of classes
new things in branch
White!!
Started some pokey stuff
Better implementation of perspective transformation.
Update README.md

Add library cover.
changed .gitignor

deployment.* files should not be ignored
editado a mano
Added an editor that allows an Instructor to add Comments to their student.

Bonus feature: they can edit their grade too, but it does not have a drop-down editor for the grade (pass , fail, incomplete).

Signed-off-by: ecnalyr <ecnalyr@gmail.com>
added underscores to files that shouldn't be compiled

Source:
http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#partials
rename poems essays
remove reposting support
empty android project
added yodalib
added roboguice
fix ttmp_check return null bug
Added .gitignore.
Added pom.xml.
trying to get without Collections.sort
Put codemirror in the master branch as well

People having problems using js-beautifier checkout locally.

If anyone's willing to update CodeMirror to a recent version, they're
most welcome.

I'm not using git externals, as they seem to bork the github page
generation silently and completely, if used under gh-pages branch (which
is exactly what I'd need) (an up-to-date copy, not a silent complete
bork, that is).
- Added FilePath method to MediaItem
- Changed singletons to static initializers as per MSDN recommendation
- Changed hard coded forward slashes to Path.DirectorySeparatorChar
- Started adding transcoding system
Merge branch 'core' of https://github.com/einsteinx2/WaveBox into core
Don't save high registers during IRQ handling
Rewrite FIND in Forth
Rewrite FIND in Forth
Whitespace fix
Introduce word name comparison
WIP: Separate flags from length byte
Change FIND and WORDS to new header structure
Change CREATE to new header structure
Fixed immediate detection in FIND
Fix decompilation of DOES>
Fix IMMEDIATE for new header structure
Add Uncertainty post.
Merge branch 'gh-pages' of github.com:elevenbasetwo/blog into gh-pages
Fixed tcp checksum calculation
Improve inspect of atoms, closes #361
Update lib/module.ex docs [ci skip]
Add Typespec.to_binary/1
Merge pull request #599 from yrashk/typespec-to_binary

Add Typespec.to_binary/1
change location of error files
Add bootstrap features

- badges
- labels
- progress bars
- page-header
- hero unit

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
Add bootstrap variables override.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
Update less.js submodule.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
Fix typo in page_footer template.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
Really fix gettext in page footer.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
Fixed the 'id' of the packages (only visual sorting related)

Signed-off-by: emanuele <emanuele45@gmail.com>
Removed unnecessary permissions from the select a permission dropdown - thank Dr. Deejay for the report

Signed-off-by: emanuele <emanuele45@gmail.com>
Merge branch 'master' of https://github.com/emanuele45/playpen
Move .ru files to spec/fixtures
prueba4 por robert
Cambios
moved 'include and exlude' traits onto 'PluginManager'
Another logical typo. What I get for coding too late into the evening.
wicket:link added per Dondi's suggestion
with iOS stuff but empty
Added support for fit files for 910xt
Update board/wakaba.pl

nuke disarmed
Jiggery-pokery to avoid duplicate resource declaration errors.
Podria decirse que logre terminar este ejercicio :)
Regenerate gemspec for version 0.2.1
Merge branch 'develop'
Version bump to 0.3.0
Generate gemspec for 0.3.0
Removes requirement to push to staging
Version bump to 0.4.0
update gemspec
Remove staging requirement
Version bump to 0.4.1
Generate gemspec
Remove locked bundler dependency
Version bump to 0.5.0
Update gemspec to 0.5.0
Fixes method error in tag_production
Version bump to 0.6.0
Update gemspec
Resolve conflict
Version bump to 0.6.1
Add version sorting
Trap SIGINT to exit nicely
Build and resolver fixes, should now work for people starting from fresh
updated the release notes from some commits having not related issues
Fix avro example, to compile
trying to pass the OptimiserSpec with all the other specs
fixed #169: moving output files instead of copying them
fixed the use of the HADOOP_HOME variable when using the useconfdir argument
upgraded to the latest kiama to get named attributes
Merge remote-tracking branch 'origin/master' into smart-kiama-integration
updated to the latest kiama to get named attributes
Login on SPECIFIED cashpoint
FileComments for Default
File docs for entities
filedocs#
added statistics view that writes additional data for reports to postgres, refs #4008
override LoginView, log each login to postgres DB
migrated to grok, added show-statistics view
return report as pdf
removed pdb
Merge branch 'master' of github.com:euphorie/osha.oira
don't use catalog, get data directly
don't use catalog, get data directly
get only published surveys
merged origin/master
LoginView -> Login
Margin's changed to accomodate Windo's viewer
initial classes, routes
updated gitignore
Merge branch 'master' of https://github.com/evuski/ExpressCare
Had big troubles with yaml-cpp, can't work with that... welcome back XML \!
Added get/setters for default namespace in DynamicConfigResolver
Added PHPDoc on DynamicConfigResolver::setUndefinedStrategy
Refactored config resolver construction in test
Completed tests for DynamicConfigResolver
Merge pull request #27 from pspanja/CreateNodeAssignments

Fix creating node assignments in ContentHandler::create
define "importSIMContacts()" in a separate JS library
Giovedì pomeriggio. Prima di modifica operation 4 da riga di comando
Giovedì sera. Dopo diversi miglioramenti
Giovedì sera. Lavoro completo (tutte le migliorie previste)
Martedì mattina, 231012 pre-test. Il resto è ok
ADD NS-2 section
FIX OLSR section
use an access token that will last forever
first shot at support batch request api.
Highlight `monospace` in Diviner highlighter

Test Plan:
  lang=text
  lang=diviner
  **Hello** `world`!

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Koolvin

Differential Revision: https://secure.phabricator.com/D2270
Allow symbol loader path prefix to use \

Test Plan: Ran Phabricator unit tests under Windows.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D3815
some changes that - I hope - ends with Banner-Zone configuration
fixed bug in group, added pt lang and migration bug.
Have decided at this time to not use FK, could possibly add that in the future. Credit given to hdias for the portuguese lang file and the fixes to the 003 migration and update_permissions() in group. fixes #73
changed activate to bool in create() fixes #74
Leaving the status as an int to allow user's to specify additional statuses as their requirements demand.  Credit to philsturgeon for the bool on the activate.
Fixed the $activation to set activated correctly
if the user is required to activate the account, true should set activated to false and vice-versa.
credit given to jyggen for finding this error.
adding password driver support
fixing merge conflict
adjusting migrations
fixed migration issues and updated file docblocks to 2.0 and copyright year
renamed sha256 to sentry, fixed some stuff
adding bcrypt and fixed a few things
added auto require to all users to add password hashing without modifying boostrap
updating class name for consistancy (dir location) added some exceptions and lang support
has_access() handles arrays & returns bool, empty removes permissions
added ability for has_access to handle an array for the resource and also now returns bool rather than throwing an exception.  Added ability in update_permissions() to remove a permission by passing an empty string for the value of that permission key. fixes #76
Merge branch '2.0/develop' of github.com:cartalyst/sentry into 2.0/develop
fixed some formating in the users class dealing with permissions
missed a few formatting things
fixed formatting issues in groups
more formatting stuff I missed
fixed update permissions, Arr::delete & empty($val) check
Merge branch '2.0/develop' of github.com:cartalyst/sentry into 2.0/develop
adding ignore file to hashing drivers
project files version update
line endings again...
Utility functions added to TradeProtocol
Merge branch 'development' of github.com:farhanrahman/kyoto into development
Fixed flipped sign in CarbonReductionHandler
Merge branch 'development' of https://github.com/farhanrahman/kyoto into development
#11 creating the initial plugin
More on errors
Add more content
Add test script to show conflicts.
Set Up + space2tabs
Add conflict example
Merge branch 'git-basics'
Move the canvas.js to javascripts/canvas.js
Add the heatmap page.
Pardon Me, First time using GitHub. Remove unnessery file.
增加chm格式API文档
Fixes for admin_client funcarg

If the database wasn't loaded yet the admin_client would fail.  This
change auto-loads the database from inside the funcarg and also
auto-marks the test function with djangodb so that this is implicit.
Updated the README with the project page link.
added overtime and date games
Intro part is good
Изменен .gitignore. Скрыты input, output.txt
new management system sql database
`reconstruct-in-place` no longer printlns
Mejoras mensajes en nuevo proyecto
Weak examples.
Some modifications 27.05.2012-7
Bug fix and small CSS updates

* Fixed bug that incorrectly set focus when esc pressed
* Removed prefixs from box-shadow and border-radius
drastically reduced the flatten function
The require rule was giving the wrong error message.
temporarily reverted to ruby 1.9.2
design and locale tweaks
fixing rootFiles inclusion
FIX: TCP listener read total bytes
FIX: HashTable contains for containsKey
Adicionados botoões de compartilhamento
add csproject
isBST is not be checked
treeToList is not be checked
add countTrees
ex26 another paragraph
some more of ex26
reviewed ex14
merge
JBWS-3541: Initial support for adding ws-security to wsrp using cxf and interceptors.
GTNWSRP-304: updated patch to better support username token usage with other actions such as encryption and/or signing
Merge branch 'master' into ws-security-cxf

Conflicts:
	pom.xml
GTNWSRP-304: Only try and perform a login if the user is already authenticated.
Merge pull request #21 from mwringe/ws-security-cxf

GTNWSRP-304: Initial support for adding ws-security to wsrp using cxf
Removed harvard references.  Ignore atlassian stuff.
shree's update
Bug fixed. getActiveOrders was returning an empty list during event dispatching.
added taps gem to do db pushes to heroku
This corrects the fact that all the parameters are mandatory

in the api explorer.
Dataset creation script

Aligns chord annotations of each frame of audio with it's features. Right now the script aligns the annotations with constant-q features, runs those features through a trained neural net, and writes the neural net output with the chord annotations to file.
Agrego libreria charts4j para plotear.
Les seteo el classpath para familitarles el uso de la libreria charts4j
Agrego ejemplo para ploteo de un set de puntos en 2D
Full support for activities
add robot basic support
Added primary keys to avoid duplication of entries in the raw_files and stagged_files
Add specs for test_helpers.rb
Add MentalModel::Matcher w/ some specs
WIP: add some pending specs
Refactor specs
DRY up match/doesn't match
Small refactor: hang on to MM collections, not just values
DRY up MM specs a bit more
Add specs around postfix scoping methods; move matcher into its own file
Add custom matcher method for RSpec
Add custom assertion for anything based on #assert
tiny spec refactor
Make specs more readable, minor cleanup, use MMM in integration spec
Documentation
API docs and README update
Version bump to 0.23.0
Regenerate gemspec for version 0.23.0
Updated documentation on starting/stopping test server
Test multiple ruby versions with `rake all_rubies`
Fix line reporting in mental model matcher for Ruby 1.9
Version bump to 0.23.1
updated readme
added jayrock to project
sci-mathematics/scilab live ebuild update
dev-java/flexdock version bump
dev-java/jgraphx version bump
dev-java/scirenderer version bump
changed release date; no obfuscating for some classes
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
changed thing to be todo
changed thing to be todo
Rejig env vars
[ci skip]
[FileBackend] Issue a warnings for cache problems in streamFile().

Change-Id: I62cf6f07dc8722d483b3b6969aae1915c4ffccc6
(cherry picked from commit 49ed2a3bc369c92d5fc18401af3e47e3a29c4cf7)
Bug 41122 - Catchable fatal error: Object of class ParserOptions could not be converted to string

Fix ApiParse occurence

Change-Id: I82db8bb6dff178e11a1e6731fbf2cd977daa804a
Update extensions/PostEdit to master

Change-Id: Iad557eefa49ca142db544e240b553d7c0a273338
per bug 41244 and 41303, handle null or false params in TextContent constructor

Instead of throwing exception in these cases (which there are use cases for),
create an empty TextContent object.

Change-Id: Ice30ea78428d95805aa56cd3a35405aa67ad10ab
fix bug 41280, show correct content when displaying edit conflicts

Change-Id: I52522c06d20ddab85799dc33a0d07c10603a20a7
Merge "per bug 41244 and 41303, handle null or false params in TextContent constructor" into wmf/1.21wmf2
Restrict app group members to users data bag items with the app group set
Subtle moving
Rebuild
Binary Tree Max Path Sum

Passed small judge but failed one case in large
has all basic options.
Added mkproxy for DBS migration service; allow access to prod/global.
RP Layouts WS update
Remove hnlogin access completely. Clean up old services.
Update rsync rules to keep releases.
Crabserver new monitoring and dbsurl
Disable SiteDB HN sync
Add wmstats in wmagent manage script
Merge branch 'upmaster'
Remove plugin: local-vimrc
Remove plugin: LESS syntax
More configurations for python-mode plugin
Refine subtype error handling
Object channels to actions
iPhoneアプリのアイコン追加
Merge branch 'master' of https://github.com/gishhub/ichiyazuke
Add Function#group_name
Updated constructor tests.
Updated constructor tests.
Updated unit tests.
Updated tests.
Using DataView for all operations. Update unit tests.
Finished tests for read/write.
.zshディレクトリも管理
put sqlite3 in dev
comment out Nokogirl and open-uri
move to using this gem just with mongoid 3.0 because it's the easiest thing to do and i'm feeling lazy
adds test that mocked methods return retval when called with a block
Corrección en algunos caracteres
ok
New notification system. Unread messages counter
* improvements to bufdataset testsuite specially for ftmemo and ftblob.
   Patch by Lacak2, Mantis #22364


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21768 3ad0048d-3df7-0310-abae-a5850022a9f2
Added most of the (currently alive) MoDELS workshops, with complete history, some even with topics
provided more detail about what everything is doing on my second view controller
linkedin.com
rsa
truecrypt
verifiedbyvisa
github.com
Updated game information.
Demo authentication.
Demo button public. Logs include server name.
Advance version number to 1.8.9-SNAPSHOT
Added code to enable the GSB Event feature.
Adding bash profile to makefile
edit Customer Data
adicionado JQ UI
Fix preexec.bash to not cause an error if $PROMPT_COMMAND was prevoiusly empty.
debug prints, minor fixes, unfinished input queue work
some tweaks, split block handlers into two files
Update _ui/css/main.css
Pulled out SSP and tested all cases where it applies.
added show source debugging option
Handle (unlikely) case of last.fm sending album descriptions not matching query
Little legibility improvement
more sync gm source
split into different classes for service to run
Prefix icebox generated properties with "_icebox".

This should mean that the chance of a property name conflict is greatly minimized.
Fix stray underscore on `_object`.

This appears to be an error in the code, as `_object` is never defined. See also: https://twitter.com/miksago/status/238750081426280448
Merge pull request #1 from miksago/master

Prefix icebox generated properties with "_icebox".
更变bug文档编码
Merge branch 'development' of https://github.com/hao3039032/Symagic.git into development
bug修复
Merge branch 'development' of https://github.com/hao3039032/Symagic into development
Updated HansSettings Sep 28 2012
Different implementation of disabling C-t
Refactored global key bindings
Restore logo to top-left corner of screen.
add a vim plug in "php.vim"
delete a php.vim
update reprocess for specific styles
Module now return _

It will provide that Underscore will work properly with RequireJS.
Fix .gitignore
Merge pull request #1 from hauleth/return-underscore-from-module

Mini fix to provide proper work with RequireJS.
repo: Make sure there is always only one buffer/sync thread on file activity. Closes #982
Eliminando sql obsoletos
Merge pull request #2 from hectorsanchez/develop

Develop
cambiando de version para git 1.1-gitdev
Merge branch 'master' of git://github.com/proyectoalba/alba
Merge commit '7fe4d4ecb9697314b12d6e5da233fafbc2f1aa2a'
Merge branch 'master' of git://github.com/proyectoalba/alba
cambios de datos en el schema
campos para responsable y nueva tabla de datos de salud del alumnos
modelos para los nuevos cambios de la db
Directorio vacío para archivos - Felicitaciones! Mi primer commit! :)
renombrando archivo de actualizacion de db
Merge branch 'develop' of https://github.com/proyectoalba/alba into develop
Merge branch 'develop' of git://github.com/proyectoalba/alba
Filtro de turno en la pantalla de divisiones no funcionaba.
Merge branch 'develop' of https://github.com/proyectoalba/alba into develop
correcion url
sql para upgrade de base de datos desde la 1.0 a la 1.1
Merge branch 'develop' of https://github.com/proyectoalba/alba
correccion link al webchat
cambios de estructura para migracion a 1.1
Nueva tabla de alumno_salud
ny fil userstatus.js
Rewrite DNS Tamper test to properly use Twisted DNS client.
* Should be ready for usage
fixed reviews and videos pages
generating random seeds properly for experiments
Set the window title
added treble clef
turn off prettyPrint temp
A13 boot: compare sun4i & sun5i DRAM initialization
Update API documentation.
[auto] Merge from Math

    • #1d6e31a — Update API documentation. (Ivan Enderlin, 2012-12-19)

---

Merge remote branch 'library-math/master'
Simplify code. #mania
Add autocompleter on realistic domain names.
[auto] Merge from Praspel

    • #a722f62 — Simplify code. #mania (Ivan Enderlin, 2012-12-28)
    • #c2c423a — Add autocompleter on realistic domain names. (Ivan Enderlin, 2012-12-28)

---

Merge remote branch 'library-praspel/master'
moving graphite trend widget
changes in vimrc and added 'ack'
Added a line
Fix a few monsters in combat.txt to agree with monsters.txt. Add silent beret


git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11587 b29ace70-8910-0410-8dcc-aa2fc6433167
Nanorhino stuff


git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11588 b29ace70-8910-0410-8dcc-aa2fc6433167
Simplify BrowserLauncher logic using BareBonesBrowserLaunch code from centerkey as a base while also allowing for non-default browser to load.

git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11589 b29ace70-8910-0410-8dcc-aa2fc6433167
Updated gitignore file

We should not commit intermediate files, .tmp files or .log files
Reverted the change to xPL_Items.pm

The device_monitor function was changed in a previous commit to match any characters instead of only non-whitespace characters. This causes some existing xPL device stop funcitoning with MH, as state in #10. What was the reasoning behind this change?

I guess it doesn't make sense to make MH restrictive in what messages is can process. IMHO whitespace should not cause a message to fail, as xPL is supposed to be a human-readable format.
Merge pull request #11 from hollie/fix_issue_10

Fix issue 10: we don't support invalid xPL messages
Add JOB_DEFAULT_REQUEST+ lines
Feature #2993 Add JOB_DEFAULT_REQUESTMEMORY to the installer

Added to the WMS Collector and Submit services these attributes:
  JOB_DEFAULT_REQUESTMEMORY=1
  JOB_DEFAULT_REQUESTDISK=1
Bug #2738 - fixed factory_startup shell error in case statement
Revert change to factory/glideFactoryLib.py... seems unrelated
Merge pull request #1 from Susanno/master

pull to me
沈亚晴的考试题
Merge pull request #5 from shenyaqing/master

沈亚晴的考题
Merge pull request #2 from Susanno/master

pull to me
gejinbao
commit kaosi
Merge pull request #4 from hongjingyuan/master

day01作业
Merge pull request #6 from gejinbao/master

葛进宝
Merge pull request #8 from ouyong/master

commit day02 作业
guoyongibn作业
Merge pull request #9 from guoyongbin/master

guoyongbin作业
给gejinbao换了地方并提交苏雅晓的代码
Merge pull request #10 from hongjingyuan/master

day02 作业
添加了wangyuanyuan和chenlin的作业
添加day03内容
empty
增加了一个yii的DEMO
Merge pull request #2 from Susanno/master

fork
11.28
projectSharedResponse
message->messageAll
11.29
projectShared
Merge branch 'master6' of https://github.com/hoyoji/HoYoJiMoney.git into master6
cleaned up javacode
commented ntwitter module to see if it fixes heroku problem
commented ntwitter module, not only functions
commented all the new stuff of twitter
added credentials file to see if its going to work
Removes specificity of footer selector
Fixed typos. Added welcome text
customisation form reset confirmation (OES-28)
Removed GLIDENumber class

Also added a command to run.sh to produce another turtle file from
hxl.ttl; this one (upload.ttl) won't contain any comments, and can be
uploaded via HTTP graph store protocol. Updated the examples in
index.php, they were outdated.
기사 summary 제공하는 부분 강화

이런 식으로 바꿔봤습니다.
summary내용에서 태그를 제거한 까닭은 시작이 img 태그이면 기사에 요약문인데 이미지가 들어가 버리더군요.
그리고 일단 문단 태그인 <br>과 <p>태그는 남겨뒀습니다.
fixing..removing mysql to please jenkins...
デコードの方式を変更
fix any problems in README.md file again. :D
- added navbar, header & footer components
- added assert.fail to page object initialization timeouts
bug maybe fixed
Merge branch 'master' of https://github.com/ibeitia/Schedulsim
entitlements for iCloud support
Merge remote-tracking branch 'origin'
move ml_book notes to its own thing
shuffling dires
new dir structure and readme
gitignore and readme
Enhanced some methods
Fixed tests.
Added Web-Module to project
Enhanced DTO and Interface
Providing a Manufacturer Web Service
Providing a REST Service
Added JMS Queues
Octopress init
Site updated at 2012-09-28 17:20:32 UTC
Set the color.u and color.branch git config values to auto.
Fixing the problems with ruby 1.8.2 and 1.9.3+
Merge branch 'master' of github.com:ign/chef-cookbooks
added manager class to support.
Merge branch 'master' of github.com:illuminate/support
file.sh made redundant
slovak: checked lines 25-54 w.o. 49
[feature/add_events] Add event core.alter_username_string to change username

PHPBB3-9550
[feature/revisions] Count all revisions for total number of edits

I originally had it count only revisions including and prior to the
current revision, but it makes more sense to count all of them.

PHPBB3-10755
added ddl files
experimental glsl operation added & some fix
Documentação inicial das classes da package genetics
Make docs slightly less ugly
Fixing diffs of files in "Attic" CVS folder.
Re-added "WebProcessingService" context
inc verions
banner.jpg, scroll bar,修复编辑滚动
Demo de uso de la clase invoker.
Clases utilitarias requeridas por la clase invoker
Clases invoker y process
Removed _love_ feature, added color custom field harness.
Changing the formatting around the color bar.
Update the debugger project Makefile to actually use debugging symbols...
Wrapping up some work on the 2d dynamic array of array-style char*.  I'm probably going to ditch it in favor of something that allocates a continuous block of memory and returns substrings from a function
Move internal parameters to an array
Add a method for modding a single control, part of the new exotic CPU optimization strategy
Remove *.01, and instead do it during note_on
Minor CPU optimization at note_on
Initial highly broken implementation of CPU saving...
Fixed the new CPU saving features.  I now get 45% of one CPU core holding down 12 notes with 1 PolyFX + LFO enabled.
Add a function pointer, and an 'off' function
Even more pre-calculated goodness
More improvements to the noise oscillator
Implemented alternate noise types
Changed theme to Cosmo. Added Ajax loading bar. Added Google Analytics
- clean up external JS libraries a bit, add knockback.
Add assert_equal_uri helper
lodash and some template improvement
ordenar por ponencias en preguntarAlPonente por titulo
Style the configuration better.
Update the selected charts when rendering.
Began to implement the html5 gui and made some fixes to the scala core
Merge pull request #1 from jallspaw/master

Some detail on README
allow /socket.io/socket.io.js to be downloaded

Before this change the initial page just sits at "Connecting…".  I
tested with node 0.6.17 and node 0.8.0 and this change seems to fix it.
Merge pull request #2 from jkv/master

fix initial connect and 404 on /socket.io/socket.io.js
Took out Supergrep Classic mention from the Guide
Update image_tag so that it will work everywhere.
First player is automatically super.

Closes #8
Change verification styles, add styles to default sheet
Bump version, update news.
Fix scope bug with image_tag
Merge branch 'master' into leagues
Added sleep.
Merge remote-tracking branch 'nebnet/master' into sandbox
Adding includes and fixing CFLAGS for sleep
First version of the figure to plot working
consolidated models and collections into one place
Began API documentation
Slowly moving parameters into API.pod
Changed help display
Start adding loop tables.
Stripping ?'s when sanitizing strings.
Le sigh, moar pointers
ignore local_settings.py
server starts, models more fleshed out (site 50%, achievements 10%), set up config module (improve later), began setting up unit tests
removed setup.py from branch, moved to utils
adding mochiscript-full for parsing on client side
merging
0.6.12
upping version
adding extended
checking in version
Use of uninitialized value bug fixed
rekapi.dom.js -> rekapi.dom.actor.js
Fixes some documentation errors.
Updates Rekapi Controls and tweaks some styles.

Squashed commit of the following:

commit 83b276a6a2a47557584573b9625ac34103484e52
Author: Jeremy Kahn <jeremyckahn@gmail.com>
Date:   Sat Dec 15 18:18:57 2012 -0800

    Rebuilds binaries.

commit 2df425a137baba99b5129edc3f0b20bbb804a5cd
Author: Jeremy Kahn <jeremyckahn@gmail.com>
Date:   Sat Dec 15 18:06:06 2012 -0800

    Tweaks some scrubber styles.

commit 2e277010b89a25ceb8cd29d01ec90c95b9e4e8d3
Author: Jeremy Kahn <jeremyckahn@gmail.com>
Date:   Sat Dec 15 17:15:58 2012 -0800

    Initial implementation of icon fonts for Rekapi Controls.
Changes the look of the Rekapi Scrubber.
Tweaks text shadows for icon fonts.
Merge branch 'master' into gh-pages
Give direct links to release note pages on website

This is a lot nicer than just directing them to the directory
index page.
Add query_literals extension for treating regular strings like literal strings in select, group, and order methods

Sequel's default behavior for these methods, while generally
consistent internally, is not consistent with the filter handling,
and I think the filter handling is much more user friendly. If
there ever is a Sequel 4, it will definitely act this way by
default.

For SELECT, I sort of understand the default, since selecting
literal strings can have some uses.  However, since Sequel uses
hashes and literal strings without aliases aren't really a good
idea (since you can't control the identifier used), that use
case is going to be very uncommon.  Both GROUP and ORDER don't
appear to accept non-integer constants on PostgreSQL (though
SQLite accepts them), so I can't imagine any breakage there.

While the usage of literal strings leads to less database
independent code and less opportunities for introspection, it's
not necessarily a bad thing in all use cases.  This makes it
easier to use literal strings in SELECT, GROUP, and ORDER without
the core extensions' String#lit or Sequel.lit.
Add Sequel.extract, missed when the other core extension replacements were added
dodana szkieletyzacja i zmienione wyswietlanie wykadrowanych komorek
delting gpi.m
There was a typo on line 2275 (iast_i intead or last_i) that kept the run to be recorded as run and throwed a PHP notice
tweaked tmux.conf
Merge branch 'master' of github.com:jgallen23/dotfiles
add devise to user_manage
test3
git自动登录
set global histfile to point to shared nfs as well
Delete code cookies by specifying domain
Added User model.
Removed devise User model.
Merge branch 'dev'
changes to sea search
Add mailtwo css file
Add Mutt configuration file.
Added a table column for the editor's Wiki ID.
Introduce a TODO list.
New Property: empty_q_no_drop.
Implemented RequestUtils
Implemented http Request type
Modificación del controlador productos y base de datos.
IE fixes continue
Added app menu
Alterado nome do link de urls no menu
Configurado para heroku
Changed TripData.toJSON to include timestamps in sensor_data object,
to ease decode in server. Also solved bug in database handler retrieving
feedback information.
issue #12 - pivot joint to static body: fixed bug and added new example "Pump".
Auto-update: 31-Oct-2012 08:12:16
Auto-update: 24-May-2012 13:44:27
Auto-update: 11-Jun-2012 12:28:17
06-hibernate-2
Better defaults and selection mechanisms for night events
Tag-table implemented in the database. Also a method to getAllTags from the database
It's not possible to add a Movie twice to the database.

A notification is still set though.
Update Architecture Spec
Update Developer manual
Merge branch 'sprint4' of github.com:johanbrook/watchme into sprint4
Started implementing the Content Provider
Keep article_dates sorted
Removed plugins (inc. Align) and reverted back my Ack mapping
Hardcoded path to Ack on OSX
Switched to environment-variable-based config
Fixed Snapping and Hotcorner, UI alignment issues.
Merge pull request #25 from snwh/master

"Fixed Snapping and Hotcorner, UI alignment issues."
Adds padding
Merge pull request #15 from snwh/master

Adds padding
removed copy of paper.js please see paperjs.org for latest copy
Implemented created, updated, deleted logic.

Automatically inject the creation, update, and delete timestamps as well as which user performed the action. Rows can now be logically deleted and there are no more named parameters just question mark syntax.
Added injection of is_deleted when doing a query
add test autocompletion
set up the .com domain
组合框的样式bug
组合框
add missing system packages
modified method string_parse to parse top-level optional summary lines
better lcd message on startup
A draft favicon for the site, and better devise alert styling.
Fix the snap-to-top offset?
Use a smaller robot picture for the logo / favicon.
Add Instapaper integration.
Clean up some binary (image) files.
X11: no logic, just white space changes
Added commons-logging, which is used by the http-client libraries for
logging.

Fixed the "identity theft by admins" bug by not using the session to
store what user has been selected.  But, we are artifically generating
changes to the session to trigger "publish" because we don't know how to
do it correctly yet.
changed line endings for two tag files CloudCoderRepository
fixed line endings in what I hope to be the last file
Shut down site
Inital Commit of README
First Commit# Please enter the commit message for your changes. Lines starting
Merge branch 'master' of github.com:jtmac6/IGNCodeFoo2
Change default notification time to 60 seconds.
Trabajando en el registro
Merge branch 'master' of github.com:juanros13/plumbago
Correção no include_path
now backs up
merge complete
Functional pathfinding
Merge pull request #172 from justindarc/master

Added CSS Rules For Sub-Views
Fixed an issue with console text not displaying when the console is first displayed
A demotrack for SumOfUs
Added /show and /info commands to ERC
Added /opme and /deopme to ERC
Use :bind and :interpreter keywords; it's simpler
Bind springboard to C-. c, which is quicker to type
Added selectkey.el
Comment out reference to the Compare module.
Add PT story URL to GitHub pull description
Update to Modernizr 2.6.2
Update jQuery to 1.8.2
Updated Merchant Map 
Updated merchant map
change/reset password for administrators
ページ一覧で、何も単語を入力しないでボタンをタップすると、全てのページに戻すように修正
Fix project name
Added pre-reqs
Key Concepts
Added info about RSpecs to key concepts
Key Concepts
Spelling tweaks
modified on 22 Sept 2012
modified on 22 Sept 2012
Don't use Stream fields directly in input frame handlers.

Instead of directly accessing the incoming content buffer and the
flow control semaphore, use the new stream functions

 updateWindowSize
 addIncomingData
 addIncomingHeaders

Now only 'intimate' stream functions use the Stream fields, and
we should be able to move Stream into its own module.
Disable isolation mode when nothing is selected.

Signed-off-by: Kristian Duske <kristian.duske@gmail.com>
first step of merge
pratiche editing
動くよ!
absolute path in makefile
adjust php dependancy to 5.2.0
small doc fix
forgot to git add the ascii login hook
target blank for "powered by pfc" link
restrict access to data folder
restrict access to log dir
Add confirm dialog.
Add picture taking library
space removed
Merge pull request #76 from zupher/master

comment and view fixes
Make backup dir to be partitioned by source hostname + path to avoid accidentally overwrite unrelated files with the same name.
Do not overwrite existing files unless the overwrite option is enabled.
google webmaster tool meta tag 를 header에 추가.
google analytics tag를 layout에 추가.
.project를 .gitignore 파일에 추가.
ignore all .xml files webstorm is generating in my branch
Port to Chicken 4.
Kevin - Added send functionality to Message frame, and exit functionality to the main menubar
separate life stream and short about, add some more content to life stream
Refactored IP Lookups to use BASH functions to implement the various parts of the PIPE
This should make customization for different routers easier (focus on the router_filter function)
rebuild after #31
Remove CRDictionaryUpdate()
Remove CRArrayIsFull()
Remove CRStringIsFull()
Rename autorelease pool to just pool
Remove null class
Rename zero to null
Rename CRImplementation to CRCode
Update copyright notice
Update readme
Tons of changes
Set min constructor priority to 101
Correct arguments_count to be argumentsCount
Use char instead of MLCharacter
Improve tests using matchers
Add MLSliceAt()
Further work on MLString
Further work on arrays & strings
Add more replacement methods for mutable arrays

Add the following methods to mutable array:

- replace_at*count*with*
- replace_at*count*with_many*
Add methods reverse and sort for mutable arrays
Add more methods for array & mutable array
added Logo upload/Font Chooser/Color Stylesheet/Footer Text Theme Settings
Исправил ссылку загрузки логотипа и добавил цвет фона по умолчанию
making groovy 1.8 default
moved creation of custom log level outside closure
Final 1.8.0 release
body font size 10
DCPU16: fix syntax of tools/dcpu16/rewrite-asm.py; make it executable; improve preamble with adding more comments
add air
Merge branch 'master' of github.com:krebscode/painload
fix test_gc
Implement missing used functions on MockPopen to pass Windows tests utilizing timeout_run().
show compiler warnings to console, not in source
handle duplicate files in file packager
primer commit vacio.
Segundo commit, modifico el rchivo README.md y elimino README
Segundo commit, modifico el archivo README
Cleanup *all* text input and textarea values upon succesfull term creation with ajax
Removing Java 7 dependency