labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'master' into ruby_1.9.3
fix shared dir in public
fix autoassign_user_school_assignments in csv importer
Merge branch 'master' into ruby_1.9.3

Conflicts:
	vendor/plugins/moonshine/lib/moonshine/capistrano_integration.rb
Merge branch 'ruby_1.9.3' into wip
remove [] from district log statistics line, so it works in 1.8 and 1.9 ruby
Merge branch 'master' into devise
api: globals => grammars
Fixed pin constructor
Adds new ack alias for CoffeeScript
Changes huh alias to use vim
Fixes OS X resume directory in ZSH
Updates ctrl-p.vim
Singleton States
Changed something
Modified Fighter collisions with side, top of Platform
Merge branch 'master' of github.com:vfseanm/Vooga2
removendo todas as flags para ver se pelo menos a vm sobe
mudando 'should' para 'deve'
fix login - logout url
Alterado arquivos
Excluído arquivos desnecessários
Alterado
took out nose ref
Hardlimit text to 72 characters.
Merge branch 'devel' of github.com:vodik/dotfiles into devel

* 'devel' of github.com:vodik/dotfiles:
  Add some passkeys.
filterkeys.bugfix
Makefile pokusy
Towards working context menu.
Updated X

  * X/Xdefaults: changed list of extesions, removed useless, use
    `Shift-Escape' to activate keyboard selection mode;
  * X/.rxvt-unicode.x-res: changed letterSpace to `-2'.

Signed-off-by: Vladimir Lomov <lomov.vl@gmail.com>
Merging the changes

