labofsahil/github-event-dataset-2012 huggingface dataset:
Getting started with flot
Towards picksets being the driver
PageBuilder and View re-added
associations configured
a
percent of winning hands by position
Module name and gem path fixes for auth plugins
Minor refactoring needed to work with the hosted service

Note: for the setting of @token_login_key I'll switch this to use the new
approach for setting default configuration as soon as it makes it to master.
Minor updates changes to the remote-auth plugin
US2634 [Authentication] LDAP integration for authentication
Merge pull request #607 from brenton/streamline_auth_misc1-rebase

Merged by openshift-bot
Merge pull request #612 from calfonso/master

US2634 [Authentication] LDAP integration for authentication
Automatic commit of package [rubygem-openshift-origin-controller] release [0.17.12-1].
Automatic commit of package [openshift-origin-cartridge-php-5.3] release [0.98.6-1].
Automatic commit of package [openshift-origin-cartridge-perl-5.10] release [0.29.7-1].
Automatic commit of package [rubygem-openshift-origin-console] release [0.0.7-1].
Automatic commit of package [rubygem-openshift-origin-auth-remote-user] release [0.0.7-1].
Merge pull request #614 from jwhonce/master

Merged by openshift-bot
Fix reference to obsolete variable.
Honor stop_lock during app_ctl stop calls

Fix references to the stop_lock file, preventing app startup
when the app was explicitly shut down previously.
Merge pull request #613 from kraman/master

Merged by openshift-bot
BZ849627 Refactored error handling for inline form elements
Restored automatic error collection for inline elements
Added error processing for select inputs.
Fixed select_input call to parts()
Merge pull request #615 from mrunalp/bugs/perl_app_ctl_env_var_fix

Merged by openshift-bot
Add:#46,47,48
query tasks of job via direct access to MongoDB
added main board logic and did fixes to client and server
made some progress on the accept changes for the diff screen
説明、インストールログ追加
fixed directed problem in prepareroutingshortcuts
moving 'sun' usage into external class
applied several changes to make it working under Android again
change necessary on android branch
deploy
deploy_
A short example of some Python code
Added offline support for newsticker & videos panel. Added video panel and offline translations to latvian.
Added last modified to additional info template.
selective ssl
Merge branch 'release/0.2.8' into develop
fixed survey var
bump da version
Merge branch 'release/0.2.9'
email async improvements
emailable
Merge branch 'release/0.2.84' into develop
Merge branch 'feature/email_tweaks' into develop
url to org show view
bump da version
Merge branch 'release/0.2.85'
Adding storylines and standings to the home page.
ok i much prefer BIGPATH decision by entire path rather than cell by cell
Make slice each value configurable to accommodate 3 for 1
api docs
thanks, @sigmavirus24
first commit to stripe branch
initialize stripe
remove header's admin dropdown
rename angular module myApp to redLive + rename angular controller AppCtrl to TeamCtrl
Patch to add call-in interface for transaction processing to GT.M.
Added more tracking data to transaction commit.
Start tests with a virgin database.
Folder containing a mechanism for creating a test database.
Overload setItems to take a Collection
Add helper for setting child view as gone/visible
Store currently updated view in instance variable

Simplifies update calls as helpers don't require the
parent view parameter.
Last checkin for the day.
1st session of code cleanup
2nd cleanup round; now parsing config file, reading but not yet writing
first attempt at version 2
updated example
merged from dev for 2.0
Merge branch 'master' into dev
Missing apps in requirements.txt added
Further missing apps, waren noch im stash
Merge pull request #5 from oversize/master

Missing Apps in requirements.txt
added json files for cities and news
fix viewmodel bug, required validation tests
add range query support (quick hack)
Moving from thin to unicorn
more 5.10
File Transfer File Download knows size in advance
added datepicker - showButtonPanel feature
Porting JS 3.1 API on the way

Signed-off-by: OHTSUKA Ko-hei <kochizufan@gmail.com>
added konoha-style const definition
kmap_add is expired
merged symbol and uname
refacotred klib.h
refacotred klib.h again
refactor MN_ FN_ macors in konoha2.h
replaced T_mn with the combination of prefix and body text
bugs fixed at ConstDecl
refactored symbol macros
refactored TY_ and CT_ macros
refactored PN_ and SS_ macros
added SYM_equals
added SYM_equals, again
Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/konoha2/klib.h
	src/konoha/klibexec.h
Merge pull request #9 from kkuramitsu/master

I think we need to sync..
Cleaned up the matrix wrapper and created matrix map type.
README.md: replace class names by links to GitHub pages
Added simple unit test for cordova platform detection
Merge branch 'cordova' of github.com:krotscheck/sproutcore into cordova
Ссылка на пост на странице редактирования.
client id changed
Made Canada AnnexOneSustain
Merge branch 'master' of https://github.com/kyotoprotocol/KyotoUI
Update js/app.js

get the model value to watch from the tag ng-options
Derp, forgot to complete the sentence.
Agregadas las imagenes, al repositorio.
alinhamento
Merge branch 'master' of https://github.com/leomurta/labgc-2012.2
Merge branch 'master' of https://github.com/leomurta/labgc-2012.2
Merge branch 'master' of https://github.com/leomurta/labgc-2012.2
commit e tentando alterar revert de file
making use of the cache functions
Fix href handling
Only look for libmd if OpenSSL is not present.

In particular, this prevents us from trying to link
both on FreeBSD.
ppc64: is_openable function needed on all platforms now.

This fixes commit 295d6af48d1d8c5238d1536b0c6a2ece42b0b445.
Ignore .gdb_history file.
test-virt-resize: Replace truncate with guestfish sparse.

Another instance of 'truncate' command.

