labofsahil/github-event-dataset-2012 huggingface dataset:
one last reference fix
stop qui marche
Unused resources clean-up.
Added caching to parse less files when searching for parsed enum values
Fixed GitHub created errors
changes in rosary scene class for different rosary's parts.
Model Update: category, subscriber
working on ScreenEditor; will pick back up in a few hours
Disable PrereqsClean and CheckPrereqsIndexed until HTTP::Tiny::Mech is fixed
Fixed TOC?
v2.2 --> v2.3alpha
Stopped using the IngredientManager in MatcherTest
Annotations added to this viewer
Remove .class files
Remove sysout
Merge branch 'master' of github.com:MNCC/fr-mncc-gwttoolbox
We don't need to get the CGPath for clipping each time we make a new CGLayer for gradients.
添加 metacity
添加 yajl
more additions, and cleaned up some stuff.. reading and writing current context now in place, almost done, in form of script
Merge branch 'master' of github.com:Magz0r/Kalenderprosjekt
Bah
Merge branch 'master' of github.com:Magz0r/Kalenderprosjekt
use the forddd
Merge branch 'master' of github.com:Magz0r/Kalenderprosjekt
comment the g translate
Fix a rake task dependency
Fix a typing example
Force a sleep after posting each event

Just like Accessibility::Core does.
cambio de nombre de mysql cas
agregando descirpcion principal a nota interior
query de tarifario de tabla
enlace sala de prensa
xzczcz
x11-libs/pangox-compat: in gnome overlay
media-video/avidemux: moved to gx86
Merge branch 'master' into gnome3.6
Use char literals in UTF 8 conversion to fix 798 warnings

The data type is specified as char but the literals are unsigned char. This
results in 798 truncation warnings in vs2010. The literals were converted
with a simple python script to signed char while taking two's complement and
the overflow into account.
Merge branch 'windowswarnings' of github.com:MichaelMcDonnell/openmw into windowswarnings
Write error message for exception and fix warning

Provides details of what went wrong when reading the .esp and also fixes a warning on vs2010.
TestReadMe
Merge github.com:MichaelsGITIGIT/TestRep
test.txt
Randomness is good. Kinda.

Signed-off-by: Robert Xu <robxu9@gmail.com>
Refactoring.
Add empty methods from Devise's API.
Boring formal stuff with license ;)
Generate the key file using rails generators.
Cleanup.
InsertSubscriberData corresponded update
depending on jss7 2.0.0.BETA3
removed jcc
[maven-release-plugin] prepare release release-2.0.0.BETA3
[maven-release-plugin] prepare for next development iteration
pass reg to unary terms
Added scripts to the NuGet package which will check with new users if they
want to go through the getting started guide. Closes #676
Renaming new unotrusive convention extensions to the agreed names.
Headers may exceed the 4000 character limit for the NHibernate, closes #737
Merge branch 'master' into develop
Checking the existing commandline options to make sure that we don't create
duplicates. Closes #276
Execute NServiceBus.Host.exe /installInfrastructure from a folder
containing only the required assemblies.
Closes #273
Decrease loglevel to WARN for scanning exceptions.
Closes #270
Upgraded to NHibernate version 3.3.0.4000
Merge pull request #381 from johannesg/nhibernate_3.3

Fix for #366: Upgrade to NHibernate 3.3.0.4000
Activity model was missing a couple methods
Prevent scrollwheel events propagating to main map

Now scroll whell events will only be handled by the minimap, preventing
double handling and weird scrolling.
OGRE: CLient connects to RTT_Server!
Changed CEGUI from TaherezLook to OgreTray imageset.
Completed Join Custom Server temporary UI.
Putting my changes to date into pushable repo
Faction - Chatmanager Conflict

I have had to use EssentialsChat until Factions works with ChatManager.
Until then all "message-formats" will have to be done through
Essentials config file.
STYLE: TimeIO: indenting
BUG: Time: correct secondary write interval
Added note about decimal separator
Added example stating that arrays cannot simply be printed as is
Bugfixes for uploadConfig
setting executable flag on yaat-generateSandbox
removed event name and added purpose_id to events
Added line for clarity
Re-added alt satchels.
Adjustable masks.
Merge https://github.com/Baystation12/Baystation12
Ported ashtrays, cigs don't produce cigbutt obj when they are put down.
Added ashtrays to every breakroom.
removed old taj files

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge https://github.com/Baystation12/Baystation12
fixed map conflict
Cigarette quickfix.
Mij's first attempt at a commit. Please lemme know if this doesn't work.

Adds msay verb to admin observers and above, including admins and mods. Test successful on local build.
Merge pull request #1827 from theMIj/master

msay fix
removed immovable rod from occurring, removed space dust, doubled time between events

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
remove random debug msg

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
ghosts have universal talk again

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
- tweaked lplasma spills and fire spawning - oxygen content is no longer counted towards % spawn chance.
- to spawn a turf fire (at default ignition level) atmos zones now require at least 17 moles of ignitable material (note that flamethrower fuel counts 15x more than other ignitables)

the relevant code seems weird and all over the place, but this seems to work in testing so i'm committing it for now

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Xenoarch: artifacts, strange rocks, pretty orebox

Artifacts and strange rock formations spawn during world gen. Frequency
may need tweaking.

Strange rocks melt when acid hits them due to what I assume are changes
/tg/ made with how acid works. Alternately I missed something during
copypasta spree. I'll muck with it later. For now, harvesting always
works with applied welding tools.

Ore boxes back to old beautiful selves. Re-added a few icons to
mining.dmi and the strange rock icon to turfs.dmi
Added holsters and bunny slippers.
Holsters work a bit different from before.
They utilize system for clipping things on uniform.
So now holster can be worn on any clothing.
Also it can now hold any handgun(or what I assumed to be handgun).
Forgot to commit icons for my previous commit.
Merge pull request #1829 from caelaislinn/bs12_with_tgport

