labofsahil/github-event-dataset-2012 huggingface dataset:
CCellFunctor added.
Merge branches 'master' and 'DigitalSurfaceConvolver'
Merge branch 'master' of github.com:DGtal-team/DGtal
Merge branch 'master' of github.com:DGtal-team/DGtal
Merge branch 'master' of github.com:DGtal-team/DGtal
Merge branch 'master' of github.com:DGtal-team/DGtal
Merge branch 'master' of github.com:DGtal-team/DGtal
Fixing some warnings
removing representation and evolution subfolders
 ConstIteratorAdapter inherits of boost::transform_iterator
 IteratorAdapter too
Merge pull request #379 from dcoeurjo/warnings

Fixing some warnings
Merge pull request #380 from dcoeurjo/CurvresRefactoring

removing representation and evolution subfolders
default constructors for scell functors
conversions ConstIteratorAdapter <-> boost::transform_iterator
more tests in testConstIteratorAdapter
circ/iterator tags (circulator, traits, functions in different files)
Merge branch 'master' into boostTransformIterator
Fixing clang warning message for std=c++11
 new ReverseIterator (based on boost::reverse_iterator)
Retreiving information on changes in files (number of modified/added/removed/deleted/unknown/renamed files) is now optional in get-hgstatus (this can be a time consumig operation on large repositories). Default is True. Same goes for the retreival of the Bookmark status.
Pass through settings for GetFileStatus and GetBookmarkStatus to Get-HgStatus function. Add default values for these settings ($true in both cases).
When not using hg summary to get status, use hg heads to check if working directory is behind head of current branch
Detect when the current branch has multiple heads and indicate by changing the colour of the branch name. Helpful when knowing when a merge is neccessary.
Merge pull request #15 from petemill/master

Improving performance - making 'hg summary' optional
Rejigging docs
almost done with the boundary on the mode for the first assignment
found and fixed the error, nginx automatically decodes urls
签证准备阶段的搜索
安置阶段的搜索表单初步完成
Basic test works.
Using prefixes though. Need a way to set them and also submit them with JSON
Some instrumentation for performance tuning.
Add Polish tanslation
Merge pull request #13 from canni/pl-trans

Polish messages translation
Decimal#to_s takes parameters which SimpleDelegation wasn't passing on
Updated the landing screen.
Fixed argument stuff for now
wohoo, works
Fix anticamp
Updated translation: French (France) by DenisChenu, riqcles
Updated translation: Croatian by rovinj
Updated translation: Norwegian (Bokmål) by pmonstad, peterhol
Updated translation: Serbian (Latin script) by OnSpot
Fixed issue #6084: When changing language during a survey not all texts were also properly switched
PEP 8 naming in new makitso version
Normativas nacionales - Ticket #291
Add trackball controls

Trackball controls
- Use A or left mouse + drag to rotate
- Use S or middle mouse + drag to zoom
- Use D or right mouse + drag to pan camera
Used pattern as bg
NetStoreManager GoogleDrive: add uploadmanager
plava pozadina je sada deo futera a ne vise body
css sredjeno preklapanje menu - comments
fixed #24
Fixed highlight of referred hidden post.
Cleanup startup for the CloudRAID core service.
mzk base is now taken from marc xml
mzk base is now taken from the combobox on the client side, because the former way was not safe
forgotten classes; see previous commit message
akka on/off switch -> editor config
typo
Merge branch 'master' of github.com:moravianlibrary/MEditor
Merge branch 'master' of github.com:MatousJobanek/MEditor into issues
Merge branch 'issues'
Readded sticky bomb to T buy menu.
Make sure common module is included to avoid undefined parameter errors
add p1

Change-Id: I8a065b11e15411c4d48db229d9d5ccdc81246773
Merge "add p1" into ics
Improved comments for documentation. Not finished yet March17.
Release 1.6.5

Signed-off-by: Meldanor <Bhaals@gmx.de>
LabWork 10.doc
LabWork 10.doc
commit
task7_move
Add version to PMD plugin.
Add PlayerItemBreakEvent. Addresses BUKKIT-1600
Add plugin channel events. Addresses BUKKIT-1844
Deprecate spawnCreature and add spawnEntity. Addresses BUKKIT-1168
Add LivingEntity.hasLineOfSight. Addresses BUKKIT-1255
Merge remote-tracking branch 'upstream/master'
Set the latest stable version of pmd plugin
update phone gap environment
/Users/MorehouseJ09/Documents/github/prospero
Skapade Projektet SimAlbDan
Path brings changes
set up CSF with bibtex
- Version 1.0.1
- Removed const RegExp constructor
- Updated methods to getters
- Updated documentation
Fixing dependenceies on an old Hashie.
added ability to create a blank page
תרגום ניסויי טיפוגרפיה

type.html
ותיקון בעמוד ניסווים את התפריט להצמיד לשמאל ולא לימין
Table structure completed, moving on to cards and dealing etc
Merge branch 'master' of github.com:Norbo11/UltimatePoker
Vault integration, starting of cards and table logic.

Signed-off-by: Norbo11 <norbo11@googlemail.com>
Merge branch 'master' of github.com:Norbo11/UltimatePoker

Conflicts:
	.classpath
	bin/com/github/Norbo11/ListenerCommandExecutor.class
	bin/com/github/Norbo11/UltimatePoker.class
	bin/com/github/Norbo11/cards/Card.class
	bin/com/github/Norbo11/cards/Deck.class
	bin/com/github/Norbo11/cards/PokerPlayer.class
	bin/com/github/Norbo11/methods/MethodsMisc.class
	bin/com/github/Norbo11/table/Table.class
	bin/com/github/Norbo11/table/TableDisplay.class
	bin/com/github/Norbo11/table/TableMethods.class
	config.yml
	plugin.yml
	src/com/github/Norbo11/ListenerCommandExecutor.java
	src/com/github/Norbo11/UltimatePoker.java
	src/com/github/Norbo11/cards/Card.java
	src/com/github/Norbo11/cards/Deck.java
	src/com/github/Norbo11/cards/PokerPlayer.java
	src/com/github/Norbo11/methods/MethodsMisc.java
	src/com/github/Norbo11/table/Table.java
	src/com/github/Norbo11/table/TableDisplay.java
	src/com/github/Norbo11/table/TableMethods.java
