labofsahil/github-event-dataset-2012 huggingface dataset:
parametrizacia XPATH na zaklade zvoleneho XML
Merge branch 'master' of ssh://git@github.com/mathio/tia_sluzba.git
you can select the country on newsletters
Better button spacing in overlay (bug 809987)
updating a few submodules
Simplifying .bash_profile
Added new config class
czech locale
use 'pk' property instead of 'id' to access an objects primary key. Primary key is not guaranteed to be named 'id'.
Merge branch 'master' of git://github.com/domasx2/feincms

* 'master' of git://github.com/domasx2/feincms:
  use 'pk' property instead of 'id' to access an objects primary key. Primary key is not guaranteed to be named 'id'.
add support for custom comments
Merge branch 'master' of git://github.com/alekam/feincms into next

* 'master' of git://github.com/alekam/feincms:
  add support for custom comments
  use 'pk' property instead of 'id' to access an objects primary key. Primary key is not guaranteed to be named 'id'.
  czech locale

Conflicts:
	feincms/admin/tree_editor.py
[posto] scheduled 'don't sort on 'start''
[posto] scheduled 'get rid of -f filename feature'
[posto] scheduled 'convert to thor or boson'
[posto] work on 'display cl help message'
[posto] scheduled ''start' should checkout, initial commit to a feature branch'
move command help to a separate md file
[posto] doing 'get rid of -f filename feature'
[posto] finished 'get rid of -f filename feature'
Allow the configuration to be overridden in the environment.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
fix spelin eror

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Remove AOKP bml_over_mtd workaround

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
I still can't spell, gesh

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Error out if the build fails to upload to goo.im

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Fix vi modeline

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Fix my space damage

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Bail out if the build fails

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Move error() definition after abort()

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Fix default configuration options

I forgot to assign them to something

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Acidify version 0.4.0

This is the last bash release. I will be rewriting acidify in Python after this.

This release introduces a global configuration file so script modifications are no
longer required or encouraged. Additionally, all config options can be overridden by
the environment. This makes way for acidifies use in automated build scripts and
when building for multiple devices. Further more, if a build environment is 
configured, you can invoke acidify from anywhere.

See config.sample to create a config for yourself. Save it as ~/.acidify/config

e.g. for running with environmental variables:

DEVICE=vibrantmtd MANUFACTURER=samsung acidify config

will run acidify config for the device vibrantmtd instead of whatever the script's
defaults are, or the options set in the config file (if present).

Options priority ENV(highest), config file, script defaults (lowest)

Signed-off-by: Max Fierke <max@maxfierke.com>
moved key into key.txt, on gitignore
Set JettyLauncher Resource Base to dinamyque path
 * In previous version the jetty resource base was in absolute fixed path, this only work on my computer.
 * The new resource base using system property named user.dir
Maven party
OPTableView was taken out.
added filter to audit pagination
updated zuul download url to use amazon s3
moved zuul.shtml to index.shtml
bundle help
Remove failing test.
Merge branch 'master' of https://github.com/mcclurmc/aepfacts
added exercise 6
added exercise 7
delete error code
vim: Add sub-header macro.
more readme finangle
FIXED MIFOSX-19: Group formation
abstracting out native vs iframe nodes and real-time resize
node fork nodeiframe fixes
new branch
pre-merge
pushing unminified version with recent changes (ignore native node stuff, will change)
chop array, show last
GROOVY-5289: another naming fix, now including getResource("/") for the long paths
GROOVY-5809: fix file path encoding by using uri to avoid encoding artifacts from URLDecoder
Fix for failing Bamboo build: AST xforms should never use internal constants
GROOVY-5593: A module using an incompatible class format version would prevent groovy from running
Fixed dependency issue with Status jersey endpoint
Added basic checkpoint tests to ep_testsuite.cc

These tests cover basic checkpoint creation as well as checkpoint
deduplication and collapsing tests.

Conflicts:

	ep_testsuite.cc

Change-Id: I2ff57019afc7f0c078bb7044733dfb27a527a28d
Reviewed-on: http://review.couchbase.org/15475
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Tested-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Added ability to track tcmalloc allocations

Change-Id: I36146728ef395bb15f34c324eb411874250b4c26
Reviewed-on: http://review.couchbase.org/13777
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
Remove unnecessary abort in CouchKVStore

Removed abort calls that were mainly added for debugging
(other than obvious ones). Replaced them with better
error return instead.

Change-Id: I0894f19b58e04a979b0bc16c78d176537502929a
Reviewed-on: http://review.couchbase.org/14589
Reviewed-by: Junyi Xie <junyi.couchbase@gmail.com>
Tested-by: Jin Lim <jin@couchbase.com>
MB-6560: handle absense of bucket on UI node in views

Because in order to list ddocs we contact local ddocs service and
because that service won't be even started on pending-add nodes,
previously we'd crash with noproc.

We also had similar problem with random key where we in fact need at
least single vbucket hosted by UI node.

Now both server side and UI handle this condition somewhat.

Change-Id: I56b3c6f7ec496bd196b7d3ebf8edad9064b538c9
Reviewed-on: http://review.couchbase.org/20663
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Pavel Blagodov <stochmail@gmail.com>
Reviewed-by: Aliaksey Artamonau <aliaksiej.artamonau@gmail.com>
change to opengl
Merge remote-tracking branch 'origin/memo' into tom
local changes to celeine and lorna
getting up to date
resolve more conflicts
IMPORTANT updated all scenes to work with !useOpenNI
mani stars
Merge branch 'memo' of https://github.com/memo/triggershift into memo
added painting trees from b and w to colour scene to Lorna - no crayon right now - just hands
Update some states
First update for #108
First improvement for the UI
Update Template
simple tool to see read distribution length in a FASTA file
remove unnecessary file
an embarrassingly useless trimming script .. I promise I will offer a better one when I have time
Check string equivalence, to prevent some edge cases
Quash flash error on default homepage load
Algorithms: Add newline at end of file
trying the latest hubot-irc script
Treat .md files as Markdown files'
replaced tabs 2 x space
made more RESTful
switched wording from gate code to gate adress
introduced a page params checker
DIV 설정하는거...가운데정렬, 팝업 띄우기
Add Snipper class in API and example
add SSL to production
error free
Modify zshrc

