labofsahil/github-event-dataset-2012 huggingface dataset:
ZAS updates and possible fixes.  Zones will no longer connect to a space tile under a door.  Added a secondary airflow value for what can move large objects, like closets.
Fixed bug with calling the air master.
Merge pull request #1381 from CIB/master

Bugfix
Merge pull request #1382 from Erthilo/master

Compile fixing.
fix for "the floor emits a pulse of energy"

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
artifact machinery now uses power

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
Merge pull request #1380 from SkyMarshal/BugFixes

ZAS updates and possible fixes.  Zones will no longer connect to a space tile under a door.
Prevented genetics from scanning headless people and permanently breaking the cloner.
Final parts of ZAS.  Works like a charm now.
Merge pull request #1384 from SkyMarshal/BugFixes

Final parts of ZAS.  Works like a charm now.
Sanity for the "give" command, changelog.
Merge pull request #1385 from SkyMarshal/BugFixes

Sanity for the "give" command, changelog.
Merge pull request #1383 from Drieden/master

Prevented genetics from scanning headless people
Merge branch 'master' of https://github.com/Baystation12/Baystation12
talking crystal can be heard with ghost ears

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
Merge pull request #1386 from caelaislinn/master

anomaly tweaks and changes
added acid_act() proc, works similarly to proc on luna code, fixed some anomaly bugs

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
Merge pull request #1387 from caelaislinn/master

additional anomaly tweaks / fixes
Fixed compilation error and moved acid_act()
Medical System Updates...

* Dragging someone while injured (brute) will have a small chance of injuring them further that increases depending on how damaged they are. This coincides with the blood spatters that are already generated.
* Blood is now actually lost from the person being dragged.

* Added splints that can be applied to broken arms and legs, and will reduce effects of broken limbs. These can be removed the same way as handcuffs. They show up on the mob and on examine.
* Added an autoinjector that can only hold five units, but acts like a hypospray.
* Added an advanced medical kit that Medical Doctors spawn with that has Advanced Trauma Kits, Advanced Burn Kits, autoinjectors, and splints.
* Health Scanners now show unsplinted fractures ONLY in arms or legs.

* People in critical (less than -50 health) from external trauma (100+ damage from brute and/or burn) bleeding, and with unsplinted limbs, will send a message to anyone trying to drag them, to warn them it would be a bad idea trying to move them. They will suffer a lot more damage if dragged while lying down.
* The correct procedure is therefore, A) Bring a roller bed, or B) Splint all limbs, stop all bleeding with gauze, and then drag them.

* Fixed CPR being performed at weird health levels.
modified travis.yml config with composer
update parent pom
Merge branch 'master' of github.com:Fabric3/maven-parent
add own rule yep
updated NameForm and added framework for LocaleBuilder
updated NameForm and added framework for LocaleBuilder
removed JAXB annotations from NameForm.parseLocale
Adding locale to NameForm and updating specification for Name and NameForm to clarify our intended use of these classes.
Removed LocaleBuilder with the expectation it will become a FamilySearch-specific class (not part of the GEDCOM X model).
Further model clarification around Name, NameForm and NamePart.
Revert "Further model clarification around Name, NameForm and NamePart."

This reverts commit 3c8864f8c0781c363fda08ce0687da64e8404651.
Re-apply "Further model clarification around Name, NameForm and NamePart." without the crlf glitch.
Adds some initial thoughts on NamePartTypeQualifiers.
Revert "Adds some initial thoughts on NamePartTypeQualifiers."

This reverts commit 6151f280efd0ae1cacd6cb1c150d274be642021d.
re-apply 'Adds some initial thoughts on NamePartTypeQualifiers'
Merge remote-tracking branch 'remotes/origin/master' into name-model
collapse document types into a single data with with a 'type' property
updating code to reflect document data type simplification
Refactor to removed notion of "primary" name form.  Also makes NamePart extensible.  Adds a name part qualifier type list.
Merge remote-tracking branch 'remotes/origin/master' into name-model.

Removed notion of "primary" name form.
Modified the recipe to include an extension element.
Updated the documentation to reflect extensionElements in some places it was not being reflected.
Updated the documentation to reflect extensionElements in some places it was not being reflected.
adding extra helper methods for find extension
profil: ajout du timestamp pour les dernieres activités
set onError properly
Cancel button now in red
Post_voter is now positioned correctly even if posts are shown in a scrollable div. Thanks @mafo5
debug material
1.2 Features
cap/stage: fixed directory typo
In classref.txt (Scala), annotaion -> annotation.
Exception inherits from Unauthorized
Adds note in readme on how to run test cases

Signed-off-by: Akash Manohar J <akash@akash.im>
agregando gui ui
gui semi modificada
Merge branch 'master' of https://github.com/HecThorFer/CSLUESFMO
gui semi modificada
Another change to the ascii README title
Rearranged Menu Buttons and Added Extras-Button
Cleaner handling of offline attempted use - @simplexml_load_string fix
Parse the input HTML for <h1> heading in CLI batch controller
Initial commit of Oercommons_serv provider library, 24-26 August work
Adding test/ offline XML-RDF data - Controller plus assets
Fixing an issue with the resources section which stop the copying of files in the resources section to the target dir.
Disabled ObjectiveFlickr support.
dont open pipes for mime type even if size > 0 closes #80
docs(tutorial): replace JsTD with Testacular + drop snapshots

JsTD references have been replaced with Testacular stuff.

snapshots are PITA to maintain so I'm dropping them, everyone loves the Git
version anyway.
chore(jstd): remove JsTestDriver from our repo

Testacular FTW!
chore(jasmine): remove Jasmine from our repo

it's bundled with Testacular, so we don't need it here
chore(validate-commit-msg): allow * and - in scope string
chore(jstd-scenario-adapter): remove from our repo