typo in og.api.rest
remove space
adding unplottable_surface_data type to mapping
remove unnessisary dependency
created a timeseries gadget wrapper, hooked up timeseries data for analytics
initial aggregation replay query
[PLAT-2792] Adding security converters (with some temporary hard-coding)
Reorganised packages of new analytics back-end
[PLAT-2793] REST endpoint for server-side logging of client errors
Adding a field to Bloomberg FX volatility surface instrument providers that allows the ticker scheme to be set
Fix bloombergIdentifierResolver to use [<ticker> <dataprovider> INDEX] for indicies
Fixed handling of columns with history where the engine produces no value
Externally provided sensitivies changes.
Modified to not abort entire snapshot when error encountered.
Correcting an error message
Adding the ability to specify the scheme name in a volatility surface specification for future option
Removing unused variable
Forgot to add some files.
Fixing swaption security converter - broke because behaviour of get() had changed in SecuritySource
Inconsistent date tests fixed
Fixing the FX option PV01 function and externally-provided sensitivities mark function and adding defaults for pure volatility surfaces
Merge branch 'develop' into ui/dev
Fixing potential NPEs if cache doesn't exist
Fix h2 alignment on kootenay orienteering
Merge branch 'master' of github.com:OrienteerApp/Clubsite
ui layout v3
Nerfed the Damage of Fiery Aura
Fixing prefix issue
Adding ipsumpicksome, fixing build processes and adding more support in the twitter app
Added start screen and player configuration
Email address is used for username

Closes #134
Add social_auth and registration as requirements
Collect first name and last name as separate fields during signup
Added a StarSystemEntity Class for Position and Mass
commented out jinja2 layout registration
harcode i2c3 bus devices, allow to use green camera on gb kernel :)
Added the crud-submodule
add package and package-group test
Removed tags and refactored fn for pkg install and remove
resolved merge conflicts
Merge branch 'master' of git://github.com/RedHatQE/katello.auto
refactored add/remove package function
changes as per review comments
Add config option to point to url of katello-agent, plus add steps to
install agent during client configuration. (untested)
Merge pull request #2 from weissjeffm/for-sachin

Add config option to point to url of katello-agent, plus add steps to
Merge remote-tracking branch 'remotes/sachin/master'
Core/Script:

Gyth
Kelthuzad
Core/Spells: Fix no combo points after Mind Control
Core/Spells: Only auras that has triggered spell should proc from fully absorbed damage.
This is Tobmaps version, and looks much better than Chipsi code.
#6410
Core: Quest - The art of persuasion
Core: Quest 'The art of persuasion' - Typo
Core/Spells: Convert Gift of the Naaru in spell script

Closes #6545
SQL: Fix sql fails :-/
Core/Spells: Fix typo (I need sleep)
DB/Quests: Fix OfferRewardText for quest "Warsong Supplies"

Closes #7279
Core/Achievements: Change ACHIEVEMENT_CRITERIA_DATA_TYPE_T_PLAYER_CLASS_RACE behavior
Allow it to be used with value1 = 0 and value2 = 0 to only check if the target is a player. Fixes some startup errors.
Scripts/Karazhan: Fix Prince Malchezaar Infernal start timer

Closes #5700
Core/Spells: Set UNIT_FIELD_CHANNEL_OBJECT also for spells that don't have explicit target unit but use NEARBY selection, fixes #7246
Core/Scripts: Cleanup the warrior spell scripts
Core/Spells: Fixed typo in previous commit
Core/Scripts: Some cleanup in warlock spellscripts
Core/Vehicles: Improved vehicle passenger position calculation (still not complete)
Core/PacketIO: Enabled some opcodes
Core/Entities: Fixed the "Move To" command for pets.
Core/Guilds: Implemented guild news & guild rewards tab

Signed-off-by: Sovak <Sovak007@gmail.com>
Signed-off-by: Nay <dnpd.dd@gmail.com>
Little codestyle change

Signed-off-by: Sovak <Sovak007@gmail.com>
Signed-off-by: Nay <dnpd.dd@gmail.com>
Core/Guilds: Corrected CMSG_GUILD_NEWS_UPDATE_STICKY structure

Signed-off-by: Nay <dnpd.dd@gmail.com>
Correcciones ortográficas al README y adicionando algunos archivos al .gitignore
Merge pull request #36 from RglMrn/master

Implementación de Less en la página
Fixes #37
Fixes #30
Un par de modificaciones al README.
Modifiqué la información de las reuniones para que apunte a la sección de eventos en facebook
Merge pull request #38 from alexishevia/master

Fix para el Issue #30 y #37
Merge remote-tracking branch 'upstream/master'
Initial theming import
Fix to parse-int
- added many more abstracts

- changed complexes into a sortedset
- added user manager to instance; keeps track of user data such as genders
- added task manager for delayed tasks (timers in TCL parlance)
- added feelings class; logical functions for bot
- abstracted away incoming actions; onChat now handles this
- incoming chat is now encapsulated into a single class which contains all information (speaker, isAction, etc) as well as shortcut functions to directly respond to message
- whispers implemented in AW connector
- fixed smile generator
- implemented many complex actions, including giving things to the bot, fucking it, balefire, etc
Added graceful upgradation of HTML4 States to HTML5 Browsers... but it seems to have broken prototype and mootools...
v1.2 now considered stable. Fixed the mootools and prototype break.
Turned debug mode off.
v1.2.1 - Re-Added History.go, updated the documentation, changed History.log calls to History.debug calls.
Fixed code sample in readme.
Clean HTML4 States completed. Tests now have to run longer... 8 seconds between test (argh).
Fixed date in changelog for v1.3.0 release
Cleaned documentation, a few other things. Not ready yet as some tests are failing.
Fixed example website state listing in readme.
Improved documentation.
Merged.
QUnit Added, Restructured Project, Fixed anchorchange trigger, Working on Queueing.
More queueing updates. Now supports multiple queues.
Working manually. Need to update go functionality.
Made a lot of progress with queueing. Works in FF3, Chrome, Opera. Now testing in IE.
Cleaned files. Improved documentation.
Added IE6 Support.
Updated readme a bit more.
v1.4.0 Release
Added note about submodules to readme.
Add uitable to Spectrometer.fig for external channels
change uitable Tag to uitableExtChans
Cleanup spectrometer_OpeningFcn()
show external inputs in a uitable first implementation
tweak gui layout
tweak formatting for external channels in uitable
add menu item for MCT for gain+trim
Added Gain Trim control