* Add -h option to ll alias
* Change keybinding to emacs mode
size optizimations
saving dist
v1.3b FilmOn
changed resource and category relation
Finally cleaned up the branch

branch cleaned updated and tested
Debug upravy.
local用
removed users table
Deleted Compass.apk
Upload
"listjobs": show "Succeeded" jobs only if "-verbose" is set
Fixing bug in function tracing of simulem.py

The problem comes from the difficuly to associate irx number from the ini
file and the dtra dictionnary. It is necessary to introduce a new dictionnary
which handle the association between radiorx.ini and dtra[utx][irx]
some bugs
Merge remote-tracking branch 'bernard/master'
adding 3 functions to pyutil to manage zipfiles
gemrc, xmodmaprc and gitconfig
Second merging test
[openbox] gtk-3.4 patch
Maybe we need some moar libz?
JBTM-934 Add a flag to not run the QA suite against JacORB
JBTM-934 Allow the script to run a specific QA target
JBTM-934 Allow the script to run a specific QA target
rename README
update description
restructure readme
remove some cruft
regexes for directory exclusion
Fixing how stuff is stashed in git config

since git has a serious problem with underscores.
Refactor schema parsing using SimpleXML
Fix xPDOObject::_loadInstance for graph objects

In cases where the same class was being loaded with an alias as a related child object from a graph query, the child object was being hydrated from the parent object improperly.
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Fix xPDOObject::_loadInstance for graph objects
  Refactor schema parsing using SimpleXML
Renamed HEIGHT to Z-OFFSET.
Added applications to menu, changed theme border
Makin compilation part in the readme more readable.
Now the user can sort the birds alphabetically.
Working around mongo db bug SERVER-7547
Add forgotten var statement in a docs example
Remove unnecessary FakeFS to get actual test project in tmp dir on file system
Merge branch 'master' into ddaniels_excon_update
Require test helper
ie7 subnav ulmargin add 5px
Sushmita,Sharvani | #93 | Adding httpd.cof to handle authentication.
Sushmita,Sharvani |#93 | Added exclusion list to the apache authentication.
Dev, Dheeru | #2 | IT Admin & CMF Admin creation
V2 | #557 | Made sort criteria as a Linked hash map
Vishal #0 Renaming test to fix compile error
Vishal #0 Adding Test back with correct name
Revert "V2, BalajiN | #520 | Providers are also responsible containers that are assigned to them by cmfadmin"

This reverts commit 0cb79e0f3c26df7db21aa3d165fef6a05698169c.
V2, BalajiN | #520 | Validating if container is assigned to provider before verifying validity of provider range
V2, BalajiN | #0 | Always storing providerid in lowercase
front controller code update
fix bug filtering duplicate strings
Bug 775067: Start using Cu.nukeSandbox for CommonJS modules.
Merge pull request #479 from ochameau/leak/use-nukeSandbox

Bug 775067: Prevent leaking sandboxes by using Cu.nukeSandbox. r=@gozala
'or' was not gettext() decorated in index.ejs - allow a translator more control over the whole phrase
on /signup use named arguments to gettext to allow the translator the freedom to re-order text
main site layout needs lang and dir args on the html tag
adorn confirmations on main site (like 'd00d, sure you wanna cancel') with gettext() for proper extraction and substition
support using custom TEST_DB_PREFIX on the datazilla datasource as well as testproj and testpushlog dbs.
More clarity re memcached setting in docs.
create_project has been renamed to create_perftest_project
Merge pull request #59 from rniwa/rename_create_project_to_create_perftest_project

create_project has been renamed to create_perftest_project
added explicit get call
added read_only_host column to datazilla.datasource that gets passed to datasource module, updated ro sql
updated to work with https
updated sql to use read_only where appropriate
added manage command to clear datasources from memcached, removed ON DUPLICATE KEY sql that was generating a warning on prod
Merge pull request #60 from mozilla/prod-changes

Prod changes
new command to reset cached datasources
changed back to ON DUPLICATE KEY strategy, change did not fix issue on production
added --load option to collection command
made changes
merged master into branch
changes for metrics
changed a bunch of stuff
Added function My_Func::auto_link($str, $is_blank = true)
Fixed some menor issues for 2.4
Fixed VC2010 projects
create /delete patient
styled the 404 page
Correct handling of 0 and Infinity ScaleHint

minScale and maxScale values of 0 and Infinity do not make sense in
OpenLayers, but they are used in WMS GetCapabilities 1.1.1 to indicate
that there is no minScale or maxScale restriction. Assuming that the
capability values for minScale and maxScale are passed as config options
to a WMS layer, it is better to not set minScale and maxScale when 0 or
Infinity are found in the ScaleHint.
Fix exporting empty vector layers to OWSContext.

When a vector layer is exported to an OWSContext document, we throw an
exception when the layer contains no features, and the geometries are to be
exported inside of an InlineGeometry-element.

This commit fixes this behaviour by exporting sth. like this in such cases:

<Layer name="vector" hidden="0">i
  <ows:Title xmlns:ows="http://www.opengis.net/ows"/>
  <InlineGeometry/>
</Layer>
Reuse variable, thanks @bartvde.
Merge pull request #761 from marcjansen/owsc-inlinegeometry

Fix exporting empty vector layers to OWSContext (p=me,@chrismayer;r=@bartvde).
parse annotation from WFS DescribeFeatureType schemas
remove JSON parsing from format, applications should handle this, as suggested by @ahocevar
appinfo can be specified multiple times, so use an array instead thanks @ahocevar
documentation is also an array, and lang is optional thanks @ahocevar for the catch
Documenting ScaleHint parsing, as suggested by @marcjansen
Merge pull request #760 from ahocevar/wmscaps-scalehint