since we don't need the adapter for JsTD (testacular contains its own),
I'm removing this dead code.
Using twitter bootstrap datepicker instead of jquery, and applied some styles to time field while offer/looking for a ride.
change the copyright language
2 main changes

ADDED: Some necessary files
CHANGED: COMPLETELY the installation system
Some main changes

ADDED: New check of .minecraft
CHANGED: Restaurer system.
CHANGED: Uninstaller system.
CHANGED: Instalator execution system.
DELETED: Classes which are not used.
Some changes

ADDED: Support to Mineshafter. (Not implemented yet)
CHANGED: All items resources to a new package.
CHANGED: RunMinecraft.jar
added fill style to new indicators
Fixed problem in RadialQuarterS with repaint
adjust location of README
Added simple_form, and frontend design
Added vector of spells update and delete in gameplay
added names to all spell particle xmls and made spells control their particles
fixed ice destroyed effect xml
Fixed fire spell so multiples can be created and no memory leaks
Added message union and message queue.
LCL->TAI
LCL->TAI in
make icu4c a dependency
If the target element is fixed to the viewport, any element positioned adjacently must be the same
last commit: Sun Oct 28 20:26:07 WEST 2012
adde d
del detached_file
added set person for combineTable & changeTable
Method Flights ophalen Voor WebAPP
Clarifying that it's two commits
Attempting to set up the hashbrowns.
Continuing hashbrown development.
Initial commit for hash table functions
Merge branch 'master' of https://github.com/CyDrive/CompilerKit
Syntax error fix
Merge branch 'master' of https://github.com/lawrancej/CompilerKit
Added stub classes.
Latest code with included empty set generated class
added optimizer class
Updated EmptySet to remove private struct
Okay, fixed everything so the test suite runs now.
Updated the include/ folder, dropped unused headers.
Merged in Kyle's EmptySet
Merged in RoboCafaz's changes. Added dummy to private to ensure compilation.
Updated CompilerKit.h
Updated include header structure
Minor modification to boilerplate generator.
Updated HACKING document.
Updated HACKING document.
Modified test suite
Issue #484

<a href="https://github.com/valums/file-uploader/issues/484">#484</a>
I know it says it has been put on hold (but this adds support to the php file to customize the inputName)

So if you use
inputName in the javascript options
you will have to set the $inputName (see commented example on line 12)
Move development dependencies into Gemfile.
[test feature] easy form build
[spec/requests] wip admissions
[spec/requests] refactored admissions and factories
[spec/request] wip admissions
[spec/requests] admissions
factories fixes
WIP : try to change the action buttons and input classes
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop
Merge branch 'form_helper' of git://github.com/tapalilov/GAKUEngine into develop
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop

Conflicts:
	core/app/helpers/gaku/form_helper.rb
WIP : Change form helpers
[fix] dynamic state select input/select
[spec/requests] add more schools specs
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
[spec/requests] campuses spec
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
[form helper] clean and fix buttons width
[specs|views] admin
[refacotr] submit and cancel buttons for all forms
Added combat.js, configured turn processing
Added reworked processors
Changing BOXMAIN_APPS to PROJECT_APPS.
Dogfooding django-redis-cache.
Added range assertions.
manager: implemented ws
test: removed old transports tests
transport: rewrite websocket transport to use ws client
*: added ws dependency
test: removed protocolVersion private api from tests
Editor core forcedly updated to full version (to provide some required features). Toolbars restored. Non-actual tabs removed from link, flash and image dialogs, showblocks plugin added
Implemented factory methods for SymbolImpl and Nonterminal
Implemented factory methods for RightSideSymbolImpl
Implemented factory methods for RightSideImpl
Implemented factory methods for ProductionImpl and GrammarImpl
Added party creation/leaving/invitation/join commands
Merge pull request #235 from Logdog82/shadowVibrator

Implemented ShadowVibrator
Don't show the SwiperChooserDialog if a SwiperType preference has already been set.
Merge branch 'master' of github.com:pivotal/robolectric
Turned ValidatingEditText back into a custom view
Merge branch 'master' of github.com:pivotal/robolectric
Merge branch 'master', remote-tracking branch 'upstream/master'
Merge branch 'master' into build
Tests added for journals controller (journal for class head).
Timetable link in class head toolbar added.
Class head can see timetable of his class.
Few tests added for class head timetable.
Create codeReviewNotes_Prachie
Added a for loop to the main function
Grammer fixes on the alerts
MAG-13 Entity: customer / MAG-24 Method: listing
delete unused file and modify .gitignore
Stars can now be displayed.
Remove unused page info from CaseSearch
media queries, countdown
modified:   main.py
modified:   mongo-python-driver
new file:   tpl/get_arbiters.json
Ticket #2768 ('make check' failed)

tests/.../do_panel_cd.c: fix test when 'HOME' contains trailing slashes.

Steps to reproduce:

    $ HOME=${HOME}/ make check
    Running suite(s): /src/filemanager
    cwd=/subvolumes/var_tmp/paludis/app-misc-mc-9999/temp
    mc_config_get_home_dir ()=/subvolumes/var_tmp/paludis/app-misc-mc-9999/temp/
    0%: Checks: 1, Failures: 1, Errors: 0
    do_panel_cd.c:86:F:Core:test_do_panel_cd_empty_mean_home:0: Assertion 'ret' failed

The patch adds home dir path normalization.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Merge branch '2768_do_panel_cd_fix'

* 2768_do_panel_cd_fix:
  Ticket #2768 ('make check' failed)
Ticket #2939 (highlight xml-pair in mcedit)

    now xml-pair highlighted in mcedit

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
change type of visualize_tags from int to gboolean

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
code refactoring of mcedit: created separate source files for store XMLTAG related code

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Make a structure for store xmltag info in WEdit structure

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
NEED SQUASH: some refactoring

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Ticket #2832: Fixed mcedit: unable to save changes in "Safe save" mode