Merging mine and Sindhu's code.
Mine : Message formats for main message, PONG, Query and Query hit
message format classes.
Sindhu : Base of PING and PONG messages, limit of 3 in and 3 out conns,
and connection handshake.
More Czech translation fixes.
Fixed bug with the merging algorithm
Fixed audioChannel pattern.
hamming: solved
直してしまった
Correct token method in LabGroup
Merge branch 'master' of github.com:water/mainline
Enable scoped dashboards
Correct indentation
Remove superfluous controller
Add :role scope to route
Test labs controller for examiner
Merge branch 'master' of github.com:water/mainline
Implement failing test for BlobsController
Add ability for reviewing submission [#156]
Include cancan matchers in spec_helper [#156]
Write specs for abilites [#156]
Use new ability verb and remove use of instance vars [#156]
add column-marker to .emacs
Chapter 10 exercises work
check if editor has method containerView. better get a nil instance than crash. (see #187)
Merge pull request #188 from ashchan/master

If the editor doesn't have containerView method, don't call that. This fixes this crash issue (#187)
Change the condition of inserting status line ( make it more accurate
expression )
Remove log trace for status line debugging
looking into the eof marker
Other little silly fix in webmodel
- Added color options, both into the client and the server
- Fixed up broadcasting connection
- Fixed scrollable grid
Fixed a bug
Merge branch 'refactor' of https://github.com/willurd/JSTest into refactor
branch submit
mater
test
Picture manager improvement and main page setting features
Some simple house keeping

Adding *.v files to the include all files
Tableaux d'episodes
Uploads after taking a picture
Now actually enforce max photo limit
spinpumping and nv_vs_laser plots added
initial qt support; fix file permissions; dos2unix **/*.cpp; dos2unix **/*.h
add qtwinmigrate vs project files
tmux.conf adaptation
try to move protocol(tcp stack) down to userspace
[trunk_admin] Update fa_IR, thanks to : Garcia

git-svn-id: http://piwigo.org/svn/trunk@19573 68402e56-0260-453c-a942-63ccdbb3a9ee
feature 2816: {strip} smarty tag can introduce bugs in javascript + fix picture.tpl

git-svn-id: http://piwigo.org/svn/trunk@19575 68402e56-0260-453c-a942-63ccdbb3a9ee
bug:2663 replace JSmin by JShrink


git-svn-id: http://piwigo.org/svn/trunk@19576 68402e56-0260-453c-a942-63ccdbb3a9ee
smarty bug introduced in r19575 

git-svn-id: http://piwigo.org/svn/trunk@19581 68402e56-0260-453c-a942-63ccdbb3a9ee
push functionality into RobotDataEditor
extracted method for creating save timer
#51: problem reproduced in test
#51: fixed
Persistent 1.1
Merge remote-tracking branch 'origin/master' into persistent11
Export toJSON from Yesod module
Scaffold update for persistent 1.1
Added missing aeson dep
minor updates to top-level README.pod
Signed-off-by: Jessica <Jessica@Jessica-note>
[desktop-parse] faster way to check if sth is in a hash table
[desktop-parse] less confusing function names, function to remove a node...
glitchwiki
glitchwiki
Set Compass's images_dir to the empty string

This is the right thing to do now that we're explicitly setting project_path to
the Environment's directory.
initial commit comment
Initial Commit
Version bump
When secondary top level require calls are made and no new dependencies are discovered the callback is not always called
Remove "Contents" header in readme.md

Minimalism for the win!
refactored toolbar to work with ace/lib/oop
photos push
position:absolute instead of float:left in main area
avoid using alert in file dialog
fix button shift when clicking in ie6
record filname when opening and saving files
try to confirm user for logout before window unload
remove a redundant comma
redesign header bar and improve skydrive support
Merge branch 'master' into gh-pages
Merge branch 'development' into styling
cart + misc changes
Merge branch 'styling' into development
small fixes (-menu Pages, bug:empty SMTP,..)
Including sensitive data.
Fixing bash syntax.
had the wrong lfuse
added CRC8, different frame format, new Max patch
sslオフ
sqale用にGemfile更新
heroku用にGemfile更新
config.force_ssl = true
Hover-Effekt für Tabellen
Use Contao ZipWriter class
looting overhaul
Fixed a declaration issue that prevented compilation of libfxcg.
trying variable-based scaling rules
Add support for RDF Collections/the toList method for Object#n3()
Clean up Environment related documentation and code
Kalendarz iCAL - DZIAŁA :)   (poprawka wysokosci plakatu w Google Calendar)
better style for contact-us
fix projects font
Add date to tags
Some changes to the PyPackedRow marshal

Signed-off-by: Almamu <games-fun-inc@hotmail.com>
Rawr. Trying to get the shutdown thing to work.
Fast gulerødder virker, påbegyndt at de ikke kan blive det samme
oprettet interface til array. rettet en stave fejl tilføjet array til de resterne array classer
Bot Class. Source file for run.rb
Adding spellchecker button into article tinyMCE toolbar
Moving degrees to popover box instead of author listing
$.fn.ThinkBox 支持自动获取当前元素上的title 作为弹出框标题。如果传递 title选项则自动覆盖title属性
Fixed GenerateRandomCharacterNameResult.
CORE/Spell Frost Presence

thank Kraven5 for you help

Signed-off-by: Mikadmin <mikadmin@wow-attitude.com>
add signature verification
Merge pull request #2 from smickles/master

Signature verification
Merge remote branch 'remotes/origin/next'

* remotes/origin/next:
  make foodcritic pass all tests, adjusted specs accordingly
increase version number to 0.1.47
add the IP for each host to get around NSlookups
first testing version for private IP detection
return first private IP found
Merge pull request #34 from Bigpoint/hostname-ipaddress

Hostname ipaddress
Cleaning that mess up.
Make a basic User model (including secure passwords)
finish user signup
force ssl production
Optimizing the number of requests. Debug output
gsgdd
Add OpenFlow 1.3 new fields to NOX API.
Fix: fields were not being masked in ofl_structs_match_put_masked.
Merge branch 'master' of https://github.com/CPqD/nox13oflib
on a fixé le registrateur id/ex
classes and target in gitignore
Administration interface
Began admin interface (menu hooks/forms)
fix TDBadgedCell.podspec clean_path error
Merge pull request #173 from waterlou/master

fix TDBadgedCell.podspec clean_path error
fixed the session/slug problem
database, yo
edit file setting
Merge branch 'master' of https://github.com/DHXD/DataLogger

Conflicts:
	www/sites/domua.khituongthuyvan.net/settings.php
Post sms cross servers.
Added SSL and Proxy options.
revert to 37df0b353c7c9298d7dbbe1f4c3182cd2242ac3e
phpdoc
Update ConfigurationError message to state that Symbol is allowed.
Fixing some initial build issues.
Removing AspnetBotHost for now.
Renamed project.
Removing unneeded references.
Removing unnecessary app.config values.
Can load level created in the editor
#79 stray test removed. #79 other parts of shared memory code removed.
#79 nacl_host_desc.c removed. a lot of code cleaning/removal
Changed mob damage some and moved all mob damage numbers to the TFC_MobDamage class for easy access
Pre16 Commit
Arrows and the javelin now know who threw them.
eurojack json update at Jun 2, 2012 2:20:29 AM
GUI: change language selection format

- display as "language - country (locale name)", when locale name consists of 2 parts
- display as "language (locale name)", when locale consists of 1 part
Should also fix the removing of the entire stack
New GWB files
tests now properly report if a line is missing (csv tests)
ScreenControl.java
ADDED
+ Navbar hover bug
+ Keyboard event trigger bug fixed
+ Timeline nu met thumbnails
+ PageVo. property added => cover
+ ImageFactory. thumbnail keuze added
+ BoekXml aangepast

TODO
+ Wanneer je op 2de boek klikt, werkt navbar en timeline niet
+ Boek met 2 of minder paginas = crash (timeline bug)
+ Code cleanup
+ optimalisatie/testen
Added session sweeping
Enabling query by parameter 'access'.
input a pyrotagger formated file
Fixed a bug when using the pyrotagger style input file
Fixed the graphics bug.
made prepare->autostart  independent of current folder.
Made it tab with \t instead of five spaces, idk why i had it like that in the first place
Series plugin will now recognize series as the same when punctuation is changed in series name.
series_premiere will recognize more series as the same that are the same. refs #1656
series plugin will record all seen releases even if quality/proper is the same as a previous release.

git-svn-id: http://svn.flexget.com/trunk@3154 3942dd89-8c5d-46d7-aeed-044bccf3e60c
Fix FreeRDP Issue #661.

Check directory operations in rdpdr to determine if the directory should be created if it does not exist - instead of always just creating a directory regardless.
Issue #684.

Fix the problem with a smart card reader being lost when a smart card is removed during a reconnected Windows 2008r2 rdp session. This was due to a improper handling of a message with a duplicate completionID. There is a lengthy comment in the code with explicit details. Also, many minor updates for the code to more closely reflect the protocol documentation - such as correcting packet lengths, undocumented padding, etc.
Merge pull request #683 from bjcollins/master

Issue #661: Fix rdpdr directory "open only" operation to no longer create directory
libwinpr-library: fix unit tests
fix slimbox
add style on scrollbar, works only with chrome
add the addColumn command
add new column button and modify column button

Merge branch 'master' of https://github.com/Froggies/Skimbo

Conflicts:
	public/app/scripts/controllers/columns.js
Merge branch 'master' of https://github.com/Froggies/Skimbo
Merge branch 'suggestions_fix' into dev
Prevent twice call
Added paver task to run integration tests
Call the unit tests task test
Added cast to int for verbosity in updatelayers, it was causing the levels to be ignored. References #238
better cenario, car now rotate with keys
Changed GetHashCode calls to fix bug #209.
Redone textures (512p) and added a README about some texture source.
merge from 1.5
bug fixing for 1.7
Fixed tasklet dispose problem
Added widget demo
Update on multi zoom context on multiple levels for zoom out.
Removes tmux-powerline so it can be added as a submodule
Adds tmux-powerline as a submodule
[feature/Auth-Refactoring] Add ZendframeWork OpenID to composer.json

This requirement is needed for the OpenID implementation.

PHPBB3-9734
[feature/auth-refactoring] phpbb_auth_manager on acp_auth

Makes acp_auth use phpbb_auth_manager.

PHPBB3-9734
Close ncurses session in the examples.
- Implemented 2 classes for viewing the obtained clusters:
	a) ClusterPrinter - prints results to a file
	b) ClusterPlotter - plots the results using gnuplot
Added the possibility of generating scripts for gnuplot
Added classes for generating gnuplot scripts for plotting with errorbars
Added output of the program
Giving suggestions
Improve lamina usage
Move to 0.2.0-SNAPSHOT
Optimize mvn pom files
Issues labels
Remove candyDoc and all candyDoc generated documentation in preparation of new documentation theme
Add bootstrap-theme infrastructure
Update generate.d for new theme
Add bootstrap theme assets
Flatten html file hierarchy
Generate documentation using new theme
Adjust relative paths
Fix index.html not getting copied to root
Regenerate documentation with applied fixes
initial commit

added core files, first pass at some templates and some content to
experiment with.
Added dom.listener module
added pvpoff boolean for the controllable pvp
Added a slideshow and social media icons
Functions.

   PS> function f { 'x' }
   PS> f
   'x'

There are some small hacks (see code) but I don't understand enough of
what's going on to fix it right now.
Added base for future commands
Added some more checks to the onCommand in the CommandManager.  Added
method to get all the registered BaseCommands.
Started paragraph wrapping code
Método de dibujar vectores añadido
Fixed sorter error
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/husacct/validate/presentation/BrowseViolations.java
Avoid installing the webrepl.
The plan is to move it to its own repository/project.
deps/Makefile: 3.0 -> LLVM_VER
winston: fix copy regression
Generic string replace.
Give libjulia an RPATH as well
Merge pull request #1813 from staticfloat/libjuliarpath

Give libjulia an RPATH as well
Revert a regression in linalg_dense from last commit.
More keys
edit()
ajout d'une tarball
add symvol
fix rake db:seed with foreman orchestration on
Install dev dependencies on Travis [Travis-CI] [Composer]

There are none for now, but it's dev environment.
Mise à jour du Makefile (commentaires)
corrected some info on readme
added twitter feed kodatype
find-candidate-key: implement cross correlation
Rm the GPG_INFO_FILE_NAME before starting a new gpg-agent so that I make sure the information taken into account is not obsolete
add icon for files
Complete
Merge pull request #149 from Arente/patch-98

Complete
Update master
Merge pull request #427 from Gaiaknight/patch-2

Update master
Added hex file
404 etc.
Simplified the MailerInterface

Methods used by the abstract mailer implementation during the send()
process are now protected methods instead of being part of the interface.
Merge pull request #6 from LogSafe/interface_cleanup

Simplified the MailerInterface
Removed Version as the tags determaine what version it is
v0.5.0
new button design
new files added to project.
Fix exception on story page when town has not stories.
Merge branch 'develop' of github.com:/MAPC/masshealth into develop
\n verwijderd, werkt niet
Blijkbaar was deze dus wel nodig
added Galaxy S3 title
Merge branch 'master' of https://github.com/Maksims/restest
Logowanie za pomocą google  oautch2

logowanie i rejestracja za pomocą googla :)

-jak istnieje użytkownik o takim adresie email jak na google to zostaje automatycznie zalogowany
-jak użytkownik nie istnieje to zostanie utworzony na podstawie danych z google'a
! hasło zostanie wygenerowane losowe.. (puki co nie ma możliwości zmiany hasła)
commit name test and add next color
add live test page
Units page is done
button refresh is done
Added highlighting for selected option
Fixed alias for Option-class
Enhanced ACP search, added user group option provider
Converting to underscore
Removing require since psych should be part of ruby
Routes and default model updated
New banner image.
Moved templates in theme directories to theme/templates
Added 404 template
Cleaned up theme.yml
Another random work in progress checkpoint for trying to parse blocks.
Removing the Meta# NuGet package. Does not build.
Now it builds again. Finished hacking out all the Meta# stuff. It is in no way good, but it compiles cleanly, so I know that I'm done with the butchery.
Stopping doing NuGet auto-fetch on build. I want to just check in my dependencies and always require a specific version.
Also adding NuGet dependency on FluentAssertions.
Enable running tests with NCrunch.
Ignore the last test that depends on having a parser present (so was failing since that is currently throwing NI).
Don't need the old Meta# grammar files either.
I correctly tokenize the empty file. It is a single token, with an indentation level of 0, for the single line. Yes, there's always at least one "line" in a file, since EoF is a valid statement terminator.
Actually, this is the right parse for an empty file. The one line should have a statement end token as well as an initial indentation level.
Rename for clarity.
Tokenization now handles the one-character file.
Refactored tests for readability.
The tokenizer now handles multi-line files.
It will now handle a line with two identifiers separated by a space. Of course, it won't work for spaces around periods (and therefore inside of identifiers).
I've taken the current tokenization approach about as far as I can. Time for some refactoring to enable that next test.
Refactoring for clarity, and to encapsulate the stuff that I'm about to vary. The tests no longer directly specify how one uses the tokenizer. They just specify inputs and results.
Tokenizer is now both an observable and produces an iterable. Test is changed to use the observable API. Now I can just remove the old API.
And now we just have the observable API. Nothing else.
It is now smart enough to handle escaped end of line characters.
More complete test for escaping end of line characters.
added working fuel pump, disabled radio calls made from outside helicopter
parse server messages and allow reconnection if it drops
Added StreamReaderService and file reading implementation
[openstack] Updated 'image update' mocks
Merge pull request #70 from pmdeazeta/mocks

[openstack] Updated 'image update' mocks
Frage 2
Fix CMake install
Define phBullet one-line methods in header file
Blank dialog
Adding panels (PAIR PROGRAMMING!!!)
Added user omniauth authentication and added admin login
Added rols and admins authentication

Added relationshio between admis and rols
Updated the gitignore file
Deteled vim files
Fix the problem when I use rol insted role
Deleted rol files
Added helper to render the account links
Remove old session partial
Merge pull request #1 from Nearsoft/omni

Authentication with Google OAuth2
Added authentication for users and admins
[#37458583] Testing...
Model runs: fix view overflowing from interface panel
model runs: fix NullPointerException with monitors

needed to make sure that withContext gets called in more places.
otherwise repeatedly pressing a model's setup button was likely
to result in a NullPointerException
fix spelling in Bird Breeder(s)
New version
Merge branch 'master' of github.com:Nexcius/gamejam
[#70] add missing chart creation function for bar, line, pie, and composite charts
[#70] add code example for chart creation function
pu_assert fulfils C90 now
clean up and delete some unuseful checks
Correcting code of ContentManager, Implementing stock-search.
Revert "Correcting code of ContentManager, Implementing stock-search."

This reverts commit a2b48eb503087fd4aebdc44d023afdc5679bae97.
Implementing manager singleton and some of its methods.
Adding stock split method, changing method name.
Merge branch 'Backend'
Merging complete
librtmp: For HTTP/RTMPT, adding unknown error handling to connect, HTTP POST, HTTP READ
Unexpectedly short reads.

These now cause the callback `error` argument to be passed as `true`.

This simplifies use cases, in that they can check `error` to see if
anything special is warranted, rather than having to check both that
*and* the result length.
Merge pull request #22 from Obvious/danfuzz-short-read

Unexpectedly short reads.
Adding exported vars to ring channel leg.
Added cookies for Retrode SNES mappings
Truncate KQ long names, improve classroom and progress views
[about] another try to fix possible BSOD
Разбираюсь с Readme.md файлом
Add test for colorscheme

This way I don't get annoying messages before running BundleInstall! for
the first time.
Added a few TODOs. Removed the Strategy.class . Sorry for the confusion.
Combined coding effort to fix a lot of classes.
Fixed the Dispatch and UpdatePropensityRole.
Added comments and TODOs to DispatchPowerPlantRole and
UpdatePropensityRole.
未订阅标签、组织提示样式修改
streams are done!
well that's dumb
it is alive!
переделал сбор информации о игроках команды
# Inlcuded Php-Array-Configurator in project libs
- Crontab permissions recognisation now more sophisticated / less prone to false alarms
# Default Action in Controller Base Class Constructor to check if Installation is completed
# Parameters for CronMan's own config file location
# ignored dynamically generated config file
#  Beautified SelectDBType-Form
# Refactoring
# Refactoring
+ Database Connection Testing now working
+ new (final) step for DB table creation added
[aml] fixed beta1 merge, missing --enable-player=amlplayer
integrated 2.16
Use "File.exist?" instead of "podcast_downloaded"
Added some comments
Changing readlink path
updated tribes.
added tests for UserProfile
examples: Added demo_view_bmp.c

Signed-off-by: amsl <iamyhw@gmail.com>
changed code in app.html to overflow right
Make managedObjectCache optional on RKManagedObjectMappingOperationDataSource; Make RKManagedObjectMappingOperationDataSource.h public
Added support for configuring the store filename used by the test factory.
ResTool v3.1

Fixed (and probably broke) a bunch of stuff. The addition of the
Uninstall Removal Tools button as well as removing Fsecure are the
biggest changes.
Added WebVttBufferInfo to webvtt.h
Merge branch 'c-parser' of github.com:RickEyre/webvtt into c-parser

Conflicts:
	webvtt-parser-new/webvtt.h
scroll over demo added
Begun adding UserParticipations to connect users to races.
fix visual selection trans with multiline.
Première passe de nettoyage du code :
nom_de_variable
NomDeFonction
class_objet* objet
dialogue* fenetre_dialogue
Retrait de publi_prevue de la bdd et de l'import puisqu'on ne l'utilisera pas
Enregistrement de session
fix potential security issues, little refactoring
new version scheme; use build-info
import directly jquery
[Mono] Fixing build for mono-4.0 target platform

Signed-off-by: Gleb Golubitsky <sectoid@gnolltech.org>
[MSBuild.Task] Removing annoying compiler warning

Signed-off-by: Gleb Golubitsky <sectoid@gnolltech.org>
Rename devices class name.

Signed-off-by: Chglove <chglove@live.cn>
Merge branch 'master' of github.com:ShanHai/ShanHai
Contenuti per la tabella hgnc
Finish demo app - make change to gemfile
Fix the project files so the don't include double slash.
Added total topics performance counter.
Fix a warning issue when build target is release.
Added filters
Moved vpis ocen actions to izpitni roki
Commented out Vpisi ocen
Bugfix: the post variable was overwriting the input, which was causing terrible brokenness
fixing bug that causes it to keep using the same slug
allow setting authors
mobilefy subway
Merge pull request #192 from ngokevin/master

mobilefy subway
Workaround for Queries duplicating and sent replies disappearing.
As the user may be initiating a query with the incorrect case on a
username, it appears that the chat view was created as a lowercase
of the username. When a query reply was received, it had the proper
case, and would duplicate the window. Similarly, when sending a
reply to a query we received, we would look up a non-existant
stream due to an inconsistency of case.
This workaround forces all query views to have a lower-case name.
Proper resolution would be retrieving the correct username before
creating the view on both the sending and receiving ends.
added coaching files
Storm shit = shit--; Performance++
Updated to new Storm command API.
Made volcano real weather.
Added ASP.Net scripts (<% %>) to the self_closing_tags group.
Merge pull request #31 from weshardee/patch-1

Added ASP.Net scripts (<% %>) to the self_closing_tags group.
fix fetch error

Change-Id: Ib929eb873e72a3150eb8e0eaf38df742fb4ef650
Italian Translazion of the Installation
Remove extra space added by accident
Merge pull request #2 from mewmew92/master

MAJ
Add JSON Files

Add JSON files to create the pokemons and attacks
Add channel file
Merge pull request #4 from mewmew92/master

MAJ
MAJ

Changement de la maison de maman et suppression des images inutiles !
FUCK
Merge pull request #5 from thebadwolf95/Dorian

MAJ Dorian
Add Attack and pokemons

Add attack and pokemon into the json files
encode the json file (utf8)
Merge pull request #3 from mewmew92/master

pokeon
Added basic predator/prey setup
better support for time ranges spanning multiple days
Add files
Merge github.com:Taumer/MythCore

Conflicts:
	.gitignore
Remove a submodule
add  controls
Merge pull request #2 from eagledu/master

Update Version 120725
Add devise for authentication management
Added simple_form, updated the frontend
Added tests for user first name, last name, and profile correctness.
changed x to myX and same for y
Minor UnrealIRCd hack to fix a stupid premature numeric
Very basic structure

Added .gitignore
made carousel works for IE - fixed div positioning;
modified:   .idea/shops.iml
	modified:   app/controllers/userorders_controller.rb
	modified:   app/mailers/user_mailer.rb
	new file:   app/views/user_mailer/complete_order.html.erb
	modified:   config/environments/development.rb
	modified:   config/initializers/active_admin.rb
	modified:   vendor/assets/stylesheets/redactor/css/redactor.css
Merge branch 'release/v0.0.3.5'
Fixed the issue while displaying saved insurance in the case of new patient.

Signed-off-by: Ajil <ajilpm@zhservices.com>
bug fixes as per bugs reported by ericsbrown on SOURCEfORGE :
https://sourceforge.net/projects/openemr/forums/forum/202505/topic/5210595

Signed-off-by: tajemo <cbezuidenhout@tajemo.co.za>
Comments ammended

Signed-off-by: tajemo <cbezuidenhout@tajemo.co.za>
Modification made to fix a bug in patient portal

Signed-off-by: Jacob T.Paul <jacob@zhservices.com>
new perscriber number for Australia
Version update
Changing prescriber over to provider
Updated code based on github comments.
Merge branch 'mc_prescriber' of github.com:Wakie87/openemr into mc_prescriber
MenbersChange
added hook object with website field
add Html Cleaner Service
verify encoding for project
simple stripTags implementation of CleanHTML
add filter 'cleanHtml' for twig templates
plug cleanHTML filter
HTMLPurifier implementation of HTMLCleaner
minor refactoring
Add HTTP 500 status when action fail
Clean state for Groups Data
In tree view of data no parentId and root mean the same
Option to beautify json : easier debug of ext/js part
Merge branch 'master' of github.com:meeloo/nui3
adding min thumb size attr
added new constructor to nuiSprite
Merge branch 'master' of github.com:neywen/nui3
Merge branch 'master' of github.com:libnui/nui3
Merge branch 'master' of github.com:meeloo/nui3
added Retina display to SpriteView
nuiTexture: force scale value for @2x images that are not autodetected but requested by the user (from meeloo)
Merge branch 'master' of github.com:neywen/nui3
Merge branch 'master' of github.com:meeloo/nui3
Merge branch 'master' of github.com:meeloo/nui3
nuiViewoDecoder WinXX wip
Merge branch 'master' of github.com:meeloo/nui3
Merge branch 'master' of github.com:meeloo/nui3
Merge branch 'master' of github.com:meeloo/nui3
nuiVideoDecoder interface and VideoDecoder tutorial updated
nglImage: added GBR pixel format
nuiVideoDecoder WIN32 wip
added nuiVideoDecoder.cpp
Merge branch 'master' of github.com:bambudo/nui3

Conflicts:
	tutorials/VideoDecoder/src/MainWindow.cpp
Merge branch 'master' of github.com:bambudo/nui3

Conflicts:
	nui3.xcodeproj/project.pbxproj
	src/Video/nuiVideoDecoder.mm
	tutorials/VideoDecoder/VideoDecoder.xcodeproj/mat.pbxuser
	tutorials/VideoDecoder/VideoDecoder.xcodeproj/mat.perspectivev3
fixed build
Revert "Imporved addPerson method and implemented it into Main"

This reverts commit dfea3190866792bd2d15f84ec3f2670bb35fb6a8.
Finished addPersonMethod

implemented addPerson into our already bloated main method SHIP
*** empty log message ***

Changed files:
    rarcrack-cflags.patch -> 1.1
    rarcrack-mime.patch -> 1.1
- new.

Changed files:
    rarcrack.spec -> 1.1
- selftest added.

Changed files:
    rarcrack.spec -> 1.2
rpmcppflags

Changed files:
    rarcrack.spec -> 1.3
Merge branch 'master' of https://github.com/pld-linux/rarcrack into pld-linux
* Updated usage function to use heredoc
* Added search Java only option, changed exclude java & javascript options
* Refactoring to reduce duplication
PPageFormats: Allow space to enable/disable formats.
PPageMisc: Add export keys feature. (Only registry is supported)
Updated Changelog
WebServer: switch to html5 (WIP), use html5shiv
fix unitialized variables
update patches/icl13.diff
WebServer: fix header padding
installer: simplify version defines
installer: include the commit's hash
update ffmpeg (n0.8-17165-g3f72dbe)
Fixed jQuery noConflict setting for test driver.
Dynamic parameters string so that all test options persist through each autorun.
Entities

Added the entities I could think of. Might be more.
Possible fix for framerate issues!
Fix null pointer

If the old expiration is null, it errors when putting an expiration date
Found some interesting banner code...
Crazy shit
Merge remote-tracking branch 'mangosR2/master'

Conflicts:
	scripts/northrend/nexus/oculus/boss_eregos.cpp
	sd2_revision_R2.h
	sql_mr/mr00383_mangos_icecrown.sql
Update docs structure for gh-pages
Restructure docs
Fix issue with function segment key generation
Added local theme support (mainly for buffer-local themes)
Only require the first correct filename
update README
- removed non-body HTML from edit view
- implemented a simple paginated recent changes view
- added L10N for time_ago_in_words
Updated zsh and emacs configuration
fix missing --limit in docssite examples
Damn you, colons...
Merge pull request #1290 from dagwieers/mail-doc-fix

Damn you, colons...
It has been reported that occasionally the md5sum command on certain platforms (?) can fail, where I suspect there is noise in the output stream.

In those events, capture the output so we can report the error more properly.
Test for directory existance, fix exception catching granularity
Add some docssite and deb package related stuff to gitignore.
Moving now from getopt to optparse

Let me know if we can move to another library instead ;-)
Add DIST_MODULE_PATH so setup.py and ansible.spec can live in harmony. Closes #1277
Keep processing the rest of the vars_files even if one has vars
Merge pull request #1304 from dhozac/vars_files-process-whole-list

Keep processing the rest of the vars_files even if one has vars
Merge pull request #1300 from tbielawa/fix_module_path

Add DIST_MODULE_PATH so setup.py and ansible.spec can live in harmony
Merge pull request #1298 from dagwieers/doc-optparse

Moving now from getopt to optparse
Merge pull request #1296 from sergevanginderachter/da92ce796b48ec80e3ead1cfe9bcbc71f5fce805

fix missing --limit in docssite examples
Merge pull request #1297 from sergevanginderachter/devel

updated gitignore for docssite stuff
Merge pull request #1289 from abondis/mysql_migration

mysql_db: connection test, dump/import state
moved modules listing to utils.py, get modules list at playbook level so we dont repeat the listing on each task
remove unnecessary passing of modules_list
@klange pointed out a slight typo here.
Add php-font-lib as a git submodule
Song info now showing. Not resizing right.
remove synchronization in {Sorted,}BiMultiValMap since they're only ever accessed inside a ReadWriteLock
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/03_group_stream_out_ranges' into p/4122/03_group_stream_out_ranges
Merge branch 'p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4125/01_admin_tools
Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools
Added a class for Puppetmasters
Fix failing test runner (bad rake task)
Expand base paths
Moving repository.json.
Trying to make this a list
count id3v2
Added multi-threading support

The server is now multithreaded; at start, a poll of MAXIMUM_CLIENTS
threads is created, and each thread will be used to respond to client
requests.
Your picks is now live, for the most part.
fixes to importer updates, more error reporting
tcp_server_select: introduced new function [int accept_new_connection(int sockfd, int client_socks[])
Added database access using squeryl
Tidied up
Merge pull request #14 from ahmadia/master

BUG: missing import sys in setup.py
Add lotterydrawrespository and namespace clean up.
判断是否有被奇门的必要
trigger(event, room, player, data)
桃（肉）的使用
trigger加room规范化（上）
trigger加room规范化（下）
骚年们，不要抱怨这个世界没有凹凸曼、蜘蛛侠。
当你遇见被不良少年缠住的孩纸，装成其家人，将其救走。
在这一刻，你就是凹凸曼，你就是蜘蛛侠，你就是上条当麻！
add SampleCrash Project

1. AinccBER 테스트용 Crash 프로젝트 추가.
Cross correlation calculation for Naturals using x86-64 assembly
fixed bug added tests and run script
fixed bug added tests and run script
Create a symbolic link to cups/lib so that gutenprintBin can be specified as a driver in services.printing.drivers in
/etc/nixos/configuration.nix
Merge branch 'master' of github.com:akaposi/nixpkgs
Make threads have a name consisting of random transaction id and request path.
Use childprocess to boot in test, requests are synchronised on installation of artifact.
Extracted a repository for dealing with artifact finding.
Extracted task stuff into a task executor.
Killed logback access.
Fix for arr-pm to make it work under jruby from the classpath.
We no longer need zip to be installed.
Renamed the service to be consistent with the project.
Switched to use logback to deal with file based logging.
trap httplib.BadStatusLine
New Github styles

Had to modify HTML structure a little to handle their new border technique
Merge pull request #4 from suan/new_github_styles

New Github styles
added new pages and working on save file function
lol
Traduccion de las vistas.
XMLUI: Clean up CCAFS theme

- Remove multiple font-family specifications, only specify this once
to keep things simple and clean
- Borrow more-appropriate colors from the CCAFS homepage, including
headers, body text, and links
updated onetree so seeds drop from buds...don't do anything yet
Added table listener
tracking only selected blobos and selecteing new blob automatically
moving a txt file
adding github readme
Playing around with optimizing login sessions and permissions. Introduced requires_auth decorator on views that require a login. So far only /uploads.
Change ERB extension to SCSS

SCSS is now used across static so switching all ERB files to SCSS to
align them with other SCSS files and enable use of helpers and syntax.
Removing empty file

platform-pages.css is empty so removing it. The only references found
across govuk projects werein prototyping so the alphagov/prototyping#3
pull request has been made to remove them.
Remove unused help-pages.css file

File contents is only comments so removing
Refactoring all files to use SCSS syntax

Files now use SCSS for selector layout and its helpers for asset paths
and conditional styles.
Cleanup whitespace
Merge branch 'static-pages-refactor' into fe-toolkit-refactor
Remove old browse styles
Replace all the greys with all the new greys
Merge branch 'master' into 10_shades_of_grey

Conflicts:
	app/assets/stylesheets/basic.scss
	app/assets/stylesheets/notifications.scss
	app/assets/stylesheets/organisations.scss
	app/assets/stylesheets/publisher.scss
	app/assets/stylesheets/text.scss
Update business link logo with new background grey
Fix related box on tablet view

checkOverflow now checks for position:fixed rather than window width.
Merge branch 'master' into fix_related_ipad
Move includes to only where they are needed
Reorder includes for better readability
Remove unnecessary includes
Change from Rails sprockets to Sass imports

Also rename to admin.scss
Remove unused media query
Re-add toolkit conditionals
Update greys in static pages while we're here
Merge branch 'master' into fix_multistep_sass
Merge branch 'fix_multistep_sass' of github.com:alphagov/static into search-mobile-changes
Merge branch 'fix_related_ipad' of github.com:alphagov/static into search-mobile-changes
Merge branch '10_shades_of_grey' of github.com:alphagov/static into search-mobile-changes

Conflicts:
	app/assets/stylesheets/core.scss
	app/assets/stylesheets/static-pages/campaigns.scss
	app/assets/stylesheets/static-pages/error-pages.scss
Adding new Business Link logo to business pages
Merge pull request #71 from alphagov/new-business-link-logo

Adding new Business Link logo to business pages
Added padding of start/end points from map edges.
Various fixes, added more commands.
enable gem plugin.
rechteck
Merge branch 'master' of github.com:amcgala/amcgala
kommentare
vorbereitungen für rekursion im raytracer
try timdream's idea about blank.html
Merge pull request #873 from davidflanagan/hackkillme

put the hackKillMe handling code back in. I never meant to take it out i...
Auto-merge from branch 'master'
Adding a clear option in the browser menu, to empty the url box and give it focus to begin typing.
Merge branch 'master' of https://github.com/admc/gaia into admc/gaia
Indentation fix for my previous clear url menu option pull request
Merge pull request #1138 from admc/master

Just fixing the indentation for the clear url mini feature <eom>
phew fixed it just need to set shouldAutoRotate to YES in iOS5
Add method readTextFile(File) to read content of text file to String
dskjd
Handle special files just like normal files

As discussed in #923
Merge pull request #923 from dagwieers/special-file

Handle special files just like normal files
More helpful message when ssh fails.
Merge pull request #448 from jkleint/better-ssh-error

More helpful message when ssh fails.
uncomment votes
Add convenience header (gh-5)
Added webview to HelpScreen
SAKIII-5556 Converted quotes on touched lines to single quotes.
https://jira.sakaiproject.org/browse/SAKIII-5556
no http in avatar
Add CAF qcom/display variant

Change-Id: Ib028f4d81f610dc9549d4084f14ee5a652f33714
Merge remote branch 'cm/cm-10.1' into jb
Dot game dojo.
ui/
test for div.panel ajax load and data-reverse transition direction setting
add crc32 id and title to ajax panels ONLY when id is not present
bugfix: remember new id when included in an ajax div.panel
add comment
merging jq.ui: including "data-reverse" anchor attribute
use .title from the div.panel loaded via ajax
Minor fixes/enhancements for new ajax based panels
remove .appstack
split up full_tsqr into 3 files
script to launch the full tsqr jobs
small stuff
several scripts
move parse_and_change
Remove jQuery plugins from boot module.
Removed gemspec

No long a gem.
Removed HISTORY

Just use `git log`
Updated LICENSE
Took out 'offending' parts out of README
Allow easy server start with thin
Merge branch 'no_gem'

Firefly is no long a real gem. It is now a regular sinatra app that will
prove to be easier to maintain and extend.
change settigs
Some minor updates plus new trained BNs for testing
Merge branch 'dev' of git@github.com:ariesteam/aries.git into dev
Fix handling of boolean values in Config.cpp

http://code.google.com/p/phantomjs/issues/detail?id=55
Bugfixes in output, added socket files.
Basic input and output.
here is my test commit [otd: 29 wl: 2 hours]
added functional test automation for new
added turbo assets
added deletion of plailists
added deletion of plailists
Fixed a bug where .DEF would not strip out the comma separating two arguments, potentially including it in the name
Fixed a bug where the assembler wouldn't look for any addresses inherited from IO into ToastyIO.
Worked with assembly to write code to move and launch projectiles
Merge branch 'master' of https://github.com/artagesw/FROIDZ
Add fix script to wipe Session records
Updated the Version info to Beta 3
[RELOAD-63] Fixed the issue with missing file in the UI of the server.
Make body a Readable Stream
Provide type of body
Provide filename as a property of the body
ensure data/ directory exists when running migrations
Merge pull request #56 from cldwalker/mkdirs

ensure data/ directory exists when running migrations
Update config and tags
Make Variables ready for more general usage
Make regions Cloneable
Fix #region mask
The DoxyGenTest project where I've tried some comment styles and see it's effects.

Signed-off-by: avw <andy.van.woensel@groept.be>
Added './openflow/del_ports.sh tunnels' argument to delete lingering virtual tunnel ports.
Added 'config.enable_gre' and 'config.enable_subnet' options for experimental OpenFlow edge networking features.
Added host_node_vnet to database for holding vnet's subnet broadcast mac address.
Added vnet broadcast mac address to network event.
Moved sta and hva demodata initialization to separate files, and use variable for node name.
changing color schemes
Merge branch 'master' of github.com:ayau/trackcraze
finished privacy for progress
Added altera folders back to bin directory.

* Needs an entry in .gitignore, since git handles 10 GB of files really bad.
Changed screenlock key combination.
added error checking for current file.
zend framework changes
run dropbox
better colors
Merge branch 'master' into work

Conflicts:
	xmonad.hs
Merge branch 'work' of github.com:b-ryan/dotfiles into work

Conflicts:
	xmonad.hs
Make jruby and rbx happy.
fix Cloudflare app in demo
[master] Some SFTP tests.
fix
add
merge
added shift register to output block
custom bush completions
started to replace cl code with dash.el
initialize @query_params in the superclass
Merge pull request #175 from bleything/warnings

refix @query_params warning
Update root-image/etc/skel/.bashrc

hope u like :)
Merge pull request #1 from PierPP/patch-1

Update root-image/etc/skel/.bashrc
Adding editor class.
Accounts.password should not be set to {} here
Merged useful features from bones
Copyright owner is belaso.de now.

Signed-off-by: Christian Trutz <christian.trutz@belaso.de>
Fix #2085 : WebUI: Does not show torrents in sidebar for categories other than 'All'

unicode value in filter_dict would not be converted into a list
Catch exception when enabling/disabling indicator in classic mode
fix error in #2085 commit 3ca886ac7ad5: value may be a tuple
Fix #2175 : systemtray free variable self referenced before assignment

This is only the likely fix for the issue as I have been unable to reproduce it.
Fix #1946 : GtkUI: ReactorNotRestartable error when set as startup application
Fix #1963 : Unhandled OSError if permission issue creating default config dir

The fix now logs the error and exits. To log the error also required moving
the logger setup code to before any default_config_dir call.
WebUI: Catch potential undefined error when attempting to disable a plugin
Fix #2125
Clean up some json api code.
Fix issues with js eventmanager. refs #2046
Fix plugin methods not being available when enabled until refresh. refs #2125
Fix WebUI submenus closing upon mouse click
Update translation files from launchpad
Update Changelog, webui gettext, gitignore & compress js
pass distcheck
add html ftplugin
Forgot to include the file resource itself and the dependency on resource service.
Test: multiple definitaions of define (was really a definition within another define).
Add isType benchmarks.
packaged as ruby gem
Add filename to AbstractMessage | Methods
Initial revision.
Adjusted for Go1 release: Describe handling of Google sub-repositories.
Added initial MongoDB reporting module
Added XLS package
Fixed concurrent analysis bug
Merge branch 'development' of https://github.com/cuckoobox/cuckoo into development
Merge remote-tracking branch 'upstream/development' into development
user authentication (with problems)
bamt: improve command-line parsing
Merge remote-tracking branch 'origin/v0.2' into v0.2
Make Event#show localizable.
Merge branch 'master' of github.com:bitboxer/hcking

Conflicts:
	app/views/events/show.html.haml
Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown()

- can be triggerd by just adding -proxy=crashme with 0.7.1
- crash occured, when AppInit2() was left with return false; after the
  first call to bitdb.open() (Step 6 in init)
- this is caused by GetDataDir() or .string() in CDBEnv::EnvShutdown()
  called via the bitdb global destructor
- init fDbEnvInit and fMockDb to false in CDBEnv::CDBEnv()
Merge pull request #2024 from Diapolo/fix_qt_crash

Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown()
Merge remote-tracking branch 'nbites/master'
Merge remote-tracking branch 'nbites/master'
Merge branch 'master' of github.com:echown/nbites
Merge remote-tracking branch 'nbites/master'
Fixed colorcreator so we can see bright white
Merge remote-tracking branch 'nbites/master'
Color creator can now isolate the colors in the thresholded image
Merge remote-tracking branch 'nbites/master'
Merge pull request #305 from emamanto/master

Fix USOpen Hack
Merge pull request #306 from echown/master

Colorcreator fix
BIG FIELD
Merge branch 'master', remote-tracking branch 'nbites/master'
Merge branches 'worldview' and 'master' into worldview
scaled slightly larger, removed println
curljson
issue#1 완료
Renamed credentials module to credentials for consistency of requirement in the code.
Renamed spec.
Changed requirement from credentials to kredentials.
Bumped up the version
added more ID3v2 tags
fix error in ID3v1 genre handling
rename: portvalue -> controlvalue
refactor
refactor: put plugin label and uniqueid in <plugin> node
added: parse json posted on /clients url to add new jack clients
Add inclusion logic and fix bug
Initial project import
Merge remote-tracking branch 'origin/master'
Keep old README file
Fixes 1847 - Check for .nil? for regexp search on LoadError
advance intro first section, update biblio and add label to explicitation chapter
fixed last_searched bug (don't double escape slashes)
Merge branch 'master' of heroku.com:mugged
use ctrl-\ for screen
デザイン微修正。
update weekly n10 e n11
expanding tables...
Re-arrangement of tag segment analysing in progress
1.增加同步job shell脚本.
1.seeds.rb中增加组员.
1.去掉任务查看页面下拉框change事件;
2.小组任务index页面初始化的时候数据不载入;
3.member模型增加task关联;
4.修改小组任务index页面小组下拉框到列表tab中.
Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.

 Committer: brian <brian@files.cnlab.net>

 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   include/os0spinlock.h
	modified:   os/lock/os0spinlock.c
fixed AttributeModifier
final fix wm
fixing something in the awsUrlBuilder (Signature still not working, ask access keys to Davi)
Add headers to prevent caching
jQuery UI Spinner demo
Added another method of accessing location data: GeoLocation.java; added
more debugging GUI elements.
Sneaky tabs, how we hates them!
update algebraic.py
update algebraic.py, remove crb.py, hdf.py, add tests/TEST.py
Merge branch 'master' of https://github.com/mlaaraie/pylayers into mlaaraie-master

Conflicts:
	pylayers.egg-info/SOURCES.txt
	pylayers/location/algebraic/tests/TEST.py
Merge branch 'mlaaraie-master'

Conflicts:
	pylayers.egg-info/SOURCES.txt
	pylayers/location/algebraic/algebraic.py
change fault source name to fault_name
selenium ide extension
Link to gh-page from README for bookmarklet installation.
add refresh menu item; double click expanded folder will force refresh; block 226 logs; small fix;
add SSL authentication support; improve verify cert dialog; host to ip will be only in curl (not display);
Merge branch 'master' of github.com:calavera/ey_cli
CLI uses code that is local to it
Explicit display that no environment will be booted if requested
Display IP address for an environment
Environments correctly created with --stack and --ruby-version requested
Use SIGINT to stop and print results so far
Use a head/tail like calling convention dimsumgo -n filename
added first publication
Cleaned up the getUser() method, just cause it was buggin' me