misc, including random fire fix
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Update demos/visualizaciones/presupuesto/css/base.css
default param obj=None for get_form (fixes bug when adding new record in django admin)
Merge pull request #4 from npinchot/4a380bf26a0ebc43450117df64ff0719b2946541

Bug fix for django 1.4.1 admin - issue with get_form and adding new records
Close #38, handle champ filter more gracefully

- just show zero values for all games which weren't played with that
champ
- this allows the user to see WHEN he has played the champ. It is
additional free info that can be read off the graph very easily.

- also added source files for jquery.powertip, which will be used for
tooltips of per-game data on mouseover of the graph

- also added some graph animations - the graph doesn't look awful when
it changes anymore. Still lots of work to do but not quite as robotic
and awful anymore.
Now using jQuery. Also simplified navigation generation
Disabled debug mode
background images are now jpg for faster loading
Revision AR
Merge branch 'master' of https://github.com/SalemHarrache/ricm4-apd
Finally figured out how to do models stuff outside of django. It's really hacky right now because of this effed up homedir thing. Won't work anywhere else right now. Also changed perms on settings to allow import, and changed debug to false for right now.
Working on getting datetimes from strings in the way Django wants them. Almost have weather objects and days going into the DB
Fix compilation (from 4110 branch)
Minor optimization, internal IMDB grabber fixes
Merge remote-tracking branch 'remotes/upstream/BUG-3927-Collection_of_fixes_according_to_feedback_for_MyVideos' into 1.3.0Alpha_SEB_ADDONV2_EXP_MM
.path:hover style to hightlight links in path/to/current/index
del uneeded lingor keys
added new lingor version keys (v.034)
new lingor source (v.034)
updated lingor server file (v.034)
Translate 1
Corrections to PAL
Merge pull request #1063 from SkyMarshal/CoolTweaks

Table smashing is now more interesting.
Removed the start_vote command, because it can only have 3 buttons and no cancel option. Start it up via the voting command, now.
Emergency fix for pod windows.
Merge pull request #1065 from Hawk-v3/master

Emergency Pod Windows Fix
Merge pull request #1067 from SkyMarshal/CoolTweaks

Antiqua changes, adds second freezer, fixes disposal derp.
Fixes *most* coat storage problems. Only two visible slots and updates/closes correctly.
text() splatted out.
Merge pull request #1068 from Erthilo/master

Fixes *most* coat storage problems. Only two visible slots and updates/closes correctly.
Adds cable restraints that can be made from 15 lengths of coil, and fixes table grammar. Also reverts lockdown changes so it works for the Exodus for now.
Lets the Head of Personnel change alert levels, might make this all heads later, who knows!
Changelog updates.
Added some \the checks.
Merge pull request #1069 from Erthilo/master

Cable restraints, lockdown fixes, resting fixes
Small fix for making cable restraints with exactly 15 lengths. Added using a wirecutter on a restrained person to quickly release them.
TG: Random button added to traitor uplinks.
- All traitor items are available in the random button so long as you have the
crystals to purchase it.
- This means it's possible (though very unlikely) to get 5 sets of revolver
ammo.
- It's RANDOM, don't expect great stuff every time.

Made startSinglo() a game-master only verb in the debug tab.
- It is incredibly useful and time saving when testing stuff out before
committing.

Added borgs, AIs and dead players to the list of protected paths in the delete
all verb.
- Unless someone can give me a valid reason as to why an admin would delete all
ghosts.
Revision: r3595
Author: 	 johnsonmt88
TG: -Added security backpacks in Warden and HoS lockers
-Added spare Warden's jacket in his locker
-Some re-sorting of items in security lockers for convenience
-Removed leather gloves from hydro lockers
Revision: r3598
Author: 	 ericgfw...@hotmail.com
Hotfix for pod shuttle windows letting air through.
Changelog.
Merge pull request #1070 from Erthilo/master

Hotfix for pod windows, misc fixes, and TG updates.
Actually fixes pod windows this time.
Small adjustment to sleep time on eating
Inital commit, install specified packages in devtools::params::packages
Fix problem finding springloaded jar now that it moved to ORG.springloaded... organization in grails 2.2.0.BUILDSNAPSHOT distro.
drawing again with dimensions object calc on load and using new group positioning. (still need to read spec on empty group inherited sizing)
vimrc
Merge branch 'master' of github.com:TakumaFurutani/dotfiles
Add a modal overlay when a message opens.
Add Javadoc. Cosmetic

Bump Maven plugin to 3.3.1. Set API target to 2.3.3.

Cosmetic, add Javadoc

Remove overly defensive code

Typo

Cosmetic

Cosmetic

Cosmetic

Cosmetic
sorry Andrew, here's the updates
Fixed conflict?
replaced German special characters in predefined templates with their proper HTML entities
added more input sanitizing to referer and visitor related functions
Merge branch 'alix5' into alix5-feature-feedback
release 1.1.8

* only show one login method on Ubackstage
* disable upload button until a file is chosen
* remove redundant app description from /apps
DB: Quest The Last Line Of Defense:

Add missing spawns for Argent Cannons,their supports and template updates.

Notes: both cannon spells need targeting scripting.This is needed before adding the rest of the missing spawns.
Core/Dungeon Finder: Update "Current group roles" according to people in queue.
Core/Dungeon Finder: Properly update internal lfg group structure at server load
Core/Opcodes: Fix CMSG_REORDER_CHARACTERS
Merge pull request #7480 from Tuxity/charPosition434