If mcedit is configured to use "Safe save" I'm unable to save changes to existing file.
Same problem is for editor_option_save_mode=2 (backup mode)
Saving to new file works.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Merge branch '2832_mcedit_safe_save' into 4.8.1-stable

* 2832_mcedit_safe_save:
  Ticket #2832: Fixed mcedit: unable to save changes in "Safe save" mode
add circle circle intersection, add point snapping to circle circle intersections
Tar bort 'läs mer'-länk från startsidan.
Rozbudowa instalatora (alpha)

* [Add] Działająca opcja zmiany języka
* [Add] Wielojęzyczność na poziomie podstawowych komunikatów
* [New] Przeniesienie stylu instalatora do pliku install.css
Item11716: correct paths in generated MANIFEST; Item11851: break targets into individual modules, to ease maintenance and make developing new targets easier

git-svn-id: http://svn.foswiki.org/trunk@14796 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11716: remove hack

git-svn-id: http://svn.foswiki.org/trunk@14797 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11854: Configure shows empty error blocks

git-svn-id: http://svn.foswiki.org/trunk@14798 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item9693: text change

git-svn-id: http://svn.foswiki.org/trunk@14801 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item9693: text change

git-svn-id: http://svn.foswiki.org/trunk@14803 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item9693: do away with unnecessary capitals

git-svn-id: http://svn.foswiki.org/trunk@14804 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item9693: more capitals

git-svn-id: http://svn.foswiki.org/trunk@14806 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item9693: improve configure email test text

git-svn-id: http://svn.foswiki.org/trunk@14809 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11855: Move Configure Proxies setting to Security and Authentication

git-svn-id: http://svn.foswiki.org/trunk@14810 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item5587: update plugin to work on Foswiki

git-svn-id: http://svn.foswiki.org/trunk@14812 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item5587: remove unused file

git-svn-id: http://svn.foswiki.org/trunk@14813 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item5587: update manifest

git-svn-id: http://svn.foswiki.org/trunk@14814 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item5587: add image files to meta

git-svn-id: http://svn.foswiki.org/trunk@14815 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11838: Doc fix

git-svn-id: http://svn.foswiki.org/trunk@14816 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item9693: fix link

git-svn-id: http://svn.foswiki.org/trunk@14818 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11858: Clean up AJAX interface

git-svn-id: http://svn.foswiki.org/trunk@14819 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11859: Don't remove <br /> tags at end of line

This was done by an old TWiki fix because TMCE used to insert <br />
before <p> tags.  It doesn't seem to do this any more.

git-svn-id: http://svn.foswiki.org/trunk@14820 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item9652: analyse.pl (script generating HallOfFame) wrongly thinks the latest release is 1.1.4. Thanks Kip for heading me in the right direction

git-svn-id: http://svn.foswiki.org/trunk@14822 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item2306: Fix statistics script so that it will only ever process ONE month, not everything since a date up to now

git-svn-id: http://svn.foswiki.org/trunk@14823 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11862: Item11814: Fix roundtrip of URL macros

Broken by the intital fix to Item11814.  Revert the fix to Item11814 and
remove the url decode.

git-svn-id: http://svn.foswiki.org/trunk@14826 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Add SessionHelper page translation
Ability to autohide panel
Implemented container Is::Empty, EquivilantTo and Contains
added dropped item code
Haunter added
Merge remote-tracking branch 'MasterBranch/master'
Haunter Eyebrows Fixed + Magnemite fix
Merge remote-tracking branch 'MasterBranch/master'

Conflicts:
	minecraft/pixelmon/models/pokemon/ModelMagnemite.java
Merge remote-tracking branch 'MasterBranch/master'

Conflicts:
	common/pixelmon/config/IDListPixelmon.java
Merge pull request #164 from GodOfWar526/master

Haunter Added in
added mouseover-effect for tracks
- ActionRules fixed
huono pdf, pois
Revert "Added alias to pull upstream changes"

This reverts commit 7a89b3ed5dfada030a3c5ca7d3461557d58ee48e.
Some work, added Analytics
Some contact details…
fixed: warning message 'division by zero' when no results
MC-Craftcom - plugin for MC-Craft.com
config/version: set version to 2.95.2 (OpenELEC-3.0 Beta 2)

Signed-off-by: Stephan Raue <stephan@openelec.tv>
busybox: add applet 'apt-get'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
fixin up Controller real nize
changed typo in RoadType enum
FileLoader & Canvas
spring cleanin
Added documentation of options of run method; added documentation of state bits.
Merge branch 'devel' into documentation
Updated a documentation for 'actual_term' option and actual processing.
Version 0.2512 with actual_term & updated documentation
demo code workspace week 3
Public release, hopefully
automake, bash, eigen3, libbsd, lrzip, mkvtoolnix, mpg123, readline, unetbootin, xorg-server
#8 PHPUnit - Navigation, treeview, Bugs User model and view collection
#5 Documentation
Styles for positioning page
Finish demo app again3
fixes
Merge branch 'master' of https://Renasu@github.com/Raane/fellesprosjekt.git
Tutorial version

I used this commit to show Carol Lynn how git works.
Add "mssql" support queries

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
TrueCopyService: fix autonumber bug

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
SubdivisionService: check possible non-existing motherledger (happens in the province)

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
FAASService: check land reference excluding current records

Signed-off-by: Jessie S. Zamora <jzamss@gmail.com>
Added 22,24,25,27,28
implemented new features
Beta 16: Removed deadlock thread from greylist stream reader
Beta 17: SECURITY UPDATE TO REGIONS; Added general build permission check at end of loops to remove grief potential.
Beta 18: Fixed loophole in regions with block placement/destruction; Added entity-purging per world
Added permissionNode that allows placement of banned blocks.
added missing def file
Core/Achievements: Fixed achievements with ACHIEVEMENT_CRITERIA_TYPE_…
…WIN_ARENA