Christie's code for tweaking the FPAS.
Add 'python-heatclient' unittest trigger
Initial fixes for NCBI GEO crawler
added fast hashmap implementation writing by Attractive Chaos, nanos gigantum humeris insidentes.
added fast hashmap implementation writing by Attractive Chaos, nanos gigantum humeris insidentes.
frequencies dict and removed try-block from parse.py
frequency and reverse precomputed and code to compute
fixed fileformat bug
Update src/org/textanalyzer/frontend/HelpPanel.java

last coments update
Text Analyzer Working Beta - Take 2
...
Merge branch 'master' of https://github.com/Schwoisser/space-ship
trade
allowed spcification of different UIPageControl class
fix scrow view frame size
Rewrite CardSwitchGesture into CardViewGesture
Simplify Card View Gesture Handling
Rewrite switchMode into cardViewGesture
Switch WindowServer.cpp to CardViewGesture
Switch SystemUiController over to CardViewGesture
Switch CardWindowManager over to CardViewGesture
fixed fallback to be of people, not a test pattern
Petite amelioration mais marche pas encore
Revert "Applied Amaranth's Entity Hack Fix (based of Trunkz's)"

This reverts commit ce9ad4059806cb965040d4b59248bbb177347a04.
Navigator docs: add a screenshot
Logic backwards on animation start.
Move animation download to inside of ModManager.
Remove old animation file, replaced with dynamic animations downloaded
upon modpack installation.
Don't delete animation file on clean up method.
Remove unused variable.
pointed auction bundle at new master commit
Fixed to work with functions that use **kwargs
Changed the headers to comments, also added 2 questions back, other questions don't seem to have a place.
Patch for supporting css class based hide/show through a "hidden" css class name.
Fix for missing container target.
Touchup to #528.  Demo fields optional, added privacy
Merge branch 'master' of https://github.com/Stanford-Online/sophi
Added DbEzException class
Make 25 bars default in lv_analyzer.
Bug fix to input_debug.
Added:
- basic layout;
- js;
- css;
Fixed layout on survey page
Merge branch 'master' of https://github.com/SuicideNote/vashapara

Conflicts:
	src/main/webapp/choose-partner.jsp
Update tools/roomservice.py

Wasn't checking properly if mmproj was None. Fixed
Fixed recent products layout.
Merge pull request #76 from umpirsky/layout-fixes-01-12-2012

Fixed recent products layout.
Moved auto-queue to WAIT_LIST_UPDATE event

Increases the chances of getting in the list in very big rooms.
Only autowoot in beginning if autowoot is enabled
add more detail message in image head output
detalles home
chat web
Merge branch 'master' of https://github.com/Throy/derp-octo-robot

Conflicts:
	Laboratorio/IndignadoWeb/Views/Shared/DisplayTemplates/DTMeetingSmall.cshtml
Merge branch 'master' of https://github.com/Throy/derp-octo-robot
Merge branch 'master' of https://github.com/Throy/derp-octo-robot
Chat
Merge branch 'master' of https://github.com/Throy/derp-octo-robot
Retoques
glm, fps camera
assets.mapproxy: set expires header to 48 hours
rescue on LIBC to fix *nix systems

added Kiwi#queue_key
removed irc templates from travis.yml, wasnt working.
bumped version to 0.0.2
Fixing bad namespace for all exceptions - I didn't know but to rely on fallback is not a good practice
detail for php using
Initial commit

Signed-off-by: Dillip <kumardillip07@gmail.com>
Merge branch 'master' of https://github.com/Tropixtech/EVENTCODES
testing

Signed-off-by: Dillip <kumardillip07@gmail.com>
DCA-975 adding licenses!
refractored and passes unit tests
improved options getter/setter
renaming files to avoid confusion
new user interface
removing the default outline offset for the chat message input box
improved tabs
Moving TemplateEngine interface under Framework
CS fixing
ignored dirs
Second commit: added tiapp.xml
Add updated submodule references for master
Merge pull request #1254 from VictorLowther/pull-req-master-3458157901

Dumbify Ubuntu's network handling [2/5]
Add README for hetrogenous OS support.
Allow something besides dellcloudedge to be used as the "origin" account.
Fix up dev sync to handle the case where a barclamp is not in the
development release.
Merge branch 'master' into hadoop-os-build
NORMAL new functionality, better auxilliary support.  A few more functions for the standard lib.
Small corrections in german and english language files

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@6624 87cc427b-4a1e-0410-b729-b2260ec0f063
AIO: replace db prefix

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@6625 87cc427b-4a1e-0410-b729-b2260ec0f063
Klarna tmpl reorganisation WIP

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@5749 87cc427b-4a1e-0410-b729-b2260ec0f063
pan_state: don't modify mapper range if no change

The way panstate is implemented may accumulate rounding error
This is particularly important for zoom_to_mouse feature,
on only one axis, which is implemented with a 1 axis only panstate
even if prev[1] == next[1], the value axis will increase slightly
at each mouse wheel scroll.

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
better_zoom: factorize and fix zoom_to_mouse algorithm

with old algorithm, a zoom-in followed by a zoom-out will
not result in coming back to the same place, which is very
confusing for the user.
The point under the mouse was sent to the center of screen.