[434] Fix CMSG_REORDER_CHARACTERS
DB/SAI: Some Ragefire Trash Mob EAI to SAI Conversions
By; Ragefire Trash Mob EAI to SAI Conversions
Closes Issue 6662
Core/BG: Prevent players from using macro to exploit leaving BG queues when they already have entered.

- Cleanup and add some comments to MSG_BATTLEGROUND_PLAYER_POSITIONS
Closes #7633
Core: Move BF-handler invitation/queuing-logmessages to outDebug() (the information given there aren't really considered "errors"...)
DB/Creatures: Fix Kologarn InhabitType
Core/Scripts: Fix Typo in 7121f015ed6561a4bc12cf08d8f9286b113e66ad
Core: Fix warnings
Merge pull request #7690 from Geodar/master

Core/Scripts: Fix typo
Core/Scripts: Muglash should walk instead of running.
Core/Spells: Use the UNIT_FIELD_CHANNEL_OBJECT field instead of Spell::m_targets to select the channel targets of a triggered spell.
Closes #7246
Core/Spells: Corrected Glyph of Blessing of Might and Glyph of Blessing of Wisdom.
They should not affect Greater Blessing of Might and Greater Blessing of Wisdom.
SQL: Update characters_database.sql
Core\Characters: Consecutive letters validation for CheckPlayerName

Closes #7694
Core/Items: Fixed items with ITEM_MOD_BLOCK_VALUE ( Increases the block value of your shield by X )
Closes #716
Core/Spells: Remove incorrect usage of SPELL_ATTR0_NEGATIVE_1 in CanDispelAura (which is used in SPELL_AURA_SCHOOL_IMMUNITY handling)

Closes #5940
SQL/Achievements: Fixed achievement "Wrecking Ball"
It should only count player deaths.
closes #1734
Core/Entities: Fixed GameObject::FindNearestX for objects with the same coordinates.
closes #4581
Core/Objects: Method to get nearest GO of type X, FindNearestGameObjectOfType

Thanks Subv for the idea
Core/Characters: Add validation checks to barbershop use (prevents exploits)

Thanks Kiddie

Closes #7702
Core/Commands: Replaced .start with a new command, .unstuck. Usage information can be found by typing .unstuck in-game
Removed a line of debug code
Merge pull request #7703 from myran2/PR1

Core/Commands: .unstuck command
Corrections to previous merged in PR
Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
Updated contents of "about" window
Decor (spawnPoints) Objet (HitBoxes)
Working more on the add/remove bookmark feature

for TorrentGroups

- I've added a success/fail return value to MySoup.pressLink based on
the HTTP status code it gets in response to the action
so HTTP 200 OK returns true, anything else is an error and returns
false.
- I've added to api.torrents.torrents.Group the ability to set the
bookmarked property, which is used to update the Group's field
without having to perform re-load of the entire Group. Unfortunately
this method currently is public because it's changed from
api.torrents.torrents.TorrentGroup but I'm contemplating re-structuring
some of the API classes to use inheritance, so TorrentGroup will
inherit from Group so it can easily get all its fields.
- The TorrentGroup.add/removeBookmark will only change the field if
pressLink went ok, and will return the same value returned
by pressLink so the caller of add/remove can check if it went ok as
well.
- The text for the bookmark button is updated in onPrepareOptionsMenu,
so will check against the bookmarked field each time
the options menu is opened, performing a refresh of the field.
- I'm still doing a bit of tweaking so there's some stdout print
statements that will be cleaned up when I've finalized the feature
Game rules were improved.
.gitignore adapted to ocamlbuild.
Reorganized folders. Added capability for >1 stock reading.
Merge branch 'master' of https://github.com/Visheshk/RSI-Calculator
change search.c to sort.c

3 bubbleSort
Fix current doc url.
README.md prerelease version
init Wable
Added local files to ignore
Improve the formatting in the mkdmg script.
Forgot to release the semaphore
Renamed the findFile() method to getFile() as it won't do any searching but just does a straightforward file_exists check for the path relative to the module. It would be possible to add such behavior to with a new ModuleInterface implementation - but it is not the expected behavior.
Last Changes before Testrelease
sql dump update

sql dump with data in boattype
Add PlayerEvent.HarvestCheck and PlayerEvent.BreakSpeed for dealing with things related to a player harvesting a block.
Fix bug in last commit that caused block to not break.
Added preliminarty Player Interact event heavily based on the bukkit event.
Missing updates from last commit
Location aware version og Block.lightOpacity for PR #169
A few requested features of ForgeChunkManager. Mods can specify a
chunkloading config directly in the config file, including chunk
loading overrides if they wish (and the config allows them).
Also added "player" tied tickets that bind to the player and not the
mod's quota.
Fix buckets, need to rethink for bukkit compatibility.
Fix vanilla bug where the player would load chunks outside its range that would be 'abandoned' and never unloaded.
Forgot comment, you see nothing...
Dormant chunk cache might actually work now, and not mix chunks across worlds
Update FML: ca1ca4f
ca1ca4f Fix maps supporting greater than byte() dimension sizing
15ee8bf Fix language registry additions, closes #113
a08b5b1 Merge pull request #112 from pahimar/master
8dac58f Added ability to query the Language Registry by key and language for specific localized text, as well as loading in localization text f
Made PlayerEvent.BreakSpeed fire when a player cannot harvest the block. Issues #191 and #188
Expanded DungeonHooks to allow for adding of custom DungeonLoot values directly, allowing for better control over the generated items.
Fix issue where light would not properly recalculate.
Fix issue where mushrooms would not check the proper soil block.
Custom tags and Validators
GameOverState
GameOverState
added Sprint_retrospectives.txt
cabal version to 0.0.23
add mlatu.loj
first commit of drivers floder
pgfcropmarks.sty added.
ViewEditBasalProfile

ViewEditBasalProfile and associated pages anf methods fixed.
init lock
alert sets volume to max
lock resets password to random 6 characters
lock works, resets password to "asdf" (random passw
Merge remote-tracking branch 'origin/master'
Revert "Testing Commit"

This reverts commit fa1432ea3b369521675b79becc757e9759e4f864.
Add new task goal, named 'absorption'
Different colors for different colonies or cells (radio box for this option)
Tiny fix for commit: 'Different colors for different colonies or cells'
Cells use best colony for life
Comments for this situation
Calculate task points for absorption task
Use save for Enemy colony
complete the J-unit test case for UseEnergy class

Signed-off-by: acacker <acacker@qq.com>
add options::stop_at_unknown
return the offset at which the parsing stopped
If you add a new configuration its selected afterwards now.
next try to fix button
Updates to images.
Adds cancel and help-text to add note
Add ajax-loader.gif
Fix absence of auth check for /manage/* pages.
Remove locking item from TODO -- actually, we need to (pretend to) implement locking, becuase otherwise OS X's webdav client goes read-only
References to images were added
dont tabify center cell
Fixed bitmapData.noise for C++ toolchains older than C++11

git-svn-id: http://nekonme.googlecode.com/svn/trunk@1899 1509560c-5e2a-0410-865c-31c25e1cfdef
Minor compile fixes

git-svn-id: http://nekonme.googlecode.com/svn/trunk@1900 1509560c-5e2a-0410-865c-31c25e1cfdef
Temporary Android build fix

git-svn-id: http://nekonme.googlecode.com/svn/trunk@1901 1509560c-5e2a-0410-865c-31c25e1cfdef
Redmine #3318: Add small extension library to bundler to load system gems

https://www.aeolusproject.org/redmine/issues/3318

This has been design to later be released on its own if it proves generally
useful.  Basically it just reads a Gemfile and uses standard rails require
mechanism to load the dependencies listed there.
Redmine #3319: Set up conductor to use new Bundler extension point.

https://www.aeolusproject.org/redmine/issues/3319

This is not currently 100% for upstream (ruby-only) dev, but gets us much closer.
We should now be updating only Gemfile.in, no more duplication in application.rb.

For the time being, you should be able to install everything via rpm, have the app
load from Gemfile.in (and not generate a lock file).  You should be able to start the
app, run specs and cukes, all using Gemfile.in (with no extra steps needed).  Note that
if you keep a copy of Gemfile in your src/, you will experience issues, as rails, rspec,
and cucumber look for that file to determine if they use bundler (even if we say we want to
load the deps ourselves).

The idea is that you, as a ruby developer, simply copy over the Gemfile.in to Gemfile,
and run 'bundle install'.  We still have a 'USE_BUNDLER' env var which is set to nil,
meaning for upstream you have to explicitly set it to 'yes'.  Once upstream is working
properly, we can default this to that setting, and set it to no/nil in our initscript.

If you add a dependency, once you have the gem/rpm installed, simply put it in Gemfile.in,
and bundle install using that file with:

bundle install [--gemfile=GEMFILE]
Base classes and modules to support provider selection algorithms
Initializer for provider selection strategies
Add strict order strategy
Dictionary for strategies
ProviderSelectionsController and related views
ProviderPriorityGroup related migrations
ProviderPriorityGroup related model changes
ProviderPriorityGroupsController and related views
ProviderPriorityGroup related CSS changes
ProviderSelection and ProviderPriorityGroup related dictionary changes
ProviderSelection and PriorityGroup related changes to routes and navigation
Migration and model related changes for ProviderSelectionStrategy
Suppot for ProviderSelectionStrategy in ProviderSelectionsController
Views related changes for ProviderSelectionStrategy
CSS related changes for ProviderSelectionStrategy
Add link to provider selection on pool_families#index
Deployment use provider selection algorithms
Cucumber test for ProviderPriorityGroupController
RSpec test for provider selection and remove obsolete ones
Fix RPM building after provider selection support added
Remove ThorCluster prop @slaves

Already absent from the xslt/xsd's, but still part of the environment xml
and generated by the wizard.
Remove from environment and calculate based on ThorSlaveProcess and
slavesPerNode.
Which avoids having to maintain (and potentially get wrong) number of slaves
in environment.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Merge pull request #1789 from afishbeck/limit2

Fix gh-1779 ecl command line does not support setting result limits candidate-3.6.x

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1787 from afishbeck/wsecl_roxiexml

gh-1774 Fix soap to WsEcl for calling roxie queries broken candidate-3.6.x

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1784 from jakesmith/swapnode-nospares

Guard against no spares on manual swap

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1756 from jakesmith/remove-propslaves-3.6.x

Remove ThorCluster prop @slaves

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'SpecialCharsInComponentNames' of https://github.com/JamesDeFabia/HPCC-Platform into JamesDeFabia-SpecialCharsInComponentNames

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #1778 from jakesmith/gh-1775

Fix gh-1775 - Splitter, child recs issue

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merge pull request #1804 from richardkchapman/PackageCommandsinECL

gh#1579 --  Add sections for ecl package commands

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'split-3.6a' into candidate-3.6.x

Make split-3.6a an ancestor (no actual changes merged in)

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/split-3.6a' into candidate-3.6.x
Merge branch 'split-3.6' into candidate-3.6.x
Merge remote-tracking branch 'origin/split-3.6' into candidate-3.6.x

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
gh-1728 Add ecl queries support for showing suspended given cluster

When ecl queries is given a roxie cluster to run against it will mark
queries suspended on that cluster with an X (S is used to indicate
suspended within the queryset).

ecl queries list --cluster=roxie

results in:

QuerySet: myroxie

Flags Query Id                     [Active Name(s)]
----- ---------------------------- ----------------
   A  chart_views_query.1          [chart_views_query]
 XSA  json_demo.1                  [json_demo]

Fixes gh-1728.

Rebased onto updated split-3.6

Signed-off-by: Anthony Fishbeck <Anthony.Fishbeck@lexisnexis.com>
Game over on Loss of life
changeed version 2
Add development.properties, set remote.compile to copy to base
Support multiple input parameters for basic transforms
Adding __contents__.xml files and other assets.
Added a mention about font awesome
add a
Merge branch 'clone' into live

* clone:
  add a
updated editTaskActivity to load task data into EditText fields
documentacion .g
Add awesome alias for capistrano deploys
testing
Added Google App Engine Library
Trying to add OAuth
removed testing.py
Added OAuth for Contacts
testing
fixed oauth
removed extra contacts_client
added HandleCalendar
changed OAuth to handle both API and Calendar
Merge branch 'development' of github.com:albertyfwu/caretPlanner into development

Conflicts:
	src/main.py
stuff
HandleCalendar works
Merge branch 'development'

Conflicts:
	src/app.yaml
	src/main.py
	src/main.pyc
Use django-registration for creating user accounts
Require authentication in the home page
added yahoo and bing support
fixed the translations file being generated with the source file's language key
QtRadio: clean up q-master and q-info processing
QtRadio: minor edits
QtRadio: slave tracking master's freq, mode and filter settings
QtRadio: reduced cpu load by doing resampling with ration 1.0
QtRadio: debug slave tracking.  Sometimes it does not track
QtRadio: debugged q-info RegExp for -ve numbers
Changed the focus policy on the items in ctl.ui so focus doesn't move from the VFO.
QtRadio: bypass resampling for better playback quality.  But cpu util goes up
QtRadio: conditional compile tweaks for deprecated function in Qt5 Edgers
QtRadio: tweak MOX
dspserver: use resampling for all speed and whether outputing 8K or 48K audio
dspserver: correct while error
dspserver: function to set src_ratio
dspserver: bug fix change of audio rate 8K/48K
QtRadio: tweaked cantx checking whether a user/password entry matches
Merge branch 'master' into dspserver-resampling
added read filter settings in CWU/CWL mode for rigctl.cpp, changed in UI.cpp -> rigctlGetFilter()
Merge branch 'dspserver-resampling'
Merge branch 'dspserver-resampling'
updated date to 2012 Nov 16
fix paste/nopaste when syntax is on
Add the wrapper.
Remove readme.
Add the ability to checkout Gradle and build it.
Remove unneeded imports.
Start breaking things out, and add docs transform to include analytics.
Name the distributions that are built by the Gradle build “Build Distributions”
Compensate for build distributions not having a versioned top level directory.
Add the building of public distributions.

Public distributions have top level directory in the zip that includes the version number.
Add the external specification of the version number information.
Add some code for calculating the version based on the version web services.
Fix the handling of the distributions from the gradle build and version numbers.
Add in the uploading of the distributions to s3.
Some shuffling around
Add support for reading commit to build from a build receipt.
Add management of website stuff in.
Change browsing interface to be a list of lists, allowing for drill down/up
Finish the new way to push the info
Use the advanced QFile
Adapt the themes plugins to the new interface
Lot of minor fix, remove the copy engine 0.2 (bugged, and hard to update)
Sync support by the copy engine
Fix server
Add Qt5 plugins under windows
Fix the plugin loaded
Fix session loader for KDE4
Don't implicitly cast doubles to floats (primarily by specifying float literals as floats rather than doubles).
cleaned up code; still untested
modifed thrift IDL
integrated sprites, animation framework
Update Rspec for Neo4j 1.9.x
cacheo conexion a DB
set frame origin for popover view and removed XIB window
adding new script to make encrypted tarball backups
reset internal scrolling vars on collection reset
Merge remote-tracking branch 'origin/counters'
Enhanced interface
added force_ssl
changed log_level
force_ssl don't work... revert
WIP files !
+ clean (rails_best_practices)
+ protect mass_assignment
+ remove unused methods / helpers / etc
+ use seeds.rb instead of migration file
+ added cancan strategy
+ added level attribute to user
+ factorized controls for admin
+ simple_formed forms in admin
+ factorized menu for admin and frontoffice
+ added breadcrumb
renamed File to FileObject
Merge remote-tracking branch 'origin/master' into new_features
+ added system_metrics (/system/metrics)
+ WIP feeder
+ reset_session
made road
Changed C-a behaviour.
added ring sessions
resolved conflicts
- removed unnecessary print statement
Fixed Memory Warnings.
add fetch interval to reduce fetch time and some small refactoring
change import of statsd client
Make the readme nicer
Added project search and project comments
implemented quest 11913 script + small cleanup
2012/12/30 Add configparser
2012/12/30 Add urllib
starts 0.2.0-SNAPSHOT.
Adds Paramater field.
updates project structure, adds readme
[app] twitter button
errors: UndefinedShellError => UnregisteredShellError
Shell.Model: clone fixes
Shell.Model: data.shell => data.id
Shell: tests
util: indented functions within util namespace
Events.xsl change
Merge branch 'master' of https://github.com/atheycreek/churchdeploy
Updates'
Changed Squishy to Crunchtime
Fix internet explorer by defining getElementsByClassName

it also defines the method for HTMLDivElement so you can chain this
method with lists of elements.
fix to errors with z values in project() and x/y/z values in unproject()
methods of lensbase
picking: fixed bug where event normals where always being passed as bounds normals

- from a commit in the dev branch
91ae1fa5a9afe231fa07d55e13eaf5e2c72b9b09
fixed a bug where MouseEvent3D.MOUSE_WHEEL was always producing zero deltas

- the delta property wasn't being cloned in MouseEvent3D .clone()
method.
bump revision number to 10
Merge branch 'master' of git@github.com:away3d/away3d-core-fp11.git
Add yard to Gemfile.
Initial Commit
initial version. animations are still messed up
merging
add subtract boards function to return the location of change
mod on thirsday evening
Add Rem, Strings, List

Diagram and Include are still works in progress
Fix linefeed/CRLF issues

Make sure windows has
core.autocrlf=true
and all files locally have DOS CRLF line endings.

The repository should have LF line endings only
Created a Page Model
Added new Page Model Functionality to Views
Making user name and image clickable at shout comments
增加左右括号匹配的例子parenthesisTest
Makefile from issue37
Why didnt MacOS catch that
Fixed for Ubuntu
Fixed main for master
Add theme file. Setting the initial description
starting on adding items to recordsets
increase intro world running speed.
remove log statement.
intro2 has sky background.
UI edits and bug fixes
Merge pull request #4 from apatel/master

UI Edits and Bug Fixes
added open chest box function.
Adjust subheader text margin
Changed progress indicator
Add a checksum. Suppression of a loop.
Testtt
Testttww
added feature files in preparation for setting up cucumber
KML generator patch to align the airplane icon w/aircraft heading.
testing an idea, or how I learned to stop worrying and love multi-tenancy
Started LevelMaker

Began working on the level generation foundation code.
My Commit! Gio
[api] prepared for npm
last minute optimization
Inital commit without NuGet packages (excluded via .gitignore)
Bedingungen der Möglichkeit zum Dialog
changed the db structure to better represent the client specs;
minor changes;
Trying to figure out whats up with delete
Testing delete
missed 'left' param in addTextBlock method calls.
changed reference to Japid42 on github repository
used japid 0.7.4
Interface improvements. Trying to create a new way to connect
modificacoes de layout para cruds de admin.
Various changes to app.py including:
- refactor all login checking to a decorator
- fix (I think) issue with second player always winning (score converted to int before comparison)
- remove some unnecessary if's related to school checking
- remove some (... != None), since these are implied
tremol stampa racuna, broj veze skratio
Merge branch 'master' of git@github.com:bringout-fmk/fmk_common
Flyttat template till WEB-INF (för att dölja den). Ändrat alla html sidor så att länkarna fortfarande fungerar.
Added documentation to headers.
Fixed off-by-one error in SBPriorityQueue
Remove unneeded logging statement.
[BUG FIX] Attachment styles

* Fixed bug where attachment :styles were not getting applied to uploaded images
* Thumbnails or other image resizing wasn't working.
* Commented out some logging used for debugging
[BUG FIX] Attachment styles

Ensure attachment.url(:some_style) will correctly add the style path to a given path.
[BUG FIX] Attachments Styles

* Attachments will now send files using a style parameter
[BUG FIX] Error Formats

* Ensure 404 errors with other formats beside html correctly work and show the error page.
Removed leaks.
Merge branch 'new_protocole' of github.com:bubbles3D/Bubble-Client into new_protocole
Refined demo app
Add safari.info by loading & parsing the plist. Very useful.
cleaning up of events from list-item-controller.
list-item-controller fleshed out.
Commit do exercício de Pull Request
switched from using an AsyncTask to using an IntentService; the IntentService takes in an intent to get all of the required information, pulls the rss feeds in the background without preventing the user from using their phone, and displays as it did before
Check if bulk_create exists before using it; update decimal encoding
inherit base deps
refs #156 - Changed add/update entry form project queryset to match clockin.
Added a test case for both
Updated README with python version requirement
refs #168 - Removed comments from project timesheet csv
Merge pull request #169 from caktus/issue-168

refs #168 - Removed comments from project timesheet csv
prep for 0.4.0 release
Merge pull request #159 from caktus/issue-156

refs #156 - Changed add/update entry form project queryset to match...
Merge branch 'master' of github.com:caktus/django-timepiece into new-clockin
refs #401 - Fixed target of quick clock in form to use clock in
Merge branch 'master' of ssh://git@github.com/calibwam/Fellesprosjekt.git
resize changes
Merge branch 'dev' of https://github.com/camupod/teledraw-canvas into dev
activity send broadcast to server work
add code to make activity control server
changed router; refactoring
Base Commands for Bukkit Server v0.9d
added parsing functionality. files get saved in /public/news/
Add SyncMail dummy to suppress error message in mail window

Signed-off-by: Stefan Schake <caytchen@gmail.com>
Added suport for traveling to Jove and moved the ship from the Sun when you TR to a new system.
Added missing Amarr stations dmgTypeAttributes to the sql.
Merge pull request #19 from ReveMu/master

Tr fixes.
Implement MailingListMgrService stub

Signed-off-by: Stefan Schake <caytchen@gmail.com>
Fix docking

Signed-off-by: Stefan Schake <caytchen@gmail.com>
Fix mail labels

Minor xmlp fixes

Signed-off-by: Stefan Schake <caytchen@gmail.com>
Fixed infogathering duplicate issue.
Merge pull request #20 from ReveMu/master

Fixed infoGatheringMgr duplicate files issue.
Revert changes to evemu_setup_database since its well documented on the wiki

Signed-off-by: Stefan Schake <caytchen@gmail.com>
Fixup build from infogathering changes

Signed-off-by: Stefan Schake <caytchen@gmail.com>
Fix color selection by sending no client update available

(Presumably) fix certificate stuff for highend ships

Signed-off-by: Stefan Schake <caytchen@gmail.com>
Add correct crtClasses to fix GetCertificateClasses

This changes the database. Migration path for existing databases is to just run sql/ofic-updates/add-crtClasses.sql on your database.

Signed-off-by: Stefan Schake <caytchen@gmail.com>
Implement SendMail and related stuff

Includes new mailMessage table; run add-mailMessage.sql to migrate

Signed-off-by: Stefan Schake <caytchen@gmail.com>
Make sure to escape body in SendMail

Signed-off-by: Stefan Schake <caytchen@gmail.com>
First of two stages of porting my recent work on bubbles, modules, warping, docking fixes from 'evemu_incursion' to 'evemu_crucible'.  Server still compiles, undock is not really fixed :(, warping is fine, docking makes you get closer than makes sense but sure enough, get close enough and you'll dock, bubbles seem fine.  Next stage will have all Module Manager related changes.
Add actual functionality to SyncMail

SendMail fixes

Needs PrimeOwners implementation

Signed-off-by: Stefan Schake <caytchen@gmail.com>
Merge branch 'master' of github.com:evemuproject/evemu_crucible
Affichage de la galerie conditionnée selon la présence de fichiers
Trying to make parallel work.
fix celimage popup not getting right orig dimension of image
Mudando pastas de lugar
ajuste dos tutoriais
Merge branch 'master' of github.com:cepa-usp/cepa-framework
ajustes
Tweaked/Improved new interview notifications - now registers on boot
Get rid of some nagging thread-global state.
Better memory management; one less global buffer.  I think that's all of them.
Moved memory management wrapper functions into their own file: memory.c | memory.h
Added skit_stream_read_fn to allow arbitrary character-by-character termination conditions on reads without introducing memory ownership problems.
Added some stubbing for regular expressions.  It's extremely incomplete.  I'm giving up on it for now because skit_stream_custom_fn seems good enough for my needs, and the regular expression stuff is rife with memory ownership issues.
Added boilerplate.
Including the array.c template after including the array.h template no longer causes intractable compilation breakage.  On the flip side, it is required to included the array.h file before the array.c file in any context.  A worthy tradeoff, since the other side of it is intractable.
Gave other templates the same treatment as array: it is considerably easier to use them in cases where some_file.c includes some_file.h and instantiates a template alongside other definitions.
Initial import from other projects, non-working (still ripping out movl and adding anymote).
Added paperclip for user images
Added user_images to user model
Added yield to layout so that users can log in
Added section to deploy script to keep uploaded images in sync across deploys
Defined where to find imagemagick per environment
added simplistic boundary checks(NEEDS MORE CHECKS)
add audio resample swr_convert function ,but still have some problems ,for example when resample there is some murmur
Update src/Week2/Question3.ml
Revised plugin head snippets
Another shortcut to move windows around
Sort configuration hash. Use OrderedHash if on 1.8 rubies
Implicit OrderedHash install on < 1.9 rubies
Rename sorting method. Force Mash instances into Hash.
Added initial draft of introduction
Make all but start date optional
add first tools.js and assets
Bug Fix, Background Color and Ago
=================================

* In show_incident(), there was a show('reset') call and it will cause
  the table display fault. As show_incident() only called when iframe is
  reload thus show('reset') is not necessary.
* Text Background Color is added to those which can be clicked.
* Change the Event Occur Time from the detail one to more vocal one.
kshm-test
Correct a ref in tests
added dual kinect example
working on tracking code, added basic tracker
trying to figure out why contours are no good, but it's just the way opencv works
understand contours now, exporting data over osc
Merge branch 'master' of github.com:cibomahto/sonos_project
Added default provider for crypto:hash() function.
Added default provider for crypto:hmac() function.
Added lib.properties file.
Added JUnit unit tests for crypto:hash() with default provider.

References #199
Added default provider management and standard names for algorithms for
crypto:hmac() function

References #198
Added default provider management for crypto:hash() function

References #198
Added unit tests for crypto:hmac() with default provider

References #199
Added unit tests for crypto:hash() for binaries with default provider

References #199
Added JUnit test for provider

References #189
Added first version of the default provider

References #189
Added list of standard algorithm names

References #198
Updated version
Added mongodb to apt-get, in case.
Improve git gems and rails autoconfig fix [stager]

stager shortlog 54c9f269..7a194938
    Maria Shaldybina (1):
        Load rails autoconfig first and git gems optimizations

Change-Id: Ie2ddb94f6ea301e27a251b19dc79fc473d9e7c0b
Merge "Improve git gems and rails autoconfig fix [stager]"
Update for spree 0.70.x
Fix tabs insertion
Fix tabs 2
Fix for stylesheet failure
add 1.0.x compatibility
add testing instructions
Merging Pierre Basile's 1.0.x branch into master

Merge branch '1.0.x' of https://github.com/kpitn/spree-snippets

Conflicts:
	app/helpers/spree/snippet_helper.rb
	spree_snippets.gemspec
change version
fix installation
Merging version change and installation fix from Monsieur Basile

Merge branch '1.0.x' of https://github.com/kpitn/spree-snippets into 1.0.x
missed warnings in checkstyle, now fixed
linux: fine-tune regex
Improved statistics label
Incremented version
Fixed issue with status flag
changed authentication scheme
Copy from local repos
KML view for countries data
update the language translater system
arch vim on right side and cache git stuff
Revise tapNack symptoms
Remove regex importing because there is no need
Add blogs sociales recipe
Update NN_autostart.sh
Removed development Makefile from tracking, and added CMake based build
bintree: re-org
basic graph, lacks real data or connecting lines
Merge branch 'master' of https://github.com/cs169-group28/ESnetproj
and hopefully get basic graph working
Conflicts:
	app/views/layouts/application.html.erb
	log/development.log
don't break please
Typo fix: "In a disconnected deployments"
#master Initial files
#master change to gitignore
#master replace Bootstrap with latest version
add the code to process FCS input format, work with FCS3.0
Updating styles list in readme
do not proceed if partition is not mounted
调整，修正，烦啊。
document recent changes
Merge branch 'master' of github.com:d-snp/system-validation

Conflicts:
	Assignment 2/src/Game.java
refix typo
Update to 3 balls
App Fiancial Management in Finance Module section:Resume created
Use appengine to ping heroku for updates
Add birt runtime jars
added jade.vim submodule
opencl: potential fix for #9120
Merge branch 'master' into opencl
Merge branch 'opencl'
Migrated to bauhaus widgets.
Bauhausify of channelmixer..
Bauhausify of colorcontrast iop...
Bauhausify of vibrance iop ...
Bauhausify of grain iop...
Make copy export to jsut copy and dont initialize a processing pipe.
Bauhausify of highpass iop...
markers with acceptable size for scale=2.0
Merge branch 'master' into tiling
add color smoothing functionality opencl path of demosaic module.
not a speed giant but a more efficient method is under development.
Temporary fix of dependency order by adding sort
Fix adapter organization issue and add text and light gradient libraries [#109]
Fix -webkit-small-control styling in core adapter for .button [#109]
Update button demo [#109]
Added references to list style type shortcuts in README and prototype (#112)
Added base layout container template and prototype (#110)
Implemented image replacement using Phark method (#60)
Move default style into a new Base/Color/Branding namespace [#109]
Merge branch 'master' of github.com:ucla/WebBlocks
Add entire branding color set [#109]
Add _build_css rake task (temporary only) [fixes #119]
Add fluid grid implementation and container tweaks [fixes #113]
Minor tweak to variable names [#113]
Tweaks to Base/Structure/Container [#113]
Tweak on container for when structure-container-width-max is not set [#113]
Added a Hint
Added a controller for Pages
Everything is up to date now
Added the contentscroller each time the page changes
Merge branch 'master' of https://github.com/dawsonloudon/mobile_app
Modified Ship.cs to stop compilation errors. The logic is bad, needs to be rewritten.
ud - matching Death_marine's repo
r - config.yml/tier classes, a - custom type handling/new config
ud - most recent DiabloDrops main repo
ud - gitignore
r - lib folder from github, a - config.yml
a - another getItem() method/identifying items now works
ud - most recent upstream
ud - DropsAPI chance calculation, a - new set detection
v0.3 Build
a - drops command, f - identifying items
added and then removed stuff
caved and used someone else's library for names and lore
Merge remote-tracking branch 'fork/master'

Conflicts:
	.classpath
	.gitignore
	config.yml
	plugin.yml
	src/com/modcrafting/diablodrops/DiabloDrops.java
	src/com/modcrafting/diablodrops/drops/DropsAPI.java
	src/com/modcrafting/diablodrops/listeners/TomeListener.java
	src/com/modcrafting/diablodrops/socket/MerchantInv.java
	src/com/modcrafting/diablodrops/socket/SocketWindow.java
	src/com/modcrafting/diablodrops/tier/Drop.java
	src/com/modcrafting/diablodrops/tier/TierBuilder.java
	src/com/modcrafting/skullapi/lib/Skull.java
	src/com/modcrafting/skullapi/lib/SkullInterface.java
	src/com/modcrafting/toolapi/lib/Tool.java
	src/com/modcrafting/toolapi/lib/ToolInterface.java
	src/de/bananaco/bookapi/lib/CraftBook.java
Looping part working
Adding message handler f# project
PERF-250: Added warning to the README.md.
PERF-250: Changed class name from isc-dhcp to isc_dhcp to avoid scope operator issue.
PERF-250: Added in a filename parameter for the isc_dhcp::host type to allow for PXE via bootp.
Merge pull request #2 from pdzwart-atlassian/master

Class name change from isc-dhcp to isc_dhcp
Commit of GRAILS Generated Structure

Also includes login via LinkedIn
[maven-release-plugin] prepare release connector-0.1.2
push by dherman: https://github.com/dherman/tc39-codex-wiki/compare/6600d43...642f452
tweak fp back
Formatação.
Formatação.
Remoção de estilos não usados.
Inclusão do arquivo para não commitar arquivos desnecessários.
Fixed Multithreading related NPE
users status now available via statuses_users
Merge branch 'master' of github.com:dieswaytoofast/twitterl
Changed the checksum equality check from a == to a LogEntry.Start method, allowing for changed implementations to work around bugs there.
new requirement implement and some code smells identified
Sid tests being reworked a bit...
updated readme, minor fixes
apache2 license header
plugin util unregister actions
updated readme
Add production settings for django
Minor detail missing..  It is for JavaScript.. :)
Refactored folder structure; Update: Express 3 server app w/ stylus support
Parse incoming search to match api db
删除默认主题
提交
TTL support
Added scope support
Update Firefox-version to 11

Signed-off-by: Hans Christian Reinl <anything@drublic.de>
disable opacity for older browsers, seems to affect IE8
added boostScalarField type
Optimized diffusion on diffuse vacant species.
Add twitter script to gitignore
* Marked Signature as ignored
* removed debug info from some files
* linear theme - added skipping album description if empty
added -k argument to AnalysisScript.py

-k allows specification of a file for reading/writing known subgames. I
also fixed a bug in Subgames.py that this revealed.
Generated content for 'Github Pages', based on commit 0b3bae24bca146549fee467af017589003a4cdf5
added translation file, renamed dir, implemented server to provide content without restriction of security limitations
Cambios Visuales.
Adding Points for Paths
Edited Chirbits Section and Centered
export book
Fixed initialization order in constructor.
Merge pull request #3 from jvilk/master

Simple Initialization Order Change