(Ported from TC)
Ch4 Over
Not centerned after 5.1.2
remove example
Removed default
DOne?
CH5.3
Finish layout
update revpos in _attachments after put_attachment

this fix a bug preventing store after put_attachment is called
v0.06.03
Provide a faster way to get a location. Adds BUKKIT-3120

Currently when a plugin wants to get the location of something it calls
getLocation() which returns a new Location object. In some scenarios this
can cause enough object creation/destruction churn to be a significant
overhead. For this cases we add a method that updates a provided Location
object so there is no object creation done. This allows well written code
to work on several locations with only a single Location object getting
created.

Providing a more efficient way to set a location was also looked at but
the current solution is the fastest we can provide. You are not required
to create a new Location object every time you want to set something's
location so, with proper design, you can set locations with only a single
Location object being created.
Update entity state correctly when marked as persistent. Fixes BUKKIT-3123

When a mob is marked with the persistent flag (animal or anything with
setRemoveWhenFarAway(false)) the entire block of code for checking if they
should be despawned is skipped. However, one part of this code updates the
mob state if a player is close enough to them. It turns out this state is
used by the AI system to decide if the mob should move around randomly or
not. To stop mobs from being frozen in place we now update this state if
the persistent flag is set as well.
Correctly shoot arrows with the spawnArrow Method. Fixes BUKKIT-3116
[Bleeding] Fix NPE in getBedSpawnLocation. Fixes BUKKIT-1949
Add SlotFurnaceResult for diff visibility
Implement FurnaceExtractEvent. Adds BUKKIT-2114
Merge pull request #1 from Bukkit/master

New commits
Version bump in DESCRIPTION.
Titre des conversations changé
more indenting niceness
Added scheduler and ability to fetch new Twitter updates from @balancedstatus
доделал метод CCModel->save()
Merge pull request #60 from Shandem/4.8.0

4.8.0
Update Documentation/Extending-Umbraco/index.md

Adds a simple description to packages section, to test the github runner is working
Update Documentation/Reference/Templating/index.md
Update Documentation/Reference/Templating/Macros/Xslt/index.md

xslt index page
Added missing .md files #h5is
Merge pull request #61 from Jayshoe/4.8.0

Added missing .md files #h5is
Added Mvc view code example to Media Picker
Added interim link for macro paramater editor blog post
Fix capitalisation of MVC
XSLT title update to new format on media picker
added more docs for hijacking routes.
Merge remote-tracking branch 'umbraco4docs/master' into 4.8.0
Removed incorrect optimization for landmarks and path markers.
Added detection for type to Doctrine form builder.
Fixed deprecated syntax in stackato.yml
Release v.1.2.1

Factory fixed
Implementación terminada, todo funcionando
Update Scripts/Libs/minimap_wizard.lua
Fix empty bounds.
Change init of pluign for allow add post types via theme
small changes for codex
update language pack DE
delete my test plugin for cpt
Update oscam to r7518
Add "My Device"
Fix auto updates.
Update drawables.
Update to new RW code.
Clean up files.
For the n00bs (me) that just directly clone the repo
Altering configuration.
- Fixed bugs in HTML analysis output, SPSTF
Optimisation de l'empreinte mémoire
Fix data snippet
Fixed projectile guns damage message
Merge pull request #38 from mikeclemson/fix-projectile-damage-message

Fixed projectile guns damage message
fix for queries returning multiple result sets
fixed boolean/number bug
(Android) Small changes
(PS3) Use rarch_settings_create_menu_item_label in PS3 port now too
Fix spurious segfaults when ratio dips below 1.
(Android) Initial work on input
started to move controllers to admin zone
Nuevo Menu!, ojo que agregue un proyecto mas, es una libreria de android para lo del menu. Ademas bug fix de los mensajes de error.
Repito como en el commit anterior, cuidado que agregue un proyecto mas, es una libreria para android para lo del menu.
Merge branch 'master' of https://github.com/Throy/freezing-ninja

Conflicts:
	GeoRedUy.Client/src/georeduy/client/activities/MapaActivity.java
Added limit example.
Make Python examples compatible to Protocol V2.0
Merge branch 'master' of github.com:Tinkerforge/dc-brick
changed src directory from challengr to src
Setpos Spam Filter + Update default setttings

Need feedback & also for other spam filters etc...
Updated docs, txt docx pdf
GUI added by Josef Melvald (myval)
Merge remote-tracking branch 'origin/master' into GUI

Conflicts:
	Library/Library.py
Various Fixes
Added a GUI start.py to help with converting files...
First prototype of image gallery.

The image path might have to be changed. It sometimes depends on what
phone you're using.
Update license and copyright information on FragmentListView and NoteAdapter.
Made another change in license information.
Licence file added.
Merge branch 'settings'
Merge branch 'master' into note_notification
A new broadcastreceiver class that making a notification and by clicking open a specific note
Merge branch 'note_notification' into note_reminder
Added a class representing a reminder/alarm. You can pick a time and a alarm will be set
Merge branch 'note_reminder' into snotebar
Added an interface to the fragment that will replace the snotebar by clicking on icons and the required enum for that
Added a class representing an icon with text, that can return a fragment and made som code clean up
Add two tests, testing the CAB and the interaction between list and edit view.
Placed license at the top of the file.
Fixe conflicts appearing when merging database into listview.
Changed flags for intent and pendingintent
Merge branch 'note_notification' into snotebar
Added some javadoc and changed method name in interface
Fragment reminder is now implenting the 'pluginableFragment'
Started refactor code from fragment notetext to activitynote
Fixed typo.
Updated Readme.
Updated Readme.
Modified regex used in String.prototype.toQueryString()
orderby descending
CAppSettings: UpdateData(bool fSave) -> SaveSettings() and LoadSettings()
CRenderersSettings: CRendererSettingsShared removed; CRendererSettingsEVR -> CAdvRendererSettings; m_RenderSettings -> m_AdvRendSets
PGS subtitles: Cosmetics.
PGS subtitles: Parsing improvements (1/2).