See commit 39df80dcc0e485e69048bddbf33c259ce532e50d for an
explanation.
tests: Fix broken workarounds for missing O_CLOEXEC.
tests: Add workaround for missing O_CLOEXEC.
tests/xml: Fix compilation of test on RHEL 5 with old libvirt.

Old <libvirt.h> had a conflicting definition of virDomainGetXMLDesc:

fake_libvirt_xml.c:36: error: conflicting types for 'virDomainGetXMLDesc'
/usr/include/libvirt/libvirt.h:715: error: previous declaration of 'virDomainGetXMLDesc' was here

The difference is not material ('int' vs. 'unsigned int').

Avoid the error by not including <libvirt.h>.
ROADMAP: Remove some completed items.
todo: General updates.
New API: mklost_and_found
generator: actions: Move 3 helper functions to a separate file.

This is just code motion.
generator: actions: Move variant functions to a separate file.

This is just code motion.
generator: Split up huge src/actions.c into separate files.

Split the functions according to a simple hash across
C.nr_actions_files files (this number can be increased later if
necessary).

This is just code motion.
Version 1.19.56.
add login_times
Delay binding of symbol class tags until frame initialization

Adds support for symbol class tags that are derived from classes
defined in an external SWF. For example http://edition.cnn.com/video/
needs this.

