labofsahil/github-event-dataset-2012 huggingface dataset:
Move to persistent HTTP connections.

Use the net-http-persistent gem to manage robust persistent connections.
Idempotoent requests are now retried automatically as per RFC 2616.
SSL certificate store changes.

This now picks up the platform default locations of CA certificates by default.
Further paths are simply added with the :ca_path parameter.
Rename library.

Change the artifact id to taverna-server-client so that the transition to later
versions of Taverna Server makes more sense.
update on develop
merge1
Update system/database/DB_driver.php

This will fix the "Missing argument 1 for CI_DB_result::__construct()" Warning
fix order number
Remove thin gem
New text for guest link
Moved menu around and added a Here Today page
removed link to old help center
Updated from and sender on the outgoing emails.  From is no longer the mailing list
renaming images to have lowercase ext
StyleSheet Changes

Introduced pastle color UI for a more distraction free experience.
updating events section
Moved the params adaptor to Atrium engine.
remove attachment_fu, fix attachment upload tests
Some UX changes courtesy of Neil Brown's user testing
Update package.json

fixed node engine to support greater than or equal to 6.x
Merge pull request #3 from damienwhaley/master

Fixed the engine check to allow it to work on node 0.8x without warning
Update css
Add text on admin page
added dependencies to poussin
added README
Create a new field in Group
Print the group names
Modified the view to re-define curated groups and fixed css issues
Remove the popular column, using a different logic
Remove the debugging info
Remove the pop_groups thing, just use groups
banner upgrade
added Ninja Breakout Board
Initial commit
Merge branch 'master' of https://github.com/nitinjn/Port-scanner
maded some changes assigned
Automated commit from build.nltk.org build 152
Added dateformat js files....ooops
doing some big changes right now
Debug github plugin
Add tags to the text version
Clean code
Fix:core:Allow itemgra's of order 0 to be displayed when zoom level allows to fit more than 1/8 of the planet on the screen.


git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5011 ffa7fe5e-494d-0410-b361-a75ebd5db220
Fix:gui_internal:Show (in default configuraton) buttons to "Abort navigation" and "Drop route waypoint" when no route can be built because destionation(s) is unreachable or Position is unset.


git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5012 ffa7fe5e-494d-0410-b361-a75ebd5db220
Merge remote-tracking branch 'refs/remotes/trunk' into navit-dev
Fix:core:Add copyright note.

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5013 ffa7fe5e-494d-0410-b361-a75ebd5db220
Merge remote-tracking branch 'refs/remotes/trunk' into navit-dev
Refactored Metadata middleware and resolved status bug
Minor cleanup and simplification.
app.pro qui marche!
Update lazylibrarian/searchnzb.py

Attempting to add second Newznab
added pre-aligner, revamped branch predictor - still need to account for
4th instruction branches?
Stopwatchopdracht afgemaakt.
Bugfix reset button stopwatch
Kickin' styling improvements
Added an exception and fixed a small bug in the contentnegotiator
Content negotiator polished
Add configure flag for examples.
TME5 posix
ENFIN
Merge remote branch 'origin'
fixed and added regression for multiple inline echos
added release history
hob: modified how the existence of a variable is checked

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
uievent: Fix an init race

There is a race where the registerEventHandler() server call may happen in
a different thread to the main UI, causing the main UI to see
httplib.CannotSendRequest exceptions.

This moves the call into the main thread, removing the init race and fixing
errors I was seeing with the xmlrpc backend.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
xmlrpc: Unbreak the transport by adding a missing logfile name

I appreciate a fixed value is suboptimal but this is better than not
working at all!

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
rootfs_rpm: Add Multilib prefix to installed_packages list

RPM does not name it's packages with the Multilib prefix,
but the rootfs_rpm class keeps track of the Multilib prefixs
in a list. Use that list to re-attach the prefix for use with
the license bbclass, buildhistory bbclass will also use this
and make it more accurate between multilib and non-multilib.
Use the embedded "Platform" information to ensure we get all
the correct matching.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
image_types: fix squashfs-lzma image creation

This removes the dependency on a seperate binary which we
don't seem to have. So, use mksquashfs's -comp lzma to
replace that functionality

