labofsahil/github-event-dataset-2012 huggingface dataset:
fix applying 5% discount
try using install env to create database for travis
validate album finish
A first version of loading the track from the server in the "systemtests.html".
Add 'GpsApi.googleMapsTrack()' that can provide the coordinates in Google's format.
Simplify GpsApi unit tests by removing loads of duplicate code (new GeolocationMock).
Merge branch 'develop' of github.com:aaltowebapps/team-1 into develop
added dummy index.js file
ABICLOUDPREMIUM-3855, RemoteDisplay.vnc.keymap
Remove com.sun.istack.internal.NotNull import
refactor: explicit use of createjs namespace as required
changed title from 'test' to something less literal
tweaks to the flow of the game
The ball can now be marked as in/out of play
move master chin to the right side of the screen
improve wording of level titles and instructions
use praise if the level is completed, remove praise if level is repeated.
repurpose the velocity/position debug message to label the velocitometer as such.
tune the objective parmeters to be slightly easier
add checks for foul conditions; player must stay behind ball.
Merge of branch 'development'
Added travis-ci status image to README.
apc.shm_size requires letter notation
Changed .create to .build to stop record being inserted into the database instantly.
Frontend controls for filter
リンクの前にアイコン画像を出せるようにした
frameWindowを作成
frameWindowとmainWindowを別けて考えるようにする
普通のリンクをクリックするとメインの画面に戻ってくるようにした
add SplitSearch.crx
add icon files
Se agregan imagenes y se cambia el estilo del menu, pero no aparecen los datos
Se habia cometido un error en el tag de shield, ya se arreglo y aparecen todas las canciones
Se completo el menu funcionalmente, faltan agregarles graficos
Se agregan nuevos fondos, no son los mas lindos pero ya vamos a conseguir mas
Se hicieron algunos cambios de estilo sobre la pagina. todavia no me gsuta
Se cambio de posicion el new son y se subio el menu
Se agrega el nuevo estilo de la rocola
Se modifica todo el look and feel
Finalisation de l'implémentation de reporting_category.
Correction de bug dans le reporting_ressources :

- la date de disponibilité était mal utilisée.
Added one getter
Merge remote-tracking branch 'dan/master'
updating to the most recent
add links, add some sections, fix content
add current mercurial head code
Добавлены границы и интерфейсы в черновом варианте
Merge branch 'master' of https://github.com/agentlab/sakai-apps.git
shorthand for object creation (ex: {Id, Tags})
Applying VersionedOGC pattern to WMSDescribeLayer format

The WMSDescribeLayer format currently differs from other formats that
inhreit from VersionedOGC by having an array instead of an object as return
type. This especially bad since the VersionedOGC superclass sets a version
property on the array. With this change, the WMSDescribeLayer format will
also be compatible with GeoServer's new JSON response type for
DescribeLayer - see
http://sourceforge.net/mailarchive/message.php?msg_id=29912776.

Another change included here is the removal of the WMSDescribeLayer
format's getVersion hack, which was replaced by a generic fallback to less
generic parsers, e.g. from a v1_1_1 parser to a v1_1 parser if v1_1_1 is
not implemented.
<C-x> <C-o> to <Leader>a cast
removing the grid
Refactor to ruby methods naming convention
Added link to the Extension AMO page
added tablesorter and ip display
Added dot vim dir
Update test_project/test.txt
Change voting to use data from 'candidates' table only.
Added dateFormat to options
Enabled Scheduled Collector (Disabled for debug)
Fix listen bug in lib/common.js
array adapter muss berarbeitet werden, onClickListItem läuft
ArrayAdapter muss überarbeitet werden
Merge branch 'master' of https://github.com/alexBeuth/whatsToDo.git

Conflicts:
	WhatsToDo/src/com/whatstodo/ListContainerActivity.java
minor changes
Merge branch 'master' of github.com:alexaivars/dotfiles

Conflicts:
	bash/config
	vimrc
Merge branch 'master' of github.com:alexaivars/dotfiles
changend config
Merge branch 'master' of github.com:alexaivars/dotfiles
condition new featuers in vim
more map features
add __pycache__ folder to gitignore
Changed type in paymentnot model
Implemented edge trigger slope for infiniivision 7000A series
Implemented trigger coupling for infiniivision 7000A series
Added more triggering types to Agilent Infiniivision 7000A
minor changes + pom update 4 jar execution
adding additional folders

sql and crons
init commit
Merge branch 'master' of github.com:alfredkam/FlipClock
More additions to config

Signed-off-by: Andrei Gorgan <andrei.gorgan@cloudbit.ro>
fix some style in readme file
Added admin setting on startup (server.js), some work on profile to allow /profile route
Merging commit from anddimario
Moved MeshObj to shared library
Move integration_test_helper to root test/ dir

Keep all helpers in the test/ directory to keep things
consistent across projects.
Fix some bugs in Artefact tagging import
use domain rather than assuming gov.uk in suggested links
sorted communities
urlescaped commas in communities urls
fold new urls, to avoid redirects to redirects
fold new urls, to avoid redirects to redirects
de-duped and folded communities
Added posts and comments
server
bin directory with server
Update TODO
Add messages to translation
Update ru.po
Fixed bug with updating email table.

The function to determine if a bug/username combination exists was reversed in logic; also added a sql insert statement so that the manager who edits the bug would have his/her email address added to the email table
Changed name to Brubuild since Rubuild was already in use for another project
added validations and all
how to add a user from the command line
Merge branch 'master' of github.com:ambtus/mobile-pages
Avoid the null reference error when no comment set
Merge branch 'following-users'

Conflicts:
	README.markdown

:q
Disabled direct script access to application/libraries/: General.php, Layout.php, My_captcha.php, My_config.php, My_image.php, My_session.php
adding to jbox
adding new files
naming series issue fixed in pos settings
Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Merge branch 'shf_rename'
Added nebula textures
Small update