With the new algo:
- we make sure that the point under the mouse keeps its mapping on screen.
- we dont use mapper.map_data anymore to find out center of screen because this implies
pixel based rounding errors
- We also factorize the lot of cut and paste in this file.

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
zoom: default back to zoom_to_mouse=True

now that zoom_to_mouse is sane again activate it by default
it is much more intuitive for user

Revert "fix the default zoom behavior"

This reverts commit def778932001559d5213502d51bc1b49bcc1245e.
better_zoom: zoom keys also zoom to mouse

This is more coherent that the keys shortcuts for zoom
also follow mouse.

This feature can be disabled using keys_zoom_to_mouse=False
or zoom_to_mouse=False

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
pan_tool: add possibility to Pan using keys

ZoomTool has keys support, why not PanTool?

Still disabled by default
add pan_keys_step=50 to constructor to enable it.

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
Zoom now resets original mapper values when history is reset
Reducing the memory overhead of image plots and introducing a new cython module for speedups.
Replacing call to np.isnan in cython code with isnan from math.h
Fixing documentation of map_colors
Added new horizon plots
Added support for positive-only bands
Shift the color bands for the positive only plot
Add example showing comparison with filled line plot
Implementing speedups suggested by Chris Colbert
Fixing typo
REL: update version in preparation for release
Merge branch 'master' of github.com:enthought/chaco
REL: master is now version 4.2.1
Updates to the lasso tool to make it work with the scatter inspector overlay
Use correct trait for lasso border width
correct errors in university page
Fix for Google Calendar, missing URLs
Merge branch 'master' of github.com:WeeverApps/com_weever
Add: test
Merge branch 'myfeature' into develop
Can view voting results now
Update bliss/dayz_server/compile/server_playerSync.sqf

Player's backpack resets to default when changing the skin (e.g. using sniper skin or morphing to bandit).
I can confirm this is the proper fix. Tested it.
https://github.com/ShadowDuke/DayZ-Private/commit/fb67e255c81fe997738d023bf5802d71d4a83c7b
Add cursor to elements
Fix isles biome affected by biome ids.
Merge remote-tracking branch 'origin/master'
Add custom biome ids to world config.
Fix wrong biome generation.
Merge branch 'master' of git@github.com:Wickth/TerrainControl.git

Conflicts:
	bukkit/src/com/khorn/terraincontrol/bukkit/BukkitWorld.java
	common/src/com/khorn/terraincontrol/LocalWorld.java
	common/src/com/khorn/terraincontrol/biomelayers/layers/LayerBiomeBorder.java
	common/src/com/khorn/terraincontrol/configuration/BiomeConfig.java
	common/src/com/khorn/terraincontrol/configuration/WorldConfig.java
Added several phones and emails for organizations in adding form
Виджет DatePicker + мелкие исправления
Merge branch 'master' of github.com:WikiSocium/WikiSocium
add name column to users table and change users_controller
Continued working on SvnInfoReceiver +test
сделал отображение работ в виде карусели, изменил вывод работ в админке 20.23 29.05.12
Delete temp vim files
Fixing links to wiki and extending javadoc [Phase 1]
Merge stable
Merge UCS
Merge branch 'master' of github.com:abiquo/jclouds-abiquo
Ported the freeloader for use in windows
Made it clear
Update README.md
Merge pull request #1 from smuralireddy/master

Ported code to Windows
máscara - não resolvido

a máscara continua bugada...
Fixed the edit profile popup.
Added scaffold org controller/views
check food position before place it and fix game over.
pontless stuff
sendscore is now surrounded by settimeout
remove unecessary stuff
Update js/food.js
refactored functionality into mongo store as part of creating read state store
refactored Coordinator class out of ReadTracker and implemented read state tracking for a user
completed get_states method to return ItemStates for passed ids
Getitem/setitem support for flat sequences.
Beginnings of runtime support for nested data structures.
Synchronizing.
Nested cuarray constructor compiles, not yet tested.
Synchronizing.
Synchronizing.
Working privately until reconverged.
Nested sequence runtime working.
Bugs in some cases with empty subsequences.
Fixes for empty lists in cuarray constructors.
Fixed bug in cuarray iterator.
Fixes to indexing.
Added cudata tests.
Added more tests.
Merge branch 'master' of github.com:BryanCatanzaro/copperhead

Conflicts:
	.hgsub
	.hgsubstate
Synchronizing work on thrustizing backend.
Updated SConstruct to allow custom Thrust installations.
cudata.so works for simple flat sequences.
copperhead/tests/test_cudata.py passes again!
But cuarray.hpp & cudata.cpp are a horrible mess.
Tagged sequences.
Synchronizing.
return dtmf key if record_to_file is interrupted with a dtmf tone
Merge branch 'hotfix/record_to_file_dtmf'
Fix unit tests on JRuby in 1.9 mode
removing the development dependency on sqlite3 to fix ci
Merge branch 'master' of github.com:adhearsion/adhearsion
Ignore Rubinius files
[BUG] Prevent Pry command/method name conflict
Merge branch 'release/2.0.0.alpha1'

Conflicts:
	lib/adhearsion/console.rb
	lib/adhearsion/voip/asterisk/commands.rb
	spec/adhearsion/voip/asterisk/commands_spec.rb
	spec/adhearsion/voip/asterisk/config_file_generators/voicemail_spec.rb
Merge branch 'release/2.0.0.alpha2'

Conflicts:
	.gitignore
Merge branch 'release/v2.0.0.alpha3'
Merge branch 'release/v2.0.0.beta1'
Merge branch 'release/2.0.0.rc1'
Merge branch 'release/2.0.0.rc2'
Merge branch 'release/2.0.0.rc3'
Merge branch 'release/2.0.0.rc4'
Merge branch 'release/2.0.0.rc5'
Merge branch 'release/2.0.0'
[BUGFIX] Don't load rubygems because it is evil
[BUGFIX] Avoid infinitely recursive exception handlers

* Exception handlers which raise an exception should just log it and finish
Conflicts:

	CHANGELOG.md
[BUGFIX] Temporarily fix issue created by Celluloid adding ActorProxy#join