Correct handling of 0 and Infinity ScaleHint. r=@marcjansen
Merge pull request #762 from bartvde/schema

parse annotation from WFS DescribeFeatureType schemas (r=@ahocevar)
make sure we can have multiple feature ids in InsertResults
Merge pull request #763 from bartvde/insertresult

WFST 1.0.0 InsertResult not read correctly (r=@pgiraud) thanks Pierre for the quick review and thanks to @fgravin for the detailed bug report
make sure we do not fail if OpenLayers.Projection.defaults has not been set for a custom projection
Merge pull request #767 from bartvde/projdefaults

make sure we do not fail if OpenLayers.Projection.defaults has not been set (r=@ahocevar) thanks @pvgenuchten for the report
Avoid !important when not needed.
This css selector is sufficient to override bootstrap’s one.
Merge pull request #769 from tonio/noimportant

Avoid !important when not needed. img.olTileImage is precise enough to override boostrap’s rule.
Fixing regression introduced by #732

Now that serverResolutions are set for all layers, we need to generate
resolutions also for non-baselayers.
Merge pull request #775 from ahocevar/wmts-resolutions

Fix regression introduced by #732. r=@sbrunner
Checagem de erro para o módulo gnomevfs
Nan on Git
Se cambio el dominio de Prestamo para que los atributos aprobado y reenviarSolicitud fueran obligatorios

Signed-off-by: MIGUEL <miguel@miguel-Satellite-L635.(none)>
US2307
US2307
Merge branch 'master' of https://github.com/openshift/crankcase
Merge branch 'master' of https://github.com/openshift/crankcase
Merge branch 'master' of https://github.com/openshift/crankcase
Fix for bug 823675 - Exposing gear count in application and consumed gears in user object via rest calls
Fix for bug 822722 - Handling boolean as well as string input values for boolean parameters in rest controllers
Typo: used else if vs elsif
Enable mongo datastore unit tests
Set debugging output to false
Merge pull request #87 from jwhonce/master

Set debugging output to false
Merge pull request #85 from abhgupta/bz823675

Fix for bug 823675
Fix for #822837. Namespace update was using wrong function to call node.
Merge pull request #88 from kraman/dev/kraman/bugs/822837

Fix for #822837. Namespace update was using wrong function to call node.
Merge pull request #86 from pravisankar/master

