labofsahil/github-event-dataset-2012 huggingface dataset:
Combine itemdescs.txt and tradeitems.txt into items.txt

git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11482 b29ace70-8910-0410-8dcc-aa2fc6433167
Add the int[item] get_shop() ASH function.

git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11483 b29ace70-8910-0410-8dcc-aa2fc6433167
In RuntimeLibrary, directly create int values instead of converting ints to strings to int values.

git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11484 b29ace70-8910-0410-8dcc-aa2fc6433167
Only enable the milk/ode buttons if you can use them.  Track special zombie Bear Hug uses.

git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11485 b29ace70-8910-0410-8dcc-aa2fc6433167
Fix store management

git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11486 b29ace70-8910-0410-8dcc-aa2fc6433167
Make SOCK and metallic A goals separate

git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@11487 b29ace70-8910-0410-8dcc-aa2fc6433167
Added rSpec
fixed  ProjectPreExpenseBalance　on sharedProject
fixed  ProjectPreExpenseBalance　on sharedProject
fixed  ProjectPreExpenseBalance　on sharedProject
fixed  ProjectPreExpenseBalance　on sharedProject
8.24. edit income 2
Merge branch 'master3' of https://github.com/hoyoji/HoYoJiMoney.git into master3
8.24. edit income edit and delete's category(pProId to incomeId)   incomeAddNew.js's submit
8.24. edit templateExpense AddNew
Merge branch 'master3' of https://github.com/hoyoji/HoYoJiMoney.git into master3
8.24. edit submit Button to menu icon
8.24. edit submit Button to menu icon
Merge branch 'master3' of https://github.com/hoyoji/HoYoJiMoney.git into master3
fixed bug:
localStorageAdapter
Merge branch 'master5' of https://github.com/hoyoji/HoYoJiMoney.git into master5
Moved plugins-info to about-page
Added patches for the most recent commits to query branch. Removed scripts directory, will be uploaded to another repo
Added patches for most recent commits to query branch
Ensure declared closure version is not overruled
answer userid
autolinq fix
Fixed clicking on gallery items

using $(window).hashchange(function(){
update shit
});
Tweak avoidance
All info for creating a relationship now encapsulated in RelationshipDescription. Will make it easier to do relate to choice of nodes.
Added ability to relate node to choice of subnodes.

Needs some package refactoring.
Need to add some logging for this command.
Need to add ability to set properties on relationships when they are created.
added before_upgrade and after_upgrade methods to package.php
merged local changes with changes from github
added TODO, added placeholder files
added TODO
updating the tutorial to also use local resources
Prepared to release to our internal gemserver
补上JPack补丁中遗漏的locale变量声明
Реализованы модели для транзакции и списка транзакций.
Реализованы модели для транзакции и списка транзакций. 2
Добавлена возможность получить историю транзакций.
Упущена инициализация ConnectionFactory.
Partial commit.
Add percent inside portion pie chart instead of be outside.
It is not yet perfect but need to more in the middle of the portion.
.
introduced mojo execution guice component scope

Mojo execution scoped components are annotated with @MojoExecutionScoped
They are created just before configured mojo instance is created
and disposed immediately after mojo execution finishes.

Execution scoped components can request @Inject MavenSession,
MavenProject and MojoExecution instances in addition to any
standard maven core components and components defined in
maven plugin contributing execution scoped components.

Execution scoped components can be injected Mojos using
standard /* @component */ javadoc (and likely new mojo
annotations).

If execution scoped component implements Commiable callback
interface, its commit() method will be invoked after successful
mojo execution.

if execution scoped component implements Disposable callback
interface, its dispose() method will be invoked after both
successful and failed mojo execution.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
alias sock for get_sockname (and use it in http_parser bind same example)
# No need to get_sockname each time
Merge pull request #27 from kostya/master

alias sock for get_sockname (and use it in http_parser bind same example)
finished goldencobra:install generators. Changed README
	modified:   README.rdoc
examples initial ci
added version (checks also) for examples
added versio tester (&& tester interface)
minor UI fix && examples version bump
do not load default configuration  in dashboard launch file but in bringup launch file
Merge branch 'master' of github.com:ipa-fmw/cob_robots
add cob3-1 upload_param.launch
testing for ipa-apartment
beautify
add basic config and tests for cob3-1
merge
pairs of similar commands made into one, with one "strict" version
moved attack wide/narrow to battle commands
strategic engagement commands are now mode
added "cover me" "i'll cover you" to player messages
Merge branch 'master' of https://github.com/imbehind/teslaclan

Conflicts:
	CW Commands.txt
cleanup from a messy merge (never user vimdiff)
Merge branch 'master' of https://github.com/imbehind/teslaclan
[feature/revisions] Fixed typo in class property name

PHPBB3-10755
[ticket/10824] Use better variable names, add language entries

PHPBB3-10824
[ticket/10824] Remove __toString() that resulted in incorrect errors

With that method, it would say "Uncaught <message> thrown in ..." instead of
"Uncaught exception 'phpbb_acp_exception' with message <message>"

PHPBB3-10824
[feature/compiled-dic] Rename $phpEx to $php_ext in new code

PHPBB3-11152
[feature/userdelete] Allow user to delete own account

PHPBB3-9621
[task/functional] Added login/logout tests

PHPBB3-10758
[feature/userdelete] Fixed pesky syntax error

PHPBB3-9621
[feature/userdelete] Email the user when account is deleted

PHPBB3-9621
changes for release badge stats
Follow patterns from Phabricator for no-ops
Merge branch 'master' of https://github.com/imobile3/cassowary
commenting out temporarily tests
task setup and map shell work. WIP
add link to custom shell prompt
onAttachedToWindow didn't work with compat due to super, removing completely instead, as super.onAttachedToWindow is empty anyway
forgotten class from before
Fixed script for cases where prefix is empty
Bumped version to 2.0beta5
libanki as of 18-07
Added inincaas:: before brand to distinguish what page we are on more clearly.
Original files