* https://github.com/celluloid/celluloid/commit/5b58edc7dd98f9db45b65ef062a983fe056d96d7
[FEATURE] Allow setting arbitrary input component options in #listen
Przerobiony singleton, usuniecie image z uobjecta, wersja rc1
tookout base facets
bs
fixed bs
reference counting test
More debugging statements for scores endpoint
removed some commenting
added fullQuery
create default config entry
Merge branch 'unstable' of github.com:afpfeiffer/TexFlasher into unstable
fixes errors in rules.html
fixes error with 'laws of navy' syntax in 'forever and ever'
removes epub docs from codebase
Remove Hello word
modify fedex tn identification
Added Pages Controller
Added Static Pages
fixed some serious bugs with audio playing and downloading.  also fixed download between two suras or two juz\'s to fix #233.
Adding tile entity debug.
Stop automatic reconnection when the desired account mode is offline and set automatic presence correctly.
Previously all-offline or all-online also disabled telephony and MMS services. Only use the
accounts provided by Accounts-Qt to prevent this.
Warnings about impossible rules
Merge branch 'impossible_condition_warning' into devel
Release preparation
Merge branch 'all_offline_fix' of https://github.com/lorenzph/profilematic into devel
Use-package now accepts function as argument
Merged with upstream
Find error.
Added empty readme with build status.
Feed sorted chronologically descent, as it should be.
Simpler composer.json
cleanup of `turses.core`
better Sphinx docstrings
Removed commented code.
Used fos_user.user_manager in fixtures.
Removed personal info from fixtures.
RubyMine Test
JBEHAVE-804: Improved test in PrintStreamOutputBehaviour
Added a check for valid xml to the xml test method, more elaborate pending methods, changed the sequence of the test story to be more like actual stories (dry run moved below beforeStory and pending methods before afterStory).
this way the story xml is proper xml.

This doesn't change any main code, only the test was wrong.
JBEHAVE-806: Jbehave doesn't reformat stack traces on Windows
added cr/lf conversion to StackTraceFormatter, added unit test for an Exception
JBEHAVE-807: odf unit test fails due to cr/lf issue on Windows
added dos2unix conversions to the test
fix for JBEHAVE-813 and JBEHAVE-815

JBEHAVE-813: html template report contains encoded html tags

correctly encode step pattern and parameters but not the html/xml tags that are inserted into the text in the report
(changes for the actual fix and added a few lines to the TemplateOutputBehavious as well as to the PrintStreamOutputBehaviour, this does the encoding correctly however)
To distinguish between XML and HTML I had to introduce an enum that is accessible from the freemarker template, which is kind of complicated.

JBEHAVE-815: template reports do not mark step parameter if it contains special chars

the parameters are matched by a regex including specific chars not including e.g. angle brackets, comma etc, this is unnecessary if the regex is matched non-greedy.
JBEHAVE-813: html template report contains encoded html tags
removed debug statement left in in last commit
JBEHAVE-812:  Handle outcome date values, with a date format customisable via OutcomesTable.
JBEHAVE-812:  Use locale-independent date format in unit tests.
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	jbehave-core/src/test/resources/story.html
	jbehave-core/src/test/resources/story.xml
Add devise-encryptable gem

Also bumps devise and devise_invitable
Add password salt field and extend password field
Change encryption strategy to use sha512 with lots of stretches
Migrate old-style passwords to new ones on sign in

Rather than invalidate all passwords we can allow a smooth migration by updating
passwords as users sign in.
Assume BCrypt::Errors::InvalidHash exceptions are bad login requests

If a user has a new-style password but their sign in fails the code
will try to check if it's a valid old-style password which causes
an exception. That exception means the password is invalid.
Merge pull request #22 from alphagov/change-encryption-strategy

Change encryption strategy
Start teleport function
09-11-2012 10:18 PM
10-11-2012 05:12 PM
AV-110/11/2012-10:29PM
----------------------------------------------------------------------------------------------------
Merge branch 'master' of https://github.com/tigeralpha/pamdental into tigeralpha-master

Conflicts:
	.htaccess
	application/controllers/frontoffice.php
	application/controllers/patient.php
	application/helpers/dompdf/lib/fonts/log.htm
	application/models/patients.php
	application/views/frontoffice/frontoffice_forgot_password.php
	application/views/frontoffice/frontoffice_header.php
	application/views/frontoffice/frontoffice_login.php
	application/views/frontoffice/frontoffice_patient_checkup_archive.php
	application/views/frontoffice/frontoffice_refresh_checkups.php
	application/views/frontoffice/frontoffice_review_checkups.php
	application/views/frontoffice/frontoffice_view_checkup_detail.php
	application/views/patient/patient_home.php
	application/views/patient/patient_home.php.orig
	application/views/patient/patient_registration_form_edit.php
	css/front/screen.css
	index.php
Merge pull request #48 from alphavictor/tigeralpha-master

Tigeralpha master PULL-AV-10/11/2012-10:35PM
AV-10/11/2012-11:27PM
Merge pull request #50 from alphavictor/tigeralpha-master

patch1 PULL - AV-10/11/2012-11:28PM
AV-11/11/2012-11:10AM
11-11-2012 1:25 PM
Merge pull request #51 from alphavictor/tigeralpha-master

PULL patch1:tigeralpha-master-11/11/2012-5:23PM
AV-11/11/2012-6:34PM
--------------------------------------------------------------------------------------------------
Merge branch 'master' of https://github.com/tigeralpha/pamdental into tigeralpha-master

Conflicts:
	application/controllers/patient.php.orig
	application/models/patients.php.orig
	application/views/patient/patient_home.php
	application/views/patient/patient_home.php.orig
Merge pull request #55 from alphavictor/tigeralpha-master

PULL patch1:tigeralpha-master-11/11/2012-6:42PM
AV-11/11/2012-7:42PM
AV-2/11/2012-1:46AM
Merge branch 'tigeralpha-master' into patch1
12-11-2012 2:17 PM
AV-12/11/2012-5:53PM
AV-12/11/2012-6:51PM
Merge branch 'tigeralpha-master' into patch1
12-11-2012 9:14 PM
AV-12/11/2012-11:48PM
OGRE: Style changes. Cut off many lines to make it fit on one screen
OGRE: Added CallbackHandler to Client_Core, initial dispatcher code