Added PathControls;
Added StarLensFlares;
An attempt to create nebula;
Small tweaks;
Refactoring;
possible fix for empty exclude_command bug
fixed empty exclude_command bug
example with mrbStudio-helper script
prepare for v4.00 tagging, documentation
minor fix for gitlab markdown
exported asdocs, still no documentation though
remove username from prompt
pyradmin.schema: ObjectSchema
Mostrando alguns pontos no mapa quando a app é iniciada'
Fix JS stray comma. Fixes #1299.
Some support scripts.
Added some extra debug and protection when getting mux config.
Merge remote-tracking branch 'tvheadend/master' into status-xml
Added some new transport/multiplex search routines and used them in epg modules.
Merge remote-tracking branch 'adamsutton/pr/128' into xmltv-lineups
Merge of adams pr/128
Updated functions to use new global functions in dvb
Lineup parsing and updating name/number/icons and summary

Tidy up of code, bug fixes. Ready for testing for stability, etc
Use mysql for database and do all database set-up in the build script, not the app
updated console definition
shared auto-conf
jartein update
procuct view
red2 page.xml
random Related.php
Updated manifest to version 2. Updated build script to build into a separate _build directory.
Yep, Pygments doesn't like PowerShell :(
* Add comments for liveBlogLiteUi options properties
* Now in UI plugin, text data from API is processed with buildTextElement() function, for cleaning and normalization
** Strips out undesirable tags like SCRIPT, OBJECT, and IFRAME, for security and usability purposes
** Makes sure all links open in new window with target='_blank'
** Appends optional URL params to all links; see below

* New 'linkParams' option in UI plugin, which appends a string of URL params to all outgoing links within post text, for link tracking, etc.
** Ex: { linkParams: "icid=liveblogTest" }
slightly sassified the scss
colocando o syntax para o less
* Added a "scrolling" background in the form of a simple dynamic starfield
* Changed ball color to make it more visible in the starfield
* Slightly faster ball speed to make the game feel more "smooth"
* Renamed variable diameter to radius
added a barrier in the middle
Snowflakes and Change in Ball Size,Color and Speed
Added Bokeh Generator

Created a BokehBall and BokehGenerator class. Experimented with
different colors, transparencies, and blur settings. BokehGenerator
randomizes the size, alhpa, and blur between a set of ranges.
Created BokehView

Refactored the Bokeh effect to have its own view, which is displayed
under the PongView. Moved code from PongView in to BokehView
Refactored BokehView
Fixed drawing bokeh performance issues

Bokeh was being drawn every frame in onDraw and this slowed down the
game considerably. Now, a bitmap is created once each time the size
changes and the bitmap is drawn to the screen, rather than redrawing
every circle every time.
Added moving obstacle and increased balls speed after 5 hits
Added a feature that doubles the speed of the ball when it makes contact near the center of the paddle.
Merge remote-tracking branch 'shamidi/master'

Conflicts:
	src/org/oep/pong/PongView.java
Merge remote-tracking branch 'monicasharma1053/master'
Updated graphics with new colors, speed, sizes
I changed ball speed to increase difficulty
Merge remote-tracking branch 'otherrepo/master'
andorid-pong
made paddle width smaller for added difficulty
merge otherrepo1/master
merge
Merge remote-tracking branch 'otherrepo/master'
Removed redundant packages, improved validation class including optional fields, improved calculation class, added simple/advanced output (still needs work).
Update application/src/gui/SolarPowerGui.java

Updated Calculations
added program1
Reorganization of repositories.
Add copy constructor to ShadowBundle
ShadowBundle get* methods return null if they are not of the proper
type.
ShadowBundle: Add clear and remove
Add getError/setError to ShadowTextView
Added implementation of startManagingCursor/stopManagingCursor
Merge branch 'robo-staging'
WS
Added PackageManager#resolveService(Intent, int)
Support for onPreferenceChangeListener
Exclude NotificationCompat in android-support-v4.jar from instrumentation
Add unit test for startManagingCursor/stopManagingCursor
Merge pull request #288 from zoodles/master

Added implementation of startManagingCursor/stopManagingCursor, use native implementation of NotificationCompat in the android-support library
Added decodeSource with Options
Added unit test for decodeResource with Options in ShadowBitmapFactory
added getFilters / setFilters on ShadowTextView
Revert "Do not instrument android.support.v4.content package since all the java code is available"

This reverts commit 72d97e47a2cafea8bf981f32427be8f177101245.

Conflicts:

	src/main/java/com/xtremelabs/robolectric/bytecode/AndroidTranslator.java
Added support for EditTextPreference
added ShadowEditTextPreference and test
add implementation of TextUtils.split(text, expression)
Added the ability to test selectAll to EditText.

Added the ability to test hasSelection on TextView.

Modified ShadowTextView to initialize startSelection and endSelection to -1 instead of 0 to facilitate testing.
don't write debug output to page if not html
logging: better formatter, avoid explicit call to logger.tostring
Merge branch 'develop'
Big changes with generation variants and masks and ext_opcodes
changed n_folds > min_labels error to warning

Also made indentations for continuation lines pep8. See
http://www.python.org/dev/peps/pep-0008/#indentation

Conflicts:

	sklearn/cross_validation.py
removed tests for the old error.

Is it possible to test for warnings?
added test for warning. Added warning category

Conflicts:

	sklearn/cross_validation.py
removed a carriage return in warning message
added space between # and text
FIX GridSearchCV on lists that I broke in 8b3e4d06c05ac82130176161404f0434b74fe2c7
ENH added test, started on cross_val_score
ENH allow lists in check_arrays
ENH make cross_val_score work, some refactoring in GridSearchCV
ENH consistency: stuff is not an array if it doesn't have ``shape``.
TST GridSearchCV raises ValueError when precomputed kernels are not matrices.
ENH Simplify estimator type checking in GridSearchCV.
Merge pull request #1465 from AWinterman/issue-1017