[YOCTO #3126]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
sanity.bbclass: Increase LAYER_CONF_VERSION to match bblayers change

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
rpm: Ensure we depend on file

rpm links to libmagic from file so it needs to be listed in DEPENDS else we
can have race conditions causing build failures such as those seen on the
autobuilder recently.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Adding initial restore machine IP
Adding shell script wrapper around Makefile
Seems to maybe work; have to test against a real empty VM
Fix self hostname; actually do MySQL restore
Do not bother with screen hoop-jumping that I cannot figure out
Add man directory and a mising apt directory
Add config files to the blank, and pass env argument to duplicity to avoid needless prompt
Also test the wiki
Close #139: added checkpoint in case of not allowed location
Самоконтроль: проработка лекционного материала
test prefixed uri for user
Update notes for submitted changes

* Place lunaprefs.h in its proper place after cmake.
Refactor chef_regex to have less duplicate code by creating common
functions
Merge branch 'mm/regex-cleanup'
Increase ibrowse max sessions and disable request pipelining

Set the global ibrowse max sessions for a single host to 256 (default
value is 10). This prevents mini_s3 requests to bookshelf from
erroring out when many requests are inflight.

Also disable request pipelining for ibrowse requests. Unclear if
pipelining would give us much benefit to begin with and some of the
error traces we observed suggested that pipelining was involved --
where a request was sent on a connection that the server was closing.
Bump omnibus-software, pick up new version of nginx

New version of nginx is required to properly handle reverse proxying
of HTTP 1.1 servers that provided chunked responses (e.g. bookshelf).
Bump omnibus-ruby (aka omnibus) and omnibus-software

- Pickup Erlang R15B02
- improved handling of git fetching for annotated tags
Port msi compilation and packaging from omnibus to omnibus-ruby for windows.
Merge branch 'omnibus-msi' into omnibus-windows
adding local settings template.
#56 - youtube sidebar start
Начал переделывать rbac
Merge remote-tracking branch 'origin/master'
favorite module 70%
social module
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/site/style.css
	protected/modules/codegen/views/templates/module/Module.php
	protected/views/layouts/_header.php
рейтинг 90%
хз
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/site/style.css
	protected/components/Controller.php
	protected/modules/fileManager/FileManagerModule.php
	protected/views/layouts/_header.php
мерджим
video module
merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/site/style.css
	protected/components/ActiveRecord.php
	protected/config/development.php
	protected/rbac_old/models/AuthObject.php
	protected/views/layouts/main.php
codegen 4%
fixed bot-bug of eating each other
StreakLayer
implement InvoicePaymentGet and InvoicePayment / fixed some typos
implement ProductGet
adding repairs by user
Sem recursao a esquerda e deterministica
protect Tcl_GetIndexFromObjStruct from empty strings in table
protect Tcl_GetIndexFromObjStruct from empty strings in table
modifications GraphObserver
Site updated at 2012-05-28 16:25:23 UTC
Adding blog widget
package is a reversed word now in coffee-script
bumped node version and mocha version, mocha requires --compilers option for coffee-script now
Merge pull request #1 from gflarity/mocha_fixes

Mocha fixes
xmloperator --update-complete
Added script for Alone in the Dark 1
ErrorDialog refactored to NotificationDialog with new arg 'title'. 
fixed bugs concerning fine checking and clearing. should work ok now.
added 'title' args to previous ErrorDialog instances around the project.
new function to compare answers to whats need in the application
use new function to decide if the application is complete or not
changing the reset functionality to be based off a param that is passed along
- Reworked Calendar's HTTP GET requesting system. Issue #17 appears to be fixed.
- Corrections to Logger
- Fixed issue #18.
space + , a szavaknál

Signed-off-by: Balázs <balazs@balazs-Inspiron-N7010.(none)>
Fixes syntax highlighting in the "Getting started" section of the README
Merge pull request #1776 from bloudermilk/patch-1

Fixes syntax highlighting in the "Getting started" section of the README
introducing a new sys property("generate.doc") that controls whether we publish javadoc or not
- `./build -Dplay.version=XYX -Dgenerate.doc=true publish` will publish javadoc artifacts for external sbt artifacts (the default is not to produce them)
- fix a few javadoc related issues/warnings
Enumerator.run
Merge pull request #185 from julienrf/lighthouse-245-patch

Fix java helloworld sample template
Added convenience methods for using a fake global in Java
todo, fixme を jsdoc コメントに埋め込みました
todo, fixme を jsdoc コメントに埋め込みました
Merge branch 'dev'
skeltumblrを作成しました
reblogging を loading に変更して tumblr 標準の機能を利用することにしました
リファクタリングしました
Update links for popular media players
Version 1.2, I went to medalsoft company last night, demonstrate it and discuss some details
Ajustement au tests.
Refactor
Refactor
Initial code commit with basic file reading.
Update metadata access and request token methods
zFreeImage: 修正图片像素掩码获取的代码
befirended adeed in profile
Added image to view page, basic layout for now
add Spokesman-Review to in the wild
Add ticket class  (just incase the parent doesn't have it included)- required to fetch staff's ticket stats.
New version of README.
Core data dictionary
Modified to download files < 1024*1024 bytes without multi-part
I just did a branch.
clean up watches
dump was not loading data, only metadata
invalidate (meta)data on commit
fix error condition: allow unset id
remove unneccessary data
handle edits with only changed metadata
Revert "remove superfluous variable"

it is not superfluous after all.

This reverts commit 75ba339987b2dfea4778879e38a9ff5a3889baaa.
move id to parent class WPCData
support passing a type or typeslug
support relationships without additional keys
support collections w/o meta table
consistency: rename db_relationslug to typeslug
support empty data and meta arrays
remove unused variable
use real wp-id: ID
implement RelationCollection
deleted content.cpp
Fixed basic predicates to true
Save this state
It works
Code style changes
Remove reference to rootElement
unit tests passing
Aggiunta cartella resources
Simplify Bottom WindowBar. Play with Top Toolbar.
Note about virtual destructor of Base is added
Rechecked fix for eps**D scaling
Improve basis transformation doc strings
Basis transformations for Hagedorn wavepackets
Add basis transformation to doc
Fixing some ndarray data types
Add gitignore file
Item/get response fixed
17발표 자료 백업.
Начало
test2
kkkk
CSS vedor tags; skills diagram on index
Nicer solution to the recursion, removed the TP view test
Averaging confidence addition
Oui oui, un commit pour un changement de version :P
Fx.Slide out fix to make it run correctly with native css transitions engine
Merge branch 'master' of github.com:rightjs/rightjs-core
Renaming from texile to markdown to help formatting displaying (hopefully)
Beta 1, Commit lhoo
changed audio builder
Merge branch 'master' of http://github.com/robgarden/geddit-web
Replace references to /usr/lib with %{_libdir} in spec file

Signed-off-by: Jonathan Davies <jonathan.davies@citrix.com>
Add Sandy/Ivy Bridge CPU models to the list for CPUID masking

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Add a rounddown parameter to zerocheck, similar to the existing
roundup parameter.

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Merge pull request #97 from jonludlam/zerocheck-update

Add a rounddown parameter to zerocheck, similar to the existing
[http] re-add the HTTP proxy code from xen-api

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
[http] expose Http_proxy.one for single-request proxying

xapi will be able to use this to forward particular requests to
other daemons (or domains)

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
[http] expose Http_client.response_of_fd_exn

This function is useful for those cases where we really want to
catch the specific failure exception, rather than just receiving None.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
[http] add Http_svr.bind_retry

This function attempts to bind an address to a socket, retrying on
(hopefully temporary) failure.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
[rpc-light] XMLRPC cannot marshal integers > 2**32

The normal workaround for this is to marshal as a string instead.
Note the unmarshalling functions already handle this case.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Add PUT to the access-control-allow-methods CORS header

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Add ability to negotiate hixie76 style websockets

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Merge commit 'c7526e8cf4d42020e4e64c666f3d070501d6b187'
Merge pull request #100 from jonludlam/web-stuff

Web stuff
Merge commit 'f4bc6d20798185f487ab7f64e2a0060721f4c84f'
Merge commit 'b37d7e4f5ac909afcb6536b735db9fde394bae52'
[NBD] add Nbd.write_{async,wait} to allow clients to pipeline requests

Internally Nbd.write simply calls write_async and then write_wait.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
[NBD] Add Nbd.disconnect_async to send a disconnect message

Note this message is unacknowledged and all replies must have
been handled before this message is sent.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Remove nbd_test binary accidentally committed in c/d a751c38199bb354f7eda5e77c314df1a1cf35d00
CA-83837: add 'Watch.has_fired: t -> bool'

This will be useful when watching for several events, and multiple
fire at once. The client code can then use this to apply some
prioritisation, deciding which watch was most important.

For example an already "failed" VBD unplug can suddenly complete.
In this case we'd want to consider it completed rather than failed.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Merge pull request #103 from djs55/nbd-async-upstream

Add async write and disconnection to NBD
need to link against math library
Merge pull request #1 from chrisforbes/master

Fix build with gcc-4.7
merge from develop.

updated date format for input dates
reports integration
member sample
Moving commit, work on testModifiers() half through
Tests failing because we do not always store the field
missing newsline
Got rid of TODOs
* Added config option ``users`` to map Trac users to Github users.
* Changed supposed issue number in log to take existing issues in account.
* Improved error messages on broken config options.
Added a common source file for functionality between utilities, and put a function to match extensions in it.
FB Auth working
Update ops docs.
ajax update
50 is better for load
* Rebuild with Android SDK r19
rgettext: fix the variable name
Bump version of cssfilter.rb to 1.3.0. [admin]
timing hopefully working again
C: fix PADLIST and PL_comppad overrides >=5.17.5
add relationship line dynamically
add move label in search controller
Introducing Vim Fugitive.
Merge branch 'master' of https://github.com/ryanalbon/vim-config
Removing bad Vim Fugitive files.
Reintroducing Vim Fugitive plugin.
Changed some naming conventions
Tidying up the templater class
commiting before refactor
added math, unsure if works:
Quaterians in
Quaterians out
Changes needed to get a clean compile on Windows
Include mpc into ptp
dedicace bomlé
find similar
Added a zshenv file.

I don't think I'll ever reasonably get beyond the proficiency I am
currently at, and I'm alright with that. I'd prefer to get super really
good at zsh, but I find it really hard to just find an answer for
something. Mostly best practices, but oh well.

Also updated my setup.py script since it breaks a little :v
Merge branch 'master' of github.com:sahchandler/dotfiles
Update .gitignore

Eliminado los archivos gitignore
fix som bug
SAK-23044 Ability to hide a folder while allowing access to files inside it
Relates to KNL-999
Patch from Juan José Meroño Sánchez (UM.es), tweaks by AZ (Unicon)



git-svn-id: https://source.sakaiproject.org/svn/content/trunk@117691 66ffb92e-73f9-0310-93c1-f5514f145a0a
Fixing StatelessSessionScope bug when using Linq. Error message was: "Unable to cast object of type 'Castle.ActiveRecord.Framework.StatelessSessionWrapper' to type 'NHibernate.Engine.ISessionImplementor'"
Setting a variable for the enter key.
Fixed condition being used to check if the sidebar element exists on the page.
ajout filebrowser
ok
ok avec jqueryFileTree
presque pour gsFileManager
commence a marcher
background color ok
better directory panel
edf style
supperposition images
recuperation reload.jpg
file browser provisoire avec info sur la ligne
file browser ok  reste a l'interconnecter
header ok
ajout baniere vishnu
ajout baniere vishnu plus grosse
logo ok
adding toggle
plus de raccourci et menage menu et cartouche old
sauvegarde dansMP
no use dump retrieving
concept mining with spock & santex
concept mining with spock & santex
Maintain short chat log and fix animations
Cleaned up assets.

* Moved CSS, JS, Images into an assets folder
* Adjusted the file structure a bit for CSS, JS, Images.
* Added a fonts folder
* Cleaned up the config a bit so it's easier to read through
* Added some KSS placeholders to tinker with a bit
* Added zepto.js so we can be a bit more friendly on mobile devices/modern browsers
* Added some basic responsive breakpoints
* Added a scaffold.css and theme.css so we can separate out layout pieces from the theme. This will let us retheme the site easier, or have multiple themes if we're feeling frisky
* Removed some HTML5 boilerplate pieces that we don't need
* Added some basic structural css partials
changes in the description part of the main script
fixed install arista plugin
bumped version number to 2.0.5
removed Java installation due to download restrictions imposed by Oracle
Do the redirection based on the grade
Distribute rulesets during the install on autotools.
Fixed typo
Merge pull request #3 from nfedyashev/patch-1

Fixed typo
ready for items templating
added second sign up link
add doc
add github support
add a TODO
Add doc notes..
clean up readme
Change boost key to AltGr instead of Ctrl
Bash-Animation
update to p3, eliminated globals
read list experiment added
fixed issue with lib. dirs
fixing bug in CollectionView._onArrayChange
Started work on context menu. (v1.1-dev)
Better GET proxy
Significant functionality implemented.
seperate static server to requestHandler.js
使用mongodb储存信息
数据库返回的聊天序列按时间倒叙排列，更改view样式
3 more AACGC plugin fixes added
Added Assignment 03 files
First pass of overview and miscellaneous notes.
layout form brutto ma migliore
(bug-fix:major) Rewritten part of wait/alive logic.

(bug-fix:minor) Forgot to add test suite for posix_process class.
syncage
Renamed user to op_user to reduce collisions and added a get client method to mage_hand_user module.
Version bump to 0.4.9
Regenerate gemspec for version 0.4.9
move the top menu & global warning
Finished 03_vectors.clj
Finished 04_sets
Remove old reference to use=>1 property in tx feature
+ 增加了repl功能
* 利用deque来加速stack执行
* 调整debug的问题
* 修正apply行为错误
Added latest bm/51 episode
only need to keep one client require file
use request name if provided

If a name is provided for the bundle, use that versus the filename. This
allows for proper registration of vendor modules.
0.1.0-pre6
rspec color added. added valid and errors methods and raise exceptions stuff other other branch
Handle id change of resource with 'new_id' field
Arrumado código do validate de CPF. Adicionado validate para comparar se uma data está entre um periodo, por anos ( data informada entre 20 anos e 80 anos )
started script implemetation
fixed phantom styles
refactoring save and saveas for robustness, fixed create
fixed save, creation with update of config
loading system is back
Merge pull request #23 from lexoyo/master

work on creation and loading
Merge branch 'hotfix/mobile-bookmarklet'
fix view layout determination for mobile bookmarklet
Merge branch 'release/0.0.1.0'
Changing release mode to true, hopefully the last commit ever violating the branching model. DO NOT BACKPORT THIS COMMIT TO DEVELOP
Added Cancel Button to Sign-Up Page
Added only german and english language
Merge branch 'master' of git://github.com/diaspora/diaspora

Conflicts:
config/defaults.yml
Minor changes to structure
Added Question types and better code division.
!F - Adds formatted strings to LanguageManager.java
added some stuff
random changes here and there
xsetroot still doesnt work :X
javascript isn't strictly typed broski.
Merge pull request #2 from davidbyrd11/patch-1

javascript isn't strictly typed broski.
Add put-sheet, rely on Lanterna 2.0.1 stable.
Merge pull request #2 from sjtipton/jeffbot

Add views for draw and vote and hook them up to routes
Merge branch 'master' into umicar
Merge branch 'umicar'
Add paper.js to view
close deh tagz
Merge branch 'master' into umicar
Added LICENSE exop and xomb-bare-bones updated README.md
fix mp4 join
更新bootstrap的jQuery插件模块
删除测试用 index.html
bottom navigation widget javascript, about us javascript
fixed bug in bookmark if url had / path in it.
Implement edit action for the ticktes controller
Test for shorthand
fixed upload url bug
StoreDatabase and AESObfuscator are no longer static.
Added basic filter functionality.
SAAS-229: Icecast Vorbis Metadata button unticks when you save

- fixed
set4
Bug fixes
Yay it mostly works. Getting close to beta :)
added support for removing spaces from keys
these edits got overwritten from last commits
add missing extern.log
add object.container.music
SSIS Load Refresh Pricing
Added logs for all the tests and charts, typo fixes
Tag v1.0.0-beta1, fix older issue
Add bare-sbcl script.
updated git modules to point to uhurusoftware's vcap-services
Cleanup

* Less hacky inclusion of main app route helpers
* Replace acceptance spec with slightly more thorough request spec
styling to form and table
Changes to get scatteBrainrain running on beamline

Small changes to get scatterBrain running on the beamline after moving
to GIT.
Tried making the pipeline precompile
vendor compiled assets
Disabled static assets
Put them back in
Modified to allow fallback
added zipit
Added grouping to industries dropdown for better readability.
Added 'All' option to cycle/year dropdowns in all datasets.
Added changelog link to footer.
Search results link to data.IE now links to contributor search for query.
Merge remote branch 'origin/master'
better server support
[MISC] update template for rakefile
Problems on Java 7 environment had been fixed.

git-svn-id: http://chianti.ucsd.edu/svn@30027 0ecc0d97-ab19-0410-9704-bfe1a75892f5
Working UART driver.
Lets mark the driver as running.
WIP - adding ring buffer.
Finished implementation of ring buffer.
Renamed reset to flush and added documentation.
Merge branch 'ring_buffer' into serialification
breadcrumbs.
Add check that the TX is idle before kicking.
Serial_Init, _Get, and _Put
Added parameter to callbacks.
Finished first pass of the serial driver.
junk commit to update my project.yml to the right serial port. need a better way.
ensure we're expanding tabs.
added echo service and enabled serial communication.
Okay, actually expand tabs.
Merge branch 'serialification'
Fix test. *shame*
Cleanup, use Adobe font
haml users
micropost pages test
microposts
Updated hero image uploader to accommodate Fog.
log fin
Updated mutate algorythm
Added percent validation
fixed deprecated path.exists for fs.exists
fixed .gitignore entries
Added NoResHere Field
Dont extend prototypes
Merge pull request #13 from Raynos/patch-1

Dont extend prototypes
Add StringValuedToken as a subtype of CSSParserToken.

Abstracts out the .append() and .finish() methods from a bunch of token
types.
Number retains its .finish(), since it has to do extra work.
Dimension stays a vanilla CSSParserToken, as it names its relevant
property 'unit' and has to do extra work in .finish() anyway.
Add the unit into Dimension's .repr
Adjust for leap seconds in TAI :|
delete maui test
Merge branch 'master' of github.com:tadeo/django-academy
Merge branch 'master' of github.com:tadeo/django-academy
merge commit
merge fix
Merge remote-tracking branch 'absolu7/master'
Merge remote-tracking branch 'snowsunny/master'
Merge remote-tracking branch 'tapalilov/master'
mini fix
Merge branch 'master' of github.com:snowsunny/GAKUEngine
Merge remote-tracking branch 'absolu7/master'
mini fix
Merge remote-tracking branch 'Genshin/master'
Fix view students/show
mini fix
editing guardians
Merge branch 'master' of github.com:Kagetsuki/GAKUEngine

Conflicts:
	app/views/students/_guardians.html.slim
	db/schema.rb
Merge remote-tracking branch 'snowsunny/master'

Conflicts:
	app/views/students/_guardians.html.slim
Merge remote-tracking branch 'tapalilov/master'
merge fix
temp commit for rollback test
Merge remote-tracking branch 'kagetsuki/master'
states_ja finished but not migrating
updating input snippet with new drop down options
drop down for different media types
Only use “current word” if it looks like a tag.

This is done by matching against /^[\w\-:_]+$/i. In practice current word would only contain a dash, underscore, or colon, if the character classes for the document type has been redefined to make that part of the word character class or if the command is invoked with a selection.

This change was made to avoid an issue when using the command in a location like: <p>‸</p>, here “current word” would be “></”.

Also enable UTF-8 so /\w/ matches non-ASCII word characters.
Merge branch 'master' of https://github.com/avian/html.tmbundle
rewrite function of receive.

added message when to use serial.
all text is copied in, I am pretty sure.
updates
updated refs
ok
Make it so loadCA() doesn't have to be called before loadX509() or loadCRL()
-rdb fixes
Comment typo

http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=29131
Merge pull request #403 from janich/patch-4

Comment typo
# [#28403] Validation error on com_finder. Thanks Emerson and Jason
[#29194] Add some alternatives to the Joomla Logo
[#29181] Make article info block semantic. Thanks Elin.
[#28213] Page titles of categories and subcategories are unsuitable.
Thanks Skunk Anan.
 # +$ Adding installation languages: sr-RS, sr-YU, zh-TW
[#29216] Clean up category lists. Thanks Elin.
 # [#29091] *Language issues during installation: E-Mail always in
English. Thanks Dennis
 # [#29176] Call to undefined method JHtmlTabs::getJSObject() (Sync with
platform). Thanks Elin
 # [#28990] Unpublish default menu item gives a PHP exception. Thanks
Roberto
 +$ Adding installation languages: bs-BA, hr-HR, lv-LV, mk-MK
 # [#29223] *Sliders implementation prevents display of some Options in
dropdowns (bootstrap). Thanks Yannick
 # [#29232] Com_weblinks and com_newsfeeds loose "Status" filter state.
Thanks Yannick
 # [#29225] Code quality in installation script. Thanks Dennis
 # [#29206] Isis Template Parameters for Status, Header and Toolbar.
Thanks Kyle and Peter
 # [#29214] Module's menu assignment always shown. Thanks Stephane
Deluce
 # [#29137] Address in single contact rendering incorrectly. Thanks Elin
 #$ Correcting various spelling issues in en-GB. Thanks Brian.
 # [#28826] System Debug plug-in doesn't show for non logged-in user.
Thanks Shaun
map update, data file is getting there
handling exceptions when getting keys from internal cache object
Fixed function name in doc example
not catching exceptions from internal cache object
Merge pull request #35 from alanhamlett/master

handling exceptions when getting keys from internal cache object
Add second lesson
~ use Perl regex for grep by default. I got tired of typing -P
+ bc quiet and include math lib by default
+ lynx accept all cookies by default
~ change calc
+ display calendar on new terminal
~ only move to home/ if pwd is /
+ display ls on new tab
~ all git log now show all graph
~ rebase on branch by default (instead of merge)
+ space to toggle search highlight
+ F3 to search the current word and open :cw
+ move Gundo to F6
+ add g g as a shortcut for qgit
algo mas de estilos
adding thin server
deploying deploy branch
Add spent time column to issue list #838 #460

Backported from Redmine:
https://github.com/redmine/redmine/commit/07339fede860573b242bb83e0392e6dc86dfc6a3
https://github.com/redmine/redmine/commit/d7a5e1703f75d1a54c4379f65ba4a40c8766edd0

Both commits by Jean-Philippe Lang
Fixed bug with scrolling in StatsWindow causing a segfault.
Fjerna 2 usings <3
Update the common/form folder to match the new extended form system in place at HiFi.

The common/form.html file is a backup of the default one from HiFi
Tweak Hunspell searching to work.

At least under Arch Linux...
Correct include paths.
Collision detection in bubble example made it much more cool
用户列表排序
can put json objects with jquery and convert it to a an object annotated with spring requestbody
#1430648 by antipex: added a message to the STS tab if there is no API key present
#1471458 by antipex: Added a refresh feature to clear the mailchimp_lists cache
Added comments
#1379242 by caseius: Added a check for account status before automatically adding a user to a required list
#1396680 by antipex: Changing roles now properly unsubscribes the user.
#1396680 by antipex: Added cron support
Code cleanup
Minor code cleanup.
Initial commit of campaign module as carried over from older branch that failed to merge.
Adding ajax handler for changing template.
Campaigns can now be saved.
Default values when editing a campaign.
Coding standards.
Add input filter for processing campaign content.
Handle updates as well as creates.
Add entity api dependency.
Numerous menu and Entity API related refactoring.
Renaming mailchimp_campaigns to mailchimp_campaign
Renaming mailchimp_campaigns to mailchimp_campaign
Removing unused template file.
Switching to Javascript + jquery + spine.
change ordereddict to sorteddict in JSONResponse for 2.6 compat.

Fixes Issue #22
This config should work
First launcher to test standalone or on mc.thgbm.net:25564 server.
added background texture, tweaked fonts, yearned for sandwich
uploading work in progress before battery dies
Getting it working and adding gem
removed mouse mode from tmux, it's terrible
Classes are now documented in PHPDoc
basic project setup
some simple experiments
first draft of basic diff
Functioning Commit.  All code and all files are functioning.  All code requirements are met.  Preparing for final commit.
Revert "QSensor: Use standard Qt dpointer pattern"

This reverts commit f1d3ec045094c40af11e5aed7bddd473711ac989.
Provide d-pointers for QSensor subclasses in a different way
Add wxversion-specific error message. Closes #885.
fix exceptions in qt4 backend with extra mouse buttons
backend_qt4: make button mapping definition use Qt's constants
Merge pull request #894 from hmeine/qt4_ignore_extra_mouse_buttons

let Qt4 backend ignore extra mouse buttons (fixes exceptions)
Fixed call signature typos.
Merge pull request #900 from pelson/doc_typo

Fixed call signature typos.
Merge pull request #886 from efiring/wxversion_msg

Add wxversion-specific error message. Closes #885.
Fix PDF collection rendering
Fix some bugs introduced by the contour hatching changes
Update imshow baseline images
Merge remote-tracking branch 'origin/v1.1.x'

Conflicts:
	lib/matplotlib/backends/backend_qt4.py
Internal frame
Inserindo proposta de curso
Completed chapter 9 exercises, rock and roll
LP Upate
project readme updated
testbranch README change
Giles API call written. Parsing is next
Merge pull request #2 from tonyho1992/testbranch

testbranch README change
Updated the README.me.
CAS customized configuration
mod/recordingsbn/*.*
Provide :Breakadd and :Breakdel
Revert "Hub::Exception should inherit from StandardError"

This reverts commit fe0b21ac707ed92acfc8c29d22a33678f2fadc7c.
Revert "remove Hub::Exception use for now"

This reverts commit edbb0c35f3996342bcceb61c1c4fe5fd21507aec.
Revert "wrap exceptions with moar info"

This reverts commit e5054b575599c82836289fd931276a28fa0373a2.
added link to hud.
add tests for directories where the contents are totally ignored
removed personal files
changed install.sh
removed folder djangoproject from git ignore
added folder djangoproject
update BG image
Merge branch 'master' of heroku.com:disasterdispatcher
Merge branch 'master' of heroku.com:disasterdispatcher
dispatch teams
Language Master się opierdala.
removed class on link
Add stuff to track is buffer is in use, or being held
Solve Problem 64
Solve Problem 112.
Cleanup snipmate
Re-install snipmate
adding idempotence to ruby install
smaller dot size on graphs
Remove some commented out lines.
Add a development dependency gem
Suppress appending a revision header
Handle :filename option starting with "/"
Add an option for handling Rack's env
Backport of HDFS-3659 from trunk. Add missing @Override to methods across the hadoop-hdfs project. Contributed by Brandon Li. (harsh)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361895 13f79535-47bb-0310-9956-ffa450edef68
Backport of HADOOP-8531 from trunk. SequenceFile Writer can throw out a better error if a serializer or deserializer isn't available. Contributed by Madhukara Phatak. (harsh)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361943 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1362052. FIXES: MAPREDUCE-4395. Possible NPE at ClientDistributedCacheManager#determineTimestamps (Bhallamudi via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362054 13f79535-47bb-0310-9956-ffa450edef68
gemfiles installed
Rename verify_val() to varify_eval().

Less easy to confuse with verify_value().
add sorting to the element list
Add jdk fixups for mac
closed #317
closed #115
closed #195
Upped jmbo-frinds' version.
Spring basic configuration
Renamed dart_trap to spawn_trap
Mummy spawner added.
Merge branch 'mummy_spawner' into dev
new click tests added
- ‘fusion-creator/fusion-creator-libs/fusion-linux-essentials-verzija-s-rucnim-reposima’
- ‘screenshots/fusion 16/fusion 16 cinnamon menu.jpg’
- ‘screenshots/fusion 16/fusion 16 solarized terminal.jpg’
- ‘screenshots/fusion 16/fusion 16 theme.jpg’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_002.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_007.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_008.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_009.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_010.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_011.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_012.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_013.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_014.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_015.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_016.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_017.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_018.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_019.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_020.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_021.png’
- ‘screenshots/fuson 14.1 RC screenshots/Workspace 1_022.png’
...
Migrating the Disqus thread to the new demo page
Fix formatting bug in signatures.
Allow API access to /profile
Merge branch 'develop' into feature/stache
Exercises: fix title of avoid caching a page
Update mr libs
Add fixups_append to vcsh

It will look for .cfg-post.d/*${VCSH_NAME}* files to execute.
GREEN: test_that_responds_to_fuzzy_search
S3 WEB: Register the InMemoryLogSink as singleton and start consuming its content in LogsController.
added scroller; fixed issue in toe.js, fixed issue with zero value in the setDimensions function
Added the axis.
Introducing variable usage into SASS. First, to dynamically create pathnames of image resources.
Merge pull request #153 from imc-ag/master

Introducing variables into sass for easier path generation.
A temporary fix for the options modal buttons being inaccessible on lower resolutions
Table of contents click handler now uses event.currentTarget instead of event.target, in case toc anchor tags contain child nodes
Fixed a bug in the Alternate Style Tags implementation involving the use of ePubs that do not contatin any external style sheets.
By defautl force the height of the component
Use the full namespace for animation (vs.fx) to avoid bug when the alias 'fx' is not define.
This bug can occure according how libs are loaded (for instace with requirejs)
Fix graphic bug with segmented button.
If the backgound is to dark, it was visible between the border and the button background.
update css to fix borders for selected items
Harmonize CSS (with last iOS css update)
Fix the position of the element
Fix default button background
Lib update
lib update
add nicer looking start / stop output
change restart to be a combo of stop/start
Black box around private message with gray background.
Not show initial text in pm response.
* Added contributing.md
* Replace contributing guidelines with link to contributing.md
Merge pull request #128 from Dignifiedquire/docs-contributing

Add Contributing.md
Add argument about handler in case of dragging.
Add draggableTask module for js.
Add taskAction module for js.
Fix indent.
Add auto create new book when created or updated task.
Send list of pcaps to Suricata
removed test.jade and incremented version
Shorter timeout for carousel startup
Internal control vars made local

start,stop,prev,next variables were leaking into the global scope
Merge pull request #170 from JensRoland/master

A few variables were polluting the global scope for no reason - defined them in the local scope
update hyper pic in the home page
HPCC-7851 Use StringArray sort()

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>
Added LGPLv3 license.
fixed filename issue in downloadify export
fixed filename issue in downloadify export
remove focus from a field before saving
Merge branch 'master' into form_sidebar
get_obj(doc) fixed and weird alignment-fix of filter fields
styling and about us action
fit commit
import
Merge https://github.com/weimade/android_demo
something wrong in this repo, can't find salvation
xss solution with no private server
Merge branch 'master' of https://github.com/wetherbeei/XHack2012
Merge branch 'master' of https://github.com/wetherbeei/XHack2012
renamed stream to broker
erster collisionsberechnungsversuch ::: tolles wort ::: und umstrukturierungsversuch
didnt mean to remove counter
Adds simples gem description to README
Pre-Release Time :D
add controlbase as control base class, use to encapsulate control message proc.
make some methods to non static.
simulate onSelectChanged event and draw hyperlink when select changed. still have issue hyperlink flick.
XMonad tweaks... Brilliance
Fixed fullscreen for Gvim in Xmonad
X settings for Xmonad
Adding some specs and breaking a dependancy on Rails.
implemented distributed config system for modules
XWIKI-6804: Alternative to sendMessageFromTemplate that receives a map of parameters instead of a VelocityContext
Signed-off-by: Sergiu Dumitriu <sergiu@xwiki.com>
XWIKI-6804: Alternative to sendMessageFromTemplate that receives a map of parameters instead of a VelocityContext
Removed duplicated code.
[Misc] Add comment + use a simpler prefix for the packager plugin
Updated Session Detail View for Snapped
Add mangle support to uglify js filter
User the xzyfer/assetic fork until kriswallsmith/assetic#316 is merged upstream
Clean up init
Adding ec2 wsdl+downloader
Updated README to describe subdirectories
Merge pull request #1 from add0n/master

Updated README to describe subdirectories
ImageAttacher fix.
Merge branch 'develop' of git@github.com:yanchenko/droidparts.git into develop
Removed final from JSONSerializer.
ad design
Merge branch 'master' of http://github.com/yanqirenshi/neo-unyo
sequence type notification (#71)
change translate button style (effects only) (#71)
change req.session.state from fixed number to uuid
comments
lol
 now works
Merge pull request #1 from qqqqqqqq-/comments

Just a minor change
Fixed a bug causing bar graphs to not show up.
Removed Alex from team page
Merge branch 'master' of github.com:yonidonner/Checkmate
Removed some vestigial jQuery UI imports.
Added alternative authentication page, skipping the JSON token route and getting explicition user permission.
Test jQueryMobile
mod: lower socket.io log level in production mode.
add js->benchmark->array
RegEx for index ID working
Resolving merge issues
Removed hash-part from Facebook JS-SDK url, caused problems with jsmin
Fixes movie looping; implement AS2Stage
Dispatching AS2 clip events
Implements AS2Key class
Adds x,y,width,height to MovieClipPrototype
Adds more tests; fixes delete
Styling fixes for Article header & Section headers

Fixes #37
Remove old references to secfilter rules in zc_install/.htaccess
CHANGE-383 - Split "locale" components from english.php into separate file locale.php
Revert "test"

This reverts commit 668ce3d8ae5358d57299280524a65f0a2f24bf4b.
close_on_empty option for outputter/buffer
[Fix] outputter/buff/into, winnr() is not pointed to the source buffer when split
update doc
minor alignment fix of doc
basic ui structure addded
quitamos algunas variables globales innecesarias
Updated again.  F
LMP: removed excessive debugging of metadata.
Azoth Xoox: default ctor for User Tune; null int fields.
Core: removed some quirks for older Qts.
Themes: added ZionReversed-derived theme.
Azoth: try opening URL-looking things as URLs.
Poshuku: respect BackgroundHandle entity attribute.
Azoth: set BackgroundHandle on middle clicks.
Azoth: unified link handling.
LMP: runtime roles in sorter :(
form
filter
Adding user image/name on the right as well as adding pictures on the google map
Merge branch 'master' of github.com:3tokens/truffleserver
Progress logger tests: increase timeout for beeing more accurate.

This should give us better test results when testing on a CPU with higher load.
Add ``migrate_class`` helper with _p_changed implementation supporting BTreeFolder2Base containers.
fixed issues with .h writing
Update skeleton
Merge branch 'master' of github.com:7er/kravmaga-skeleton
code cleaning

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1280 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
contacts.cpp returned back to the core

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1281 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
x64 compile fix


git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1282 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
removed non-existant todo.txt


git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1283 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
fix #2 for launching service plugins

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1284 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
fix to avoid the DbChecker's call after database opening

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1275 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
added watrack_mpd port

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1276 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
folder rename

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1277 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Watrack_MPD added to full solution

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1278 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Refactoring of Mechanize Client
Rotating by angle has been implemented
Partie sur la modification d'astre complète
Re-organized everything to OTP compliant structure, added skeletons for everything, set up supervisors.
[mod] Add return version of navigation::content for include scope
[git] Ignore logs folders
Merge branch 'master' into PrettyUnit
Initialisation de l'application

Initialisation de l'application db infoshop
ticket:5 positioning form elements...
Displays file open exception with the message.
Android: Renaming Java classes and house keeping.
texto de  prueba
remove .DS_Store from svn
drop saddle, mount attributes on server
finished paperSize exersize
got lake linkes and images to work
Started configuration service
Fixed README.ms
modified queue to handle functiona args...variable number too!
Added Exercise action and images
Moved image files and tweaked action balance slightly
Removed avatar.png (doesn't belong here)
Added Event framework and tentacle attacks to use it.
Added another example and some stuff
simply fying!
Tiny change in index.
AutoFS4 config added.
Wrapped additional "type" column names into "`type`" as they can be reserved in some dialects which would cause a test failure.
First part of system introspection for objs and funcs added
Get system introspection functions fully working
Clean up some additional exception handling with new stack handler
Merge branch 'master' of https://github.com/ChaiScript/ChaiScript
Adicionado: Novas Imagens e Icones ao Projeto.
Adicionado: Outras Imagens.
Removido: Arquivos incorretos.
Adicionado: Painel que Carrega Imagens de fundo.
Adicionado: Arquivos Binários Class.
Alterado: Main do Projeto.
Adicionado: Novo método de Busca de nomes no banco de dados.
Adicionado: Busca de usuários no banco e atualização da tabela.
Adicionado: Novo Design as Janelas do Projeto.
Adicionado: Novo icone configuração.
Updated build for ios 6. Probably not necessary - found out that just a build setting change was required.
Renaming files according to new names
Pathnames changed to reflect new folder names in assets/snippets/
CS-14461: Add more infrastructure page shortcuts

-Add additional shortcuts for:
  -Primary storage
  -Secondary storgage
  -Virtual routers
  -System VMs

-Replace host stats with the new shortcuts

-Add 'zone' dropdown to create form for the newly added-shortcuts'
 sections, to support creating these items without a zone context

Conflicts:

	ui/index.jsp
CS-16354: Allow users to specify VM names on the hypervisor

Description:

    1. We introduce a global flag vm.hostname.flag intended to be used
    by the deployVirtualMachine API. If this flag is set to true,
    and the displayName parameter is also passed in to the API, for
    example, during instance creation in the GUI, then displayName
    will be used as the internal name (name as seen on the hypervisor)
    of the guest VM instance being created. If this flag is not set (it is
    false by default), the instance's internal name will be auto
    generated by the management server like it is done currently.

    2. Adding upgrade scripts for upgrade from 3.0.5 to 3.0.6.
    Changing version from 3.0.5 to 3.0.6.
CS-15617. Changed CounterResponse to a List as queryAsyncJob expects it.

reviewed by: Nitin
CS-15606 Dogfood Setup: Virtual Router (DHCP Server) fails to create in Pods

Reviewed-By: Alena

Changes:
- Correct the virtual router entries from table' virtual_router_providers' that wrongly refer to SecurityGroupProvider instead of VirtualRouter provider in physical_network_service_providers table
- For such entries, we update them to point to the VirtualRouter provider in physical_network_service_providers table
Fixed Thumbnail generated image to fit in cloud portal UI with default Width and Height (144x110)
autoscaleUI development - adjusting css for proper hide/display of scaleup/down titles
Don't allow dragging from edit button
CS-14751

F5/Netscaler/Juniper/Cisco config API commands are available to ROOT admin only
VPC : by default , outgoing traffic is allowed out, once egress rules are added, only traffic specified in those are allowed out, others are blocked

reviewed-by: kelven