- Need to add overloaded functions to AppState to actually call
OGRE: Add empty ProcessCallback() functions to GameState and MenuState

- The functions are empty right now. Need to add handling of the functions
OGRE: Make callback handles loop every frame.

- In case we get more than one callback per frame
Client_Core: Fixed CallbackHandler not ending properly (inf loop bug)
OGRE: Hooked up ProcessCallback functions

- The MenuState LeaderChanged() function crashes though...
OGRE, Client_Core: Updated release versions of makefiles
Get Github API keys from settings file; skeleton home template.

Yeah, it's a multipurpose commit. I'll atone later.
Merge remote-tracking branch 'origin/master'
[maven-release-plugin] prepare for next development iteration
Merge branch 'master' of https://github.com/amaiberg/hw1-amaiberg.git
add alanine.nanma
Merge branch 'master' of github.com:amcadmus/adress.noneq
add tools
add files
pass compile, not debugged
rename files
fix bug
use TreePosition to locate TreeNode
better use of posi
add brother detection. pass test
misc: sun4i-vibrator: depends on android
drm: mali: fix for 3.4
ARM: sun4i: honor memory information passed by the bootloader

unless CONFIG_SUNXI_IGNORE_ATAG_MEM is set
block: sunxi-nand: fix Makefile typo
video: sunxi: Combine Sun4i and Sun5i hdmi and lcd modules
video: sunxi: Combine Sun4i and Sun5i disp module
video: sunxi: Rename config declarations. CONFIG_LYNCHEE_FB_SUNXI to CONFIG_FB_SUNXI
video: sunxi: Restore .config compatibity
sunxi disp: Try to split UMP dependency from disp
video: sunxi-disp-ump: fixed typos
mess
Fix autocomplete and formatter view.
report exec if git exec is not found
ENH going for a universal property ``_pairwise`` instead of many functions.
Update to 3.0.42-rc1
[maven-release-plugin] rollback the release of release/8.4.702.jdbc4.1-rc4
Moved methods into target
Wrapped and removed static
Changed static reference on methods
Removed more static stuff
Removed static stuff
Fixed all static references with directories
Profilverlauf integriert
transparent bootstrap background
all files running in this directory structure
Updated with options on route A and new pole data from Paul
app-id test
Basic frontpage layout
static styling
Update templates/dependencies.json