Downloaded from current website
Warnings fix (explicit case branches).
Scalar multiplication functions added to COORDS.
[COSMETIC] rvalue refs
Separated graph root accounting into another class.

Backend::Graph now holds the root subtree as well as per-graph metadata
(currently, only name).
Added initial renderer class and parameters.
Added possibility to access a block's child links from its scope.
Added vertical (a)symmetry support to the renderer parameters.

May be subject for merging.
Improvements of the renderer interface.
Namespaces renamed.

Backend -> Semantics
Renderer -> Builder
Generator -> Renderer
Renamed external interface files for consistence.
Updated graph XML schema description
renaming fixup
Changed starting/ending blocks accounting.

This allows starting/ending block lists to be directly passed
to the renderer interface.
Finally add the graph builder (core completed).

This completes the cross-platform core.
keep it simple, my young Padawan
added two more size choice.
first commit
Merge branch 'master' of http://github.com/iulogy/iulogy-news
Make default quantize 1/1 beats instead of 1/4, I think that's a better default...
Wrapping up some very minor changes, I'm going to think long and hard about my next steps, these early architectural decisions now will have a huge impact on how well PyDAW works.
Added some more design documentation
Fixed a problem where positioning didn't account for scrollbar width.
cairomm: add depends_on :x11

Cairomm-1.10.0 stopped linking correctly and started missing
includes after the Homebrew-0.9.2, the cairo, and the pixman
changes.  Add `depends_on :x11` and fix all the problems.

Tested on Lion using clang and llvm from XCode-4.3.3.

Fixes # 13313

Closes #13333.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Add Version class
Preliminary version test refactoring
Initial version comparison implementation

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Move version detection to Version class

This seems to have broken part of the version validation codepath, but I
haven't investigated it yet.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Further version test refactoring
Replace version strings with Version objects
Add Version#detected_from_url?
bash: cast version to a string before splitting it
SoftwareSpec: simplify conditional
Add support for custom version schemes

A version scheme is a class that inherits from Version and reimplements
Version#<=>. This will allow formulae to specify a custom comparison
method that will be used instead of the default, for cases where the
default is insufficient.
keg: add method to return the corresponding Version
outdated: use new version comparison machinery
deleted:    README.md
	deleted:    config.php
	deleted:    irc.php
	deleted:    main.php
	deleted:    pluginmgr.php
	deleted:    plugins/defaultCommands.php
	deleted:    plugins/example.php
	deleted:    plugins/filter.php
	deleted:    plugins/googl.php
	deleted:    plugins/isup.php
	deleted:    plugins/lmgtfy.php
	deleted:    plugins/uptime.php
Updated config with isup plugin
some VIBR changes/fixes
Jekyll opt out
Added line in Readme
Some new guards and error messages
Handling explicit parenthesis for operators
Added an iota executable
A first demo
Added a test for defining equals (passed right away!)
error private.xml
Reorganizing ajax and events.
Testing Change Management
clean cmd
sublines set the parent id
routes for sublines
theres a form now... it doesnt work but its there
Fixed some defaults in the inject command
Added packet injection
Frontend for sending arbitrary packets
Added packet injection and replay [insert maniacal laugh here]
Added test to verify Scene::destroyObject() actually destroys the object
check user an admin
add clear cache for all values functionality 
- add DB table for top urls and hosts
- add get functions for top urls and hosts 
- period restricted to day , month and year. it's mean you can get tops
only for today, this month and this year
Merge pull request #27 from vmoor/master

getTops optimization
Prettied it up.
Assume that we need my PPA for libgrok, didn't make it into Ubuntu yet.
compat, anon instances
Split out sql from README; idea,some text from mchenryc; from master/5e2dab448e..d8d5691fd7