Correctly parse the subtitles so that none is missing.
PGS subtitles: Improve the traces.
PGS subtitles: Parsing improvements (2/2).

Fix missing subtitles in some cases.

This commit and commit 809931e08c9e0dcb77cf9b01fe95415232e3785b fix ticket #48, ticket 515 and ticket 2533.
added invoice info to stock control
add jekyll and ES to my technologies at devseed,
таблица=)
Ref #3026 : Event log filter V1, before functionnal review
Expose setStyle and delStyle methods

This is meant to be used by subclasses to do deletion and reset
of associated styles (particularly for setting the public style
from an authenticated request, see
https://github.com/Vizzuality/Windshaft-cartodb/issues/41)
Add afterStyleChange and afterStyleDelete callbacks

Includes testcases
Use 8083 as the default testing port
Release 0.4.10
harder than i though
Remove logging
Update version
Corrige typo na página de cidade-sede.
Merge pull request #1 from vitorbaptista/master

Typo na página de cidade-sede
解决了 黑线问题  窗口大小调整时背景截断问题

outline  父容器设置最小宽度
- arbitrary data added
buttonized the rest of the cart, got rid of placeholder badge #109
starting upgrade to rails 3
fixed migrations to be partially compatible with existing installations
changed error messages to be more informative for reservations. possible issue with validating available
Merge branch 'development' of github.com:YaleSTC/reservations into development
#221 delete user's cart_reservations when finalizing reservations
Merge branch 'development' of github.com:YaleSTC/reservations into development
Merge branch 'development' of github.com:YaleSTC/reservations into development
Rajout de pas mal doptimisations suite a lutilisation des table cache
Se agrega carpeta de proyecto de eclipse
add a package
add peng sql txt
create TARP Kinect Support
Merge branch 'master' of https://github.com/YoshihisaMaruya/TARP

Conflicts:
	TARPApi/TARPKinectSupport/WindowsGame1/WindowsGame1.suo
	TARPApi/TARPKinectSupport/WindowsGame1/WindowsGame1/WindowsGame1/Game1.cs
	TARPApi/TARPKinectSupport/WindowsGame1/WindowsGame1/WindowsGame1/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TARPApi/TARPKinectSupport/WindowsGame1/WindowsGame1/WindowsGame1/obj/x86/Debug/ResolveAssemblyReference.cache
	TARPApi/TARPKinectSupport/WindowsGame1/WindowsGame1/WindowsGame1Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Improve data fetching for machineconsole
Styled Actionbar background
Prace nad obsluga zdarzen (okno i baza).
'Automatic build of: ProcessPuzzleUI-DomainLogic-0.0.1.jar'
 'Automatic build of: ProcessPuzzleUI-DomainLogic-0.0.1.jar'
 'Automatic build of: ProcessPuzzleUI-0.8.0.js'
 'Automatic build of: ProcessPuzzleUI-DomainLogic-0.0.1.jar'
Define namespace.
Desktop.destroy() hides HTML elements during change language or skin.
missing ) typo
Update _config.yml

add Google analytics and disqus support
Apply jpmckinney/active_admin/commit/1c4bca112fe49d321922d9251f61d116b007c14b (active_admin/pull/1470).
Statistiques présences : Par services et par personne
back to store
report named for store
Merge pull request #11 from matjkd/master

back to store
Fix CacheInode config block

The config block "CacheInode_Client" was recently
renamed to "CacheInode", so we need to update our
config.  This patch also sets Attr_Expiration_Time
back to 120 to avoid performance impacts

Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com>
Updates for rebase

 * Removed SONAS debug define
 * Updates for new glist member exportlist_t->exp_list
   All exportlist_t->next changed to exportlist_t->exp_list->next

Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com>
Fix strike
Sequence loading commits
Ensure that all broadcast finish time checks are done the same to stop potential create/delete in same call. Fixes #31.
Merge branch 'epg-rewrite' into initialscan
added user and role named queries
integracion diseño home y detalle suscripcion
Better title for open file dialog.
Shell script reorg.

- Move scripts into a new "scripts" directory
- Add package_www_files.sh script for packaging the mac www files into Brackets.app/Contents/www
- Add support to Brackets.app to load from Brackets.app/Contents/www/index.html (if it exists)
Windows: load www/index.html if present. Hold Control key when starting to clear saved launch file.
Update README.md
Update README.md
Merge branch 'master' into glenn/scripts-dir
Update README
Quit app if user cancels the 'choose startup file' dilaog.
Better title for open file dialog.
Exit application if user cancels the initial 'choose startup file' dialog.
Merge pull request #59 from adobe/glenn/scripts-dir

Add script for packaging www contents into Brackets.app
implement brackets.app.language
Merge pull request #62 from adobe/glenn/issue-60

Quit app if user cancels dialog to choose initial file
implement brackets.app.language on windows. change API to return wstring
Add locale comment clarification. Return CefString from GetCurrentLanguage()
update windows to return CefString
set CefSettings.locale
set CefSettings.locale on mac
Merge branch 'jason-sanjose/loc' of github.com:adobe/brackets-shell into jason-sanjose/loc
bug fix. change from system locale to user default.
set CefSettings.locale in common cefclient.cpp instead of OS-specific impl
added node_modules to ctrlp ignore (for good this time)
inserting solution framework and initial test
Wrote documentations. This closes #4.
Added Filter.
MEDIUM / Fixed issue with DropScheme not active for inherited target EP
IMPORTANT: Moved TOCBrowser.fib to appropriate project (was
flexodocgeneratormodule but belongs to flexodoceditor).
MEDIUM: Added list (ul & ol) buttons to wysiwyg
MEDIUM: Fixed hiding of progress bar
MEDIUM: Removed Sysout
Merge remote-tracking branch 'github/1.4.5' into 1.4.5
Доработка плагина файлового менеджера, теперь может вызвать глобальную функцию при выборе файла или установить произвольный атрибут.
Log oauth information
Try pp
Inspect w/o !
Don't use inline attachments until you can use them from Devise
removed redundant files and modulated lists
FIX/CLEANUP docstring
FIX: _make_stc no longer exists
Merge pull request #139 from dengemann/data_frame_doc

