labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #7 from udp3f/master

fixed path for annotations
ENH: performance - only create DbSnp namedtuple once.
allow no annotations via -t
Merge pull request #9 from udp3f/master

updated esp and vep for gemini
restructure gt* arrays
Merge branch 'master' of github.com:arq5x/gemini
pull cyvcf from github, not PyPI.
ESP annotations and tmp. dep. on cyvcf
no need to test for None, as cyvcf handles this already.
improved SQL statements accessing numpy genotype arrays
remove misleading comment
refined custom SQL parser and restructured shortcuts
standardize the query interface for gemini shortcuts
add gene col to variants
use is_exonic
add shortcut for grabbing variants in a specific locus (chr:start-end)
enforce chromosomes sarting with "chr"
added shortcut from isolating variants affecting specific gene
Store ESP freqs. not pcts.
major refactoring of submodules for easier use.
HBASE-6182 TestStoreFile fails with jdk1.7

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.92@1347391 13f79535-47bb-0310-9956-ffa450edef68
[HBASE-7366] Make old logs directory have a subdirectory structure

Author: amirshim

Summary:
To speed up replication, it is useful to have each regionserver's old logs in a separate directory, so we don't have to do LS on a 300,000 file directory (namenode doesn't like that).  So we're changing the oldlogs directory structure to contain subdirectories of the format: "10.159.11.45%3A60020", for example:
/TITAN029-ASH3-HBASE/.oldlogs/10.159.11.45%3A60020/10.159.11.45%3A60020.1355452542203

Test Plan:
Unit tests - passed.

Run on cluster, and make sure that files are being moved to the correct subdirectories, and being deleted after the retention time has elapsed.

Reviewers: liyintang, nspiegelberg, mycnyc

Reviewed By: liyintang

CC: hbase-eng@, davejwatson

Differential Revision: https://phabricator.fb.com/D659154

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.89-fb@1423101 13f79535-47bb-0310-9956-ffa450edef68
[jira] [HBASE-6732] [89-fb] Reduce scope of synchronized block in HBaseClient.Connection#sendParam

Author: michalgr

Summary: sendParam method synchronizes on out stream (so that only one thread writes to socket).  Right now it prepares (eg. compress) message under this lock as well. Lock should be taken only for sending.

Test Plan: Run unit tests in map reduce. Some tests failed. Some of them failed when repeated on my computer (TestLogSplitOnMasterFailover, TestDistributedLogSplitting). These tests failed when tested against trunk as well.

Reviewers: mbautin, kranganathan

Reviewed By: kranganathan

CC: Karthik, stack, Kannan, Liyin

Differential Revision: https://reviews.facebook.net/D5259

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.89-fb@1388181 13f79535-47bb-0310-9956-ffa450edef68
[HBASE-6836] [89-fb] Parallel deletes in HBase Thrift server

Author: mbautin

Summary: We need to expose server-side parallel batch deletes through the Thrift server.

Test Plan:
Unit tests
C++ client test

Reviewers: aaiyer, nzhang, kranganathan

Reviewed By: aaiyer

Differential Revision: https://reviews.facebook.net/D5541

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.89-fb@1388183 13f79535-47bb-0310-9956-ffa450edef68
optimalizace sql dotazu, odstraneny routy pro admin kdyz je FE a naopak
moving some codes to person.js from birdview.js
Fix pattern image fill for worker context
added Dyno
need to implement Dyno for all the tree classes
Ask for confirmation after all dependencies are computed, even if there are no packages to remove.
Extend "opam list" to make it able to list only packages that match one of the regexps provided as arguments
ocp-build: update with most recent version

Conflicts:

	Makefile
ocp-build: remove useless directory boot
Add some comments about the previous patch
Merge pull request #85 from lefessan/master

update ocp-build to the latest version
Merge branch 'master' of github.com:OCamlPro/opam
Ask for confirmation if there are more than 1 package to install
Merge pull request #89 from cago/master

More interaction when doing opam install/remove
Merge pull request #84 from vbmithr/opam_search

Extend "opam list" to make it able to list only packages that match one of the regexps provided as arguments
Merge pull request #81 from vbmithr/master

Warn user when trying to add a repository with a specified backend that is not supported.
fix encrypt unsafe file name when upload

some file has unsafe file name (unicode name like thai, chinese,
japanese character).
it cannot upload and show link to file correctly.
encrypt it.
add TS
fixed build.xml so can build jar
Added the hub and missing dlls
Updating to tetra 1.0.4
try to recover

yes
added approach in junit
solution to transpose in place added
sublime text2 config in repo
fix new version
Merge branch 'master' of github.com:vlandham/vis
Applied patches form Mike and Martin, correcting "Required" section and adding some formatting changes
删除演示的js目录文件
readonly depth should be correctly created now, checking previous versions to see if the dsvs match up. (bug on rendering)
Last experimental commit for quads, some issue with depthstencils causing issues at the instancing pass and the quad pass. Implementing the tilebased compute shader pass next.
More cleanup on renderers, next up is compute lighting shader and its pipeline
Shaders actually compile from previous commit
Test
Merge branch 'master' of https://github.com/w8iig/server
add demo ipa
Added new standard module for buy files
partially replace icons in SWeb. should do more.
tongan
Update whois.srs.net.nz response fixtures to version 5.00
Use more meaningful names.
Update specs for throttled response.
whois.srs.net.nz now recognizes throttled responses.
Regenerate gemspec
add 2012-07-21-coffeescript-notes-1.md
added new swing jars and removed unnecessary classes to ui
add package ocaml-core

Set of patches for making an ocaml cross compiler targeting windows.
add generalized util functions for determining where pyhis data should go (using appdir module)
add beginnings of ncdc module
style sheets for README
Update hw_1/game.js
Added foreign key migrations. Added the venue and gigs table and their respective models, switched to mysql
test

add a test text
王鹏：master分支和wp分支合并至wp分支
王鹏
王鹏：project尝试修改
王鹏：增加model和Idal个人负责部分
王鹏：修改使得web.config文件不更新和上传
王鹏：完成model IDAL 和 MySQLDAL层的编码
王鹏：完成初步的bll
王鹏：完成主页和登录页面
王鹏：index使用模板页
11
王鹏：删除中文文件名文件
王鹏：提交日历控件
王鹏：两个基本页面的设计
王鹏：项目管理基本页面设计以及数据绑定完成
Merge remote-tracking branch 'origin/wp' into MacGrady

Conflicts:
	.gitignore
	TacroManagement/Projects/TacroManagement/BLL/Project.cs
	TacroManagement/Projects/TacroManagement/BLL/ProjectDoc.cs
	TacroManagement/Projects/TacroManagement/BLL/ProjectDocUser.cs
	TacroManagement/Projects/TacroManagement/BLL/ProjectUser.cs
	TacroManagement/Projects/TacroManagement/DALFactory/DataAccess.cs
	TacroManagement/Projects/TacroManagement/IDAL/IProjectDoc.cs
	TacroManagement/Projects/TacroManagement/IDAL/IProjectDocUser.cs
	TacroManagement/Projects/TacroManagement/IDAL/IProjectUser.cs
	TacroManagement/Projects/TacroManagement/Model/ProjectDocInfo.cs
	TacroManagement/Projects/TacroManagement/Model/ProjectInfo.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/Affair.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/Project.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/ProjectClient.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/ProjectDoc.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/ProjectDocUser.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/ProjectUser.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/Schedule.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/SubTask.cs
	TacroManagement/Projects/TacroManagement/MySQLDAL/User.cs
	TacroManagement/Projects/TacroManagement/TacroManagement.suo
	TacroManagement/WebSites/TacroManagement/css/index.css
	TacroManagement/WebSites/TacroManagement/web.config
	TacroManagement/WebSites/TacroManagement/web/index.aspx
	TacroManagement/WebSites/TacroManagement/web/index.master
	TacroManagement/WebSites/TacroManagement/web/login.aspx
	TacroManagement/WebSites/TacroManagement/web/login.aspx.cs
	TacroManagement/WebSites/TacroManagement/web/userIndex.aspx
	TacroManagement/WebSites/TacroManagement/web/userIndex.aspx.cs
Refactoring code and fixing failing test
site_seo
OLD media
cleaned up directory structure for pipeline outputs.
Added new KML layers for CWGC data
added funtions to convert from and to 'xytes'
Modified master laucher, added dummy netclient
Updates to Makefiles for v12 tools

Change to how XScope is specified and force inline is now set so that I2S is
properly unrolled.
обновил шаблоны
Kommentiert und Abbruchbedingung entfernt
Version 3

Signed-off-by: Salva <smauro20@gmail.com>
Start one port listening to use the same session data.
Set expiration time for the session.
updated zip to have license info
print search
Do not run coverage tests all the time
features.md: Work around behavior differences between Wiki and plain files
Cleaned up faces-settings.el
inicio informe 4
remove check ip
Fixed a bug when a function had 10 or more functions that it called.
增加批量获取商品的示例
Minor metadata API changes
Add primitive PlantUML renderer
Support for non-boolean node exits
Minor PlantUML renderer improvement
Add start option to the PlantUML renderer
* ncl-mode.el: fix infinite loop
Added timeout, updated identifier regex to match chained functions.
Moved outcasts to its own project
Merge pull request #11 from zhangsu/efx

Efx
Merge pull request #15 from zhangsu/gem

Gem
Merge pull request #16 from zhangsu/gem

Gem
Merge remote-tracking branch 'origin/master' into gem
type traits class also has a value member
Remove some unused stuff
documents for vSMC::random123_eigen
remove core documentations
add 2 users. adjust the folder of *.hbm.xml files. add resources to pom.xml.
Merge pull request #5 from zjulzq/ticket-0003

add 2 users. adjust the folder of *.hbm.xml files. add resources to pom....
add a field to User.java
Merge pull request #7 from zjulzq/ticket-0004

add a field to User.java
Change options / settings while joyride is in progress using attribute data-options in html

Syntax for options string similar to css style attribute. e.g.
<li data-options="tipLocation:top;tipAnimation:fade" data-id="test"> Content </li>
New options stick for remaining steps.
Merge pull request #14 from nayanshah/master

Update settings while joyride is in progress
Consistent colon in French Readme.
Proofreading filter section on French Readme.
Merge remote-tracking branch 'upstream/master'
Note about 1.8.6 in french readme
Fix copy/paste error with nokogiri in french readme
Update french readme for :static_cache_control setting
Add one space to align all parameters in french readme.
Add link to CI server in french readme
remove unnecessary parens from example
rework logger setup

* CommonLogger by Sinatra is no longer added if
  Rack::Server will add it. Fixes #380.

* Setting the logger options to nil will avoid
  automatically pulling in Rack::NullLogger, thus
  allowing you to set up your own logging
  middleware outside of the Sinatra middleware
  stack. Fixes #371.
fix CHANGES check
Merge pull request #389 from zzak/25e8aec3

book-contrib is now recipes
update changes
Merge branch 'master' of github.com:sinatra/sinatra
fix logging test
fix title level in Spanish readme
remove unnecessary parens in Spanish readme
doc logger setup changes in Spanish readme
Merge pull request #392 from ohhgabriel/readme-es

spanish readme sync
Merge remote-tracking branch 'upstream/master'
adding explanations of muppet commands
No more shadows on drag&drop objects in compton
Initial commit
Add git ignore file
file backup
First try of jni with the help of ndk
Make jni native functions work.
Move everything from BoardLogic to Board
Live on the bleeding edge
More cleanup
Made a copy of mappings in experimental area as I'll remove those we don't use from the main code
Pep 8 compliance of ITB engineering model work
Typo
Small formatting changes to docs
Remove INSTALL (which was deleted in
a33db117c67c39fd674e2bd28617aa40aa78710f) from the Meta target.
Better implementation of setting warning levels.

Turn off warnings for the FireBreath projects.
Add correction to .mailmap file.
fix new namespace bug
tileset for world 3
Merge branch 'master' of github.com:Adhesion/ld23
added splash graphic
en translation fixes
update EFM parameters
small homepage tweak
Add a script for setting FR3D path
[MOD] minor cleanups
[ADD] HTTP: Queries and scripts can now be directly addressed and
  evaluated. Examples:
  http://localhost:8984/commands.bxs
  http://localhost:8984/query.xq?hello=world
[MOD] web.xml: default paths changed, query and script evaluation added
[MOD] Suppressing server start/stop information.
[MOD] Convenience function added: IO.string()
Adjusted v3to2 convertor.
Add clear inventory API to PlayerInventory with a successful count return. Adds BUKKIT-2745
Add default Clear command. Partially fixes BUKKIT-2671
Fixed scale on mouse over in an ugly way
added phpenv-install file for use as a phpenv plugin
updated README to include instructions for using php-build as a phpenv plugin
updated README
Merge git://github.com/humanshell/php-build into feature/phpenv-install
Merge branch 'feature/phpenv-install'
Removed references to zend & zend-server cookbook
More test cases, fixed isBigger
Cleaned up the sound classes and moved them into the pwnee.sound package. Added a method in ImageEffects for producing a cropped image.
Code cleaned and working
GCC 4.7 support:
 * Silenced warning in test/bq/align.C
 * Modified version pragma

Signed-off-by: Vladimir Smirnov <civil.over@gmail.com>
Work on build system to allow out of tree builds and installing
Merge pull request #1 from bzar/master

Reworked build system
Modified colon and spacing in samplr.js
Merge branch 'master' of github.com:Code41/iphack
Update dist/ files. Closes #444
Lib: Fix for incorrect deserialization of messages

- Changed the order of the message header so that the existing parsing
   functions will work.
- They were interpreting direction to be message type
Lib, UI_Core, Novad: Assorted fixes to MessageQueue bugs

- Some cases of unsafe usage of queues
- Some out of order calls
- Some missing features
All: Added an InitializeUI() function to UI_Core

- Function must be called first of all the UI functions
PULSAR: Collapse schedule element into smaller on-screen form factor

Every one of the elements of the schedule has been vertically collapsed
to allow for more screen real estate to be used for other elements.
Release of com.dexels.navajo.function version 2.0.17
Development stream of com.dexels.navajo.function version 2.0.18
[enh] added link display also to topic detail
Supression du type MESSAGE_PRIVE
fixes #8
fixes #6
Implémentation du bannissement en utilisant la structure d'échanges de messages, avec traitement du message par le serveur
LO43
Removed the all instances of the jam folder
no nil pero bla
no nil pero blafd
Merge pull request #4 from avatartavox/master

atraca ps
build: add makefiles

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
configd: start property fetch thread

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
Fix metric setup.
Remove delayed_job.
use filesystem to write values to gpio
Merge branch 'master' of https://github.com/EnotionZ/GpiO
ERT-18 isuue in jira. Bugfix for plotting after forward run option x without any conditioning.
ERT-44. Added identifier to the enkf_states which says if thet have been initialized. ERT should not crash with uninitialized ensemble anymore, rather initialize from scratch and run.
ERT-19 in jira. New simple menu added as an option from the main menu.
Fixed typo in url.
Small updates to the help menu.
ERT-19. Added help menu with decription for the simple menu.
ERT-19. Added simple plot menu.
Merge remote branch 'upstream/master'
ERT-30 and ERT-51. Manual loading tui option clarified.
Merge remote branch 'upstream/master'
ERT-44 Added poor-mans solution to the initialization problem. If none of the parameters have been initialized, then everything will be initialized from scratch.
Merge pull request #11 from myrseth/master

Mainly TUI changes and bug fixes
BookInfo
ARM: libavresample: NEON optimised flat float to s16 conversion

Signed-off-by: Mans Rullgard <mans@mansr.com>
ARM: libavresample: NEON optimised stereo fltp to s16 conversion

Signed-off-by: Mans Rullgard <mans@mansr.com>
ARM: libavresample: NEON optimised generic fltp to s16 conversion

Signed-off-by: Mans Rullgard <mans@mansr.com>
x86: Remove some leftover declarations for non-existent functions
trasher: Include all the necessary headers

The missing headers are required for errno and for strerror.
This fixes building of this tool on mingw32ce.

Signed-off-by: Martin Storsjö <martin@martin.st>
x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place
  trasher: Include all the necessary headers
  x86: Remove some leftover declarations for non-existent functions
  ARM: libavresample: NEON optimised generic fltp to s16 conversion
  ARM: libavresample: NEON optimised stereo fltp to s16 conversion
  ARM: libavresample: NEON optimised flat float to s16 conversion

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavf/compute_pkt_fields: only run pts by duration correction if reference ts is available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
riff: Add SVQ3 fourcc

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
MDL-13629 grade: added some unit tests to clarify the handling of droplow and improved apply_limit_rules()
MDL-32665 mod_chat: disabled popup notifications in the chat windows
MDL-34374 SCORM prevent skipview being set to always when used inside a SCORM course format.
MDL-29563 course Hide duplication button in activities without backup2 support - Credit to Mark Nielsen
MDL-29563 course Throwing an exception instead of a message
MDL-34233 SCORM backup - change to using set_source_sql to preserve order of records in backup.
MDL-34265 SCORM: Removing sorting from unsortable columns
MDL-33448 javascript: Added caching for the YUI instance used for debug in get_string
MDL-34226 multichoice qtype: correct is_complete_response for multianswer

The multianswer qtype uses the multi-choice one, and the way it does its
responses array breaks an assumption that multi-choice was making.
MDL-34251 question engine: possible infinite loop loading usages

In the case where either a question_attempt had not steps, or a
question_usage had not question_attempts, the load_from_records methods
could get stuck in an infinite loop.
MDL-33159 course: Fix for site wide restricted modules not being selected by default
MDL-34396 Ensure TinyMCE editor spell checking works on pages with $PAGE->https_required()
MDL-34243 completion: get_criteria() incorrectly passing object
MDL-34243 completion: Fixed up call to completion_criteria::factory that was passing object
MDL-34322 Don't display empty navigation nodes which have no link
Merge branch 'MDL-34265-m22' of git://github.com/ankitagarwal/moodle into MOODLE_22_STABLE
Merge branch 'm22_MDL-34233' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
Merge branch 'm22_MDL-34374' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
MDL-34427: Corrected language string when not allowed to enter the chat room.
Merge branch 'MDL-29563_22' of https://github.com/dmonllao/moodle into MOODLE_22_STABLE
MDL-36323 usability: Normalising icons used in blocks
MDL-36398 Usability: New navigation block icons in svg and png formats
MDL-36323 usability: CSS for block headers
MDL-36323 usability: CSS rules for activity block
fixed: advanced search in admin gave token error. Close GH-432
Update components/com_fabrik/language/pt-BR/pt-BR.com_fabrik.ini

Translation of items not translated
Merge pull request #497 from rogeriocc/master

Translation of items not translated
fixed: js error on csv export
Looking at wrong wrong params in list template, needs to be
$this->getModel()->getParams()->get(), not $this->params->get().
fixing params access in list templates
Fix for numberFormat miultuplying by 100 bug.
clearrect before drawing on canvas
Removed app/cache directory
Multiple pages on some urls now
Force the non-greedy regex to be non-greedier (bastard)
add project and link to users related projects
updated css comment with better text example
Fix X button and url regex
Fix jquery error
add spiketrain plotting functionality

Signed-off-by: Dipanjan Mukherjee <dipanjan.mu@gmail.com>
add examples for spiketrains

Signed-off-by: Dipanjan Mukherjee <dipanjan.mu@gmail.com>
add a simple tool to help generate spikes/signals

Signed-off-by: Dipanjan Mukherjee <dipanjan.mu@gmail.com>
Fixed idents, JS code style, added spaces.
Moving to constants.
Reversing append to go top-down instead of bottom-up.
Merged with Anth.
Eliminar tracks de listas
Kreisfarbe änderbar

input-Elemente eingefügt und entsprechende Handler geschrieben.
TODO:
- Linienbreite veränderbar machen
- Draggerfarbe sollte sich auch ändern
- Farbe und Breite des ausgewählten Kreises soll links angezeigt werden
Kreisbreite änderbar

TODO:
- Draggers ändern ihre Farbe noch nicht
- Farbauswahl und Slider je nach ausgewähltem Element aktualisieren
Update quest and gossip framed.
h
model 6
Part of Chapter 6 Exercises(More3-Palindrome)
Fixed input posting checkboxes as On AND true, and a bug fix for autoloader to avoid .DS_Store and any file thats not PHP. Thanks
Okay, now i added the gunpowder and waters. for real.
Merge branch 'develop' of github.com:Jaguti/Jaguti into develop
travis-ci experimental support, de-minified sandbox, added run-qunit for phantom
travis update
Fixed rhtml colors.
Updated report. Lot of VGA needs rewriting since downscaler design completely change location in pipeline
update tests/benchmarks + fix on list_slice
SNode: code issues
SNode: code issues
SNode: remove changePropertyName usages
Ignore one audit constraints test
fix tests: restore PersistenceTest removed with migration (2.0) solution
add "editable model" condition to actions where needed
fix problem in plugin's generator
add stacktrace to error in SNode
make project after changing actions
INavigationHandler.canNavigate implemented
some handlers removed
navigate using all possible handlers (more symmery, doesn't change current behavior)
show non-navigatable messages in black color, always
fix MPS-13502 RC2: Errors in the console
error was needed during stubs migration (one module per model), now it can be checked using ModelChecker
Worker.{pools,last_shift} update

- Use Worker.pools to denote activity and update sync-script accordingly
- Maakt Worker.last_shift afhankelijk van de pool
Merge remote branch 'life/master'
barco:  invoeren van tellijsten
planning: manage: Als er geen diensten zijn in deze pool dat laten zien.

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
Join some lines

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
samba_setpass: Add (security) comment

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
secr_add_group: 'description' ook opslaan

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
Zin mooier maken

Improves: d70ca3e818bca2983e163811b314afe2b64f6271

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
tabs -> spaces

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
Fix security issue when Giedo is hijacked

As noted in: 60ae07a31f70c6ecfe6d10b980787c882e2e3118

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
Remove trailing spaces

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
settings.example.py: Fix some indenting

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
settings.example.py: Enable the kn.planning application

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
settings.example.py: Add a remark that kn.poll is still MySQL

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
Ook 'admlezers' de NAW-gegevens van users laten zien

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
Fix: admlezers meer laten zien.

Improves: d355a7781cc44d23e2d0670a16fb039fd0af7b25

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
Merge remote branch 'life/master'
BarCo: Helper om slecht geturfde velden makkelijk in te voeren

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
BarCo: Fix JS-referencing error in de geldteller

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
BarCo: Fix indenting

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
[install] exec to eval
add travis status to README
add how to use to readme
move random to helper
change test command to make test
Run: Added custom commands.

Edit Run.cfg to add Command=Action sets.
All variables and bangs are valid.
upgrade testing support to NUnit 2.6
ripple update
Migrated UrlContext, HtmlEncode/Decode and UrlEncode/Decode to FubuMVC.Core
closes gh-41
somebody just shouldn't be allowed to use git, rolling back the bad Nunit again
resetting the nunit version
added more abilities for using Methods with ReflectionHelper/Accessor
Update the android library project while installing

While installing it now updates the android library project to add files
which ant uses to build from the command line. These usually include the
path which points to where the android SDK is on the machine that kirin
was just installed on. This simplifies the process of using kirin from
the command line by removing a step that you'd usually have to do
manually.
Merge pull request #12 from matto1990/android_install

Update the android library project while installing
Added tooltip for the balloon.
Added project file.
Cleaned up z-indexes.
minor changes
Merge branch 'master' of github.com:Koura/eternia
minor additions
Merge branch 'master' of github.com:Koura/eternia
Imported * [mr222] fix problems with fast shapeshifting (powershift) Thanks Darkstalker
Some MR2 commits and a "basic training dummy"
Revert https://github.com/mangosR2/mangos/commit/96dc153464382c6e2795e9aa151f8f4acf9d28ba
https://github.com/mangosR2/mangos/commit/48b96127c064d9764d0d9c9827e63c40a781d5df
https://github.com/mangosR2/mangos/commit/d5eb1ee9fa65d47edabfb65db21ab0fb19a2f295
https://github.com/mangosR2/mangos/commit/a52ddfd4dfc10334cc57493e28fda0d098ba9f12
https://github.com/mangosR2/mangos/commit/1873ed3f35aeb11c48664fde3c766243b07bab22
Compile fix
https://github.com/mangosR2/mangos/commit/350ae3d8049ca7349274572b329d2985f57b7584
https://github.com/mangosR2/mangos/commit/087157c3a54d55722ac62895a69bdcf6b3655786
Completely resturctured the pvp gold reward system. Needs testing.
Since this is called before the killstreaks are set.
Possible crash fix if called improperly

Signed-off-by: Carl Hjerpe <lillecarl@gmail.com>
Adding a todo list to keep track of what i actually need to do.
Fix cmake generation on windows and add sigar library for future use.
Added 2.4.3 Spellwork binaries, source can be found https://bitbucket.org/sidsukana/qsw/downloads
PvP system changes
This could be much better.
Msvc 2008 project update.
Ship::Jettison: export the cargo spawning into it own function.
LuaShip: export Ship::SpawnCargo to lua
Merge remote-tracking branch 'robn/lua-event-queues' into jettison-lua
Use a pure lua implementation for Ship:Jettison
Ship.cpp: Rip out Ship::Jettison

The InfoView method awkwardly uses the Lua API, waiting for robn's
new-ui to make it all better :-)
Merge remote-tracking branch 'upstream/master' into jettison-lua
Merge remote-tracking branch 'robn/lua-event-queues' into jettison-lua

Conflicts:
	src/Ship.cpp
Ship:Jettison: Use the new Event API
New LuaFaction files, initial commit of those.
Register the new Lua class and expose it via LuaStarSystem.
Had to change the const-ness of the faction returned form GetFaction.
Add simple example script use.
The <code>m_stats.total_mass</code> rewritten to include remaining fuel
mass. Remaining fuel mass is also added to ShipInfoPage. Change of
<code>m_stats.total_mass</code> also affects calculation of the
hyperspace range
Revert of modified fuelUseRate, which doesn't belong here.
Update the vc2012 project files so that people can actually try it out!
Try updating the Makefile - NB: I don't have a Linux box to test this with.
Now I noticed that function GetMassNow is already in place under name
GetMass. Revert.
Another corrections..
ShipInfoPage and "info page when buying the ship" were changed
(almost) according to the proposition to more readable and more
informative format.
Lowercase "free" in ShipInfoView.
string: CAPACITY_USED, FREE_LOWERCASE, FUEL_WEIGHT, MAX.
port orientation checking with inPortrait to regular QML
Finished removing GSMConverter
Put length limits on names and acronyms. #29
add config for elpa, anything, ceded, malabar-mode
start a 1.9 branch by copying rbx code
Fix typos
Change netldi default to 50378 since that's what's set in install.sh
file method isn't added in C code for some reason
re-add old stuff
complete rewrite
rework digest C code to be more stable, doesn't produce correct results, yet, but also doesnt segv
fix reset and finish, makes vmunit OpenSSL tests pass again
ignore rbx and openssl products
begin fixing things in SSLSocket
Merge branch 'master' into tim/openssl
Merge remote-tracking branch 'origin/1.9' into tim/openssl

Conflicts:
	src/kernel/bootstrap/Globals.rb
	version.txt
for now, we don't support rb_io_check_read/writable or wait_read/writable, we just sleep and don't raise
Fixes bug.
Merge pull request #177 from MapofLife/bug/splash-species-tool-link

Fixes species list tool link in Splash
updated modules, updated ckeditor module and library, updated geophp library
liveness: athrow
liveness: instanceof
liveness: switch
Removed useless transitions and zooming delays due to transitions.
added reference page

References will be provided via PDF, links currently go nowhere.
remove tabs in twiddle_factors (looks like the svn/git bridge doesn't catch them)
make static assert in static_fft.hpp depend on template parameters to delay instantiation
fix CTestConfig to avoid errors when out of branch
avoid generating intermediate directories for tests
is_prime test
tests for rephorz/vert
remove tofloat workaround in twiddle_factors
make a sub2sub from reinterpreted expression size to expression size
Added basic saving
Merge pull request #95 from divineprog/ThreeZeroOne

[MOSYNC-1920] Added missing Database API documentation.
Merge pull request #96 from grigaci/ThreeZeroOne

Three zero one
Merge remote-tracking branch 'mosyncgithub/ThreeZeroOne'
transformation muss überdacht werden die scheiß achsen fluchten nicht
Page cleanup, start on portlets, Theme design changes
Dashboard shell/menu items
db
(hw1P4) Connect read_addr1, read_addr2, write_addr with ir.
(hw1P4, controller) Set value of mux4to1_select, mux2to1_select, imm_reg_select in state machine.
(hw1P4, tb1) ok for first 2 instructions.
Add testbench codes for P4/top_tb1.v

Conflicts:

	hw1/XX1011074/P4/top_tb1.v
(hw1P4, controller) Remove display messages.
Merge branch 'master' into marco

Conflicts:
	hw1/XX1011074/P4/top_tb1.v
always 5 grid lines
Changes Version 0.0.6

Version 0.0.6
(23.11.2012)
[ADDED] a checkpoint! ( graphics not final )
[ADDED] working fullscreen and scale options
+ minor code changes
Bug fix: Make sure the unit is drawn at the top
Latest changes.
New startup sequence.
Utility for generating a hex pdf.
Protect the reschedule queue with a seperate lock to fix a backend deadlock.

Fixes a deadlock in mythbackend caused when a reschedule request occurs
immedately prior to a recording starting.

The recorder thread locks the scheduler when starting a recording. The pending
reschedule request handled in the event loop waits for the scheduler lock to be
released blocking the event loop. The backend is now stopped from handling any
further events or protocol requests, meanwhile the recorder is waiting on
events to be processed before it will release the lock resulting in an
irrecoverable deadlock (or hang) and the failure of the recording.

This deadlock was more likely to be triggered for users of EIT because it will
ask for a reschedule every 5 minutes in addition to any reschedules triggered
through other means.

Refs #10771
Change the signature of TvPlayWindow::gestureEvent() to match the base class, the two diverged at some point.
Added vol list
Accept Reject option enabled
Import error corrected
Merge branch 'master' of 10.65.0.5:~/repositories/nss

Conflicts:
	templates/home/contacts.html
	templates/index.html
Hosted vol registration and project pref.
Merge branch 'master' of github.com:NSSatIITM/nss

Conflicts:
	templates/users/dashboard.html
	users/views.py
Merge 10.65.0.5:~/repositories/nss

Conflicts:
	templates/users/dashboard.html
updated vol list
S-Mailer Done
Added S-Mailer files
Unsubscribe added to S-Mail
Vol Registrations
Merge 10.65.0.5:~/repositories/nss
Url issues corrected
Email urls hidden
Merged
Merge branch 'master' of /ext/websites/nss/repositories/nss

Conflicts:
	smail/views.py
Home Tab url corrected
Merge 10.65.0.5:~/repositories/nss
Attachment added
Tradotta una piccola parte

Ho modificato qualche frase per adattarla meglio e per non renderla troppo lunga
Merge pull request #743 from Bracster/patch-17

Tradotta una piccola parte
man-db updates
Merge remote-tracking branch 'upstream/master'
add connect and read timeouts when calling priam (from within cassandra)
Merge pull request #115 from jasobrown/1.1

add connect and read timeouts when calling priam (from within cassandra)
ddclient: Upgrade to 3.8.1
automake: remove versions 1.7 and 1.9
autoconf: update to 2.69
automake: add version 1.12.1
automake: switch the default to 1.12
firefox: Disable parallel building

http://hydra.nixos.org/build/3348854
Make the bot able to move.

The bot now attempts to find nearest "unexplored" place. Currently gets
stuck pretty quickly because it doesn't realize stones next to the player
are really stone when player is next to them.
Show row and column numbers when printing out terminal.
Make exploring work. Somewhat. Lots of stuff.
Added some classes about Database part.
Fixed the return type of the GetConnexion method.
Fixed some return values.
Added methods to Create and Get the ID of an account.
Updated the account files of the database part.
Added some account management.
Added some methods to the account management classes and create a Database Logger.
Added the updating of the last login date and current IP.
Merge branch 'Login' of github.com:Noxalus/YAPOG
Added the Boost's REGEX library.
Merged the game-engine branch with master.
Fixed error with saving "none-type" background image.
gestion d'erreur + nouvelles fonctions
remove maxOrderIndex from view mode
И ещё раз
Fix Darkness
Carry over old NL generation fixes from subtle repo.
Prueba:wq
rephrased 4.42
Laget en tcp server og client, samt login fungerer
Merge branch 'master' of github.com:Proj11/Proj11
Fixed bad image paths
There was an error with creating the bodies had to rejig the globals to the right order. Body must come before Body Definition.
Added Player Movement using SetlinearVelocity
Kinematic
updated sec 2012 chart
Se soluciona un error fatal.
Si no existía includes/plugins el sistema se volvía loco.
added proper README file
template extension - HTML5 tags + a few more DOM elements for future themability
added proper README file
added netbeans project files to gitignore 
theming modifications
template extension - HTML5 tags + a few more DOM elements for future themability
change filename of license
change filename of license
footer.php merge
new footer link
Merge branch 'master' of https://github.com/cfoellmann/ReGlot into cfoellmann-master
take schmoos solution for generic timer
take some spell stuff from R2
use cmangos style in TargetMovementGenerator
Commit dia 19072012

Change in file font-awesome.css
Renaming index and bootstrap comments to "Paulus"
Renaming the default title to "Paulus"
Forums drag and drop to position them
fix tests on grack
Ignore invalid channel names

Previously, trying to display a channel with an invalid JID (either missing user
part, such as @example.com, or missing domain, such as user@) resulted in Urwid
trying to render text widget with zero width, which failed and result in a crash
because of an AssertionError.

But trying to handle these invalid JIDs makes no sense anyway.

These JIDs are now detected and rejected by the client, so they don't cause the
UI to crash anymore.

A future patch will add a visual notification for such invalid channel names.

Many *many* thanks to Simon (@imaginator) for his help in finding this (and
sorry for the delay).
Expose all defined exceptions in bccc.client

One day they will probably be of some use.
Adding bootstrap 2.0.4 to shared, creating client, server, etc. structure
Add test for warn_unknown
fix incpath
initial classes
docs
fix creating token
add get-oauth page to be inherited
cleanup
Merge pull request #183 from stanistan/identity

Identity
Use patched version of h.r.download

It does not destroy buildout contract, so there is no need for local downloads
directory.
Pick newer buildout.

As h.r.download was anyway updated, it will result in a lot of recompilation,
so it is the best moment to upgrade buildout.
Merge remote-tracking branch 'origin/erp5-luke' into erp5
LAMP generic: don't erase htdocs at update

htdocs can contain user data
Set correct log option
Revert "Set correct log option"

This reverts commit 509d47a6036f1736de3d77900874be9d8fdbc17b.
Merge branch 'master' into slaprunner
Update slapos.toolbox version to 0.31.1
fix js error - stop using var name public :-\
added plotting of variance (2)
added delete URL
added stream.views.edit_item and some rough versioning
added parent and display for versioning
added delete URL to template
reverted changes i made before
deleted generic inport in models
delete content_object before deleting streamitem
Merge branch 'master' of github.com:Subito/kr0k3n
Adds link translation.
Cleanup reaupload
Remove Notation.xxx.name, and use instanceof
Start the notation support
project sturcture adjustment
added more failing unit tests for constant anon covariance

git-svn-id: http://haxe.googlecode.com/svn/trunk@4681 f16182fa-f095-11de-8f43-4547254af6c6
report missing/duplicate/extra fields on covariant anon cases

git-svn-id: http://haxe.googlecode.com/svn/trunk@4682 f16182fa-f095-11de-8f43-4547254af6c6
CHANGES.txt update

git-svn-id: http://haxe.googlecode.com/svn/trunk@4683 f16182fa-f095-11de-8f43-4547254af6c6
do not type structures against the empty structure

git-svn-id: http://haxe.googlecode.com/svn/trunk@4684 f16182fa-f095-11de-8f43-4547254af6c6
do not cache modules defined through Context.defineType (fixed issue #790)

git-svn-id: http://haxe.googlecode.com/svn/trunk@4685 f16182fa-f095-11de-8f43-4547254af6c6
Merge remote branch 'trunk'
Achievement Fixes
Minor Achievement JS verbage fix
update search algorithm (sort by view_cnt)
Merge branch 'master' of github.com:Timego/timego
quotes around windows installer with spaces in name
Fix: Adjust performance test start position.
add the neat reveal-modal plugin by Zurb
Test case for ENG-2660, verified failure with prefixed code
Oops. Missed 1 line of merge patch.
Fix HSQL version number
ENG-2417: communicate selected SnapshotInfo, not just txnid.
Do not add elevation profile URL if elevation profile is turned off
add comment to install.sh
removed block_export -- Worthless!!
use terminology consistently -- a revision is a page, a version is a number
Improved TableView:heightForRowAtIndexPath method to reload data faster, fixed #19
Small fixes, Added God and made IO more efficient
Make even more sense
Better checks for repo_dir and home_dir
Two opposing directions do not actually cancel each other out, fixed logic
Follow import best practice by separating stdlib modules and 3rd party modules
Add some Eclipse/PyDev maintenance files to .gitignore
Fix calculation of value column
Change accumulate method to store IntervalSum

IntervalSum was unused for the accumulate reduction type.  Changing this
so that the IntervalSum is used; this will be the same as the Value
field.
Merge branch 'Reduceless-experimental' into ReducelessMigration-experimental

Conflicts:
	source/ZocMonLib/Framework/StorageCommandsReducelessSqlServer.cs
Change migration script to copy accumulate's value column to interval sum
Get records to update on flush
Fixing bug with updating values on flush

Existing logic seems to assume that database records are always dense.
If that isn't the case, in-process records can be combined with
nonmatching database ones.
Merge branch 'develop' into DynamicTables-experimental

Conflicts:
	source/ZocMonLib/Framework/RecordFlushUpdate.cs
Merge branch 'DynamicTables-experimental' into Reduceless-experimental
Merge branch 'Reduceless-experimental' into ReducelessMigration-experimental
rebarize code
I added a simple utility if you're interested
working on quitting
[ABICLOUDPREMIUM-2975]-BAD_CREDENTIALS_HYPERV_CHANGED
[ABICLOUDPREMIUM-2975]-Test_Fixed
Merge branch 'ABICLOUDPREMIUM-2975-HYPERV_WRONG_MESSAGE'

Conflicts:
	api/src/main/java/com/abiquo/api/services/stub/NodecollectorServiceStub.java
Added nyancat :D
cybercrime (ancora da fare)
Fixed bug in example code ;D
All CloudStackCloud operations extracted into separate modules grouped by responsibility
Fixed npe in notifier when no recipients. Added status to CheckState, exposed in dump ui
Reorded attributes in CheckState toString()
Send 'share_with' for own calendars currently being shared
using new fork of mongoadmin project
added test harness and testing some GETs
Updated uglify
GET to application.js and css using unminified versions
updating some dependencies in the package.json (stylus, optimist, fast-detective, coffee-script)
just some little changes to go with the idea of this branch being the new hem source in npm. nothing official yet
first stab at porting old spinejs.com hem docs into hem readme file
Merge pull request #55 from kapadia/master

Updated Uglify
adding a todo in the readme for adding proxy capabilities to hem
updated uglify dependency
compiled
version bumps required for npm to pull in updates. makes sense
lingering fs > path update for updated node API 
bring in customizable host config from https://github.com/mmavko/hem/commit/0f382b1ca66e66ff379f9bd6815d754b0d0bf222
sync with maccman/master
bringing in .jeco enhancement - object includes index prop, and optionaly extra data
wild untested stab at proxy layer
well it at least compiles
psuedo code for the regex base path stuff. comments explaining thoughts behind proxy
actual working regex for the proxying magic
added watch
Change git url to git:// for npm compatibility

@ symbol indicates tag or version to npm install.
removed forgotten code
Merge branch 'master' of https://github.com/afarazit/blog
cluster mas cercano
Expenses handle multiple owners

This update allows for the (probably invalid) situation where a custom
expense type possesses multiple owner id references to employees. The
'fix' involved moving from a standard LINQ query to using an involved
Where clause on the set of expenses, which ends up being more readable.
mismatch commits, revert
[Config] Ignore compiled Python objects (.pyc) and JavaScript bundled libraries when building the tar-ball.
Merge branch 'trunk' into releases
[Samples] Added a schedule error case input file.
Merge branch 'trunk' into releases
empty Host directories must present
use json notation instead of dumb strings
added text to news
merge from https://github.com/sstrigler/JSJaC.git
ieXDRToXHR added
allow overriding auto slug by yaml setting in the post
rewrote flask-flatpages myself to enable real slugs that are stored in the page/post objects.
Make the Dashboard buttons a little nicer
Merge pull request #337 from olasd/master

[GUI] Arrange the new Dashboard icons into a grid
Mat.14.1
apelaoum mais lento das teclas superioras
Use reference in interfaceAction
Software packages in puppet facts
Tests for handle_facts_packages in puppet plugin
Software tab in device view added
Minor improvements
PEP8
Start tests for device software view
Continuation tests
Unnecessary space
Version field in Software model
Display version in software tab & improvement in tests
Small fixes
Merge branch 'master' of git://github.com/allegro/ralph into dev
Version column in component software - added migration
Change samples data in puppet tests
Style
Reorganization imports
Refactor plugin puppet tests
Refactor and fix errors
Merge
Merge pull request #220 from quamilek/dev

Detecting installed software packages through puppet plugin
pic1
333
updated export to work for scripts that return string and scripts that return enumerable of string
precision and scale for price column for products
has_secure_password should not raise a 'digest missing' error if the calling class has specified for validations to be skipped.
Restoring documentation for env_config per #7070
Merge pull request #7219 from jmazzi/master

Restoring documentation for env_config
move method for dependent option check
Refactor dependency check validation

Move the logic for validation check to the same method, and cache
dependent option in a variable to reuse inside the dependency
configuration methods instead of relying on the options hash.
Merge branch 'refactor-dependency-check'

Extract dependency check logic that raises ArgumentError in case of an
invalid :dependent option given to an association.

Closes #7054
The use_schema_cache_dump configuration moved to ActiveRecord.
Merge pull request #7224 from kennyj/move_to_ar

The use_schema_cache_dump configuration moved to ActiveRecord.
Change AR's CHANGELOG, because it is related to e35c67ae0f920011a2440210041e96659a8de985
Merge pull request #7228 from kennyj/move_to_ar2

Change AR's CHANGELOG, because it is related to e35c67ae0f920011a2440210041e96659a8de985

[ci skip]
Merge pull request #7217 from freerobby/no_password_requirement_if_validations_skipped

has_secure_password should not raise a 'digest missing' error if the calling class has specified for validations to be skipped.
Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."

This reverts commit 3803fcce26b837c0117f7d278b83c366dc4ed370.

Conflicts:
	activerecord/CHANGELOG.md

It will be deprecated only in 4.0, and removed properly in 4.1.
Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.
Add `Relation#load`

This method explicitly loads the records and then returns `self`.

Rather than deciding between "do I want an array or a relation?",
most people are actually asking themselves "do I want to eager load
or lazy load?" Therefore, this method provides a way to explicitly
eager-load without having to switch from a `Relation` to an array.

Example:

    @posts = Post.where(published: true).load
Refactor a bit

This doesn't change the exernal behavior, but it moves some code around
to where I think it properly belongs.
Use explicit delegations

This makes it easier to see what the documentation refers to.

It also means that we are not doing unnecessary work for delegations
that have no args / splats / block / etc.
Add CollectionProxy#scope

This can be used to get a Relation from an association.

Previously we had a #scoped method, but we're deprecating that for
AR::Base, so it doesn't make sense to have it here.

This was requested by DHH, to facilitate code like this:

    Project.scope.order('created_at DESC').page(current_page).tagged_with(@tag).limit(5).scoping do
      @topics      = @project.topics.scope
      @todolists   = @project.todolists.scope
      @attachments = @project.attachments.scope
      @documents   = @project.documents.scope
    end
s/scoped/scope/
happiest cities data vis continued
SEO is SEO in PL
mod_menu PL translation
mod_comment translation (PL)
mod_admin_predicate PL (note: someone with better background should
review this)