Changed the dependencies template to specify full file paths
Se agregaron código de anuncios y cambios en estilos
add .gitignore
add bash config file
suppression du double menu
moved files into dummy dir
salon page started
nav bar
nav bar
info panel
+ images/background
removed DISCLAIMER as we are out of incubation

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/utilities/trunk@1427021 13f79535-47bb-0310-9956-ffa450edef68
updated the free minecraft regex
hack to make sure we don't falsely detect free minecraft links again
Fixes#20 : Added ability to upload MetaData with Amazon:S3's PutObject and InitiateMultipartUpload operations
tests: add test for buggy variable renaming (before pull request #7)
Fix popup prevent default.
Merge pull request #7 from bronislav/popup-prevent-default-fix

Fix popup prevent default.
curmut
Forgot to republish it.
Extracted article links in /ideas/show as their own partials.
Show article author image in /ideas/show articles list.
added folder in file
Delete spark script
Add spark as a git submodule
Syntax Coloring

Embedding code in Blog
Add ability to edit the coolant temperature sensor lookup table from SECU-3 Manager
Add an empty controller for IO remapping
port of default from googlecode
doEdge_SobelOperation

add new process
Anwalt gelöscht
ATND test

Signed-off-by: hirofumi kaneko <kaneko120@gmail.com>
Fixed readme.md typos
Missed a link to dispass.el
lab4.pl must start to pass tests... seems a problem in lib :-/
Fixes for issue #81
Include user member routes for get crop_profile_photo and upload_profile_photo.  Fix expire action routing error when saving a new category post.
Merge pull request #100 from jahart/rails3

Rails3
children re-added, children multimethod removed
Fix bug in TransientHashMap's -lookup with not-found
Use Clojure's implementation of frequencies w/ transients

Taken directly from core.clj from Clojure's current master.
* devnotes/corelib.org: update corelib.org with completed transient work
Have cljs.core/hash-map use a transient map internally
PersistentArrayMap ported from Clojure

TransientArrayMap is the transient equivalent. Conversion to
PersistentHashMap occurs when growing beyond
cljs.core.PersistentArrayMap/HASHTABLE_THRESHOLD entries.

Also introduces cljs.core/array-map, which is guaranteed to produce a
PersistentArrayMap regardless of size.
* devnotes/corelib.org: array-map done
Re-precate ObjMap

The compiler will now emit code to construct ObjMaps for maps with
simple keys and up to cljs.compiler/obj-map-threshold entries. -assoc
onto ObjMap causes conversion to PersistentHashMap after
cljs.core.ObjMap/HASHTABLE_THRESHOLD updates (instances of ObjMap keep
their own counts initialized to 0 by cljs.core.ObjMap/fromObject and
incremented at each assoc / dissoc).

Map literals with complex keys and up to
cljs.compiler/array-map-threshold entries now produce
PersistentArrayMaps.

ObjMap now implements the IEditableCollection protocol, however calls
to transient on ObjMaps return TransientHashMap.

This commit also removes the deprecation notice previously attached to
ObjMap.
IKVReduce -- ported from Clojure's KVReduce

Including support for terminating reduce (only inside reduce-kv for
now).
* src/cljs/clojure/browser/dom.cljs: Vector -> PersistentVector
Allow for docstrings in ns forms (just discard for now)
Fix bug in TransientVector impl
Support terminating reduce
clojure.core.reduce copied over from Clojure

Copy and paste with protocol & protocol method names adjusted,
Exception changed to Error and (set! *warn-on-reflection* true)
removed.
set BEAM version to 4.10.4-SNAPSHOT; increased version from  2.9.3-SNAPSHOT  to 2.9.4-SNAPSHOT
Changed the EclipseLink Repo URL
Expanded documentation for adding a task

Bug: 598865
Change-Id: I3351e76f4aa0f8d94e90e8a6933b26541463970e
Merge "Expanded documentation for adding a task" into develop
move virt manager settings from db to config file

This means we only support one (optional) RHEV-M instance, instead of
many. It makes things a lot simpler and lets us fix the issue with
leaking VMs in beakerd.virt_recipes if the db transaction rolls back.

Change-Id: I48e526f650d52c787e65b53639ce349dee644132
allocate MAC address for RHEV guests

Beaker should use the same MAC address allocation scheme for RHEV guests
as it uses for guest recipes, for the same reasons.

Change-Id: I81b39a8e08c08851a870226f82ec3c4db5e6c50e
use postreboot instead of install_done for RHEV reboot hackery

This way we can ensure the reboot happens at the very end of %post.

Change-Id: I7c5333498015380b75629fd988b99387d2b98650
Merge changes I7c533349,I81b39a8e,I48e526f6 into develop

* changes:
  use postreboot instead of install_done for RHEV reboot hackery
  allocate MAC address for RHEV guests
  move virt manager settings from db to config file
removes errant whitespace from custom defined views
Deleted _posts/news/2012-09-28-your-filename.md
Working on data update detection, gh-1

Tracking the mtime of the file seems to do the trick.  Also
introduced the concept of a read only backend, this can be
used in production mode where the file will be considered static
and only reads take place
Finished all team listing.
added wiki-tables
Fix some functional tests (Machinist2)
Merge branch 'master' of github.com:SpoutDev/SpoutAPI

Conflicts:
	src/test/java/org/spout/api/collision/BoundingBoxTest.java
Fixed unit tests and improved toString

Signed-off-by: berger killer <bergerkiller@gmail.com>
Rename and symlink .so
Adding new approach
adding ion auth
backends
refactoring the projects
commit code with add ip wrapper
typo corrected
typo
Fixed bug in which the number of flagged data was being incorrectly computed.
Updated gitignore to remove jar files from git repo.
Add Travis-CI status to README.
Slight refactor of model builder.
Convert README to Markdown.
Add SetTheFlashMatcher#[] to specify flash type
Add flash type to expectation and description
Fix style.
增加发布位置信息按钮的select状态图片。修改广告图片。
weibo定位
Add woo
Woo
added changes before horimenu
poem list js
changed 

are you human? -> Security Question
Post new Job interchanged

Employers Dashboard
Merge branch 'master' of https://github.com/bpocareerhub/BCH-v2.0.git
Adding binding endpoint and metrics
Added default.model to models dir, should be a good starting model
Minor UI tweaks
Make pull rebase by default.
add awk library
Added description meta tag to all pages.
Fixed bug with coordinates on the map tool.
Messing aroud with templating.
staring branch1
master modifications
modify my_file
Merge branch 'branch1'
also modify my_file
Merge branch 'branch2'

Conflicts:
	my_file
corrected small typo in vid spam message

go vote for your part." --> go vote for you" part.
leader op
Change super_var_dump, start include PHP error
multi-id woo!
prevent multireddit use bypassing the blacklist in reddit plugin
Implement signin and signout functionality with a remember_token cookie and successful tests
print GC stats at exit; call Gc.major before cleaning up the passive state
Add textDrawingMode context property.
more, yesod
now handling 0% mixed
updated solution file
fixed stack overflow issue
Structure : ajout de la méthode delete
logging of processing time (TDF lookup) and some formatting
HEMERA-3234, HEMERA-3217: Table infrastructure / call activity
HEMERA-3217: Commit with broken CalledElement
Merge branch 'ca-develop' of github.com:camunda/bpmn2-modeler into ca-develop
Moving away from the packet parsing

  * changed to read RSSI off the correct pin
  * added in vestigial PWM stuff
defaulting rails environment to match stage name
Merge pull request #267 from monsoonrains/stage_environment

Stage environment
-initial stab at doc-modal sheets
-fix uninitialized _selectedRange member when loading from cib
Revert "-fix uninitialized _selectedRange member when loading from cib",
putting in another branch

This reverts commit 2a82703e468d19c49ed9df3db84d2ee25ec13b3f.
Merge remote-tracking branch 'upstream/master'
Various fixes for sheet bugs
-handle attempt to close sheet while it is animating in
-fixes Safari 5.1 animate out bug by using a timer to
initiate the in/out process
-allow window shadow to become 0 width/height for smoother animation
-keep parent window behind sheet when orderFront: on sheet or left mouse down on parent window
-sheet attached to modal window runs in modal context
-events in modal run loop get passed to sheet's parent window, so it can move and resize
-implement CPWindow sheet notifications on delegate
-raise error when window already has a sheet, or attaching sheet to a sheet
-update docs for sheet notifications
-call orderOut: to dismiss the alert sheet
-use _endSheet to end sheets
-do not call orderFront: if the sheet is already visible
-implement orderOut: to control sheet dismissal
-lots of comments and a few debug prints
-allow any window to become a sheet
-allow any window to become a sheet
-remove next sheet context hack
-order of notifications/didEndSelect are correct now
-correct documentation
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AppKit/CPApplication.j
	AppKit/CPWindow/_CPDocModalWindowView.j
-added manual test
-removed unused import
-capp_lint
-enable close buttons based on context
-remove stuff that doesn't work
git autoclrf
Merge branch 'master' of github.com:carlhoerberg/dotfiles
Change base href and variables that need adjusting to be more clear
Fix .gitignore
Replace tabs with spaces.
Made changes per notes by +pledbrook+
Publish get requests
ability to switch between projects
fix #1312: Strange progress indicator on GPX-import
constraint bug fix
file based backend implementation
Fix the sample app to use the consumer_key and api_base from the oauth header.
fixed bad favicon.ico file
Created Drafts feature
Added subtitle feature for posts
Starting new post
Use relative path instead of %ChocolateyInstall%
v0.9.8.17
Updated Nav layout for membership page
install and zshrc fix
added DBpedia annotator, refactored some of the template code
NOJIRA Adjust PageLogger's output to be more useful when there's no servlet
CLC-144 Tasks/assignments widget using dummy data
CLC-220 Provide end-point to request Canvas OAuth2 grant
GET http://localhost:8080/api/canvas/oAuthToken?redirectUri=/api/currentUser
The default redirect is to "/secure/dashboard".
If the user already has a locally stored token copy, it will be replaced with a new valid one.
If the user refuses to grant Canvas access, any locally stored copy will be deleted.
Merge pull request #83 from ctweney/logTweak

NOJIRA Adjust PageLogger's output to be more useful when there's no servlet
Merge pull request #86 from shacker/CLC-144b

CLC-144 Tasks/assignments widget using dummy data
Merge pull request #88 from raydavis/raywip

CLC-220 Provide end-point to request Canvas OAuth2 grant
Merge ets/master
CLC-238 - Add some more styling to the dashboard widgets
asymptote-mode
Improved ListView template and version bump to 0.1.6
EditPost returned space name instead of space URL
faster update from git
#25 use of potentialUserGroups if userGroup is null
hnw_enquiries: export map_au as ds code, not block
comentado a chamada de debug
Updated README 1.0
minor fixes and added TbBulkActions to TbExtendedGrid
arreglo de ofertas en micrositios y micrositio.js
Fix default MIN, MAX and STEP options handling

Fix default values for min, max and step options.
Made Action Menu extend from the base menu with some improvements to allow easier movement between menu options
* src/cljs/cljs/core.cljs: move bounded count into local in apply
* src/clj/cljs/compiler.clj: first cut at CLJS-238, all test pass
* src/cljs/cljs/core.cljs: fix cons so that it checks to see if coll is ISeq
* src/clj/cljs/core.clj: call -first and -rest directly in apply-to. call seq on args.
* src/cljs/cljs/core.cljs: attempting to optimize seq on vectors
* src/cljs/cljs/core.cljs: missing declares
Merge branch 'optimize-apply'
Fix property access in browser-connected REPL.
CLJS-129: Fix browser-connected REPL namespace loading

The browser-connected REPL keeps track of all of the namespaces it has
loaded and will only load them once. Some namespaces will have already
been loaded when the host page was loaded in the browser. This fixes
how we attempt to determine what has already been loaded. Instead of
asking the browser what has been loaded, which is not reliable, we
allow namespaces to be loaded a second time. If loading a namespace a
second time will cause problems, the namespace can be passed to
repl-env to be ignored. See doc string for cljs.repl.browser/repl-env.
Add an example that didn't work before the CLJS-129 fix.
add local cache file to store diff of changes pushed to s3 which is used when deploying to cloudfront after the site looks nice on s3
ADDED ToorCamp 2012 Maltego Graph and associated Exported Image (.png)
Port blueblazer to my new nginx paradigm.
add html5 pre
Merge branch 'master' of github.com:coldnew/coldnew-emacs
update
move connection into its own class
zlib streamer class
connection class, more refactoring
data frames are not compressed. more refactoring.
added _parse_header_block
more cleaning
CSPACE-5390,CSPACE-5285: Ensure that tenant counter is incremented each time when looping through tenants array.
Re-order imports.
Added support for parsing pybot cli-variables from ROBOT_-prefixed environment variables.
Updated .travis.yml to test support for ROBOT-variables.
Made docs for mal search react to comchar changes.
fixed receiver category
Add README.md with general information and CoffeeScript compile instructions.
Copied resources from jasmine and jasmine-reporters.
(jasmine) Changed to tag v1.2.0
Added jasmine's favicon
Modified SpecRunner.html, to fix the path to appropriate one.
Added missing jasmine-reporters file
Remove all study-work files
Add fedora 17 to our per commit build list
update README
..
body tag already started on parent template
add chardetails module template and condig section.
better method to initiate ajax request
Merge pull request #1 from Abizern/master

Minor correction to the changes in your last commit
Update project settings for HiDPI images

Recommended by Xcode 4.5.

Can be merged into main line once 4.4 is released with ML.
Merge pull request #2 from Abizern/hidpi

Update project settings for HiDPI images
Add 10.7 supported drag and drop methods
Merge pull request #24 from Abizern/master

10.7 added some extra methods to outline views to support drag and drop.
Fix for #25: iconRect.y calculated from iconSize.width not iconSize.height.

This commit fixes an issue where setting a non-square icon size for a
Source List could cause the icons to display incorrectly. This was
because the min-y value used when calculating icon rects was being based
on the width set for the Source List's icon size, rather than the height.
Does seem to be messing with odd clipping behavior.
add example for Glopus *.tk format line without comment
rename print()
added official enlightened images

changed filenames
progress on extracting + deleting
Increasing max-height on band photos
Compatibility with xampp and add trigger
actualizacion 13-12-2012
Youtube videos on fancybox now supported
GlobalRecoveryPlan
- also renamed some files and classes
- started with a new test (rangeserver-failover-basic/run10.sh) which is not
  yet finished
Added tabs component
Added button styles
Updated to version 0.2.4
Add an incomplete implementation of client-side glTexSubImage2D

This empty implementation does not add the command to the command queue,
but simply calculates the size of the image data necessary for
transferring.
Generate the command id for all functions

This is necessary so that we can start to autogenerate machinery for
more complicated GL functions.
Widen the range of functions that are auto-generated

This makes way for implementing glTexSubImage2D and friends.
add gpuprocess_gles2.c gpuprocess_gles2_cli.c gpuprocess_gles2_cli_private.h
Make glFlush and glFinish synchronous calls
Add some getters for client state and use them in the caching server
add ShortenExample
dumped class_id as it wasnt used and console went too
search gardening
reverses sales audit numbers
Merge branch 'master' of github.com:danieleli/MaidBrigade
sales audit report, new micomaid files
Seed MicroMaid files