MRG More Liberal StratifiedKFold Input Validation
Updated the ToDo list. A
Changed the processing files a bit also ran it a few times. A
Updated to use aether 0.6
sunspot_plus
添加表格插件当加载数据错误时候给予提示，而不是错误信息而影响表格样式。
修正事故单查看页面中内容从单元格溢出
1、修正ace编辑器无法正常使用；
2、修改ace编辑器样式，改用同bootstrap风格相统一。
1、扩展time_zome.rb，添加对多语言的支持
2、删除i18n_time_zone.rb文件改用扩展方式
3、修复个人页面中时区始终显示英文
Merge branch 'master' of github.com:aronezhang/ironmine
fixed:
add entry count to column tree
fixed:
fix workload
fixed:
修正事故单回复中的附件列表样式问题
fixed:
修正用户不能查询出相关事故单的BUG
get_tickets(): get queryBase urls
handles situations when GET requests fail
adds Talk section and some additional information about SD/Prophet
Added missing semicolon for consistency
corrected bug with lift happening after the blank, and added a up then
down lift ( should be made a setting )
Added support for 'set' startegy
Added deployment scripts for WindGate Retryable Plugin (#128).
Fixed #242.

TestDriver resolves working directory with user home directory.
Merge branch 'issue/128-M14' into 0.4-develop
Merge branch 'issue/242' into 0.4-develop
Removes snapshot.
Adds entity powertype.
adding the parse2
Minor Fix: TypeExpression
Fix: ReadOnly XToOne does not work

https://github.com/BatooOrg/BatooJPA/issues/94
Task 95: Provide a better ColumnNamesHandler 
https://github.com/BatooOrg/BatooJPA/issues/issue/95
Minor Fix: Allow empty string is jpql.
Fix: JPQL Parameters were broken
Better handling of validation mode.
initial paige style implementation & modular css files
Increased server timeout and reduced rdp-file
Missing French translation string
Adding dev for favicon
Adding favicon to the head and to the header
Exceptions that include offending less filename and line number
misc
bump
Merge branch 'master' of github.com:atk4/atk4-testsuite

Conflicts:
	atk4
	page/modeljoin.php
fixes
provide oauth2 state params
do state checks on redirection
version bump
Pull Request: master
Merge pull request #11 from atmos/oauth2-state

master
Put Footer underneath the license part

To avoid not displaying the footer on small screens its now underneath the license box.
comment changes
note that it works with arrays as well as objects
send/reply/msg methods moved to Stream.prototype; other changes

also, global rename of serv argument to conn for clarity
[tr] new albhed encoding for encode/decode commands; removed now redundant albhed command
[calcbot] functions self-contained in calc(); ans now a property of Math instead of global
[infobot] showfact/sendfact commands -> show/tell
[launcher] use do while loop
[badword] separate "faggot" from "fag"
[elf] use channel defined in module.chan
[calcbot] bugfixes and optimisations

- fixed qe command to correctly accept decimals and missing coefficients
- fixed dice to correctly accept >100-sided dice and limit number of dice instead
- dice is now in try ... catch block to prevent abuse from causing uncaught exceptions
- slightly more efficient looping in ave()
[CORE] Add blocking read/write APIs for vmm_blockdev

Signed-off-by: Anup Patel <anup@brainfault.org>
[TESTS] ARM V5: fix platform ID for versatilepb.

Signed-off-by: Anup Patel <anup@brainfault.org>
edits to intro for OPAM installation
nrpe server settings
Gauche0.9.3以降に依存する変更とリファクタリング

- 低レイヤ(node)におけるヘルパーを廃止
- mongo-findにいくつかのオプションを追加
- queryメッセージが送られるタイミングの変更とカーソルの挙動を変更
- mongo-findがカーソルを閉包した遅延シーケンスを返すように変更
- その他諸々
Level editor creates 3 testing packages when ran
COLORS :D
clean (bin folder)
Fixed fly up/down on click methods
Merge branch 'master' of https://github.com/bakis2011/PocketVDC
"fixed up/down on fly listener"
Remove javascript from scripts.js
Add flash message
Remove contact form information from CSS
Add client_validation gem for ajax validation
Merge branch 'contact-form'
Added read only list of schedule for volunteers.
Added URL pattern for selecting schedule page
Derek: Adding send metadata interval to fix ganglia...hopefully
added imports 'as'
content-deletion - minor changes to changeset history

This commit contains a couple of minor changes for the changeset history page:
1. support listing the 'deleted' changesets
2. support searching based on "type:promotion" and "type:deletion". Without
   this particular change, the user would have to search using
   PromotionChangeset and DeletionChangeset
支持键盘粘贴复制功能
pnml to c fix
Add tooltips to Transition
git_hook: come on, work!
Better filesystem scanning and guard notification
Add .rvmrc
Add turnip as dev dependency, start command line BDD.
Move switchboard examples to subfolder
Move steps to acceptance/steps, improve Guardfile for turnip, fix spec failures, add features.
Add rails_name attribute to schema and make it testable. Use it in model_generator.
Add suppress model generation. Implement more steps.
Cleaned up GUI
Fixed remeber username/password
updated names to avoid namespace conflicts
Should support both mod_php style auth and FastCGI method provided
apache has the configuration:

SetEnvIfNoCase ^Authorization$ "(.+)" PHP_AUTH_DIGEST_RAW=$1

Works for FastCGI needs testing on mod_php.
Update .gitignore
Extend tags a bit
removed css with hardcoded urls from git repo
Added English-language change output to paper_trail.rb in Initializers. Shows up in _list_versions.
added item to .gitignore
Berkelium Java: fifo fix
berkelium-cpp: added ms vc++ 2010 express project files
license change

Added BSD-style license for consitency.
v0.1.1
Invalidate beverage cache every 60 seconds
Issue #869926 by bfroehle, p-andrei, therainmakor | dpalmer: Use phpCAS::setCacheTimesForAuthRecheck.
Fixed the partial fields error and the issue with posting form data
changed to elsif
secured card heroku ready. removed sitemap.
fixed auto email
add permission mark
catch up to current
update the buildtools
Adding padding back to tooltip.
Improving Documentation

* first documentation updates
* introduce PodWeaver files to
* getting autogenerated pod by dzil build
Changed RPM build method; needs fixing.
Fix JS Error with missing sendTx
Fix JS Error with missing sendTx
Fix JS Error with missing sendTx
Add `if' parameter if running in iframe

It's useful from a statistics point of view to know how many beacons
came in from boomerang in an iframe v/s boomerang in the main page, so
add that to the beacon.
Prevent empty first argument

The var loop prepends an & to every k-v pair, and appending this to a
url that already ends with a ? or a & results in a url that looks like
this:

http://foo.com/?&v=...

or

http://foo.com/?something=blah&&v=...

ie, we get a ?& or a && in the URL, which results in an empty parameter.

This patch rewrites the url generating code to use an array and then
array.join to make sure the query string part does not have an & prefix.
use subscript notation for reserved word

if is a reserved word, and yuicompressor doesn't like it used as an
object property using dot notation, so switch to subscript notation.
Call initFromCookie as early as possible

initFromCookie reads the start time out of the cookie.  We need this
time available before done() is called because done could do interesting
things, and could potentially also be called during the unload event (eg
if unload fires before onload).

Calling initFromCookie in the init() method is better as the value from
the cookie is correct at that point.
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge pull request #38 from bluesmoon/master

Merge other pull requests, measure boomerang time, fix rt.start bugs
copyright year bump, just to rebuild broken gh-pages
fixed conflict from master merging
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
PreparedRequests don't carry proxy information.

The proxy info appears to be carried on the session. The only remnants
of proxy handling are this line in __init__().
Use full URL when contacting proxies.

Requests should use the full URL, not the path URL, when forwarding
traffic through proxies.
Remove unneeded import.
Merge pull request #1060 from Lukasa/proxy

Provide full URL to proxies.
Make sure proxies have their scheme attached.
Remove silly print statement.
Merge pull request #1071 from Lukasa/master

Proxies should have schemes.
Working updater service
Upgrade SBT to 0.11.2
Merge pull request #74 from bmonaumann/master

CSS refactoring and fix for build.xml
Updated version number and added ChangeLog notes.
Supporting custom header and footer in createPlayer method. (Issue 79)
Updated patch version
The create message needed to be updated to return the json string
Header, Footer and PublisherInfo set to text-align "left".
Add Interactive Edition of thinkcspy and Data Structures book
Added method comments for the remaining methods that didn't have comments.
Added support for 'success' notifications as well as the current 'warnings' and 'notice' (information) notification types.
オクテット列を引数にとるメソッドで、空のオクテット列を渡した場合 EAccessViolation が発生する問題を修正
start testing-and-removing unused CSS rules pulled in from the website, and reorganize CSS rules to match document structure
"added examples"
Take new script content into account when calculating content length. Fixes #38
Merged `objects` and `operators` modules into `compontents`

* Rewote operators to define their own grammars and number of terms
Add SKIP_DEP_TESTS env var to skip tests with depdendencies.

Now all tests pass like this:

bradmac-2:camlistore.org $ SKIP_DEP_TESTS=1 go test ./pkg/...
?       camlistore.org/pkg/auth [no test files]
ok      camlistore.org/pkg/blobref      0.023s
ok      camlistore.org/pkg/blobserver   0.032s
?       camlistore.org/pkg/blobserver/cond      [no test files]
?       camlistore.org/pkg/blobserver/google    [no test files]
ok      camlistore.org/pkg/blobserver/handlers  0.031s
ok      camlistore.org/pkg/blobserver/localdisk 1.693s
?       camlistore.org/pkg/blobserver/remote    [no test files]
?       camlistore.org/pkg/blobserver/replica   [no test files]
?       camlistore.org/pkg/blobserver/s3        [no test files]
?       camlistore.org/pkg/blobserver/shard     [no test files]
?       camlistore.org/pkg/cacher       [no test files]
ok      camlistore.org/pkg/client       0.029s
?       camlistore.org/pkg/errorutil    [no test files]
?       camlistore.org/pkg/fileembed    [no test files]
?       camlistore.org/pkg/fileembed/genfileembed       [no test files]
?       camlistore.org/pkg/fs   [no test files]
ok      camlistore.org/pkg/googlestorage        0.034s
?       camlistore.org/pkg/httputil     [no test files]
ok      camlistore.org/pkg/index        0.298s
?       camlistore.org/pkg/index/indextest      [no test files]
ok      camlistore.org/pkg/index/mongo  0.524s
ok      camlistore.org/pkg/index/mysql  0.020s
ok      camlistore.org/pkg/jsonconfig   0.022s
ok      camlistore.org/pkg/jsonsign     0.155s
ok      camlistore.org/pkg/lru  0.015s
ok      camlistore.org/pkg/magic        0.030s
?       camlistore.org/pkg/misc [no test files]
ok      camlistore.org/pkg/misc/amazon/s3       0.028s
ok      camlistore.org/pkg/misc/gpgagent        0.018s
ok      camlistore.org/pkg/misc/httprange       0.026s
?       camlistore.org/pkg/misc/pinentry        [no test files]
?       camlistore.org/pkg/misc/resize  [no test files]
ok      camlistore.org/pkg/netutil      0.088s
ok      camlistore.org/pkg/osutil       0.016s
ok      camlistore.org/pkg/rollsum      0.027s
ok      camlistore.org/pkg/schema       0.017s
ok      camlistore.org/pkg/search       0.016s
ok      camlistore.org/pkg/server       0.039s
ok      camlistore.org/pkg/serverconfig 0.031s
?       camlistore.org/pkg/test [no test files]
?       camlistore.org/pkg/test/asserts [no test files]
?       camlistore.org/pkg/test/testdep [no test files]
?       camlistore.org/pkg/webserver    [no test files]

Change-Id: I9c9b0ee4f51cbcf785aed665bbb494339dd84261
Remove the .last_go_version file; no longer used now that Go 1 is out.

Change-Id: Ibf9d0247364967cbca7021255b901862293db4ab
Fixed a typo, I wrote trickly instead of strictly, wow.
introduce array-like attributes

Example usage:

     class User
       include Enumerize
       enumerize :interests, :in => [:music, :sports], :multiple => true
     end

     user = User.new
     user.interests << :music
     user.interests << :sports
First revision; added basic functionality
Add new object AST_node.
Add some test expressions.
Parse infix expressions.
Allow parsing tuples and lists.
Add most haskell grammar rules except for foreign declarations.
Uncomment some stuff.
Update.
Removed hyperlink from CGL sidebar
Debugged round_pairings.py
Updated contact/join sidebars to use RequestContext
implemented CGL player search
Cleaned up Contact Us page
Added round announcement email command
Added automatic checking for whether player.isActive in update_scores.py. Fixed a bug where future rounds were counted as ties.
Fixes name spaces from entities, repositories, etc... (refs #3) (#refs
#1)
Fixes load Dependecy Injection (refs #4)
Fixes bootstrap and index to config include path
didn't do much
lotsa stuff
latest
'this is really the latest'
Indicate Bro master branch at the top.
Fixed indendation
Merge pull request #7476 from ayrton/fixed_indentation

Fixed indendation
fixed bug where images only didn't work right.
updated documentation
Merge branch 'acacia'
woo colorchooser
1. update webpage
2. seperate fans and weibo
Merge pull request #1 from buglabs/new_content

New content
Merge pull request #2 from buglabs/new_content

Improving the template management
New draft 2.0
Draft 2.0
don't monitor deactivated nodes at all
Overnight changes.

Removed DataStream.
Removed InputStream.
ChatClient will handle sending and receiving messages.
Fixed layout on editor page
Fixed undfined addtion to level editor
Added level 3
Modify Readdir since 'offset' is not used by the python bindings.  Returns a list
of directory entries instead of the file name at the given offset.
Readme. Tests.
license file
data sources from microarrays profiles
Debug
.gitignore
new-changes-calvin
Fixed issue with coordinatesToOrdinal causing ordinal to be miscalculated and added tests in to prevent issue from occuring in the future.  Also changed unnecessary .from_json(hsh.to_json) as .new(hsh) works just fine and is much more efficient.
add get values for select
including coverage for .gitignore
added new sbt version
873655: Don't bundle the jar deps

Reuse the ant target that creates symlinks to the system jar copies
after exploding the war, so they're recognized by rpmbuild as symlinks.
Merge pull request #118 from candlepin/jbowes/symlink-deps

873655: Don't bundle the jar deps
879022: Add message for too many content sets when V3 is disabled.

When cert V3 is disabled on the server and a client who supports
V3 certs attempts to consume an entitlement with too many content
sets, the error message would say that the client should be updated.

This is not the case if the client supports V3.0 certs... It is
because of the server, not the client.
Merge pull request #127 from candlepin/mstead/879022-too-many-content-sets-messages

879022: Add message for too many content sets when V3 is disabled.
*few client side tweaks
Separated PCTV.Input into contract and implementation projects;
Changed the REST web service host to be a generic (to host any service)
Added Android Remote IntelliJ project
Open should be correct
style menu
changed URL for the AJAX calls
missing CSS classes
Introduce the "facet" concept
Add the prepare_task method
111612_1539

fixed display problems in test area of track_files_test.py
Changed comma to '-' preceding official's position
updated cudafunc for pointer solutions as opposed to vectors
So it turns out I was actually raytracing instead of rasterizing...
refactored githubService to not use Rx (avoiding Rx for the simple things)
Added JurisdictionTypeOS to Client views and to Client conversion
Updated publish scripts, added SQL Agent job
Reorganization

- src -> 1.0
+ 1.0 .jar
+ Current
- src -> Current
Rely on the apache2 cookbook to install relevant apache packages.

Thanks to Guilhem Lettron for pointing this out.
Add redirect uris for all user's apps
more HTML5 & more responsive
Revert "help to recall"

This reverts commit b3be92cddbdb1fc88993c36fb8c3e3dc40d82f09.
2012.10.28
tsan: add memory range access functions to public iface


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@168692 91177308-0d34-0410-b5e6-96231b3b80d8
tsan: improve Go report format + fix build


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162042 91177308-0d34-0410-b5e6-96231b3b80d8
The changes for changing the accessors to public
Added for my personal files...
Major overhaul in selection process
android init
Merge pull request #5 from s2k1ta98/master

a
修改了房态统计
将view文件分开,便于修改维护
Try to cleanup on SIGHUP so we can check valgrind output.
MongoBson: remove mongo_bson_new_from_static_data()

It was a serious point of pain and what not, so getting rid of this.
I think we will just typedef MongoBson to GByteArray and for those
that want a static alloc.
[protocol] Free array of Bson documents when done with them.
init
clients add file
adjusting <head>

1. add charset meta tag
2. fix viewport
3. move down the css link
modify rctype.h to handle loops and vector
auto mark notification read when visit topic.
fix tagEditor conflic with typeahead.
switch separating characters in a string function added
Got nmatrix.cpp as close to compiling as we can at the moment.
Changed new_extconf.rb to work with clang/clang++.  Still needs some work if we want to support LTO.
hardset versioning
Support ovirt-engine-sdk build

client/tests/virt_v2v/tests/install.py: add install module to support ovirt-engine-sdk build.
client/virt/base_installer.py: add some flags to allow caller ignore some unnecessary steps
                               for building ovirt-engine-sdk.

Signed-off-by: Alex Jia <ajia@redhat.com>
Restore semicolons to the end of jQuery UI files, as they are needed when concatenating the files together. Will be adjusted upstream as well. props ocean90. fixes #20466.



git-svn-id: http://core.svn.wordpress.org/trunk@20494 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Theme Customizer: Display 'Save and Activate' when switching themes. Add  and  properties to the WP_Customize class. see #19910.

git-svn-id: http://core.svn.wordpress.org/trunk@20495 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Move to admin.php?customize=on&theme=$stylesheet, rather than juggling both template and stylesheet values. see #19910.

Combine the setup_theme() and customize_previewing() methods. Remove the set_template() and set_stylesheet() methods. Add set_theme() method to WP_Customize to store the working WP_Theme object. We will use this for the stylesheet and template.

Use the WP_Theme display() method when preparing headers for display, not get() or the deprecate properties.



git-svn-id: http://core.svn.wordpress.org/trunk@20496 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Theme Customizer: Improve color picker toggle styles and markup. see #19910.

git-svn-id: http://core.svn.wordpress.org/trunk@20497 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Update swfobject


git-svn-id: http://core.svn.wordpress.org/trunk@20498 1a063a9b-81f0-0310-95a4-ce76da25c4cd
fixed bug so logged out users can view streams/show
fixed bug so logged out user can click different items in stream show
removed bootstrap-*.js in favor of bootstrap.js
Redirecionando para página inicial após login
#3 adding cirro_core.install file and cirro_multi_img to that
#3 Adding file
moved the multi_img into cirro_core.module
Converted DTOs to simply facilitate public properties instead of OO constructs.

[Issue(s) CIAPI-28]
Fixed Composer being build unconditionally.

[Issue(s) CIAPI-124]
Enabled MakeGood support.

[Issue(s) CIAPI-28]
Kludged/Fixed PHP Maven repositories gone missing.

[Issue(s) CIAPI-125]
Removed erroneous and superfluous PHP Maven version specification, which is implicitly handled by the parent POM.

[Issue(s) CIAPI-125]
Fixed PHP Maven releases repository configuration.

[Issue(s) CIAPI-125]
Added explicit PHP Maven version specification in project POM.

This partially reverts commit f3bacb46d67b6017ed5ce65ad5bd0e9978860c9d.

[Issue(s) CIAPI-125]
Unified/Fixed line delimiters to Unix (LF).

[Issue(s) CIAPI-27]
Fixed warning 'Overriding managed version 2.0-SNAPSHOT for maven-php-plugin'.

[Issue(s) CIAPI-125]
Disabled warning 'No grammar constraints (DTD or XML schema) detected for the document.'.

[Issue(s) CIAPI-27]
Implemented initial login/session methods.

[Issue(s) CIAPI-29]
TapHandlerMock created, pom provided
Add note on Gzipping
setting initial gateway to CHANGEME so it is eaiser to bootstrap
fixing example_install.sh to point to the right repo
Merge pull request #18 from galstrom21/master

setting initial gateway to CHANGEME so it is eaiser to bootstrap
used avg diff for motion detection
implemented slider, demo content
deleted image hash link files
fix pathogen loading in sudosh environments
guard vim 7.3-only config options
Ignore .class and .pyc files from fuzzy finder.
Alias j and k to gj and gk for better movement with line wrapping.
Replace ruby_focused_unit_test_vim with vimux and vimux-ruby-test.
Upgrade vimux-ruby-test.
Quote words for GitGrepWord so it works with special characters like ?
Add more key bindings for vimux.
Merging pgr0ss's pull requests
.vim and .gvim are common directories that most people have prior to using this script; and you can't rm a dir, so it needs to be handled differently.  This change resolves the issue.
Don't symlink README.txt
Always use rm_rf to remove symlinks to handle directories.
Merge pull request 19
Upgrade vimclojure to 2.3.1
Reinstate drew's removal of \aw in 25176e352f087b068fac6bda45f83efe9705b3e3
Remove other duplicate mappings: \gw and \rt
Update vimux to the latest version
Fix typo in FileUtils
Add missing gio headers.
zsh aliases and scala
py cofig
resolve merge conflicts
Add buildmaster installation procedure.
adding more missing assets to production env
BUG-9811 New skin for 404 NOT FOUND ERROR page.

I replaced file 'gulliver/methods/errors/error404.php', with the new code of the NOT FOUND ERROR page proposed by eliz.artinf.
Merge pull request #714 from Jennydmz/BUG-9811

BUG-9811 New skin for 404 NOT FOUND ERROR page.
[11988] Fix a bug in SCRIPT_COMMAND_TEMP_SUMMON_CREATURE

Now despawn-time will be treated as TEMPSUMMON_DEAD_DESPAWN as expected. Thanks to Xfurry for pointing.
Also make the DB-scripts work only with players on the map. This might affect a few rare scripts, especially related to far-teleport

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11989] Add support to call spell_scripts in more cases

* Support to script Dummy spells with spell_scripts
* Support to script TriggerSpell spells which have no existing triggered spell
Note that the order which spell-effect actually triggers the DB script is well-defined (SCRIPT_EFFECT before DUMMY before other)

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
Merge branch 'master' of https://github.com/mangos/mangos

Conflicts:
	src/game/SpellEffects.cpp
[mr1974] code style
I use now Eclipse, so i have some code style marks :)
[mr1975] fix old mistake with attribute naming.
Merge git://github.com/mangosR2/mangos into SPP
fixing issue with select menu option updating
experiment part 2: using variables
exclude site packages from buildout config

Change-Id: I8d3550690a91e9c364ed4228f152076e9130257c
Reviewed-on: http://review.couchbase.org/23614
Reviewed-by: Pavel Paulau <pavel.paulau@gmail.com>
Tested-by: Pavel Paulau <pavel.paulau@gmail.com>
Adds link to zeromq perf test.
fixing function declarations for websocket unlock and lock because Im a retard
I'm learnding!
Merge branch 'master' of github.com:crazydog115/Voltron
Initialized compass and added .gitignore
Fix a warning with SunStudio compiler

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
changed the prompt slightly
Probando ignorar el fichero wsgi.py
Armando el modelo, habilitando traducciones, etc...
[Delivers #30689223] Symbolize json keys.

Support for symbolized keys is just for json right now. It should be
trivial to add xml in the future. YAML may need more work.
Created User Sign in page
Handling invalid form entrys
Working User
Completed sign/out
Editing and updating users
Protecting edit and update with a before filter
Friendly Forwarding
Working index page
Users index with pagination
Can now destroy users (as admins)
7 steps
Corrected name of blue.
some old stuff?!
Added the Markdown Mark to the readme.
[BUGFIX] returning in error does not help -> die
[BUGFIX] clean assets, reanable support for extras
first commit
test
fghjk
Account confirmation and jQuery default search text

Fixed account confirmation to add units to session.

Added jQuery to have default text in the main search bar
updated readme
Merge remote branch 'kindohm/master'
Look at my body
added missing dependencies for php54

libpng and freetype were missing
New gitignore
Removing sqlite for production
Adding pg for heroku
Do not skip autobahn reservations, and use new ip ranges.
Merge pull request #360 from isartcanyameres/feature/demo-dave

Do not skip autobahn reservations, and use new ip ranges.
Support removing static routes in routers staticroute capability.
Delete static routes in physical routers when destriying the vcpe scenario.
Merge pull request #334 from isartcanyameres/feature/vcpe-logic-delete-staticroutes

Feature/vcpe logic delete staticroutes
added docs; removed a couple of unused functions; added back sample.txt.gz data
Past tense is your friend
app id adapted to ios test (this breaks the android build)
MDL-34004 - mod_url: don't display html icon for plain links

Or mimetypes we don't know about
Let's see if this fixes things
That didn't do it, reverting
Precompiled assets
Let's see if this fixes things
Adding missing css files to prod config
Removing precompiled assets
add MoviePlayer
Add Guard,Spock and helpers
update - fixes still needed
A few quick optimizations.

Many operations performed on Geos::Points return known values or the
point itself, so we can avoid making more expensive calls through ffi by
just returning what we'd expect straight away.
Changed font to DejaVu.
Added coffee-snippets.
Fix: compiled win32 version of QtEditor
Fix: fixed MeshInstancePropertyControl for qt
Fix: Removed direct calls to glBindBuffer and added a layer
Merge branch 'development' of github.com:dava/dava.framework into development
REF: engine (actions, pagecontext, login)
expose card details in other languages (#16)
Add loading screen and split long running jobs into shorter asynchronous ones that take callbacks for completion to avoid blocking the reactor
Remove perlin noise
Got basic server going, moved client stuff into public directory of server, modified build script to create files in correct directories, sorted out water, removed duplicate territory assignment, started work on optimized merge function
menu fully nested, content works
Merge https://github.com/davidkofahl/af-docs into feature/fully_nested_menu
Adding msg pos computing on click
Preparing server side free zone system
Interactive networked booking
pick pascal changes for reporting
fix pep8 compliance
still need fix
using new TLPOverlayWithLeakEvol plot
Merge pull request #2 from davidtrem/pascal-report

Pascal report
Merge pull request #4 from davidtrem/plotting

using new TLPOverlayWithLeakEvol plot
now open oef file
Merge pull request #3 from davidtrem/oef

now open oef file
fixed deploy default env
README and unused config removed
libdawati: hide secondary window name when identical to primary
shell: fix wrong type cast
switcher: do not display the same app title twice
switcher: fix close button disappearing with title too long
theme: sync values with proprietary theme
switcher: center main application title when no secondary
translation: update po files
theme: add default shared font size for all widgets
libdawati: support multistage panel using gtk+
libdawati: rework application view
Bump release bump
Changement de couleur, création des Teams et placement
Added unit test to prove accessory views are getting instantiated more than once, then fixed the problem. To elaborate further, _getAccessoryViewWidths() was referring to the class instead the instantiated view. In the event _getAccessoryViewWidths() found a class it would create a view from it, this resulted in the same view being created and added as a child multiple times. Not only is this incorrect, but it causes major issues with views using preset layerIds.
Added binding between a tree controller and it's tree item observer to keep the selection options between the two in sync ('allowsSelection', 'allowsMultipleSelection', 'allowsEmptySelection').
Fixes addition of has-icon class to list items that don't actually have an icon defined.

- There are situations where a ListItem will have `hasContentIcon` set to true, but will not have an icon defined.  It's more proper to not add the has-icon class, which makes space for an icon, if there is no icon.
Fixes documentation typo.
Fixes gray background appearing on first and last segments.
Fixes white background appearing on first and last disabled segments.
Merge pull request #681 from sproutcore/team/workmanw/text-field-accessory-view-multi-creates

SC.TextFieldView instantiates and adds accessory views as a child multiple times.
Also fixes serious memory leak when a user types a large amount of text.
Fix desktop vs touch for experimental ScrollView
Makes comment easier to understand.
Adds unit tests proving that customized classNameBindings (ex. 'isActive:active') don't work.  Also fixes the other unit tests in this file that had misplaced parentheses.	.
Fixes customized classNameBindings.  (ex. classNameBindings: ['isWorking:wkg'] )
Actually fixes customized classNameBindings.  (ex. classNameBindings: ['isWorking:wkg'] )

- Accidentally committed testing version.
Merge pull request #787 from rykov/master

Fix Desktop vs Touch for experimental SC.ScrollView
Merge pull request #758 from sproutcore/team/workmanw/treecontroller-selectionoptions-persistence

Added bindings between the tree controller and it's tree item observer to keep the selection options in sync
Merge pull request #786 from dcporter/master

Clicking on a content-less collection view results in a thrown error.
flex-find > flex-scopes refactoring
add more indexing support this time for primary keys of type long which extends to int, etc. etc. and other types
swapped order of history commands in PROMPT_COMMAND
switched to SASS
fixed broken JSON

[ci skip]
merge
Issue closed #4
Another GEM file update
Refactoring hub build
put rights url in a 'pre' tag to wrap it if longer than container area
simpleDocument upload, tib-view-def. use delving:imageUrl as primary image
tib-view def once again
Merge branch '12.08' of https://github.com/delving/culture-hub into 12.08
adding ' OR ' between multiple delving_specs in the query
cleanup
allow hyphens in page key
auto gen page key with i18n validation
page list order
auto gen page key with i18n validation
large save button
allow for 35 chars in page key
'required' notification as bootstrap label
dimcon layout cleanup
trigger tooltip() on .extHelp class
label .label style adjustment for nice inline display
display vc name instead of spec in list
hr above and below "publish" field
buttons/links back to edit and list
vc help
profile pages improvements
extHelp becomes tooltip mouseover
turned of cleanup callback for now
check if homepage cms content is set to 'published'
Updating definition aff/aff-validation.xsd
More code migrating to CodeGenerator
Moved to version 1.0.8-SNAPSHOT
Fully independent of definitions.  Fetching schemas.
Temporary backwards-compatibility hack that makes the SIP-Creator work with file store that has not been updated.
Definitions moved to schema-repo, and unit tests now fetch from there.
Initial experimental scanning of media directories
Definitions seems to still need deletion
Recording index of the files that were copied, maintaining keywords that describe their original locations.
Attempt at using ImageIO API abandoned.  Performance is useless.
Storing the media in subdir "Media" of the dataset directory.  Keywords now lowercased of course.
First hack at media uploading, assuming the same submit url can be used for files matching "HASH.extension"
Quick hash, similar to git commit hashes, has linear performance (samples 8 1k blocks at intervals) and prevents full file re-hashing upon re-ingestion of existing media.
Merge branch 'next' into schema-repo
Version 1.0.9-SNAPSHOT, jumping ahead again.
Schemas now located in https://github.com/delving/schemas.delving.eu, which must be cloned nearby to be found.
Disabling the media import and upload experiments for now
Merge pull request #282 from delving/schema-repo

Schema repo
CachedResourceResolver moved to core, now caching things for testing as well.
Using stack trace for tracing in CodeGenerator, instead of marking lines with // comments
Somehow CachedResourceResolver did not get added
Merge pull request #360 from delving/improvements

CachedResourceResolver for testing & Stack trace marking up of generated code.
Paying attention to the "flat" attribute of a RecDef.  Other tidying up.
unix_stream_server: accept, setup
fix terrible recursive source bug in sub
Commiting index.php stub
stubbing out index.php
Added second random number set (tied to random seed) to pull from for random sampling without affecting run processes.
Added fem_res_cost insruction cost option..
Merge branch 'xep0184' into v8
Merge branch 'otr' into v8
Show toast when start-/stopping encrypted chat

Instead of displaying a progress dialog simply show a toast message and
perform the requested action in the background. The warning view and the
options menu entry are updated once the action has been processed.

This fixes issue #42.
Extract toast message strings to strings.xml

Since the messages are displayed to the user when enabling/disabling OTR
for a chat, we should make it possible to localize them.
Merge branch 'otr'
Remove two stray OTR message injections, fixes issue #48 in new tracker
Removing jade module dependency
Shrinking client-side javascript
Developing Room Management
Room management development
Merge pull request #2 from maiconio/master

Starting the room management code
Update text/18_Tracking_Branches/0_ Tracking_Branches.markdown
Add local satya config file
working on span and preferences structure and creation - EN COURS !
UTF8 vs. ANSI // CRLF vs. LF
Implementacao da pesquisa por endereco
Implementacao da geolocalizacao ao carregar os mapas
Implantação da tela final dos padrões de interface
Adding comment explaining why we use many-to-one relationship in DrugInfo instead of using a one-to-one relationship
criando versao experimental do uploader de arquivos ajax.
changes on languages
selenium wrapper improvement
Merge pull request #11 from dimagi/mwhite

selenium wrapper improvement
Updated mainly views to use new field names
Updated hellomap/HelloMapActivity.java file for real time location plotting on map
Added a bunch of code. It doesn't work :)
recreant
Dodao security za cijeli backend.
Corrected rom_from_hex.py from <= to =.(MT)
debug of gcd
Merge remote-tracking branch 'origin/single_cycle_fpga' into single_cycle_fpga
fixed gold coin generation
Update src/fix_message_priv.h
Added a Location Details view controller to be displayed before annotation details
core: Fix hostdependency checking

Previously we tried to use a NULL pointer to check if we should
add hosts to the check-list when using predictive dependency
checking. The compiler failed to warn us about that, since we
explicitly initialized the temp_hostdependency pointer to NULL
and therefore didn't use it as an unassigned value.

We fix it long-term by moving the declaration to the usage
point and making sure we initialize it.

Signed-off-by: Andreas Ericsson <ae@op5.se>