Idea and some text from mchenryc in 2005 original jsettlers project cvs
Add my sqlite setup instructions to README.developer
Add comments on safe naming conventions
Add mchenryc indexes and formatting from http://jsettlers.cvs.sourceforge.net/viewvc/jsettlers/jsettlers/src/bin/sql/jsettlers-tables.sql
dbhelper +doesTableColumnExist,isInitialized, cleanup try/catch; from master/bb1be797b0, 75c0e88b56, 7b9f596762
initSocSever,stopServer: Print ready/complete message; from master/b925284cf0,82b414b0cd
player +updateAtTurn, call at game.updateAtTurn (stub for now); from master/9d491e105a
rset +getKnownTotal(); from master/c031a41485,13f69b2658
boardpan.setSuperimposedText: Comment re string g == compare (sf bug report 3521346); from master/cd91a250ac
TradeOfferPanel: Use 2 labels for 2 lines of text; win32 Label ignores '\n'; from master/3767abde2f
boardpan.paint: Local reference to buffer, in case it's reset by another thread (fix occasional NPE on resize); from master/19f85e2a7d
genericSrv.removeConnection instanceof bugfix from paul bilnoski; from master/d5fef8f6cf
SOCDBHelper.cleanup +isForShutdown; from master/17ee5ca3c8; javadocs
initSocServer: register shutdown hook for db disconnect; from master/7197cf2a51
srv +init_getBoolProperty; from master/d154189f82,d89d4a2643
Default to disallow debug user over TCP; from master/80a48d170b
VERSIONS.txt +1.1.14; discard add missing (c)2012
changed the way letterspacing is done to ensure that kerning is rendered correctly across browser
[Issue #75]  Enable mixed style (ordered / unordered) list nesting

--HG--
extra : rebase_source : 83100c5b5dd8021fd8959bfa0297a02ce1b48359
Merge pull request #78 from stanio/badb5da4f4bf576f8fb33c3e2bc84529ade17098

Fix for issue #75
Merge branch 'master' of git://github.com/unclebob/fitnesse
i swear tmux config changes
Adds a key binding table.
Adds key binding for Help modal (H).
Adds a key binding for pausing and stopping.
Rebuilds binaries.
Merge branch 'master' into gh-pages
Tweaks shadows, as per @nrrrdcore's suggestion.
add installation script for openbox to install.sh
Make deck prettier
add print function.
implement aFileChooser library
Fixed camera orbit bugs and added vec2 functionality
Updated bounding volumes to do ray intersection tests
CAPP_FLOATING: make qwindow library as a separate apk

[CCE-1041] make qwindow library as a separate apk
install 스크립트 수정, title 높이 35dp로 고정
Res 클래스 간소화.
Res 클래스를 package scope로 변경
별도 APK로 분리한 것에 맞추어 Android.mk 수정 (테스트 필요)
apk의 설치 위치에 따라 2가지 xml 준비
jdt prefs 추가
z-order 변경 잘 되도록 함
slight additions, night hunter pics
Various new processors.
Initial commit of PagingStore.js
Updated to use the correct variable for the solr.start script
Corrected minor issue with path for solr init script
fix awkward video slide
Pretty up/balance home form
Merge branch 'master' of github.com:jkresner/Pitchback
pretty up show page twitter link
Merge branch 'master' of github.com:jkresner/Pitchback
Update RandomScale/R/histline.R

Fixed a typo in the Description (changed cutbpoints to cutpoints).
Merge pull request #1 from m3rk0rd/patch-1

Update RandomScale/R/histline.R
GitIgnore Config
Add function to underline a line of text.
add support for older versions of express, specifically 2.5.11
#27 Add setting to allow custom output file name

This changeset solves two problems by adding a new setting that allows
users to opt-in to use the "advanced" output file selector.  This new
selector is simply an OpenFileDialog instead of a terrible
FolderBrowserDialog.   The two problems that this new dialog solves are:
(1) A custom file name can be added as requested by issue #27, and (2)
It is much easier to edit the output folder with the OpenFileDialog
because you can type/paste a file path (which helps a bit with issue
#9).
Standardize folder structure
gitignore added and backbone local storage hooked into test config
do not need to line break
add template processing to requirejs.

this should close #86.
update changelog and bump version.
Merge pull request #87 from jney/master

load nib if available
update changelog.
misc cleanup.
This fixes #89
Added a less test covering fix for #89
Merge pull request #90 from searls/patch-1

Prevents non-string (e.g. undefined) output
repair failing handlebars test

The format of precompiled template functions in handlebars 1.0.6
has changed.  This brings the test back in line.
Merge branch 'master' of github.com:gruntjs/grunt-contrib
sort arrays before compare
use basePath from left to right.

reading right to left can cause issues when basePath appears twice in a
string. this should resolve edge case seen in #92. fixes #92. fixes #94.
update CHANGELOG.
fix CHANGELOG.
Merge pull request #93 from mikaelkaron/copy-test

sort arrays before compare
update CHANGELOG.
bump version
why anonymous function if underscore is available ?
Auto-update: 23-May-2012 17:12:26
Auto-update: 24-May-2012 10:19:27
Auto-update: 23-May-2012 15:09:20
Auto-update: 04-Oct-2012 18:09:57
finished circles-to-torus in TS1S1.agda
add get Graphics by page interface
first commit
Merge branch 'master' of https://github.com/johlits/ds-proj-12
updated scheduler to report error and use new dir structure
simulate extension loading
merge extendSirius
cleanup background page
sync to atopwi
Added fetch logic unit
Refactors IO code into it's own package
Refactor packages, no intentional functional changes
Merges GCFileStorage and GCDiskAllocator
Improves logic for triggering GC
Use ByteBuffer for Int serialization
Adds a scalacheck for Block
Rewrite of BaseNode MUCH better performance, more tests
cap deploy improovement
Replaced tmuxinator yaml files with shell scripts
only swip on mobile version
cppblockchain update
changed layers.infolayer to layer("info")
Fixing missing build info.
calculo concentracion por quimica
transferencias de volumen
Merge branch 'master' of github.com:josedaniel/qfluids
making bb map default, starting vector
Added Makefile and linker script to run tests with musl C library.
remove CVS data
Remove spec for adapters, this is silly
Add spec for createBeat()
Move SpecRunner.html to index.html, seriously
add isPlaying method to core from audio adapters
Add specs and docs for isPlaying()
remove adapters.js from spec
Fix isPlaying() spec
Fix Webkit's play() method to check if it's loaded, and binding an event otherwise before playing
Now with logging!
Ignore the log file
got celery and flag checkin locally, key was celeryd -B
Updated Downloads.md for release ../CloudCoder.wiki
updated release.pl script
irb prompts
irb completion
less gem used
Nyt on itse tehdyt filetin mukana!
no reason to mark_as_advanced these variables
allow user to set the root installation of ICU
Fixed minor graphical glitches.
Merge branch 'master' of github.com:jvermeir/GitTester into TD2
Revert "First commit"

This reverts commit 287eba703775c96260a8ab65eac2387b051cc161.
Day 3 - lists
resume commits with github  for windows; many changes
Site updated at 2012-06-06 14:55:16 UTC
Create settings.ini in ~/.privatepaper
MDL-31856 Choice: if choice not open, responses inconsistently displayed
Afegida la llicència GPLv3
Now connects individual segments.
First work on graphing and plotting using NetworkX
ver.1.08
Exception handling for parsing type 0 font
Merge branch 'master' of https://github.com/katjas/PDFrenderer.git
総入れ替え
Merge branch 'gh-pages' of https://github.com/kazuph/NightWalker into gh-pages
Some refactors and bugfixes, plus create new library for managing the tools area
Add tabs to tools, and get basic library accordian working
Moving lab1 into its own dir
Add a note on how to create common EndPoint functionality.

I'm not entirely sure whether EndPoint should be a type or a
type class. Since there will almost certainly be only two
concrete types of endpoints (clients and servers), I think
that a type class is overkill. Best thing to do is to try it
out and see whether I'm wrong.
Working on Server, adjusted paths.
deletion of they Omega theme
Edited CSS for condensed forms
Added translatable text to product part column
Added view_all layout
sleep 5 seconds to be sure sourceforge file timestamp are differents
minko examples
DelayTimes
Tweak neokdemand again
Fix missing commit Cleancache
Try to fix aegis builder deps and cobs + some cleaning
add code for processing arguments
add class Query
add the print weight method
delete clutter
move into classes
remove clutter
fix bug
add this line so I don't have to type ruby all the time
organize it better
case statement
put table for events in separate template
try another technique for pg restore
Photo_delete fix
mise à jour du 09/05/2012 à 19h24
Merge branch 'master' of github.com:kirby49/stage_2012
Added missing standardizePath call to expand a tilda.
Add styles for kudo
updated pinout and get range from serial
0.69.3
Testing branching
minor changes for ttir1
some more changes
more changes
hopefully merging
My Message
some merging
java changes
Udated gitignore to ignore .pyc
removed the javascript folder in favor of the one in the app dir
Be compatible with parent getIterator.
Merge branch 'develop' of github.com:koriym/BEAR.Sunday into develop
use cs.
Изменил способ получения версии приложения
patchade readme med nycz också
Selecting shapes done. Translations, rotations, and scaling via mouse. Shaders are wrong.
Two Java Projects I've done so far at uni

1. AberPizza Project
2. WordLadderAssignment
refactoring for multiple client textures
add relooper sources
add README file (current buildstatus)
Update Viscidus AQ40

Fix .sql <3 Trista
Added some notes of what I think is happening in the client. Commit of the server will need to wait until after I am home from Algeria
Moved passOptions class definition out of main
Moved socket initialization after telemetry start
Merge branch 'cleanup'
Merge remote-tracking branch 'origin/master'
7.26 w
commit before pull from jon
fixed merge conflict
Merge branch 'master' of https://github.com/bcat/SVDP
Merge branch 'master' of https://github.com/bcat/SVDP
Fixed bug when creating a username that had 30 characters
Fixed validators to match DB schema
Changed data that is shown on view member depending on role
Normal users can no longer see active/inactive nor user id
Fixed general formatting of the table
Changed sender of emails to match production email
Remove unused admin view script
Fix view script HTML escaping
Improve client form read-only logic
Document and fix up address subform
Start documenting my library code
Fixed up error controller.
Document client side validation in progress
Document search service
Document map service
Finish documenting search base form class
Document safe serialization service
Household History partially completed
Merge branch 'master' of https://github.com/bcat/SVDP
Created generic schema-object directive for listing and adding attributes.
added external snippets

TODO: handle this better
killed surround
split out the tmux keybinding from the tmux config so I can set it differently per machine
Update styling of links in .subnavigation
Update copyright to jQuery Foundation.
Update package.json to contain more information.
Update AUTHORS.txt.
Menu: Added missing position dependency to header comment.
Grunt: Use grunt-git-authors plugin to generate authors list.
Allow newer 0.3.x releases of grunt.
Update AUTHORS.txt.
Tabs tests: Add tests for accessibility of ajax tabs.
Tabs tests: Added tests for show and hide options.
Dialog: Prevent tabbing out of modal dialog. Partial fix for #7862 - Dialog: modal accessibility.
Core: Adjust data pseudo creation to use new Sizzle pseudo creation for pseudos with arguments.
Merge upstream changes
Dialog: Possible to tab outside modal dialog. Partial fix for #7862 - dialog: modal accessibility
Allow multiple karma on one line.
changed fragment texture scaling
cpg example updates and some better tex-code generation
Remove arrays for POSIX compliant
Test 7
test 8
test 9
adding buggy/broken warning

git-svn-id: https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons@3144 96b784f8-4ae3-dd11-aff7-0030488c597c
fix for file new still displaying the measurements
by default the script now has display distance false
this prevent the script failing to deactivate

git-svn-id: https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons@3145 96b784f8-4ae3-dd11-aff7-0030488c597c
* Measure Panel - Version 0.8.7
* API change: ngon_tesselate -> ngon_tessellate
* Use persistent handler (scene_update in scene_update_post) for geometry calculation to reduce CPU load when idle.
* Remove all properties when add-on is unregistered.
* Minor: Moved text offset constants to the other script constants.
* TODO: Still heavy load while doing simple translation/scaling/rotation though. Is there a way to avoid that?


git-svn-id: https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons@3146 96b784f8-4ae3-dd11-aff7-0030488c597c
* Measure Panel - Version 0.8.8
* Fixed normal calculation (again) for global mode.


git-svn-id: https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons@3147 96b784f8-4ae3-dd11-aff7-0030488c597c
* Measure Panel - Version 0.8.9
* Remove scene_update from the handlers on unregister.


git-svn-id: https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons@3148 96b784f8-4ae3-dd11-aff7-0030488c597c
removing bridge & loft functions from the menu. both these features caused blender to crash instantly.
sorry it has bad #comment out everywhere but prevents bad crash. temporary fix to save users
bridge/loft functions may be removed at a later date or reworked for bmesh 
thanks

git-svn-id: https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons@3149 96b784f8-4ae3-dd11-aff7-0030488c597c
correct spelling tessellate


git-svn-id: https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons@3151 96b784f8-4ae3-dd11-aff7-0030488c597c

Attention: big changes in __init__.py, almost no changes in import_pdb.py
and export_pdb.py

1. With respect to the propositions made by Campbell and Sebastian
(see http://projects.blender.org/tracker/?func=detail&group_id=153&aid=29226&atid=469)
I changed the code. The PDB IO has now the preset option in the file dialog
of the importer and exporter.

2. Furthermore, I have put all properties into one group, which is located
in bpy.contect.scene. 

3. Some code cleaning

Soon, I will put in a new option (next days): the user can decide whether the 
panel is always, once or never shown after a PDB file is loaded. Note that
the panel is essential for me and also my students. It helps quickly modifying
PDB structures.

Blendphys 




git-svn-id: https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons@3152 96b784f8-4ae3-dd11-aff7-0030488c597c
update targetPackage in manifest to be some bs value
update method name to be friendly w/ruby
nginx recipe magic
comma
Fixing reference to correct recordset's moduleID
Adding scopes prefixes.
Adding scopes prefixes.
Updating jQuery Mobile
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
adding variables scope to car references
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Adding nolock to mssql in main content gateway queries.
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Adding nolock to mssql in main content gateway queries.
Adding explicit variabe scope to vars.
Scoping variables scope display objects.
Scoping variables scope display objects.
Scoping variables scope display objects.
Scoping variables scope display objects.
Scoping variables scope display objects.
Adding explicit variabe scope to vars.
Fixing variables.eventOutput scoping.
Fixing issue with links opening in new window in system navigation.
change errors container from a "p" to a "div"
Using this instead of the random hashmap implementation currently being used. uthash calls for the immediate deprecation of the other one. (But I like to procrastinate)
only serialize / deserialize user.id, not whole user object
Modify travis.yml
Merge branch 'master' of https://github.com/leo-project/leo_mq
Add tests for IP_Network_Address->excluding().
Use foreach loops.
More efficient excluding implementation.

Also updated doc comments.
Fix out of date comment.
Initial commit
Merge branch 'master' of github.com:letterj/foundation
Changes
frontend css/template update
readme demo
Переключился на "Update"
Скопировал file1
Внес первые изменения
Внес вторые изменения
Merge branch 'Update'
made the tutorial space for http://www.nodebeginner.org/ application
Initial commit
merged
Fixed merge conflict
Added commands
Added a text file named COMMENTS, as part of HW 5. It describes what changes
could be made in order for the code to look more improved.
woo hoo\! it works, albeit with integration tests
selection handling
output chinese character as int array. show it using javascript.
move "api" application to internal
Merge branch 'master' of github.com:enyojs/support
Merge branch 'master' of github.com:enyojs/support
Merge branch 'master' of github.com:enyojs/support
Merge branch 'master' of github.com:enyojs/support
Merge branch 'master' of github.com:enyojs/support
Merge branch 'master' of github.com:enyojs/support
Merge branch 'master' of github.com:enyojs/support
Merge branch 'master' of github.com:enyojs/support
migrate 'examples' folder here from 'enyo'
Merge branch 'master' of github.com:enyojs/support
ha-ha-ha unicode string ascii encoded
Remove access from large tests for isolated memory
article har default dagens dato
Cleanup

-Removed unused classes (Logout, ViewImpl1, ViewImpl2)
-Fixed size of the main panel
-Navbar condensed into one
-Navbar now doesn't show category edit button if not an admin
-Misc renaming
-Chosen driver is bigger
-Removed unused imports
-Added Dane's JUnit test
-Removed unused images
-Updated favicon
-Added Shawn's css file (not working)
fixed != and == comparisons with None
Two playlists, one for the current album, one for the user's playlist
Add button for futur configuration system + Some changes nothing big
Creating initial repository structure
Added initial index file
Updated index.php
Created test structure of settings files.
Merge branch 'master' of github.com:lorique/deploytest
Add two more 'non-existent' tests
making a friendlier event claim a la JOINDIN-165
a couple of phpcs fixes, to show off git and codesniffer
removing the current banner - it is outdated
Merge remote-tracking branch 'lornajane/JOINDIN-165'
Merge remote-tracking branch 'lornajane/no-banner'
clear shadow cache on mpeditent
add api invoke for get user infomation
more haskell fixes
haskell note
adding hgetall to stub
Add clean merged branches alias
Install GDE*.o instead of GDE*.m
Create general sr_port/mumps.cmake to run mumps during build
Merge branch 'hackathonjune2012-brad' of git://github.com/luisibanez/fis-gtm into hackathonjune2012-brad
Add missing sr_port/README.txt
Hmm... not going to need dojo after all.
a very basic POST call that produces things, i.e., baby steps.
unneeded javascript
Integrated the engine with the web, tweaked the parameters for workout generation.
movecopy bug fixes
the beginning of the end
stripped spaces
rewriting
added single repeat
Fixed #130.
Fixed AttributeUsage for ScalarAttribute.
Fixed #129.
Working on #127.
Fixed #127.
Updated T4 templates.
Updated nuget packages.
Fixed #125.
Updated version.
Updated version.
Updated version
Merge branch 'master' of https://github.com/igor-tkachev/bltoolkit

Conflicts:
	Source/Data/DataProvider/OdpDataProvider.cs
	packages/NUnit.2.6.2/lib/nunit.framework.xml
Updated version -> 4.1.16.1
撤消、恢复功能完成
README prints 'macro' instead of 'function' for macros
fix for slashes in paths on windows :)
Fixed event handling for font style and alignment
fixes the typedIdent problem for good

Previous attachment retaining fix was only working for Idents which
get turned into Selects. Now it works for all transformations applied
to Idents (e.g. when an ident refers to something within a package obj).
Merge pull request #1809 from scalamacros/topic/ident-attachments

fixes the typedIdent problem for good
changes to printrun icon
Ignorando arquivos .DS_Store
Formidable arquivos do plugin
Revert "Formidable arquivos do plugin"

This reverts commit 7e583e3ff40e50879d2551232075ea5d70135ea6.
Revert "Revert "Formidable arquivos do plugin""

This reverts commit d03b60e6052d7365873586df9108119831b63dac.
Revert "Revert "Revert "Formidable arquivos do plugin"""

This reverts commit e233f57c65524518a046ee3b8e76fcb13f065375.
Revert "Revert "Revert "Revert "Formidable arquivos do plugin""""

This reverts commit 421024c604016278d83bcf2472165582af241924.
reconnection for blocking socket, reconnect parameter for IProto.get_connection
Release 0.3
modifiche aggiunta sezioni
disable fiveapi proxy
Print function call fixed
Ajout de mo calendrier Google et de la fonctionnalite basic de focus.
Amélioration du flipping pour le calendrier entre la vue background et foreground.
Modification au login

Maintenant, la page de login fait une connection et regarde la page de
retour pour confirmer que l'utilisateur est bien authentifier. Il envoie
ensuite au client une notification le lui laissan savoir.
Merge branch 'master' of github.com:malavv/PolyDossier into FinirAuth
moving scripts around and fiddling with evaluation
more evaluation work and plenty of new scripts to do the job
DUE gps pps update
Debug cleaning...

Moved createDummyEnemies to the bottom of the page, with the grid
creation.
Renamed _TMP_ prefix, to _DEBUG_.
Upped dummy spawn to 2000, so that their's lots to fly around with :).
Merge pull request #7 from manix84/master

Merging
bump to 0.7.6 with support for latest mapnik, grid rendering fixes, and fix for rare memory corruption when a mapnik.Image or mapnik.Grid object goes out of scope when a view is still encoding
Updated title and copy for more SEO juice on 'Web Apps'.
Update README.md

- added speech about "pointers" from Boris Smus.
Update npm on install/update
release v0.3.2
Updating, showing and deleting users exercises done
Fixing bug when calling update handler and supplying a key
#1 Add support for a .Else condition
more complete .gitignore
Merge branch 'master' of github.com:martinblech/kanine
Fix &amp; issue in espanol.haml & index.haml
check-in to find out why it is failing
update module version

Signed-off-by: matt4446 <barmy_matt@hotmail.com>
update documentation; jettison part 2 of parsing
start Haskell implementation:  tokenizing, parsing, and evaluation
refactor apply/eval to handle error conditions
undid last update, realized it was flawed...
Committing changes before update.
Help.
metomi/rose#2: treat namelist as a location.
metomi/rose#2: rose.config_processors.file: tidy.
Show the last assignment on the drudge list
Buttons:
- Update the install/initial configuration/repair screens buttons, props DrewAPicture
- Fix the welcome screen buttons and fine-tune the buttons css, props lessbloat

fixes #21598


git-svn-id: http://core.svn.wordpress.org/trunk@22314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Use wp.media, not media, in media-editor.js. see #22676.



git-svn-id: http://core.svn.wordpress.org/trunk@22972 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Compress scripts/styles: 3.5-RC2-22973.

git-svn-id: http://core.svn.wordpress.org/trunk@22973 1a063a9b-81f0-0310-95a4-ce76da25c4cd
teh magic
[gad]
create runtime dir
we are gwnerating ts test now again
Merge branch 'master' of github.com:mbeddr/mbeddr.core
had wrong mps path in spawner's build script
fixed a bug in genutil
Merge branch 'master' into stubImporter
removed IUnsignedNumber Interface
refactored some code in Game: got rid of the size and fill params, put player update in game update function
fix eventid
Enchanced output UI
Enchanced output UI
Merge pull request #8 from mdewey/dev

Dev
fixed a bug, thanks  ivanistheone
Added support for overriding values while displaying the inherited values
yes, stills is only one function
fuzz.py is an ungodly place for now
I have to ignore tests for now
no time for testing, i'm doing science
Flag "el[0-9]debug" string.  Found in debug kernels.
Fancy post-processing tested.
switched to leaflet.js
links to perlchef.com
Commit wchar_t by Zonedark
compare q learners script
Merge branch 'master' of https://github.com/melonhead901/vegas
Added vperf1*.conf files.

Change-Id: I13fa16c4ceec53cc32c2f2c08efd301837f446b3
Reviewed-on: http://review.couchbase.org/15618
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Tested-by: Steve Yen <steve.yen@gmail.com>
CBQE-545: Automation tests XDCR

- Added pre condition for failover and
warmup tests in uni and bi XDCR, to avoid
test failures.

Change-Id: I87b91829bf997f801002476b36b2051b9b0b4750
Reviewed-on: http://review.couchbase.org/21440
Reviewed-by: abhinav dangeti <abhinav.dangeti@gmail.com>
Tested-by: abhinav dangeti <abhinav.dangeti@gmail.com>
CBQE-545: Set correct indentation in conf file

- Unidirectional XDCR

Change-Id: I9973ccf590f80ea0133ea768be207e47f4802721
Reviewed-on: http://review.couchbase.org/21837
Reviewed-by: abhinav dangeti <abhinav.dangeti@gmail.com>
Tested-by: abhinav dangeti <abhinav.dangeti@gmail.com>
Configured to connect to acm server, added swf to repo for conveniency
test for DataMapper
Problems with Session testing :(
Files should compile now
git select #story-id
Update README.md
Merge pull request #1 from PedroCunha/git-select

Git select <story-id>
Fixing server error if user fails authentication
Working model of World with all the features tested and the bugs fixed
Changes in detector.py and designing Mask object
mais heu
debut de verification du nom avec iconv , voir pour regler ce soucis
since I forked this from damm I want to make sure we attribute him correctly.
termine für den adminbereich
Standards browser redesign
posts ajax view
feedback ui
see all link with number
adding whiteboard to lessons!
add CJKLINUX intro
hhh
Merge branch 'master' of git@github.com:mihaela1561/Movies.git
Storing user_wall_assignments in mongo db so tablets can figure out who else is at the wall
changed videowal to letters and other stuff
Merge pull request #86 from agamba/master

changed videowall to letters and fixed events
Merge pull request #87 from mikecules/master

Finally added (probably completely broken now from the merge)
Merge branch 'master' of github.com:encorelab/NEOplace
working first step in sideboards -- students can now post tags to wall with full persistence
Merge branch 'master' of github.com:encorelab/NEOplace
updated the classroom.json
Added sail.js and server.js to frontwall-tracker
Merge branch 'master' of github.com:encorelab/NEOplace
added equation images
Merge remote-tracking branch 'upstream/master'
Merge pull request #88 from miketissenbaum/master

updated classroom.json
Added Sail submodule to teacher tablet
Adding Sail events.

A work in progress.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitmodules
Add sail submodule for teacher tablet
first 2 sections finished, restoreState added
Merge remote-tracking branch 'upstream/master'
Merge pull request #89 from pchen/master

Small updates to the teacher tablet.
Remember the config location when installing, and use that from then on unless explicitly given a different path.
Tagbar and latest vimrc
ENH: work in progress--detection of harmonic lines in spectrum
Now using filtered replication
Add javascript filtering/sorting of html package list
Fix sticky post archive bug on custom post types. Adjust margins.
Added submodule tricks
[api] Use browserify middleware instead of bundling step.
Add options for browser or script mode

o Begin designing API wrapper
o Move option sanitizing into respective classes
o Move query into options hash
modified:   HF_OOAD/Guitars/src/hf_ooad/mitya/FindGuitarTest.java
	modified:   HF_OOAD/Guitars/src/hf_ooad/mitya/Inventory.java

Guitar search returns results in as a List
Occasional import deleted
Fixed root seed
Updated heroku
Add support for changing candidate keys and candidate panel fonts.
added comments
support for mouse over
added className option
added class to each tab
some todo for Tabs
test for setActive()
now Tabs can create tabs dynamically by means of setTabs() method
Revert "Made $location search to be processed in the same ways when passed to constructor and to setter. fixes #751"

This reverts commit 4f5a8453bed94dffccd6eb89893128d2a31b92e8.
Store the correct node reference in rowsCache.
Partial Fix for Issue #9
Added read me file.
Added Readme.txt
Added Readme.txt
I followed what Xcode told me to do!
fixed error with MC JSON
Add submodule dired-plus.
Start Emacs server if not already running.
Reuse directory buffers in dired.
Complete basic setup.

Move everything from .emacs to files in .emacs.d. Add more settings from other sources.
Configure JIRA server and sqlplus executable.
Merge branch 'master' of github.com:mnuessler/.emacs.d
Update submodules.
Fixed minor bugs

Removed sapper duplicate from results
Fixed item box closing when clicking on chance
Updated compile and generation instructions
changed logging from log4j to slf4j
Merge pull request #3 from molindo/logging

changed logging from log4j to slf4j
Issue #4 Incorrectly calculating the size in bytes of the IdAndVersion object was causing memory pressure and OOM for large datasets.

Owen B & Paul S
Merge pull request #1 from molindo/master

Allow using a custom Comparator for verification
Created a parser for the tab-separated format the PrintStreamOutputversionStreamVerifierListener outputs so that upstream applications can parse the output.
Very subtle fixup of the example, missing a '-' in one of the options, and highlighted the information about the need for sorted streams.
Extracted constant to make the quality rules happy.
[maven-release-plugin] prepare release scrutineer-1.0.2
[maven-release-plugin] prepare for next development iteration
Issue #4 upgraded to latest java-merge-sort which contains some tweaks to lower memory usage
[maven-release-plugin] prepare release scrutineer-1.0.3
[maven-release-plugin] prepare for next development iteration
No longer tracking plugin_ajaxselect.pyc
Added some questions; fixes and upgrades to plugin_ajaxselect and plugin_listandedit
fix typo on plurk share msg

Signed-off-by: Irvin <irvinfly@gmail.com>
Agregando nivel para consultar a docentes
breaking css out into separate files. One for example specific styles and one for styles needed to make the radial menu work.
Rename expose_class to expose_plugview
Make expose_plugview visible in docs
Add versionadded annotation
Make it possible to properly use MethodView
Add basic (and broken?) methodview example.
Fix link to index
Add basic flask.views.MethodView embedding tests
Merge pull request #134 from plaes/expose_plugview

Support for nested flask.views.MethodView
Adding index
Adding index
+ ‘#README#’
+ ‘bin/crawl’
- ‘bin/crawl.pl’
Fixed serious issue with trying to figure out node types at load time - this is just the first version, needs test and cleanup
Refactored main method to remove redundancy
Fixed possible issue with the same plugin being handled by multiple callbacks
implemented check to verify it works as well for import and reference situations
Merge branch 'plugindb_fix'
home/rewritefs: fix Gimp's directory
port over O(N*N) patch to menu-again
Merge pull request #3 from joequant/menu-again

port over O(N*N) patch to menu-again
added random enchantment level feature
added examples to default.yml
Update to cNet service reference/view model.
cNet Api classes
Latest version of specs, Everything compiles and module works
NO WHITE SPACE
Adjusts dirtree key behavior.
fixed some stuff from fish
Will be used for game vars
Nginx + spring = works!
Make access_token as primary key of session.
WIP websockets
nginx + socket.io mostly happy.
moved terminal and nonTerminal to nodes package
Added a log4j configuration file for unit testing
Added a log4j configuration file for unit testing
Fixed a bug that model is left in initialized state after destruction.
Reorganized test methods to ensure better test coverage
Added missing afterParse() call
Implemented more test methods
calc中
中
sha1_impl.hpp: calc() を実装してみたような。（使ってみてはいない
とりあえずここまでは出来ましたーん、っと
sha1_impl.hpp: get_result() とりあえず使う
calc()の2段目、上手く行ったんじゃねーｋ
Deleted old files: add_alarm_view.xml, AddAlarmActivity.java
task reporting
optimized exponent code slightly
Added the rest of the lab.
Add ping
Add idleTimer
Merge branch 'refactoring' of github.com:nduhamel/pwdremind into refactoring
new tool to deploy settings to a user's registry branch
use "-Force" switch instead of creating a separate function
Merge pull request #248 from nelenkov/dev

added num errors to import/export; properly fetch in ContentAdapter
fetch comments from network when loading more comments
Aggiornata la funzione CUT di image
Prematurely added SSUnique plugin to Makefile

Removed until it actually exists.
Fixed typo with bubbleplot in Makefile.

Makefile wanted "bubblelot.svg", causing it to remake this file every time.
Added code to test to see if a there are any shortcodes in Sidecar_Base->the_content() before trying to loop through them.
Event management modifed
Added minor fix

Signed-off-by: nia <niadev76@gmail.com>
Purpose; Hex Grid Generation
Purpose: Hex and Cube Generation
Making it heroku ready
Rename index.html
Brought along his assest
Moving jquery
Changes
Refactored directories
fasdas
add restclient
updated readme
changment .ui

Signed-off-by: dewillie <edewilliencourt@gmail.com>
Merge branch 'master' of https://github.com/nicoctopus/octopus into newMaster

PROB mainwindow.cpp nico a MAJ a la main

Conflicts:
	mainwindow.cpp

Signed-off-by: dewillie <edewilliencourt@gmail.com>
MAJ mainwindow nico .cpp

Signed-off-by: dewillie <edewilliencourt@gmail.com>
Add error handling for hub
Add GitHub ribbon on demo page
Invite Mattieu Gamache-Asselin / Parse
Merge pull request #45 from Mattieuga/invite-mattga

Invite Mattieu Gamache-Asselin / Parse
Auto-select embed code in map.html
Hides the toolbars when focused on the captioned image caption editable inside the block.
Merge branch 'dev-jqueryui-ultra' of https://github.com/alohaeditor/Aloha-Editor into dev-jqueryui-ultra
Fix for experiment tuple triple
Fix rpc to at least not fail
Fix environment recreation on menu perms calc
changing cache extension to json
added java strukture
Moved to src main structure
Removed unused files
mauto: add integration methods
SurvivalGames conflict fixes
add files
add more files
add more files
README markdown tested with github's "markdown preview"
actually working
some
metadata registry

* add the metadata registry file with all the required fields by FS
* comment out all the simple dc metadata in the sword config to avoid confusion
webadmin: use empty string instead of empty constant

Change-Id: I2bda325519c667733115b40d849ba67030296d73
Bug-Id: https://bugzilla.redhat.com/871380
Signed-off-by: Shahar Havivi <shavivi@redhat.com>
core: remove unneeded reflection use in SyntaxChecker

Using the built-in valueOf method of Enum instead of fancy, expensive
other ways to try to get the enum value.

The former code did eventually a valueOf check which is case sensitive
and then another EnumUtils method which was case *insensitive*. Since the
inner EnumUtils call would only be read on a match there is no point in repeating
the enum fetching twice, and in a very expensive way when we have a
ready made method for it.

Change-Id: Idd74aad49d292e64dec6f5925ffd186f13b9887c
Signed-off-by: Roy Golan <rgolan@redhat.com>
engine: Get Gluster Volume Profile Info Query

- New entity classes for Gluster Volume Profile Info
- New XmlRpc class for Profile Info
- New bll and vds query
- New Junit test for the query

Change-Id: Ic47eb168bd4bcd5f3297a7e89a5ef46e643ed73e
Signed-off-by: Dhandapani <dgopal@redhat.com>
Update README.md
Making ORM switchable, and test passes for ActiveRecord
Prepared Mongoid models for testing
Fix minor spec failures with Mongoid
Spec now passes for both AR and Mongoid
Fix CI spec failures
Freeze FactoryGirl's version to 2.x
Make db:seed runnable on both ORM and fix session issue on switching ORM in dummy_app
Add CarrierWave support for Mongoid
Freeze Paperclip's version to 2.x because of incompatibility with jruby-18mode
Merge branch 'master' of git://github.com/sferik/rails_admin

Conflicts:
	lib/rails_admin/adapters/mongoid.rb
	spec/integration/config/edit/rails_admin_config_edit_spec.rb
	spec/unit/adapters/mongoid_spec.rb
product.js 因該會起衝突
[html][css][js]modify lots of product css and service page...
Merge remote-tracking branch 'upstream/master'
Merge pull request #32 from meifu/master

改了很多product.html的東西
Merge branch 'master' of https://github.com/observerslee/ardic into develop

Conflicts:
	css/product.css
	js/product.js
adding json and jsonp interface
Added some install info.
allow temperatures to work when the display name is changed
Merge pull request #44 from twalpole/temperature_Fixes

allow temperatures to work when the display name is changed
Set log level on new handler setup
Fix msg location in 'run' object
Left-aligning channel names when icon is missing.
pg_search
Search fixed for Heroku and Local
Removed Sunspot
udpated something
Merge branch 'master' of https://github.com/omarCA/simplefieds into bootstrap
the beginnings of twilio
updated gemfile.lock to resolve merge conflicts
stable master
test twilio on heroku
test twilio on heroku1
prep for heroku mailer
herkou mailer test
front end changes
merge conflict resolution
prep for design merge
Merge branch 'master' of https://github.com/omarCA/simplefieds into bootstrap
landing page design
Some tidying up of makefiles

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
Plantillas View
Control seguimiento

L1
Skipping define_replay...it is breaking unit tests.
Luke: int to str
Buildout to use pyon as an egg
skipped test to illustrate bad resource registry behavior
update tests that configure port agents to remove hardcode ports and other
Merge branch 'master' of github.com:ooici/coi-services
Update ChibiOS/RT svn revision
Improved logging configuration.