Enable mongo datastore unit tests (bug# 824037)
Merge pull request #91 from mrunalp/master

Fix for bz 816171
Bug 825354
Merge pull request #95 from danmcp/master

Bug 825354
Merge pull request #89 from abhgupta/bz822722

Fix for bug 822722
Merge pull request #94 from mrunalp/master

Fix for  bz 813061
Finished binding, added python test, added dll target
Added active base setting to test script
Bob Kleemann reported that logdie() in wrapper classes
printed incorrect caller lines. Fixed by adding
caller_depth_offset() utility to Log4perl.pm.
auth: eval 'use' so plugins can be enabled by default

and tested.
auth_vpopmail_sql test, eval 'use DBI' before testing
checkpassword: remove newlines that appeared
auth: adding tests (should have attached with a previous commit)
restore validate_password test

not sure how/why that got removed, but it wasn't intentional
comment out vpopmail/checkpasswd plugins in config
added new t/config directory, with developer tests

run when $ENV{QPSMTPD_DEVELOPER} is set

plugins file is same as in config.sample, but with more stuff enabled
added note in file telling which plugin uses it
Merge branch 'auth' into spf
spf: make sure headers exist before add attempt

remove a: return (OK)
    it prevents subsequent MAIL FROM plugins from running
    Nobody on the mailing list spoke up to support that behavior
Updated for sbt 0.11.3
translated core-utiliti-libraries/router.rst into ja
add ja/core-libraries/helpers/cache/rst

add translate into Japanese
Merge pull request #298 from BiMihoujyun/ja_bm

add ja/core-libraries/helpers/cache.rst
Add new ja translate : String : Retry
Add new ja translation: Security
fixed comment location was wrong
translate 2.2-migration-guide to Japanese
translated core-utiliry-livraries/set.rst into ja
modified sanitize.rst
add development menu and tralslate development.rst file
add ja/core-utility-libraries/inflector.rst and sanitize.rst
completed incomplete translation
added models/transaction.rst
added models/transaction.rst
added models/transaction.rst
Merge pull request #301 from suzuki/ja-translate-string-retry

Add new ja translate : String : Retry
Merge pull request #305 from ichikaway/2.2-migration-ja

translate 2.2-migration-guide from English to Japanese
Merge pull request #306 from hiromi2424/ja-core-utility-libraries

Ja core utility libraries
Merge pull request #307 from ichikaway/develepment-menu-ja

added development menu and tralslated development.rst file
Merge pull request #309 from meriiken/ja

add ja/core-utility-libraries/inflector.rst and sanitize.rst
modify syntax
More commands.
Add \!help and fix regexp for nick with weird characters.
Remove ontopic command.
Use same args signatures for PO#on_signal and POI#on_signal

Fixes issue #31;
ProxyObjectInterface#on_signal shares now the arguments signature whit
ProxyObject#on_signal and can be used without specifying explicitly the
bus parameter, since the POI itself already owns the reference of the
bus is being used on.
Test the new ProxyObjectInterface#on_signal

Ensure the api is properly tested inside the test suite
Merge pull request #37 from stoffie/issue31

Use the same args signature for PO#on_signal and POI#on_signal
Seperate directory traverser in class
Cleanup AlvaraEngine into Mirror/Scanner
Project file
Add single dot as special case of key tag
[NSFileManager applicationSupportDirectory]
use constants for error message.
Switching to a static storage mechanism which supports far-future expiry.
Removing all un-intelligent static references.

All static resources should be able to take advantage of long-life expiry times after this.
Updating Bootstrap to 2.0.4
Fixes for Twitter Boostrap 2.0.2 to 2.0.4 migration.
Fixing filter field length.

Apparently support for "span*" classes on inputes ceased and was replaced by "input-<size>" classes.
Merge pull request #105 from tjdett/caching-static

Caching improvements for static files and images
index.html body restored
Merge branch 'master' of https://github.com/n1koo/pohjalainen
test touching a file

blah blah blah, I touhced a file.
Added Altoholic v5.0.002

Added Altoholic v5.0.002 by Thaoky and pompachomp
More changes to slopefield
traverse the domain and gather scripts
update README
Add JSON method to Response
smart beginning of line
Add draft of rsync-snapshot pool.
MDL-32037: MDL-32037: After displaying error message filepicker could not send proper request to server

We need to make sure that code executed on error does not create more requests and
especially does not create the same request that resulted with error. So now by default
filepicker will clear the right side of the window if repository_ajax.php returned an
error.
Also fixed an 'invalidsesskey' error string.
MDL-32036: Repositories wikimedia and youtube lack paging

repositories wikimedia and youtube:
- save last search in
- process parameter 'page'
- remove buttons 'Refresh', 'Search' and 'Logout' since they don't have meaning
filepicker:
- allow unknown number of pages (['pages'] = -1), show one 'Next' page after the current (both JS and non-JS modes)
repository wikimedia:
- add non-AJAX search form to make it work with JS disabled
MDL-28972 formslib: whitespace fixes
MDL-31911 admin tools: moved loop after tools admin category created
MDL-26243 calendar: display correct number of repeated events
Automatically generated installer lang files
MDL-27064 - Blog - Changing the link text for different levels of blog entries
MDL-32028 Documentation : removed legacy 1.x documentation
MDL-30890 accessibility compliance: add summary to calendar table
Merge branch 'install_22_STABLE' of git://github.com/amosbot/moodle into MOODLE_22_STABLE
weekly release 2.2.2+
MDL-31594 question manual grading: did not handle comma as decimal.
MDL-31528 navigation: Fixed up generation for category contexts
MDL-31528 navigation: Fixed up navbar generation when editing categories
MDL-31528 navigation: Tidied up page for viewing and managing categories
MDL-31835 message: added a view conversation type link after each conversation on the recent conversation screen
MDL-28952 blocks: Fixing the extra escaping issue with profile links
MDL-32079 folder revision must be incremented after any file change
MDL-32071 fix fatal problems in experimental forum_usetextsearches
MDL-32071 fix incorrect get_dbfamily() call
lowercase and shorten some facility names
IndexFile 기능 개발

jstl을 이용해서 화면뿌림

Overview에 TopRank 부분은 적절한 자료구조 모색후 개발
Merge pull request #63 from kgcrom/master

admin페이지에 IndexFile기능 구현
confirm before delete #749
added more options to the customizer and started working on the masonry js
do not print navigation
flashback to Scroll :|
App has been styled and script to save data to local storage is complete
removed template console.log in order to be friendly with crapy IE
change states page; add a editer plugin; change relative URL
Roll on poms to 1.5.0-SNAPSHOT, moving results tokens to new package, moving ExecutionListener into dedicated package
Disable trace test comparison for now

The t_trace output isn't consistent from run to run.  To fix "make
check", disable the comparison against the reference file until we can
make the output consistent.
Fix uninitialized memory errors in t_trace.c
Fix k5test.py hostname canonicalization

r25844 (#7124) stopped using AI_ADDRCONFIG when canonicalizing
hostnames in sn2princ.  So we need to also stop using it in k5test.c's
_get_hostname() or we could come up with a different result on a
system where forward and reverse resolution via IPv4 and IPv6 produce
different results.  That in turn causes a t_gssapi.py test (the one
using the un-canonicalized hostname) to fail, because libkrb5 looks
for a different host principal than k5test.py put in the keytab.
Add control over enctypes supported for session key enctype negotiation

    This adds a principal "string" (key: session_enctypes) by which
    to specify what enctypes the principal supports for session keys.
    (For what it's worth, this actually allows one to list
    des-cbc-md5 as a supported session key enctype, though obviously
    this hardly matters now.)

    This also adds a [realms] section parameter for specifying
    whether to assume that principals that lack the session_enctypes
    key support des-cbc-crc for session keys.  This allows those who
    still need to use allow_weak_crypto=true, for whatever reason, to
    start reducing the number of tickets issue with des-cbc-crc
    session keys on account of clients that still give des-cbc-crc
    preference in their default_tgs_enctypes list.
azucar blanca total zafra
Use sum()
Add space
big batch testing plus improved logging
Rename *_uci_move() to *_uci().
minor changes to models
Merge branch 'dns' of github.com:ninuxorg/nodeshot into dns
Merge branch 'dns' of github.com:ninuxorg/nodeshot into dns
Merge branch 'dns' of github.com:ninuxorg/nodeshot into dns
Improvements to admin and minor bug fixes
minor changes to models
Merge branch 'refactoring' into dns
メインロジック作成
Bugfix for ASN highlight in traceroute for Vyatta
Pirix communities
Bugfix for prepend/postpend commands for other routers
Added different approaches for Buffering. Compare them as soon as BufferedXYZDeliverer3 is working as exspected
finished lesson #01.
finished lesson #02.
finished lesson #03.
パッケージ名を修正。
Tweaks to mvc bundle
ecran détail
unread notification support
remove mistakenly added folder
uprava formatu rozpoctu
uprava formatu rozpoctu
Uprava loginu a prav.
writing out destination/working folder (to stdout)
Added .travis.yml
Updated README
Fixed issue with exports.
global update site
proper closing of the fanin channel in request
Little change in a Garmin function.
Changes in coroutine code for future purposes. No idea whether it'll
work...
Including coroutine.h.
Some final test cleanup.
NXP-9429: fix typo in flavor merge
added random grammar generator program
KERN-2763 and KERN-2765 Unit tests to demonstrate how corrupt sakaidocs get migrated
KERN-2759 ensure block_image_left widgets are added in migration
Merge pull request #736 from zathomas/kern-2759

KERN-2759 fix the support for block_image_left widgets
KERN-2753 Add option to :merge content when updating. :replace works like "continue if exists" and so :merge is needed to control whether the update merges or replaces the existing content.
Use replace(..) in sparse when :replace=true && :merge=false.
KERN-2753 Build fixes for sparse changes. Add note on how some methods should be refactored in the next release.
Merge pull request #737 from thecarlhall/kern-2753

KERN-2753 Add option to :merge content when updating.
KERN-2766 keep html blocks and widgets in order
KERN-2769 Unbind POST operation in the LiteBasicLTIConsumerServlet

KERN-2769 Updating servlet service docs and removing deprecated methods.
Merge pull request #739 from mrvisser/KERN-2769

 Unbind POST operation from basiclti servlet
KERN-2763 Sparse upgrader to fix sakai docs with 'undefined' nodes
KERN-2763 Partial implementation of the undefined node fixer
KERN-2763 Finish impl of undefined-node fixer
Unit tests no longer needed, so Revert "KERN-2763 and KERN-2765 Unit tests to demonstrate how corrupt sakaidocs get migrated"

This reverts commit ec906f6ee446afb4a0e3848e6350db97e782eed8.
KERN-2766 fix regressions that popped up with the kern-2766 fix
Merge pull request #741 from zathomas/kern-2766

 migration: some migrated elements out of order
KERN-2763 Move structure0 to files API
Merge pull request #740 from ctweney/kern-2763

Kern 2763
KERN-2771 Creating a special operation for publishing sakaidoc pages: SakaiDocPagePublishOperation.

This was created to overcome issues with replacing sakai messages when page is published. This Operation will maintain a history of sakai/message nodes that existed prior to the draft being published, and be overlaid onto the final content after the draft has been published.
KERN-2777 Provide the ability to granularly "@Ignore"

This change allows UI devs to specify @Ignore as a key suffix in a JSON import that instructs the server to completely ignore that tree of content. No content below that node (including the node itself) should be updated or deleted.

An example import of content can be:

{
  "id3973361": {
    "comments": {
      "message": {
        "sling:resourceType": "sakai/messagestore",
        "_created": 1334613157826,
        "_id": "e1pKIIgOEeG4WfQRwKgBAw+",
        "_lastModifiedBy": "admin",
        "_lastModified": 1334613157859,
        "_createdBy": "admin",
        "_path": "l6yabccQGq/id9487514/id3973361/comments/message",
        "inbox@Ignore": true
      }
    }
  }
}

Where everything below id3973361/comments/message/inbox, including 'inbox' itself will not be modified or deleted. Note that the following are considered equivalent:

"inbox@Ignore": true
"inbox@Ignore": {}
"inbox@Ignore": []

As the value of the content is not important below this point.
Merge pull request #745 from mrvisser/kern-2771

 Creating a special operation for publishing sakaidoc pages
- Changed repository name.

Signed-off-by: Offox working to UGDSoftware <offox2001@gmail.com>
payload data of the packet is saved

also "/".join issue is changed in a more pythonic way
fix for the getting file md5 is added
field and function is added for taking tcp packet payload to the handler
field and function is added for taking udp packet payload to the handler
packet payloads are saved, model field is added to the model definition
displaying pcaket details at the template is handled

with this temaplate change fixes #7
combining string with \n maked them easy to display at the temaplate
handler fix after md5 sum function is changed
virustotal scan result links are added to the smtp attachments at the template
smtp attachments are sent to virustotal for being analyzed
Correct return type of method
Add dependency: ORMLite
Add TestNG jar file
search word by double clicking
Using PopBoxTelefonica
Bump version due to updates
Updated background map image
getposition fix auch vorher aproxximiert.
dddd
conny test
deviation in measurements
konny: xDeviation  yDeviation in measurements
REMOVE_MICROVOIP_DSL depends on REMOVE_VOIP_ISDN

git-svn-id: file:///var/svn/freetz/trunk@9770 149334a1-2f27-0410-a3b9-fc62619ac1e6
apache2:
 * disable lua dependent modules explicitly to avoid build problems on systems with no liblua installed in cross-compiling environment and with liblua installed on host
 * provide menuconfig option for libxml2 dependent modules, disable liblxml2 explicitly to avoid host-libxml2 related build problems, fixes build problem reported in #1110


git-svn-id: file:///var/svn/freetz/trunk@9033 149334a1-2f27-0410-a3b9-fc62619ac1e6
Fixed NOrway as a language
Fix of broken unit tests
+ ‘Ley de PI 1928/ 2011-11-19.pdf’
+ ‘Ley de PI 1928/2011-10-28 15.57.36.jpg’
+ ‘Ley de PI 1928/2011-10-28 15.58.09.jpg’
+ ‘Ley de PI 1928/2011-10-28 15.58.33.jpg’
+ ‘Ley de PI 1928/2011-10-28 15.58.58.jpg’
+ ‘Ley de PI 1928/2011-10-28 15.59.38.jpg’
+ ‘Ley de PI 1928/2011-10-28 15.59.50.jpg’
+ ‘Ley de PI 1928/2011-10-28 16.00.04.jpg’
+ ‘Ley de PI 1928/2011-10-28 16.00.27.jpg’
+ ‘Ley de PI 1928/2011-10-28 16.00.43.jpg’
+ ‘Ley de PI 1928/2011-10-28 16.00.57.jpg’
+ ‘Ley de PI 1928/2011-10-28 16.01.07.jpg’
+ ‘Ley de PI 1928/2011-10-28 16.01.19.jpg’
+ ‘Ley de PI 1928/2011-10-28 16.01.38.jpg’
+ ‘Ley de PI 1928/2011-10-28 16.01.56.jpg’
+ ‘Ley de PI 1928/2011-10-28 16.02.08.jpg’
+ ‘Ley de PI 1928/2011-10-28 16.02.21.jpg’
+ ‘Ley de PI 1928/2011-10-28 16.02.24.jpg’
+ ‘Ley de PI 1928/2011-10-28 16.02.30.jpg’
+ ‘Ley de PI 1928/2011-10-28 16.02.39.jpg’
...
+ ‘PI concepto dificil de tragrar/Bibliografia/Derecho de ¿autor? El debate de hoy.pdf’
+ ‘Eventos Cultra Libre/.~lock.Bases del Concurso-Ensayos-libres.odt#’
+ ‘Eventos Cultra Libre/AntologiaPoeticaHackerEnsayisticaLibertaria.epub’
+ ‘Eventos Cultra Libre/IVFestivalPoesiaBanerWeb.png’
+ ‘Eventos Cultra Libre/IVFestivalPoesiaBanerWeb.svg’
+ ‘Eventos Cultra Libre/RevistaBanerWeb.png’
+ ‘Eventos Cultra Libre/RevistaBanerWeb.svg’
+ ‘Eventos Cultra Libre/pdfreaders-f.png’
+ ‘Eventos Cultra Libre/pdfreaders-f.svg’
+ ‘Eventos Cultra Libre/rutaHormiga_BanerWeb.png’
+ ‘Eventos Cultra Libre/rutaHormiga_BanerWeb.svg’
+ ‘PI concepto dificil de tragrar/Bibliografia/lipovetsky, gilles y serroy, jean - la pantalla global.pdf’
/ ‘Eventos Cultra Libre/AntologiaPoeticaHackerEnsayisticaLibertaria.odt’
/ ‘Eventos Cultra Libre/Base_del_concurso-poesia  IV.odt’
/ ‘Eventos Cultra Libre/Bases del Concurso-Ensayos-libres.odt’
Implemented working dtmf test algorithm

to mimic the behavior of the dtmf chip
tested the dtmf decode function works, via polling
still need to check via an interrupt
clientSide v.0.2.0
tornado.httpclient used
clientSide v.0.2.0
tornado.httpclient used
clientSide v.0.2.0
tornado.httpclient used
servertSide v.0.2.0
async tornado.httpserver used
async server
block sync client
async server
block sync client
non-blocking HTTP client base on tornado
Merge branch 'async_client_server' into develop
non-blocking HTTP client base on tornado
non-blocking HTTP client base on tornado
templates used
asyc HTTP server base on tornado
Merge branch 'templates_used' into develop
non-blocking HTTP client base on tornado
templates used
asyc HTTP server base on tornado
Merge branch 'develop'
Travis file
Fixing mocha argument
Dummy test files
Completed per-round error handling (i.e. wrong answer)
GDA-5157 add a double-check in checkInitializationCompletion() to the
list of unconnectedCriticalChannels, to see if they have connected by
this point.
fix scrollView in comment
sign up and sign in with facebook complete without get profile image
added new [ops] procedure list substitution string for use with the postop macro.
Changes to admission letter to make it wrap better onto second page
bugfix
reverted commit made in error.
[OE-2126] enabled contact association for all users in the user table under a new group called Moorfields staff.
added missing name attribute to buttons on the delete form.
Merge branch 'release/1-moorfields' of github.com:openeyes/OpenEyes into release/1-moorfields
[OE-2051] script to set previously created correspondence letters direct_line field to the direct line of the associated episode.
[OE-2051] use raw queries to ensure deleted events and episodes are accounted for.
[OE-2051] typo
added getLetterArray() method to Institution model.
Merge branch 'release/1-moorfields' into feature/admission_letter
[OE-2165] fixed procedure updates not showing correct estimated time and failing to correctly align the third span to the right.
Add mustache js template lib
committing unchecked model relation from live.
[OE-2005] fixed a bug where viewing an event for a deceased patient shows a blank page.
[OE-2176] don't strip tags from textarea content when displaying the input.
Merge branch 'release/1-moorfields' into release/1.1-moorfields

Conflicts:
	protected/skeleton/module/views/default/delete.php
Merge branch 'release/1.1-moorfields' into release/1.2-moorfields
Merge branch 'release/1-moorfields' into release/1.1-moorfields

Conflicts:
	protected/widgets/views/TextArea.php
Merge branch 'release/1-moorfields' into release/1.2-moorfields

Conflicts:
	protected/widgets/views/TextArea.php
[OE-2292] added ability to search for contacts who are specialists tied to an institution.
added 'append' field to slider widget
Design

CSS tweak to MetaData - quick fix to improve readability
OFC-926 Add check marks for published and modified in survey list
FeatureCollection renaming.
Bug in 2.0. We did not configure host and user groups.
Merge branch '2.0-release' of git://github.com/openlava/openlava into 2.0-release
Changing a name of a variable
Completing a few methods
Adding a new method addEveryStep, where the particles are added every
step; this method will be used just from AllListParticles.java, while
when the implementation of Sweep & Prune complete is, the particles will
be added only once with the method add
Adding a new algorithm for the collisions
Renaming a method
Commenting some code
reverts refactoring to Measure #72
Update notes for submitted changes

* Fixed template loader bug. Fixes bug 999360.
Update notes for submitted changes

* Don't call a method that doesn't exist for unauth'd requests.
Update notes for submitted changes

* remove default value of local_ip in OVS agent
Update notes for submitted changes

* Ensures port is not created when database exception occurs
Final 2012.2.1 versioning

Change-Id: Iedbe1d2f4586f93e27a878a40ce00f65914035a7
Fixes lp:1002135. Minor re-factor to rest client

Bug 920817 was fixed in Essex. This patch re-factors the rest client correctly
set the management url depending on the public URL returned by keystone and
the service client subclass requesting the URL.

Change-Id: If5e6b5d5287daa2137c20515d18babb105ab5ee8
PynagRadioWidget now has an initial state (fixes issue #4)
Merge branch 'master' of github.com:opinkerfi/adagios
Closes #25 moved to using url handler instead of static links
switched to condensed tables
update dependent relation
added photo attachment to users
user views generated by devise
folder for uploaded files
updated configuration for custom views
added profile photo
added users to admin section
added CRUD for users in admin section
updated users styles
added debugger gem
added debugger gem
updated categories styles and navigation
updated default pagination number
fixed paging and redirections
fixed param key
updated styles
debug code on RangeValue was causing class cast exception.
Fixes issue #140
debug code on RangeValue was causing class cast exception.
Fixes issue #140
Merge branch 'master' into develop
Refactoring: renamed variable
Metamodel fixes
should now conform to AADLv2.1
Modified parser to allow empty lists in property values.
Extended faces decomposition example with Factor Analysis.
Factor Analysis learns variance of generative model for every dimension. Illustrated with faces.
Setup a few catalogs and implement bootstrap and haml
* Cities
* States
* Clients
Made names more specific
Adding more SL ugens.
Merge pull request #169 from ctwitty/master

Add more SL ugens.
Added savefig.pad_inches; refactored savefig.bbox
Increase mocha timeout to try and make travis tests pass
Fixed planet class to own file
la til default splash screen
Remove fodder
readme gcc, servidor recibe cantConecciones por parametro
readme markdown format
Shared Account, implemented all config directive for Hibernate sessions.
Turn of optimizations for ASIHTTPRequest. Fixes RELEASE bug
Documentation for Ember.Router, Ember.Route
Updated Router documentation to reference new Application.router property

this also includes some small edits for clarity
commas, how do they even work.
if there is no context, allow for views without controllers
Documentation about Ember.Route's serialize and deserialize fucn... er, metho... callbacks? Yes. callbacks.
Merge pull request #1053 from tchak/allow-views-without-controller

If there is no context, allow for views without controllers
Merge pull request #1027 from trek/DocumentationForRoutesOnMaster

Documentation for Ember.Router, Ember.Route
Allow access to API from all Battle Parousia sites
removed border radius for now, I think maybe I like square tabs
- affichage dynamique des colonnes de la liste des contacts.
Markov functional model initial submit
auto update on pch
Moved tzinfo code into PLIB.
implementada a funcao que libera um baralho.
Merge pull request #12 from pelegri/gh-pages

Adding News and Articles, plus internal cleanup
Merge pull request #13 from pelegri/gh-pages

Added a button on default navigation to go to raw file on stage repo
Merge pull request #14 from pelegri/gh-pages

Added link to submit an issue to navigation menu.  Also added Bugs page
Merge pull request #15 from pelegri/gh-pages

Add All Slides from SlideShare
Merge pull request #16 from pelegri/gh-pages

Adjust contribution pages
Update news/Latest_News.md
Cambios relacionados a deploy en linux
Removes references to the reloader in the documentation.
a fix in HTML header numbering
restructure the app, specs green
v0.1.1
fix test bot
javadoc: fix deleteReplys score argument description
Merge pull request #327 from pfactum/typography

javadoc: fix deleteReplys score argument description
не показывать ссылку удаления комментария для автора если на комментарий уже существует ответ
не показывать ссылку удаления автору комментария по истечению часа
в PreparedComment есть haveAnswers
убрали из comment.tag весь java
немного комментариев к предыдущему коммиту
в PreparedComment логика для replyTitle в getter и перенос проверок permission в @Service
use System.currentTimeMillis()
дублирование кода, isCommentsEditingAllowed вывел из нового isCommentEditableNow
search: autofocus на поле ввода запроса
Merge pull request #329 from hizel/delete-fix

не показывать ссылку удаления комментария  если уже существует ответ
fix NPE for ananymous in #329
Merge pull request #331 from hizel/delete-fix

fix NPE for ananymous in #329
comment out samsung adv
imports cleanup
semi-automatic code cleanup
убрал group.isImagePostAllowed, вместо этого надо использовать аналогичный метод в section
Group cleanup
view-news: fix Property 'votePoll' not found
Add strand info in WIG
Revise on - strand in wig
Fix bug on gzip output
fix bug of path '~' in two files
Add script for filtering reads
PG: Initial version - yet without FOP functionality
add __dirname for corrent fs context
clean indentures
More edits to make work with MV data
coef for exploratory returns correlations in list, and mirt equations in doc updated
Removed DG
Move tags to the footer, save button styling
Maybe less cluttered this way?
Moved powered-by to bottom, tag shadows, colors, buttons
Issue #159: When anonymous users are denied access, guide them to log in.
Put tags on the bottom of page, better styles
Take out include_tag plugin for now
Merge branch 'master' into tagging
Forgot to remove a print
Some tagging style changes.

Changed them to inline rather than floating. They weren't showing up correctly in FF using the floating method.  Added drop shadow inside the editing area to keep the appearance consistent.  Margin around the powered-by area.
Managing attributes, wor in progress
Merge remote-tracking branch 'philipn/infobox' into infobox
Add django-extra-views dependency
Switch to modified branch of django-eav
Merge remote branch 'mivanov/infobox' into infobox
Allow editing only existing attributes
Allow adding attributes to a page
Merge remote branch 'mivanov/infobox' into infobox
Break out related_objs mv functions to page_utils
Copy rel objs when template is used to create page.
hethethey
Adios Unneeded files
Adios Uneeded Files

Adios Unneeded Files
Testing the repo
Merge branch 'master' of https://github.com/phresco/Test-Repo
Fixed bugs in show/finish and story merging after accept
Moved Get_FreeSpace command to File plugin

In the future it will go to the Drive plugin
Adding serializer package to documentation index for distro
node-gyp on node 0.6 needs this
Add location to known pulsar file as a config.

Example of this configuration is to look in the PWD, this can be changed with an explicit path.
Add missing import of 'utils'.
add release tests
Add support for Slovenska Sporitelna (slsp.sk)
Corrected case statement structure for custom fields.
The original case statement had a semicolon for the first option, but other options incorrectly used colons as terminators
fix empty YAMLError message raise
add num_entries to env
make maxwords work
typo

and move sample entry.txt to sample-entry.txt.
complete commands overview
basic support for references, #67

currently tracked:

  - next, prev links
  - changes in translations
Fix renaming a database

Since 3e05c4d832e5658419094c34ce0ee6959bc1d85a commit, when a user renames a
database, the treeview is emptied after the refresh. This patch makes sure
that the refresh is done only when the change occurs at the sub-schema level.

Per a report from Regina.
Rearrange storage of data in xl_running_xacts.
Previously we stored all xids mixed together.
Now we store top-level xids first, followed
by all subxids. Also skip logging any subxids
if the snapshot is suboverflowed, since there
are potentially large numbers of them and they
are not useful in that case anyway. Has value
in the envisaged design for decoding of WAL.
No planned effect on Hot Standby.

Andres Freund, reviewed by me
Assign InvalidXLogRecPtr instead of MemSet(0)

For consistency.

Author: Andres Freund
Always treat a standby returning an an invalid flush location as async

This ensures that a standby such as pg_receivexlog will not be selected
as sync standby - which would cause the master to block waiting for
a location that could never happen.

Fujii Masao
[Action] Add error type.
[Action] Add isSucceededWithErrors() method.
[NonHumanoid] Fix bug (class method redeclaration).
[World] Add NonHumanoid creation.
Solarized color theme for terminal and vim
vimrc: removed unused stuff
vimrc: highlighting of trailing whitespace & mapping to strip them
vimrc: new mappings: faster scrolling, deleting without updating clipboard, tabs
vim: ToggleComment plugin
handle address update and caching correctly
initGrafico() denovo
Merge branch 'master' of https://github.com/println/ontofacil
Increment version to 1.1.7
added download extension icons to footer. fixes #66
修复bug

去掉读取开箱文前300个字时的html标签
想玩，在玩可点
Merge branch 'develop' of github.com:project8/Pypeline into develop
Seems I forgot to add the DripInterface.py file...
added Pages controller
added site layout
facebook added
facebook margin update
update facebook icon responsive css
facebook icons styles
ISPN-2182 Some DefaultCacheManager constructors still performing legacy configuration adaptation
JBQA-6622 Tests for Asynchronous API (life+idle)
ISPN-2063 Remove workaround to deal with null commands
JBQA-6693 Test for async notification - exceptions

JBQA-6693 Test for async notification - repair1
ISPN-2188 Avoid a comparison on null key during lookup in the transaction context
Creation of projects feature complete
Added title functionality for show page
Add validation to ensure names are specified when creating projects
Worked around bug in FF & Safari, where browser cannot reliably get offset() or position() of svg element
Worked around FF bug where SVG element requires explicit width and height attributes or it clips.
fucking braces again
fix in browser and new functions
Bugfix in getbundle
Still other models
updated GEM date for PubNub Ruby Gem.
Ajout de la souris 3d
Modified Make defs to fit the non-Cygwin win toolchain PX4 is using
Merge branch 'master' of github.com:px4/px4_nxbuilder
The mixing library function works.
[2.3.0] Mise a jour du changelog
Testing EventEmitter.prototype.off
Finish Contact page
Finish Contact page
updated to alpha 4.1
fixed share files packaging path
created build script, #10
add a download site

Signed-off-by: Xiaofeng Qu <quxiaofeng.at.polyu@gmail.com>
fix typo

Signed-off-by: Xiaofeng Qu <quxiaofeng.at.polyu@gmail.com>
Mostly done
Changed license
minor fix
terms link added in guest checkout oage
add .zshenv, separate from .zshrc.
b2 test
Removed the whitespace management since it was causing issues with repo's that weren't mine, specifically Homebrew.
Updated to not copy the zsh-them folder into my ~/
Themes dir added
Merge branch 'master' of https://github.com/raulmpad/.emacs.d
mail test run
Esta es una prueba
Adding first class to the project
Corrected perl path.
because double quotes are cooler
Ajout d'un lien

J'ai ajouté ce lien pasque....
Allowing save to handle multiple commits
Enabled arrow navigation.
Enabled color ls.
Added mandel_quadtree
add a test for changes eventsource feed.
Add required parameters to cassandra.yaml
Expose parameters via DatabaseDescriptor
Modify OutboundTcpConnection's socket buffer size (WIP)
trains be red
Merge remote-tracking branch 'origin/master'
Msg Queue future reimplemented (std don't work on ARM)
started to use libev, address classes in progress
link libraries as static
static build
Menores alteracoes
Some docs for Bind, Functor, Monad.
Docs for Monad, Monoid, Semigroup.
IoExceptionOr add extractor
remove unnecessary parameter
If you're going to switch type parameters around on me, at least do it
consistently!
MVar and Chan ported from Haskell along with a few useful concurrency primitives
examples for MVar and Chan
fix mvar, phasedlatch. cleaned up examples
Changed Validation's Semigroup instance to use both Failure's and Success' Semigroup instances.
Merge pull request #97 from halcat0x15a/enumerateet-copointed

Unnecessary parameter
Merge pull request #101 from folone/scalaz-seven

Validation's Semigroup instance
roll back pull request -- breaks
disable gpg plugin
rename validation instance
either
new cozip
Added complement to Ordering instances.
Fix compilation with 2.10.0-M5
Merge branch 'scalaz-seven' of github.com:scalaz/scalaz into scalaz-seven
buildery
Modifying the Skip Install stuff.
Updating Layout module from alpha4 to alpha5
new database yml for development, also cats
Cambiando la cadena de texto.
try to fix tests and revert programme form
alter public view of programme
begin versioning
continue with versioning and fix delete for programmes
merge
make additional field required in programmes