FIX/CLEANUP docstring
FIX Epochs: preload=True

Avoid reading epochs from disk twice with preload=True
Merge pull request #143 from christianmbrodbeck/preload-fix

FIX: Avoid reading epochs from disk twice with preload=True
Merge pull request #140 from Eric89GXL/minor_fix

FIX: _make_stc no longer exists
FIX : mne_compute_proj_exg due to change of function signature
FIX: raw dtype, preload
FIX: doctest, verbose
Merge pull request #147 from mluessi/raw_doctest_verbose

FIX: doctest, verbose
FIX: avoid duplicate EEG proj
ENH: Raw proj handling
FIX: Nosetests werent testing correctly
Merge pull request #150 from Eric89GXL/cov-test

WIP: Nosetests werent testing correctly
ENH: Adding exact test, halving time for tail == 0 case
ENH: Clustering by sign for two-tailed tests
ENH: Adding src dist support, dist connectivity
FIX: Adding equivalent commented code for distances
ENH: Adding optimized spat-temp function
FIX: Minor fixes
autoload lib/
WIP:feature
WIP:feature2
worker refactoring
used nested_form for model _form views
Merge branch 'feature/jmeter_railtie' into develop
new file:   rsc/fsl/tbss_x/swap_subjectwise_32
 	new file:   rsc/fsl/tbss_x/swap_subjectwise_64
 	new file:   rsc/fsl/tbss_x/swap_voxelwise_32
 	new file:   rsc/fsl/tbss_x/swap_voxelwise_64
 	new file:   rsc/fsl/tbss_x/tbss_x
 	new file:   rsc/fsl/tbss_x/tbss_x_index.html
modified:   globalvars
	modified:   misc/scripts/extractConfoundsFromNativeFuncs.sh
	modified:   run_script.sh
	misc/scripts/eddy_correct_new
Merge pull request #4 from akotomanov/master

+Gitbox.app
fix webkit bugtracker link
Added Wordpress section
Added Git section
Nightly CSS Backup Sun Aug  5 22:13:55 CDT 2012
using lscache for localStorage key expiration.
small fix
some refactoring on GUI
gui: implement autosizeWidth
gui: buildControlList
more on gui.list
more on gui.list
gui.list with border
queue: more actions
more on gui
debugging
gui layout logic
gui layout logic
more on gui
gui: border around song display
small fix
Complete overhaul of the console system.
It worked well for very basic functionality, but for anything complex or creative it was quite deficient. On the downside, the implementation now *requires* render-to-texture in order to run. I suppose that's not too harsh, but it might be a good idea to implement an alternative at some point. Changes:

*Consoles no longer represent application windows. That role has been usurped by the ConsoleFrame class.
*"Virtual Consoles" are no more. Instead, the frame has a "root" console that is set to the dimensions of the console frame to which it is attached. Additional consoles can be added with variable dimensions, constrained by the root dimensions.
* In the SDLConsole implementation, root consoles are implemented as the primary render target. Non-root consoles are implemented as texture targets that are rendered to individually, then copied to the main target.
Create the CUDF core sub project.
Made some more Ch.5 edits and sprites.
Adding more general help system
Adding 'rm' operation
完善电子优惠券
set Ansicon configuration for nvidia graphics card
Bundler, tests now execute (note that they don't pass).
Labels: update and init methods.
Moved from lab-computer: work of 7.20
Add WFD Transport debug

Change-Id: I890b0592da0d9bc200c2361fc7981f003e56dd95
WIP components and containers
audioserver*ocilloscope type thing
wq
Merge branch 'master' of https://github.com/alrondan/jackie-chan

Conflicts:
	src/CMakeLists.txt
	src/visualizer/window.cpp
	src/visualizer/window.hpp
Reverting failed init script toying.
translate is not idempotent ...
Added braces and microtime(TRUE) for caching patch (Issue #1370)
MooTools added MTAjaxInPlace based on the original AjaxInPlace. Also added an example of it's usage to the example project.
MTAjaxInPlace java file. Forget to commit it with the others.
add Method : trimZeroInFrontOfNumbers

trim leading 0 from a (Number) String
add 3 Methods to ERXArrayUtilities

arrayIsNullOrEmpty(NSArray)
arrayIsNullOrEmpty(NSMutableArray)
arrayToLogstring
javadoc

japanese javadoc
3 new Methods to ERXValueUtilities

String[] stringsToStringArray(String ... anyStrings)
Object[] objectsToObjectArray(Object ... anyObjects)
String stringArrayToString(String[] sa)
ERXProperties new 6 Methods

String stringFor2Keys(String s1, String s2)
String stringFor2KeysWithDefault(String s1, String s2, final String defaultValue)
stringFor3Keys(String s1, String s2, String s3)
stringFor3KeysWithDefault(String s1, String s2, String s3, final String defaultValue)
stringForManyKeys(String[] ss)
stringForManyKeysWithDefault(final String[] ss, final String defaultValue)
New TCP/IP Class

This Class provide some Helper for TCP/IP and is the foundation for a new Method in ERXProperties. english javadoc will be provide later.
new InIpRangeOperator class

Provide Properties setup like

test.sampleip3.@forIP.192.168.1.50-192.168.1.90 = avalue
delete 2 duplicated Methods

Thanks to Pascal and darkv
javadoc

japanese javadoc
javadoc

japanese javadoc and english javadoc fix
fix some javadoc
add valueFromPlistBundleWithKey

Returns the key in an plist of the given framework.
@param bundle - bundle name
@param plist - plist Filename
@param key - key
@return Result
change repeating code to one Method

fix also some deprecated calls
new Class ERXStaticResource

see javadoc
add ERXHyperlinkResource

New Method for JqueryMobile and SnoWOman CMS
add a hook in ERXApplication to modify URLs generated by ERXResourceManager
code cleanup
add methods to check if a property exists
fixed qp7
added preliminary discussion and example on Flask
Got rid of some comments. Final cleanup of code.
just can't get enough
Fix in _change_seqs.
Bugfix in listing labeled atoms.
Random generation of labeled species.
Building bid responses correctly
Better access for bid button
Move yui gem to :asset block.
foundation tuning
's' for seconds in timedelta tag
0.3.3
added !obj
Cleanup

Change-Id: Ie987b6c4aaf0ae64dfefd36f175b37bf75e7be0a
limits can be passed to Model Find queries now
Refactor.  I was able to cut 11 lines of code and rename some varaibales and methods for clarity. :)
tweak game methods
increment gem
test(transition): Improve tests on promise resolution & Add some doc comments
pushing downsample_wrapper.
Bumped version to 0.1g.

Also updated versions.txt
Allow multiple comments, check if the whole string was parsed.

Bug with multiple comments one after the other is fixed.
Now, when the JSON ends too quickly (e.g. with an excessive '}' sign) it
will throw an error.
added core search
added App controller
corrected section
added core section
removed delete for core
clean up
added abilities check
added flash messages
cleanup
cleanup
fix rule, that auto type conversion has to stop *gg*
Friday Saturday work from home. With process resource usage done (but historical data still loading) and working on user profile page
scene 1-5 added
final
add image to index card
Responsive fixes for 'add proposal' form
Global renaming (prefer - instead of _)
puppet-emacs24 up and ready.
Added the puppet-aptitude module.
Fix on bootstraps.
Use the git url instead of the https one.
Use an already existing puppet module for the aptitude tools.
Fix (not quite sure on how we must work with git repo and git submodules yet) - if the
class is not named as the main class, this does not work.
Fix on services
Fix cucumber tests
Add travisci support
student registration
Student Registration
student test
profile page
profile page
Merge Formation and Group model into one ; correct login based on the formations for_life
fixed pjs using the wrong default values when creating a java array for booleans or object types
fixed whitespace splitting for data-processing-sources parsing, and fixed fragment loading 'adjacent canvas' check
Fix jslint error
Fixed array initialization code [#1817]
Fixed data-processing-sources to seperate files or ids by whitespace, not just spaces [#1818]
Merge branch 'develop' of git://github.com/jbuck/processing-js into bug555_3
nightly update

git-svn-id: https://firebird.svn.sourceforge.net/svnroot/firebird/firebird/branches/B2_1_Release@54314 de594faa-8d1b-4a0c-9a6a-a7de5f8bf859
Fixed my yesterday's commit.

git-svn-id: https://firebird.svn.sourceforge.net/svnroot/firebird/firebird/branches/B2_1_Release@54316 de594faa-8d1b-4a0c-9a6a-a7de5f8bf859
Allow Darwin to build using new empty.vers

git-svn-id: https://firebird.svn.sourceforge.net/svnroot/firebird/firebird/branches/B2_1_Release@54318 de594faa-8d1b-4a0c-9a6a-a7de5f8bf859
Allow Darwin to build using new empty.vers

git-svn-id: https://firebird.svn.sourceforge.net/svnroot/firebird/firebird/branches/B2_1_Release@54319 de594faa-8d1b-4a0c-9a6a-a7de5f8bf859
Files not needed
No longer need these old files of Zoar's in the repo.
challenges - rosalind - longest common substring for many strings.
cccp
shop-toy.ru
Merge branch 'master' of github.com:askovorodka/mosharov
Merge branch 'master' of github.com:askovorodka/mosharov
dom-stroi-plus.ru
Initial bootstrap of documentation
check_puppet_agent updated
Tidy up BBC radio station names
IMockCommit interface added
Removing abaaso from modules
combine controller extensions into single module; rewrite configuration/app selector; default Proc selector; other changes
change config generator to generate initializer; gempsec file list update
cache app selection for length of request; note current app in log output
12-4-12
Implemented a way to keep track of the current game screen
Uppgift 2
Uppgift 3
Uppgift 4
Uppgift 6
Uppgift 7
Uppgift 8
Uppgift 9
Uppgift 10
Uppgift 11
Uppgift 12
ensure update_scripts.pl is compatible with latest BE syntax
added support for different connection strategies
project row
jquery DP
fix conflit content in git repository
No BFS on P5Q SE2
2012-09-13: Fixed scripts so they would bail on error(s)
v0.98
Merge branch 'master' of github.com:ballock1/MCDek-Sharp
minor bugfix, added write-to-file.
After update, redirects to calendar page for month and year of the updated event
Updated the bitly_api to use SSL when usin OAuth
Space issue between components in panel
Improve yardocs, specifically param types
Change the responsive design
Updated models for car and display of category
Clojure day 2
Working on ading new games
All games view start
fixed footer's position
Completed and tested the dbTest script
Define #pkg_helper on SystemProfile so that all systems have at least an UnknownPkgHelper for proper error messages.

closes gh-206
WIP. Almost ready for the iseek run
Added travis tasks for CI
add support to get individual issue by it's number, and fix tests
added tabs gem
Merge branch 'develop'

* develop:
  Accordion collapse functionality now fixed
  added accordion and fixed detailtabview bug
rebuild and fixed paths
Merge branch 'master' into develop
removed data parent, might be causing problems with ie
switching to non build for ie debugging
need to do a prevent default for ie?
check if localhost shows up on ie
copied solution from bootstrap collapse to strip ie full url on href
fixed wrong retrieval of id
Merge branch 'master' into develop

fixed problems on ie for accordion
removed JSON.stringify, not supported on ie
updated def validation code for leaf
switched to a lightweight version of jqueryui 1.8.18
Fixes #3 - Added Google Analytics to Betacube website
DOCS-478 correction
minor: tweaks to page references
DOCS-249 removed edit to Rep Set Admin doc
Default submenus to "None"
include document and window to make minification better
grunt
Updated db.js to not need an initial query.
Added update_paragraphs.js
Added support for index_non-js.html to cache_buster.php
Added a note to ask.js.

And some code cleanup.
Version 0.0.2

Updated the transmission structure and fixed the tests
EC2 config is https
Polyline editing test
Test for polyline selection switching
Revert debug worker config
Rotation transform uses same interactions and UI elements as workplace rotation
Coins added, health bar added, health system completed, images
changed/added
Bugfix, ~ was not expanded in g:vimshell_temporary_directory and some
access failed.
allow externally managed robots.txt cache, also started a build.gradle
Fixed datavizwiz patch source.
Added No Cache to pushtx GET
no need for 'boundary'
remove comment cruft
calculating meetup points works much better
white meetup lines
the lion sleeps tonight
Updated tests for security fixes
1.0.1 pom
After 1.0.1
Mingyang Final For M1
[maven-release-plugin] prepare release hw2-team15-0.0.1
[maven-release-plugin] prepare for next development iteration
m2 start @11/16
@11/22
Merge branch 'luzhengs' of https://github.com/bolei1985/hw2-team15 into
mingyans

Conflicts:
	src/main/java/edu/cmu/lti/oaqa/openqa/test/team15/keyterm/LuzhengsLingpipeKeytermExtractor.java
	src/main/java/edu/cmu/lti/oaqa/openqa/test/team15/keyterm/PosTagNamedEntityRecognizer.java
	src/main/resources/hellobioqa/hellobioqa.yaml
	target/classes/hellobioqa/hellobioqa.yaml
	
	new after Luzhengs' work without the former Bolei's class
are there any difference?
No, there are no differences
Merge branch 'luzhengs' of https://github.com/bolei1985/hw2-team15 into
bolei

Conflicts:
	src/main/java/edu/cmu/lti/oaqa/openqa/test/team15/keyterm/BoLeiStanfordKeytermExtractor.java
	src/main/java/edu/cmu/lti/oaqa/openqa/test/team15/keyterm/LuzhengsLingpipeKeytermExtractor.java
	src/main/java/edu/cmu/lti/oaqa/openqa/test/team15/keyterm/PosTagNamedEntityRecognizer.java
	src/main/resources/hellobioqa/hellobioqa.yaml
	target/classes/hellobioqa/hellobioqa.yaml
Updated PosTagNamedEntityRecognizer to accept adjectives and verbs for
key term extraction.

Deleted the KeytermUpdater phase from hellobioqa.yaml because it
shouldn't be a separate phase.

cthayur
modified the Solr query generation
ignore target folder
Merge branch 'bolei'
Merge remote-tracking branch 'origin/cthayur'

Conflicts:
	src/main/java/edu/cmu/lti/oaqa/openqa/test/team15/keyterm/PosTagNamedEntityRecognizer.java
	src/main/resources/hellobioqa/hellobioqa.yaml
Merge branch 'master' of https://github.com/bolei1985/hw2-team15
untrack target folder!!!
Merge remote-tracking branch 'origin/mingyans'
After Document Retrieval part
working on Passage Retrieval
stun: minor: renamed port variable

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
dissector: call pkt_free in same function as alloc

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
Wrote front page material
bean wiring DI revised
added placeholder for aside
add support for setting buffer max and min
implement caching for the depth() method, automatically refreshing if document changes
doc love, streamline
should not hang when abscommand fails: dont return None but False if not found
allow canceling long running property get job
add method to invalidate depth cache
better if the text cursor is inside a collapsed region
only if I know before that it would be soo complicated.....:)
Merge branch 'master' of git://github.com/wbsoft/frescobaldi
new action: fold top region
sorry
Some minor... some testing actually.
Merge branch 'master' of git://github.com/wbsoft/frescobaldi
Fixes #2428. Reference limiters in rules by name to avoid issues. Also put upgrade code for existing configs. The same fix is necessary for 2.0.x though not sure how this should be committed there.
pfctrl is comment aware (#).

Leave comments in place so last update info can be retrieved by diagnostics tables.
Instead ensure private space is not included.
Add label to each pfctl logged result line, not just the first one.

With this, log filtering can find both the addresses added and deleted bogon records.
Merge pull request #286 from N0YB/bogonsv6_comments

pfctl is comment aware (#)
Added "interface_selection" type to enable interface selection in tinydns server
This is usefull in multiwan setup and to check if a server behind pfsense is still running.
So that tinydns can change the corresponding records
Merge pull request #77 from Whizkidzz/RELENG_2_0

Releng 2 0
Make sure the page does match as we trying to match the page to the url path and not the full url
AS7-5976 Prevent HC abort killing the PC when servers are running
Allow greater flexibility in waits between respawn attempts
Changed require to authfile itself
Hopefully safer request data extraction for rails2
Merge pull request #14 from bugsnag/rails2-fixes

Hopefully safer request data extraction for rails2
Creating a completion script for CocoaPods.

CocoaPods is a bundler like tool used for specifying
dependencies in OSX/iOS development projects.
Merge remote-tracking branch 'cocoapods/master'
Update readme to include essential information about using request context processor.
Merge pull request #1 from dpnova/master

Quick documentation fix.
Created a story detail view with a rough template, and links between the list
and detail views. Support for get parameters is outstanding.
Import of scan-me-now code from HEAD
Forced empty folders