The root script does stop() and starts loading an external SWF. When
the external file has been loaded and parsed, nextFrame() is called.
The symbol class can not be bound before the initialization of the
second frame because only at that point the base class definition has
been loaded from the external file.
adas
Merge branch 'master' of github.com:likwidmonk/sharediddy
insert action bar classes
c++11 version common module done
c++11 version common module done
c++11 version common module done
c++11 framework tested on matrix classes and basic operations
c++ framework tested on matrix module
Add move semantics to dense_matrix (tested)
revising macc_reduce_core
update modules. fixing sata, mali and spl problems
Fix compile failures for FSAL_UP and SNMP
top bar CSS done + expand/collapse
added nbproject/* to the ignored list
修改主题，但是不太成功
added test lines for stockmine_weekly, however date formatting function
isn't working as intended
Added end date parameter back to ystockquote (accidentally removed
previously)

Changed date input in Stockmine to use strftime() to make sure it
outputs the correct date format
Better changes for url argument of add_crumb.

- The url argument passed url_for method for convenient use, except url is nil.
- Unify default value of url argument.
- Fixed puts line...
- When breadcrumbs[:url] is nil, cleary specify not calling link_to method in partial template.
Reformatted a whole lot
Status: Added a link to the blog entry about GNUStep on the Hurd.
Merge branch 'master' of http://git.savannah.gnu.org/cgit/hurd/web
open_issues/hurdextras: Add ipc_guide.
open_issues/hurdextras: Sent email to all NOKs, asking for assignment.
Merge branch 'master' of http://git.savannah.gnu.org/cgit/hurd/web
open_issues/glibc: cba1c83ad62a11347684a9daf349e659237a1741 (2012-07-29)
Merge branch 'master' of git://git.savannah.gnu.org/hurd/web
IRC.
Merge remote-tracking branch 'fp/master'
* open_issues/packaging_libpthread: One issue fixed.

hurd/libpthread.git, commit 549aba4335946c26f2701c2b43be0e6148d27c09 »Fix
libpthread.so symlink«.
* open_issues/packaging_libpthread: One issue fixed.

hurd/libpthread.git, commit af7d78e726cb0d3248c461cfee27fe15121dacd1 »Rename
ia32 sysdep directories to i386.«.
* libpthread: Update.

... with information from thread starting at
id:"87a9ybndxn.fsf@kepler.schwinge.homeip.net".
* open_issues/libpthread_1fcd93fd3c733eb19bcad8d03e65f13ec4b0e998..master-viengoos-on-bare-metal: New page.
Replace outdated information with a pointer to the official supposed-to-be-up-to-date page
Add page about chroot configuration
Drop done items
open_issues/binutils: New process tool; e1104996559067c40207c803ab1a5847a4a05145 (2012-06-07)

Configure with support for sysroots.
Give an example of RPC path in the Hurd.
mention special files served by special translators
remove pthread_create ENOMEM return value bug

it has been just fixed
Author::CJM 4.12 adds Test::PrereqsFromMeta
Port to Strawberry Perl and MinGW gcc

  Just fake the structured exception handling
  Include winresrc.h instead of winres.h
  Bump version to 1.10
Don't use deprecated names stricmp & strnicmp
Adjust to new scope rules in for loops
Fix refresh param in WaitForWindowClose

  typo meant it was always 0
Add 30-lasterror.t
Remove references to LastErrorCritSection

  It's no longer actually used anywhere
Define _CRT_SECURE_NO_WARNINGS

  Suppress warnings from newer Visual C++ compilers
Displays proper error message, if `elements.yml` is empty.
Better deploy:script generator.
\response->relay()
links update to tutorial
Fixed OSX deployment section
Fix MySQL assembly. Also added the install binary for easy use.
Update tool with the recent Mangos changes
Update installer to the latest build
Update to the latest core
update admin code
Merge remote-tracking branch 'mannix/master'
merge mannix code nov 30
update ranking query
stephen merge nov 30
lightbox

lightbox, resize, follow indication
Corrections to prev. commits III
Corrections to prev. commits IV
quickfix for blogs route, was not able to figure out negation of full words in regex...
Update wolf/app/controllers/PageController.php

It would be useful to know when pages are being reordered.
Finish bottom menu styles
Compress scripts/styles: 3.5-beta3-22668.

git-svn-id: http://core.svn.wordpress.org/trunk@22668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
In get_custom_header(), support a default header that is registered using default-image but not register_default_headers(). fixes #22221.



git-svn-id: http://core.svn.wordpress.org/trunk@22669 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Updated SDK to newest M5 syntax changes
ConcreteProcess: can't invoke java variadic methods with Iterable anymore

Like Ceylon variadic methods
Enlazando granja con lote
Enlazando granja con lote
add file io feature
Merge branch 'add-file-io-feature'
Merge pull request #203 from masche842/fixes_master

fix for elements generator to allow empty elements
Always display subnavi and subnavi add ons together
Fixes #205 - Bug when saving a normal Page if its urlname also exists in the global pages scope.
Removing old files
Raising version
Fixing new page form select. Again and again and again!
Fixes for contact form
Fixing contact form mail views and removing html version
Updating gemspec
Adding a link to still maintained status image
Refactoring admin/contents#create. Fixes #206
Adding a js growl notice if not authorized
Fixes some more alchemy select boxes.
Fixing paragraphs with floating button in it.
Replaced Wiki link with guidelines
Adding :global option to page_selector helper.
Also fixes Issue when using :only option.

The following issue with :only option is now fixed:
If no :only option was passed to the helper, it would select pages with page_layout => nil and public => true. For sure this is an empty array. It does not return an empty collection, because on line 103 the pages_for_select helper returns all pages, also if the passed "pages" collection is empty.

Now:
If no :only option is used, it will NOT be used in the where clause.
Additionally you can pass :global => Boolean as an option to the helper. If true, it will select global pages instead.

The default behavior of this helper is not touched.
Its just refactored and got a new feature.
Using url instead of path for essence_picture_view, so we can use it inside of mailings.
generalize credential-invalid-message to improve security
Removes Page#edit from urlname feature.

That was a stupid idea.
Release 2.2.0
Updating README for 2.2 release and travis ci settings.
2.3.beta1
Reduce travis-ci.org build matrix, per discussion in #264
Merge pull request #265 from michaelklishin/patch-1

Reduce travis-ci.org build matrix, per discussion in #264
Removing Ruby 1.8.7 and Rubinius from Travis CI build matrix.
Completly removed Page#to_param.
Add code climate badge
Updating still maintained image link [ci skip]
Removes class method 'get_page_layout_names' from PageLayout. Closes #258

This was a needless class method because it was never used anywhere in alchemy.

Even though the name suggests the return value would be the page_layout names, this is not the case. Instead it returned the keys…
Add a dependency status image
Add a link to the latest stable branch
renamed @current_language to @language
deprecation warning and updated documentation
fixed typos and tried to clarify things
moved definition of skip_attributes and resource_relations for resource into model
Fixes #266
Adding localeapp api key
Do not require localeapp/rails on TravisCI
making jar and project 5 directory
sort index by date (only) in ff3, closes #36
adding rabbitmq instructions
qt4: remove duplicate file save button; and remove trailing whitespace
Merge pull request #1014 from efiring/fix_qt4_icon_dup

qt4: remove duplicate file save button; and remove trailing whitespace
Fix small gaps in the hatching in Agg backend
Merge pull request #853 from mdboom/hash_gaps

Hatching gap on agg backend
Save output volumes in subdirectory
GATEWAY-2769:Re-applying doug's changes for the datasource business
GATEWAY-2769:Added resource-refs to the domain template
GATEWAY-2769:Swapped transrepo to datasource
GATEWAY-2769:Remove c3po from the build
GATEWAY-2769: Updated README
GATEWAY-2769: Reverted JVM Memory Arg settings
Merge pull request #90 from matthewtiller/CONNECT_integration

GATEWAY-2897 validation suite fixes
fixes issue: GATEWAY-2925 (gateway.jks needs to be added to embedded glassfish)
fixes issue: GATEWAY-2925 (gateway.jks needs to be added to embedded glassfish) needed to add some removed files to commit
modified soapui plugin to configure properties and upgraded to soap 4.5.1
Merge remote-tracking branch 'upstream/CONNECT_integration' into CONNECT_integration
fixing small installation-related inaccuracies in README
removing moribund deployment code
Merge pull request #92 from dharley-5am/CONNECT_integration

removing moribund deployment code
upgraded plugin, added property to disable embedded test
merged with CONNECT_integration
removed commented out code
Merge pull request #93 from bhumphrey/CONNECT_integration

upgraded the soapui plugin to use 4.5.1, added standalone property and property override
removing building of CONNECT, as maven is the new build system, and we can assume that the maven build has already completed before installation occurs
Merge pull request #94 from dharley-5am/CONNECT_integration

removing building of CONNECT, as maven is the new build system, and we c...
Camera moves towards target direction, but with limitations

// target.position is not updated, so the camera moves always towards
one point
			// also: works only if target and position are in positive values
ST7 glossary / glossary needed pages added to readme
fixing bar to beat and added some extra utils
raise exception instead of letting processing continue
renamed aboutDisplay to aboutTextDisplay
renamed helpLabel to helpTextDisplay
UI tweaks
rewrote tips catalog and help text
fixed wrong case
unfinished work from last week
added bare bones node.js server
test for lineage when constructors are used instead of .children <<
Update version.
Merge branch 'release/0.1.0'
Merge tag '0.1.0' into develop

Tagging 0.1.0 release.
Bump version.
Removed broken apache submodule
Added apache submodule
More fixes to pages!
removed further svn leftovers
Function: Disable autofill. Closes #173
Theming for materials request form
Change "Home" to "Catalog"
Fix to where file is transfered to ACS pacakging service
Fixes to citations
Show no description provided as needed in templates
Remove length and publisher if not provided in description popup
Trim eContent description when shown in popup to match print record
Add additional information to print record for eContent to make testing easier.
Error message if we cannot load data for popup box
do not change url when loading overdrive information
Display subtitles in mobile interface
Added OverDrivers Holds screen
Add AdminUser seed
strip www, fix single character user id bug, fix autopaging of small pages, fix logging of auth/opt
small change to sytling
Add try/catch to notifyChanged()

With tabs sending/retrieving data over the internet now,
notifiyChanged() could be called at any time. If called at a bad
time (like during a orientation change), a null pointer exception
will occur. The try/catch will prevent the app from crashing.

Signed-off-by: Greg Meiste <greg.meiste@gmail.com>
Implement Questions send button. Closes #15

Signed-off-by: Greg Meiste <greg.meiste@gmail.com>
Retain RuleBook so scroll maintained across orientation changes

Signed-off-by: Greg Meiste <greg.meiste@gmail.com>
full func test
Added editing functionality in the API + reference js implementation.

- a "BC break" because `isNewComment` is added to the
  CommentManagerInterface. This shouldn't affects users that use the
  default supported storage backends

- The html class "fos_comment_comment_form" got renamed to
  "fos_comment_comment_new_form". Any custom JavaScript implementations
  should update for this change
Removed old getSortingFactory() calls + added test coverage for sorting / displayDepth in api
Fix functional test
Fixed name of documentation file (before the links to it were broken)
Extra , generates warnings in IE7
Merge pull request #157 from F5/fix-ie-js

Extra , generates warnings in IE7
Fixing service id argument and the widening scope exception being thrown.
Comment counts for threads can be loaded asynchronously
Add close/open thread button
Revert pushing the wrong branch to upstream/master.. Sorry :(

Revert "Add close/open thread button"

This reverts commit 175ac13bcc86cbf4d34e287581877bd1b7cfdfd7.

Revert "Comment counts for threads can be loaded asynchronously"

This reverts commit b2df95acc2087d47cd968c0fea7ff30d98c66411.
Update test kernel config for latest changes in FOSRestBundle
Update .travis.yml
Comment counts for threads can be loaded asynchronously. Fixes #163.
Add notes to UPDATE.markdown
Merge branch 'async-comment-counts'
Add close/open thread button. Fixes #162.
Merge remote branch 'origin/thread-open-close-button' into next
Merge remote branch 'origin/comment-editing' into next

Conflicts:
	Twig/CommentExtension.php
Merge branch 'next'
Refactored the twig extension
Unit tests

Change-Id: Id20977ef78d928266a6dff202aec6c6746023c82
improving man pages
Incrementing the app7 dependency version
Style tweaks for add portal button and autocomplete selection
Listen for keydown instead of keyup on autocomplete popup
Track user last visit time and account creation
Removed the bind helper function; not that important
Desktop: added space below table
Monger 1.0.1 is out
made it initialise on first use, not on boot, pretending I know what I am doing
2.4.0, add misscan helper class
Merge pull request #1 from mickeyng/2.4.0

2.4.0, add misscan helper class
Command M109 / M190 wait for Temp
Microstepping PINs was only set for X-AXIS
Merge branch 'master' of https://github.com/kliment/4pi-firmware.git
Add Led PIN's and function to set/clear LED IO's
Added motor current and microstep settings M906, M907, M350 based on tonokip/Marlin
adjusted constant for converting mV to digipot value
Removed M908.
Merge branch 'master' of https://github.com/kliment/4pi-firmware.git into motor_settings
Add support for M303, PID Autotune
modified usb_printf
added (.data.*) to linker script. again
use motoropts.h in stepper_control and add function prototyps
updates to pid autotune
Remove redundant \r\n
Merge branch 'master' of https://github.com/kliment/4pi-firmware.git into PID_Autotune
Fix PID Autotune
Collect all settings in the parameter struct.
So it is easy to save and load the values from flash.
Merge from master (Kliment)
Added UI elements to the reading view
Merge branch 'master' of github.com:miguelneves/moodle_up

Conflicts:
	style/core.css
Moved from Adsense to Doubleclick for Publishers
wrap it up with a todo
test
Merge branch 'master' of https://github.com/milenaf/CopsAndRobber
try to fix remote comment edge case
Revert "Disables cast creation"

This reverts commit 55088dec6551221811873dd951104100d514d7f2.
Moves generic maps classes to common location
Add web server cofniguration sample.
Change Pic module name to GyazoServer.
Add features.
torque mit
More small changes to EAD internal page's html for consistency.
Added the ead internal page (showing collection items, reached from the ead overview page)
Moved some code around in preparation for fleshing out the ead internal page.
Changed route for ead overview and interal pages.
First part of work on overview section of ead internal page.
Fixed a bug.
Refactored internal page code to make it like overview code.
Added items on EAD internal page and fixed some bugs.
Merge branch 'master' of github.com:mkorcy/tdl_hydra_head
apname
Add sample site to README.md
env
host changes
Removed a few Windows test files; made STRICT_FORMAT checing a default as in 1.6.*
Update bot.php

Fixed URL encoding bugs.
GEP rep finished. RNC's are stored in an unboxed vector and the gene rep is a
ByteString. Chromosones can be built by appending genes which are monoids.
link: to discogs
add: discogs submodule
Fixed dependencies in cl_urdf.
Added explicit slot ROS-PACAKGE to ROS-GROVEL-FILE.

It seems like newer asdf versions require it.
Improved support for reachability reasoning.

Reachability reasoning now also works for locations `to execute'.
Updated package exports.
Moved reachability-designators fact group to location_costmap.
english translation thanks @Herrie on webosnation
Lab1 + HW1
Refactored HSP is now loading and running inside of Bukkit. Not fully functional yet, still errors when running commands but this is good progress.
add v1.7.0 MySQL upgrading, lots of testing
Deepan, Sanjana|Fixed build
Ashish | #00 | Adding scripts to check unmerged commits
Adding a simple Makefile
Refactor config loading to use wrappers.
Refactor config API to support global instantiation.
Reorganize some structs.
Merge pull request #15 from mozilla-services/features/config-api-add-globals

Refactor config loading to use wrappers.
Updated error bundler to match refactoring on amo-validator
Added CSP warnings; fine-toothed cleanup of AMO junk

+ Adds CSP warnings for scripts
+ Adds CSP warnings for markup
- Removes JS bits and pieces used by XUL
- Removes JS rules used only in add-ons
- Removes theme-specific rules
- Removes XUL test files
* Cleanup of predefinedentities
* Shortcut functions for predefinedentities
* Moved some of the junk functions from actions/call_defs to entity_values
Skipping for now; see issue 187
added createTestGraph.ml to create test graphs
Добавлен fine uploader
Fixed Jamie's horrible formatting, added first 2 slides
Last bit of overhall

I merged both the $currency and $till arrays into (1) multidimensional
array. This saves space and makes the code 20 lines shorter. Also
exchanged a few for loops for for each to simplify coding. All in all
it's about 10 lines shorter!
fix wrong thumbnail path
Current and voltage divider.
Current and voltage divider
Makefile for everything that was included when I wrote this.
added current and voltage divider.

look at EQ_COMPONENT section, needs to add inheritance stuff
Fixed issues causing warnings
Finish the benchmarks
Update survey css etc
follow loose ends of variable change
lscerts now shows active cert
Add toggle keymap for nerdtree
Add rxvt terminal support for 256 colors
default wget settings should trust server names
Turn of visual bells for screenrc
Added Xresources. Updated gitconfig information.
Made factory attribute names changable in case of collision with model
Merge branch 'master' of https://github.com/jorislops/molgenis_apps

Conflicts:
	modules/datatable/org/molgenis/datatable/view/JQGridView.java
Some work on tests
Merge branch 'master' of https://github.com/molgenis/molgenis_apps

Conflicts:
	.classpath.template.xml
Minimalist build of datatable project.
Work on tests
Merge branch 'master' of https://github.com/molgenis/molgenis_apps

Conflicts:
	.classpath.template.xml
Merge branch 'master' of https://github.com/jorislops/molgenis_apps

Conflicts:
	.settings/org.eclipse.jdt.ui.prefs
	modules/datatable/org/molgenis/datatable/controller/Renderers.java
	modules/datatable/org/molgenis/datatable/model/AbstractFilterableTupleTable.java
	modules/datatable/org/molgenis/datatable/model/BinaryTupleTable.java
	modules/datatable/org/molgenis/datatable/model/MemoryTable.java
	modules/datatable/org/molgenis/datatable/model/QueryTable.java
	modules/datatable/org/molgenis/datatable/plugin/JQGridPlugin.java
	modules/datatable/org/molgenis/datatable/view/JQGridJSObjects/JQGridConfiguration.java
	modules/datatable/org/molgenis/datatable/view/JQGridView.java
Finalise merge
fixes to make branch possible with daan
Merge + fixs of Tests
Merge branch 'master' of https://github.com/DanielReid/molgenis_apps

Conflicts:
	modules/datatable/org/molgenis/datatable/plugin/JQGridPlugin.java
Fixed most Tests
Fixed plugin and tests of JQGridPlug
Before changes to fix last page problem in column Pager
Fixed last page problem of column pager
added page by input number
Moved Renderers.java to view package
merge
fixed merge errors
Slow down the game & add TICKS_PER_SECOND constant
Change game title slightly to reflect domain name
Carousel: media player cell view does not detect taps if media player is hidden
Carousel: YouTube cell exposes if it is using UIWebView to display video
Carousel: overlay is forced to visible if a YouTube video is displayed with a UIWebView
Carousel: canHideOverlayViewAtIndex: is correctly queried before to hide
** Previous commit is wrong, this one corrects it: sorry **

Carousel view controller integrates new YouTube videos behaviour.
Carousel audio cells does not detect taps now.
Example project display name changed
Erased git attributes which makes Xcode proj a binary during commits
start view lists all "mobile published" city maps. moved from .html to index.php.

additionally:
- mobile citymaps have their own url (to which modern browsers dynamically change)
  (the newly created index.php takes over cityMapId and workspaceId)
- a new center button/label displaying the city-maps name as a link to the current citymap
Merge branch 'master' of github.com:mukil/kiezatlas-mobil
1) BASE is created in current directory
   2) The build function should accept more than 2 arguments
Make two objects into sprites, also scale the triangle object.

Remove 'friend' attributes in the threedObject.h {they are not needed}.
Removed friend attribute which is not needed.
Spacing and style changes.
File Browser View(Needs Review)
Merge branch 'master' of github.com:mundane/ETA_analytics
File Browser View(Needs Review)
nginx with cache_purge module
Revert "nginx with cache_purge module"

This reverts commit 671f2bd15362a6b36dfeba09dcef488f6d64d771.
nginx 1.3.1 rpm (including cache_purge module inside)
set mappage as default body class
Update HFYMP wording, fixes #32.
Fixed zram{start,stop} locations in systemd service file to match Makefile
Fixed module param num_devices is now zram_num_devices
Merge pull request #2 from gbagnoli/master

Fix paths in zram.service
inputButtonPressed default behavior removed
Added Twitter and News Search (Bing)
drive publishing works
another echo
Make sure to use appropriate ontology id
TextComponentPopupFactory works once again
vistas finales
after deleting some file
added MIT License minus distribution requirement
added new post: podcasts in china
Basic imprison/release logic
またREADME.mdを修正
first commit of old version with some fixes for SFML 1.6 (still not all right)
Fixed bug with setting the player.
Return from adjust_image_position unless sized
Purpose: PHP Info
Bug #62917 Handle translated MOD names correctly, fixed again.
[intl-de] Entferne AUTHORS Datei und aktualisiere Liste der Übersetzer
Merge remote-tracking branch 'nickvergessen/update-authors' into intl-de

* nickvergessen/update-authors:
  [intl-de] Entferne AUTHORS Datei und aktualisiere Liste der Übersetzer
Merge remote-tracking branch 'phpbb/master' into intl-de

* phpbb/master:
  Bug #62917 Handle translated MOD names correctly, fixed again.
Merge remote-tracking branch 'nickvergessen/intl-de' into intl-de

* nickvergessen/intl-de:
  [intl-de] sie => Sie und weitere Typos
  [intl-de] Entferne das Datum aus der Readme Datei
  [intl-de] Leerzeichen zwischen Lizenzname und Version
  [intl-de] Korrigiere Verion, Stand und Paketname in der README Datei
  [intl-de] Aktualisiere die Übersetzung für AutoMOD 1.0.1
DB changes for prod
compiled assets
thin instead of webrick
thin instead of webrick
asset pipeline precompilation
Asset pipeline compilation
jquery map back
Trying to fix asset pipeline heroku issues
asset pipeline
moving to rubyracer
scheduler optimization
Completing Registration Steps
Email templating in registration email
Commit's Info:

- Se Cambió el logo del sitio
- Se achicó el alto del banner, para que las imagenes
  Quedaran alineadas al borde inferior
- El texto bajo las imagenes en 'Lavervaterapia'
  se alinearon a la izquierda
cube + efficiency
Better backwards rotation
Working forwards rotation.
git: add diff stat aliases
git: add commits to log message when merging
Table cell editors fixed; no more table lockup
Use new events for password reset KPI (closes #37)
Permet de gerer plusieurs panoramas et de naviguer entre eux.
Permet de gerer des panoramas qui ne boucle pas.
Try to use Flash Canvas for IE
changements
Merge branch 'master' of https://github.com/nocentim/Cozy-Android
Added some basic testing.
Test StopableThread.
Added continuous integration scripts.
Added Travis CI build configuration.
Fixed installation on Python 2.6
Added more tests and more i18n support.
Took out terrible hack from open. Fixes role switching.
Fixed the crashing, dangerous ball still works.
Merge remote-tracking branch 'nbites/master'
Merge pull request #305 from emamanto/master

Fix USOpen Hack
Added git

Git added
ConnectDBSingleton change null
remove old
NXP-10208: fix marketplace package artifactId
Add the ability to add three photos
selenium testing: updated test cases
removed themes

removed themes i didn't care for
fixing inputrc tab completion
차트 페이지
change stat calulater

add daily stats
dataLen is unused and thus removed
fix get sample fabfile
Remove user list. Redirects to /not_found.
removing un-needed import

Signed-off-by: okkam1 <okkam1@hotmail.com>
Refactored code in Event Detection for user notification service. Have separate methods for match and evaluate_condition. These only return True and False.
reorder producer context
Issue #39 - Registration link not working
Merge branch 'Issue39' into develop
solr supports ru, en, de, fr, and it
fixed strange bug related to stored sunspot fields
Update notes for submitted changes

* Increase relative size of home button (Desktop)
missed a file for gh-274
json encode string
Fixed other lead source4
kaさん追加
Fixed block parser id.
Fixed programming blocks
Update README.md
Merge pull request #1 from srivastavarobin/master

My pull request
Add multiple cursors
Add expand region
Add hits algorithm
Bump version
Basic integration of acts-as-taggable-on for User class as :languages
fixed delete of asset, https://github.com/parmarg/asset_manager/issues/22
GOHAI
Add update instructions with virtualbox and vagrant
Switch from scala-tools to Sonatype for releases
Add 2.9.2
Set version to 2.3
Add clean SOA expire data to output. Also only use defined SOA records.
Did A1Q2. Housekeeping

Downloaded assignment descriptions and solutions for A1-A4
forgot to include actual dates
Bump version to 0.2.0.
Generalize MonadIO instance.
Fix broken finally implementation.

There were two bugs in `finally`.

First, `finallyP` was not recursing over the continuation of `Yield` and
`Throw` constructors, so finalizers didn't survive after a `yield`.

Second, `finally` was calling the finalizer after the end of the
`finallyP` block. But `finallyP` attaches the finalizer to the last
`Pure` constructor, so that was obviously incorrect.

Also add a regression test.
Add Control.Pipe.Exception.try.

Add a `try` combinator analogous to Control.Exception.try.
Fix PipeL implementation.

liftPipe for PipeL now lifts each constructor individually, and threads
the unawait state. Now a lifted pipe containing awaits will correctly
start to use queued unawaits.
Finish user sign up
Finish sign in
Finish user edit, update, index, and destroy actions
finish home
Remove a wrong builtin call in mkdcd

mkdir is not a builtin command.
Merge upstream changes
Re-symlinked the quack prompt theme
set time to Europe/London
Add new (clean) linear algebra library.
Add partial test suite for new linear algebra library.
Add additional read-only protections to test suite build.  Compile
test suite without optimizations for easier debugging.  Check return
value of random seed function.
Consistently use ECEF instead of XYZ to refer to ECEF Cartesian coord system.
Documenting and slightly touching up the function for calculating az and el between two points.
Touching up some comments.
Documented and cleaned up the NED conversion functions. Removed a bunch of trailing whitespace.
Updating copyright comment blocks at tops of files in libswiftnav.
Cleaning up and documenting code for getting CA codes, now a more general file to put functions to get different GNSS PRNs in.

Also fixed up some whitespace and made swift_nap_xfer_blocking more const correct.
Merge branch 'new-linear-algebra' of https://github.com/peddie/Swift-Nav-Code into new_lin_alg
Reverting gcc/ld flag changes from 59c01c1e14f1b6b12e1e918f60c500892c881b2f for now as they seem to create problems in some build environments.
Use random() instead of rand() for higher quality random numbers on BSD (i.e. OS X).
This check for non full rank matrix is not needed, already checked this a few lines above. 
Update license comment blocks for linear_algebra_new.
Cleaning some whitespace.
Changing names of new linear algebra routines in prep. for switching over to using these ones.
Switching over to the new linear algebra routines.

Also cleaned up some trailing whitespace.
Use old doxygen syntax for emphasis (the new style requires markdown support added in 1.8.0 which we don't have on the server yet).
Add step to the documentation build that compiles diagrams from latex/tikz source into PNG files that can be included from Doxygen. Added diagram for a Costas loop.
Documenting the loop coeff calculations and costas discriminator including diagrams.
fixes and public interface refactor
Added visual cue to volcano 1 that you need the skeleton key
Configure resend expired packet on env variables
kattis_armystrengtheasy.cpp: Finished.
adicionando filtro e consulta de last
adds notes on new features and braking changes
Refactoring JSHint execution code into separate class

Moved JSHint rhino code into standalone class to improve readability and
also a step towards also providing a command line interface. 

Signed-off-by: Phil Mander <philip.mander@gmail.com>
default to hash
bug #3521016 [edit] NOW() function incorrectly selected
Merge branch 'QA_3_5'
Fix popup message on build SQL of import
Fix undefined variable warnings
Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5
Czech localisation added
Stemming option on the search form #32
Code revision from coding rules point of view
Implements Parceable on all models; Lyrics activity
Patched granite to include SourceList for Tom's editor
ldapdiff
ZZX
ldap naar zimbra sync
alleen uid gebruiken, namen prive houdne
Whitespace, and testing GH integration. [finishes #35945305]
Duplicated tests that also applied to executable.
- BR: QtXmlPatterns-devel
delete unneeded files
Merge pull request #6 from litao91/master

Delete unneeded files
Pull from group and finish merging
MainTestActivity added. This activity include all testing activitis.
Updating docs, configuration
Исправлен глюк при редактировании номера продаваемого места
Работа над шаблонным мастером
Логические тесты баланса
Postersに「Bookmark」と「Audio」を追加するパッチ
 - タグ補完を修正
Replace null with empty string in returned json page data
Demo improvements
Update docs
DEMO LIB jui_theme_switch v1.00
DEMO LIB jui_theme_switch v1.00
Uniform Ditribution in x, y, z
changed ve to python 2.7
allows choice of python version
made script idempotent
Merge branch 'feature/port_to_python2.7' into develop
RSS syndication for listings
new files have a license header and a sub folder
Added documentation.
Added more documentation.
cleanup.
hue shifted icons for top panel
Merge branch 'master' of github.com:prototo/StreetsOfDFID
Backup changed files
Corrects the semantics of VertexStore.remove(removeCondition)

Fixes issue #18
- Added getAll(condition) method for vertexStorage
- Corrected the text conditions for edge removal
- Corrected the package declaration for the test case
Merge pull request #1 from uzh/master

Fix for storage stats
Initial commit
Use interface instead of subclassing
Handle close
Built classes.jar
some extra functionality

Signed-off-by: pussbb <pussbb@gmail.com>
Removed doctests.py that made tests of other packages fail.
Merge pull request #13 from tdesvenain/master

Removed doctests.py that made tests of other packages fail.
[compiz-ubuntu]:bug fixed
fix for text drawing in qt>=4.8,x
Fix for issue #19, also add in the "getDeclaredXXX" members,
which lists private/protected members.
Article is a URIModel
better test for ssh agent
even better
Z-Wert Anpassungen
finalised sample recording
type isn't required in <scrypt> and <link> in HTML5, fix broken tests
refined background pages and added OAuth
updated content.js and manifest
updated sendData.js
added extraction of highlighted content
removed server files
incorporated gmail authentication and resolved known bugs(notes file) 1-4
updated the notes/bugs file
changed access keys, changed storage scheme
raw code for separation of highlights
solved problem of overlapping and intersecting highlights
updated list of known bugs
webBook element being replaced by all its children and not just range.toString()
webBookElement being replaced by all its children exactly
removed alerts for general use, tested for 2 hours
separating text at every non-text node
Backs out migration of ensureUDFContext from SequenceFileStorage to Loader

This method wasn't being used by SequenceFileLoader anyhow. This helps keep current feature branch succinct.
skip empty blobs by default in binary_block format.
This is equivalent of how Base64Line reader skips
empty lines. This feature can be disabled if an
empty blob makes since in some context.
support for Thrift unions.
ThriftUtils : use return type of get method to
find the type of a field. This works for unions 
where there are no real fields in the class.
typo in method name 'getFiedlType()'
Merge pull request #155 from sagemintblue/hazen_remove_signature_is_null

Removes signature not null precondition in SequenceFileLoader
rename skipEmptyBlobs to skipEmptyRecords.
added a few utitility classes : IdentityBinaryConverter, RawRecordReader, RawRecordWriter
unit test for empty records in b64-line or block files.
add configuration for setting minimum number or errors
in input before failing. 
Merge pull request #162 from rangadi/empty_records_in_block_reader

skip empty blobs by default in binary_block format
Merge remote branch 'upstream/master' into record_reader_min_err_conf
Merge pull request #163 from rangadi/thrift_union_support

Thrift union support
add UnitTestUtil & makePigServer() method.
rename TestEmptyRecords to TestErrorsInInput.
update TestErrorsInInput to test error tolerance in
LzoRecordReaders.
skip test if there is no lzo configured
Merge pull request #164 from rangadi/record_reader_min_err_conf

config for min errors before failing in RecordReader
Release 2.1.11
prep for release 2.1.12
Switching to bootstrap
Coming up with way to handle forms.
Admin and forms and whatnot
Deleted files.
putting dashboard path in the correct place.
Merge pull request #52 from jcannava/ubuntu-precise

fixing path
First push of GUI elements
create example configuration script
added support for image attachments, thumbnails, and basic support for attachments pro attachments, moved configuration into config file
Removed reliability steps from workflow
added paper processing to postprocess directory; gitignored credentials.json
added functions to convert rain pixel to modis pixels
added rain series tap and tests
renamed variables in casc query for clarity; commented out old rain functions
formatting change
updated rain source and tests to source directly from rain-values output
Revised rain preprocessing, filled out tests, moved some functions
Extract rain separately from converting to MODIS
Automatic update [Thu Jun 28 06:11:55 CEST 2012].
who the fuck knows onthis machine
merged
fixed the mapping of userid
Merge branch 'qa' into development

* qa:
  forgot to fucking hit save
put constrings in gitignore.  fixed some queries
Merge branch 'development' into qa

* development:
  put constrings in gitignore.  fixed some queries
  fixed the mapping of userid
  who the fuck knows onthis machine
Add a flag to adt data to make it recognizable and also only pass in arguments to the wildcard pattern, same as other evaluators
Add the key / pattern parameters to the `this` parameter of the adt
Working on ignoring private members starting with the _ character
Added a function to deconstruct data directly (without an evaluator)
Prepare for two more serialize/deserialize tests
Fix the serialize method (so that it properly supports strings with quotation marks)
Fixed several .dup() methods to duplicate all fields and added a null check in formatType().
Added photo counter, and sped up photo retrieval
projects working, still need to tweak CSS to not go boom w/ overflow
Project#show view

One can add users to the projects, remove someone from the project on
that page (with a modal dialog).

The select used to add people disappear when there are no candidates
left.

!!!! NOTE !!!!

I removed something in assignments that I don't think was supposed to be
in the code:

-    @bind 'change:id', (assignment) ->
-      assignment.view.render()
+    # @bind 'change:id', (assignment) ->
+    #   assignment.view.render()
Add jsontmx import plugin
Moved creation variables from mp to cs namespace
Added iceil() function to vmath
Updated system generation to replicate global unit cell
Updated neighbourlist to use unit cell interaction list
Merge branch 'master' into system_generation_2
Clean-up of sundry junk files in root directory of repository
Bugfix: Amended neighbour list calculation to use integer unit cell coordinates to prevent segfault
Added interaction range to unit cell class for MPI neighbour list calculation
Implemented transfer of supercell coordinates to allow new neighbour list generation method
Code Tidy
Added option for periodic boundary conditions for serial code
Bugfix: Corrected MPI neighbour list calculation for > 1 atom/unit cell
Merge branch 'develop' into system_generation_2

Conflicts:
	vinput
Bugfix: Prevented error in neighbourlist calculation from incorrect usage of unit cell category id
Bugfix: removed legacy calculation of supercell coordinates incompatible with non-orthogonal lattices
Added read-in of unit cell for replication. Moved read of unit_cell dimensions to within unit cell class.
Added neighbours class to record interaction id 

Interaction id of each i-j pair is required to form complete interaction list. Also fixed scope errors in mpi compilation and added better estimate for number of neighbours in a given unit cell. 
Implemented vectorial and tensorial exchange calculation

A list of interactions is compiled from the unit cell data and stored in atoms namespace. A vector and tensor class have been defined for performance. New functions have been written to calculate the exchange fields. 
Commit of estimated number of interactions/atom
Merge branch 'system_generation_2' into develop
changes to polaroid pictures
added spec coverage for cron provider logging output via popen4
refactored mock logging to make it easier to assert log contents
fixed buggy log_should_not_contain_text()
updated Gemfile for next custom chef and ohai
quick fix for failing to create /var/cache/rightscale during spec runs on dev box
Merge pull request #52 from rightscale/azure_12_3_fix_chef_popen4

Azure 12 3 fix chef popen4
Remove all use of right_link_dir
Merge pull request #53 from rightscale/azure_12236_fix_integ

Remove all use of right_link_dir
Refs #11855 Changed all references from thread_name to runlist_policy and adjusted specs accordingly.  Pointing to master of right_agent for the time being.
Refs #11855 Added audit creation to the instance
Merge remote-tracking branch 'origin/azure_12_3_system_logger'

Conflicts:
	Gemfile
	Gemfile.lock
Refs #11855 Handle nil runlist_policy cases
Added squelching of audits instance-side when a policy name is in effect
Refs #11855 Bumped right_agent with newest payload change
must always initialize the resource_uid to ensure we can detect restart
remove the original line where we set the resource uid
Merge pull request #54 from rightscale/azure_12_3_9782_need_to_init_resource_uid

must always initialize the resource_uid to ensure we can detect restart
Handle nil fingerprints when updating login policy
Merge pull request #55 from rightscale/azure_12086_optimize_login_policy

Handle nil fingerprints when updating login policy
metadata writer looking of user-data.txt in wrong dir
Refs #11855 PolicyManager public interface defined
add arg-test on section9
Add support for removing old files during upgrade #716
Remove unneeded call to new_schema #716
Remove needless ::
Minor polish and better .gitignore entries
Refactoring and adding TradeMinister class
Re=-adding these commits due to git svn pain.

git-svn-id: svn+ssh://svn.internal.cwa.co.nz/vol/work/infrastructure/linkcheck/trunk@21091 5f79d30b-c411-4e78-a681-ab1a8db94be4
Merge branch 'master' of github.com:robomc/linkcheck-core
Revert temporary fix for #178.
[Test] Fix typo, json_file to json.
Get correct path of current executable, and read symbol link when extracting packages. Fix #186.
Temporarily removed encryptable from user model
Adding much-needed comments
Fixing animation stuttering on event ajax load
Fixing withdrawal policy bug
another typo fixed.
rqt_runtime_monitor: initial commit
updated new status bar features
Adding a pom file.
New algo: late_coercion
Fix deploy.rb typo.
Fix notification badge style.
Add avatar to Home topic list.
fix naming problem in theirs conflict script
More change changes
Removed singular content template stuff for now.
エラーを表示するようにした。