labofsahil/github-event-dataset-2012 huggingface dataset:
Ask user to unlock the SIM when leaving airplane mode
[Browser] Gaia side of Clear Private Data, closes #3124 once platform support lands
Fix live search info displayed and new message when no results
HotFix. JSONP dropped. system XHR Used
Hotfix JSONP. Fixing lint and timeoutHandler name
[Browser] Go/search button, closes #5099
Calendar - Offline Event Creation/Deletion/Editing
[settings] Do Not Track
Merge pull request #5294 from lightsofapollo/calendar-offline-events

Calendar - Offline Event Creation
Merge pull request #5335 from fabi1cazenave/dnt

[settings] Do Not Track
Merge pull request #5324 from benfrancis/browser-awesomescreen

[Browser] Go/search button, closes #5099
Merge pull request #5322 from jmcanterafonseca/hotfix_JSONP

[Facebook] Hotfix JSONP no longer used for FB API. Now using system XHR
Merge pull request #5312 from fcampo/liveSearch

[SMS] Fix live search
Merge pull request #5309 from benfrancis/browser-settings

[Browser] Gaia side of Clear Private Data, closes #3124 once platform support lands
Merge pull request #5306 from timdream/sim/airplane-unlock

Ask user to unlock the SIM when leaving airplane mode
Auto-merge from branch 'master'
include headers css and semantic-ify some markup
discard custom header styles and use standard
semantic-ify more HTML to use shared header components and discard old css
convert all bottom toolbar divs to footers (as used in the sms app), and style them according to the recommendation
undo arbitrary z-index and make remove old css of select-toolbar
make bottom toolbars 40px high like in the mockups, and remove unneeded CSS now that those divs are now footers
make edit background color consistent with photo view background color
change outline to 3px from 5px as discussed in #4929
Use margins instead of black borders to properly have a 1px space between thumbnails, since borders and outlines don't play well together in this situation. #4929
add class='hidden' to body
add class='hidden' to thumbnail-list-view
make usage of sections consistent
Merge pull request #5480 from adityab/gallery-tweaks

Gallery tweaks, according to Visual recommendations
disable search; fix bug 742102
Complain when modules do not have documentation.
Change the way gene interest is found; add MPI2.GeneDoc.updateInterestRegistered
Rename onSearch callback to afterSearch
Added the possibility to hron dynamic object serializer to value types (such as int)
MovieMatcher returns empty Result object when no movie is found
nope, we need them!
cleanup basic settings
use msmtp
Change orglog-enter-day so that it makes the buffer immediately ready to accept an orglog entry.
[リファクタリング]パッケージを移動
リファクタリング
GATEWAY-3130: xdr audit framework and tests.
GATEWAY-3190: code complete
GATEWAY-3130: xdr audit framework and tests.
GATEWAY-3130: Updates to auditing after GATEWAY-3190 refactoring
Merge branch 'GATEWAY-3130' into CONNECT_integration
Merging GATEWAY-3130 and GATEWAY-3190
Information Field implement (Basic)
Backend GUI fix
 SVG Layout Bugfix
Merge branch 'development' into layout
trying to get the session shit working
MainActivity - Implement: Reload settings when after has completed setting
[222] Small update to build.xml
Remove unused WindowsSetup.ps1.
bug fix in playorm run config
Initial commit of some Mystic code. Commit includes a demonstration DTO library, data access pattern, REST service pattern, and the dummy MVC4 template from Visual Studio. A database does not currently exist: Attempting to execute any of the DAL will result in a failure to connect to... anything.
Added LICENSE file and fleshed out a bit of the README.md.
うーん…
Update QFixHown.
Change permission of QFixHown
Modified QFixHown and QFixGrep
Fix powerline setting.
Add plugin 'ack.vim'
Changed filename

Changed filename of campuses to facilities. Just to avoid the doubt that
I've forked this project from my earlier code.
partial fix for LOGIC-77, still not getting the expected result
add real cKanren programs to the tests
oops, remove some redundant tests
Merge pull request #256 from Barryvdh/master

Updated dutch language file
fixes
procExec 2 arg bug fixes
fix startpath bug
do nothing
Merge pull request #239 from dairiki/2.x

Constrain dialogs so that they can not be dragged outside of the document body
fix newline
select file on rename error
do nothing
update jquery
Merge branch '2.x' of github.com:Studio-42/elFinder into 2.x
Merge branch '2.x' of github.com:Studio-42/elFinder into 2.x
Merge remote-tracking branch 'healerz/2.x' into 2.x
fixes
closes #186
fixes
Merge branch '2.x' of github.com:Studio-42/elFinder into 2.x
Merge pull request #252 from dairiki/customData-in-url-params

Include customData in params in url to file using the 'file' command
closes #185
Merge branch '2.x' of github.com:Studio-42/elFinder into 2.x
use fm.uploadURL
Merge branch 'pixlr_edit' into 2.x_n
Enh: Gesture menu
fix bug where tuple tree could ack even if tuples weren't delivered (because coordination tuples always ack). now it always keeps a coordination tuple until the condition is met before it acks them
allow null pid dir in topologycontext
update changelog
Initialprojekt erzeugt.
RSpec eingefügt.
FactoryGirl eingefügt, Tests für Activity-Modell eingefügt.
Modell Activity eingefügt.
MVC für Activity eingefügt.
Merge mit 6efd0b11663753602336340c5d6d66a708c32e68
Bugfix: Vergessenen Konflikt-String entfernt.
Index page edited and attribute Activity:state added.
MVC ActivityState created.
ActivityState id added to model Activity.
Select field for the activity state added to the activity views.
MVC ActivityCategory created and ActivityCategory selection added to Activity.
Output of all attributes added to the index and show view of Activity.
Attribute tag to Activity added.
Application renamend from AV ('Aufgabenverwaltung') into TAM ('Time and activity management')
Merge remote-tracking branch 'origin/master'
same as other methods
haXe -> Haxe
Merge branch 'master' of github.com:ncannasse/hxWiki
Merge pull request #19 from ndawe/master

fix build status URL
fix output of heroku post vars
added missing usb_desciptor.c for maple target
Updated configuration to match changes in Config implementation.
Merge pull request #48 from jakewins/master

Following on the merge done in community
Formulario de busqueda declarado, falta trabajar en la funcionalidad y usabilidad
mobile theme detail and landing pages on mkt
added a custome theme for zsh
emptyItems added
move example to archives, extract new session class into sulley/sessions
move example to archives, extract new session class into sulley/sessions
cell table changes files.
Merge branch 'master' of https://specindia@github.com/nikotsunami/osce.git
Tweaking build-sources a bit.

* Modifying OS_DIR to include non-os. prefixed directories provided
  they have the target suffix (.<TARGET>).
* Wrapping allow_multiple arguments in array regardless of the number
  of actual values.
Reshuffle some files.

Since os.* is no longer the required naming scheme, I'll try to avoid
as much stupid crap to do with that. As such, os.osx under system/ is
now system.osx. The suffix has to stay, but at least I can ditch the
less-descriptive 'os'.
Generate scaffold Member
Skeleton of 10142
Updated server.js to route messages via router.
Merge branch 'master' of https://github.com/nodemvc/node-mvc
Removed useless commented code fragment

Signed-off-by: Norbert Csaba Herczeg <noherczeg@gmail.com>
Revert transition opacity duration 0.2s because of hiding glitches
Move slave <iframe> to background page
* init.el: Fix ledger-mode.
Mathgl manual in the wrong place
finished products database and pics
Battle prototype with effects
d/rules: Add target to generate HTML doc from lib/

Add target (and helper tool) to generate HTML documentation from the
POD embedded in the Lintian Perl modules.

Signed-off-by: Niels Thykier <niels@thykier.net>
readme i dunno
Add Guardfile
Finish Net::FTP mock spec support implementation
Add File extension to check binary or non-binary type
Add fargo lib class
Revert "p2 reboot"

This reverts commit 79d9b3fdcb7cdecaae8532c8ead70e4ece40c2d2.
Revert "Revert "p2 display testing... to be moved to css""

This reverts commit c0e29f147f5f850ff078a581c539138127c99b8c.
Revert "p2 still working on password verifiication"

This reverts commit ccf6f425dbb1c99ca533423bcaf2cd396fb7dacd.
Revert "p2 password verification"

This reverts commit 294303e6776ac942ebdc8fb58e09050fd06b9556.
Test configuration. RSpec is not yet default.
Merge branch 'master' of github.com:nybblr/omelet_ui
Refactor of stylesheet: line per rule as per CSS conventions for readability and editability.
Updated to use Mongo C# driver 1.4.1 Nuget package.
Manage fallback styles for frontmatter
decided against making individual files for items
going in a different direction
add file empty notice to __init__.py
update readme with new direction
(island, zone) coordinates working
LOOK output formatting
NEXT and BACK check to see if the hero can do it
reformat default css, copy to catena.css
Add helpers block to Garaj::Web class
Add syntax highlighting via pygments.rb
use path_is_dir? function in Garaj::Project class
Release v0.1.0
Clear appspace when app launcher started
Include delete checkboxes for Gareth: don't include when not appropriate - refactor out of loop
Correct POST being sent as a GET
bitfolk deploy server
do not import image servlet token util
issue #1 done
Fix : code blocks line spacing
Bootstrap updated to 2.0.3
layout improved
Added some aliases to zsrc.
Set emacs as default editor.
Full build of v1.1.3
Small bugfix

Change-Id: Ie70e7888f841bba4aee533e302744f8dacfc5c20
transparencia
Merge pull request #1 from thyfl/master

balbalbalblabalbabla
fix some things and added stop buttom
fix some things and added stop buttom
init
postgresql in database.yml
Change new poll title
removing divs from form
changes add candidate to assign to poll automatically and redirects to poll when done
redirects to poll page after creating candidate
cosmetics on poll and candidate creation, adds slogan
changes edit page to include list of candidates, other cosmetics
removes new candidate option from candidates page
more cosmetics on candidates
prevents creating duplicate candidates in a poll, displays error message
removes flash notice, which is redundant with redirect upon voting
allows candidates to be deleted from edit poll page
small change on route url
allow editing of candidate names from edit poll panel without conflicting names
Small change in notice for updating candidate
prevent poll names from being the same
prevent creation of poll with name that is same as existing
small change on delete poll message
move poll results to edit page
support for templates
dependencies update
Merge branch 'master' of github.com:op1ekun/cinodine

Conflicts:
	config.js
CoList Update

The CoList has been updated to use the opencoweb API correctly. More thorough testing
still needs to be done, and the design fo the colist is a little inefficient since I
could not find a way to insert at arbitrary positions in the data grid.
Simplified colist demo
Minor changes
CoList tested and in stable condition. For #192
Merge branch 'treeBasedEditor' of github.com:opencoweb/cowebx into treeBasedEditor
Finished porting DOM based tree to cowebx.
Issue #157: Updated BusyDialog widget organization to match other cowebx-widgets
Issue #157: Updated BusyDialog widget organization to match other cowebx-widgets
Fix php 5.3.6 dependency bug
Additional domains support on ImageMosaic
Merge pull request #83 from dromagnoli/custom-dims

GEOT-4347: Add support for custom dimensions on ImageMosaic
Merge branch 'master' of git://github.com/geotools/geotools
include height again until so that the template doesn't break on the dev server
(fixes #3108, BP from #2547) fixed japanese in pc_backend community settings page
(fixes #3106, BP from #2470) fixed for sns term in mobile page
(fixes #3107, BP from #2665) add translate catalogs for mobile UID erros
(fixes #3099, BP from #2461) fixed to display self introduction item
(fixes #3098, BP from #2481) fixed not to display delete buttom in mobile page
(refs #3148, BP from #2847) use renderError() and render() instead of renderRow() ONLY captcha field.
Merge remote-tracking branch 'Kai-ishikiriyama/in381' into stable-3.8.x
[sfImageHandlerPlugin] sfImageGeneratorImageTransform::doResize() causes an error when using ImageMagick (fixes #3195)
Update notes for submitted changes

* Fix cinder-volume-usage-audit
Update notes for submitted changes

* Sync with latest version of openstack.common.cfg
svchikr: add chief_department to main page!
Add "reason" argument to nyx_system_reboot calls

The API of nyx_system_reboot has been extended so this must not be merged
before the API change is merged into nyx.

- Add reason code to nyx_system_reboot calls
- Specify dependency on version 3.0.0~RC1 of nyx-lib
- Bump patch level of component

Open-webOS-DCO-1.0-Signed-off-by: Janne Hurskainen <janne.hurskainen@palm.com>
Open-webOS-DCO-1.0-signed-off-by: Keith Derrick <keith.derrick@palm.com>

Change-Id: I4e993d8b84001df1586560481db7987959e590bb
added custom tab-specific class
лась -> лся
Simplified finding the Customer for a Consignment
Modified the way the headers are cleaned

It's now easier to add additional headers to be preserved. Perhaps we can
put the option into configuration file.
More text in README.md.
Update OsmAnd/assets/voice/el-tts/ttsconfig.p
Merge pull request #322 from aitolos/patch-1

Update OsmAnd/assets/voice/el-tts/ttsconfig.p
apetag: fix error handling in ff_ape_parse_tag()

The following error handling is broken due to signedness.

    int file_size;
    uint32_t tag_bytes;
    int64_t tag_start;
    ...
    tag_start = file_size - tag_bytes - APE_TAG_FOOTER_BYTES;
    if (tag_start < 0) { ... }

Note that tag_bytes is unsigned, which makes the right-hand side of
`tag_start = ...' unsigned, too.  The 32-bit unsigned value is then
zero-extended to 64 bits.  Therefore, tag_start must be non-negative,
and the check (tag_start < 0) is always false, which breaks the error
handling.  This patch fixes the check.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
cdgraphics: fix incorrect vertical offset mask in cdg_scroll()

The vertical offset mask 0x07 is suspicious.

    v_off = FFMIN(data[2] & 0x07, CDG_BORDER_HEIGHT - 1);

Note that v_off is up to 11 (CDG_BORDER_HEIGHT - 1), the correct mask
should be 0x0F.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
lavfi/drawtext: add support for printing frame numbers

Fix trac ticket #1949.
lavfi/avfiltergraph: improve error message in graph_check_validity()

Fix trac ticket #1944.
id3v2: fix reading unsynchronized frames.

Current code would incorrectly process e.g. 'ff 00 ff 00 ff' to
'ff ff ff', while it should be 'ff ff 00 ff'.

Fixes Bug 395.

CC: libav-stable@libav.org
ffprobe: implement subsection field selection through the -show_entries option
ffprobe: implement -sections option
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  id3v2: fix reading unsynchronized frames.
  cdgraphics: fix incorrect vertical offset mask in cdg_scroll()
  apetag: fix error handling in ff_ape_parse_tag()

Conflicts:
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests: prefer ffprobe -show_entries to -show_format_entry

The latter option was deprecated.
id3v2: print ver/flags/len on debug level.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ADPCM AFC decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
movenc: fix assert failure caused by rounding.

Fixes Ticket1820

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
xmv: signal EOF

Fixes #1946.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
vqavideo: Reinitialise the actually used partial codebook bytestream-reader.

Fixes ticket #1942.
avidec: try to support oddly muxed MMES stream

Fixes ticket1804

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
dcadec: fix av_log level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mpeg12: fix av_log level and context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
truemotion2: Fix av_log level and context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
rmdec: fix av_log level and context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffv1dec: remove incorrect assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Improvements to the new items email template.
Add caching and reading requests from disk
Merge branch 'master' of github.com:ozataman/shpider

Conflicts:
	Network/Shpider/State.hs
Agregué descripción de la viz
Change-Id: I8bff19e1d914498da4d8d146a0902aa30a281e9e
+ cmu cafe
twitter認証いれた
libkdeedu
kimono
korundum
kross-interpreters
perl-kde
perl-qt
qyoto
ruby-qt
smoke-gen
smoke-kde
smoke-qt
clamav yamalandı.
add db5
Merge branch 'master' of github.com:pardus-anka/2013
Added memcaching of team data to avoid exceeding datastore quotas.
Added .gitignore.
pat: small changes.
gas parser: In .section, look up special symbols even if not '@' prefixed.

This reimplements commit ea721258cf22e6ba8b32b244fdeb6ef9de0cd6c1 to only
apply to .section, and thus not break other directives.
ElfSection::getIndex(): Make const.
X86Opcode::get(): Make const.
Move X86General class definition to header file.
coff: Don't assert if an error occurred during output of a section.

If an error occurred, the written length will almost certainly not match
the section size.
Fix minor typo in the definition of pmulhrw.

Merged from yasm:master commit 73a5474278
Implement Mach-O object format (macho32, macho64).
Merge remote-tracking branch 'yasm-nextgen/master' into path64-assembler
Updating the tests a skitch
Implement ccd region querying for PVCAM and simulated cameras.
Translated from on the new upload interface should work

I was a dumbass and forgot to change the name
of the variable and that was making translated_from
be None.
Verifying if the original subs match the uploaded subs
Remove unused admin field.
Document filter and order_by for TaskResource
Update integration repo
When building subtitles_dict, if base_language exists, use that for title and description.

For: https://unisubs.sifterapp.com/projects/12298/issues/642887/comments
Merge branch 'dev' of github.com:pculture/unisubs into dev
Rollback c62ad49
Fix #1202

* If the user uploads subtitles and it's to an original
language, verify if it has dependents - if it has,
block if the parser has less subtitles
* If the upload is a translation from another language,
verify if the parser has more lines than the original one
Merge branch 'dev' of github.com:pculture/unisubs into dev
When getting SubtitleLanguage title, also check if there's a standard_language to retrieve title from.

For: https://unisubs.sifterapp.com/projects/12298/issues/642887/comments
Merge branch 'dev' of github.com:pculture/unisubs into dev
When getting SubtitleLanguage description, also check if there's a standard_language to retrieve description from.

For: https://unisubs.sifterapp.com/projects/12298/issues/642887/comments
Update oauth2 library to the latest version.
Update failed upload messages

https://unisubs.sifterapp.com/issue/1216
Initial styling of the 3rd party accounts page

https://unisubs.sifterapp.com/issue/1196
Fix regression on "in progress" indicators. Also, I'm an idiot.
Fixed the interaction between caption length conforming and user editable line breaks, for https://unisubs.sifterapp.com/projects/12298/issues/606511/comments .

Even though this code is run many times, and it's not optimized, profiling shows that it takes a very small piece of the cpu. Could be optimized later on
Merge branch 'dev' of github.com:pculture/unisubs into dev
Update 'move video' warning copy.

https://unisubs.sifterapp.com/issue/1101
Merge branch 'dev' of github.com:pculture/unisubs into dev
Fixed new line to br convertion, fixes https://unisubs.sifterapp.com/projects/12298/issues/606511/comments
Updated transifex translations -- through update_translations.sh
Removed production app servers pcf-us-cluster{6,7}
Merge branch 'production' into staging
updated vagrant setup for new environment
* Only show a task if the user can perform it
* Changed the place where we create the user tasks
Re added the settings tab
Made all tasks work via dashboard.

It's a hack, it's fugly, but works.
Reverting the deletion of CellGpsDataImporter.
added snipmate and dependencies
Gallego (gl) completo (exc. autosave). / Galician (gl) complete (exc. autosave).

git-svn-id: https://forja.cenatic.es/svn/iteexe/trunk@643 da0ca0ef-283e-4aa9-9c6d-6a5f12f73a05
Gallego (gl) completo (plugins propios). / Galician (gl) complete (eXe plugins).

git-svn-id: https://forja.cenatic.es/svn/iteexe/trunk@645 da0ca0ef-283e-4aa9-9c6d-6a5f12f73a05
TinyMCE i18n. (ca@valencia = ca).

git-svn-id: https://forja.cenatic.es/svn/iteexe/trunk@647 da0ca0ef-283e-4aa9-9c6d-6a5f12f73a05
Opciones media como en catalán. / Media options just like in "ca".

git-svn-id: https://forja.cenatic.es/svn/iteexe/trunk@649 da0ca0ef-283e-4aa9-9c6d-6a5f12f73a05
i18n.

git-svn-id: https://forja.cenatic.es/svn/iteexe/trunk@651 da0ca0ef-283e-4aa9-9c6d-6a5f12f73a05
Traducción al euskera. / EU translation.

git-svn-id: https://forja.cenatic.es/svn/iteexe/trunk@653 da0ca0ef-283e-4aa9-9c6d-6a5f12f73a05
Se incluye en las exportaciones el css de exe_lightbox solo cuando es
necesario

git-svn-id: https://forja.cenatic.es/svn/iteexe/trunk@655 da0ca0ef-283e-4aa9-9c6d-6a5f12f73a05
Admin View -> pequena limpeza do layout
SQLParserUtils triggered an error when feeding it Type instances instead of PDO param type ints.
Removed is_int check and converted both comparisons into equality comparisons when expanding list parameters.
Merge branch 'DBAL-240' into 2.1.x
SKip if oci8 not installed
added readme for web app
MONDRIAN-1303 - cloning the necessary physical schema elements when using shared dimensions multiple times in a single cube.
spaces around = in output
loadToMap exceptions
deleting outofmemory catching
out of memory
Drawing style interfaces rename
Adding OFFSET support to PHQL. Volt improvements
Merge branch '0.6.0' of github.com:phalcon/cphalcon into 0.6.0
add various kinds of shape classes
build
* fixed variable
start analyse speciel key
aend mousewheel up and down
code clean up / keyboard special characters
Moved index.js out of App, added App to gitignore

This will enable people who use Ejecta to more easily keep up to
date and still keep their own apps intact inside the App folder
Merge pull request #34 from amadeus/master

Making it easier to use Ejecta in development
Fixes #30 dyld: Symbol not found: _OBJC_CLASS_$_NSObject

Tested on OS X 10.8 and 10.7
Minor Ui changes
Removed background position cookieness
Fix progress formatter for non-ansi terminals (windows) - closes #35
added statistics
return proper return code from app
broke spec to show failed results formatter
shahuishi?
11yue29dyas_3
leachter
Merge branch 'master' of https://github.com/picasso250/cheng
Merge branch 'master' of https://github.com/picasso250/cheng
leachter_2
del program
end
11yue30days
Merge pull request #35 from zhiqinyigu/master

11month30days
Added LICENSE and copyright information to all php files
Gestion stochastique instructions
- rebuild with DirectFB 1.6.x
- release 14 (by relup.sh)
modifs de Cloud9
A lot of css fixes to author, video and news view page
add flashmediaelement.swf, needed for audio play and commit pending changes on video view page
TF-IDF works. Should test.
more nrepl purging
Badger.

Signed-off-by: Nick Campbell <nicholas.j.campbell@gmail.com>
B31: added attack command
jj
select boxes added
Create lessMVC
[default-settings] setting defaults, no backtrace w/ invalid config
  - rabbitmq & redis settings default to empty hashes
  - separate file for sensu version
Merge pull request #251 from portertech/default-settings

[default-settings] setting defaults, no backtrace w/ invalid config
fix body height in css
implement file_stop_sending and automatically resume at last confirmed position after timeout
Merge pull request #14 from projectNe10/dev/raminzaghi-arm/patch0003_03_mulcmatvec

Dev/raminzaghi arm/patch0003 03 mulcmatvec
Corrects bootstrap import error
Added limit to phing version. It's now >= 2.4.12, but just for 2.4.* versions.
Added optional condition to AggregateColumn behavior
Merge remote-tracking branch 'upstream/master' into aggregate_condition

Conflicts:
	generator/lib/behavior/aggregate_column/AggregateColumnBehavior.php
	generator/lib/behavior/aggregate_column/AggregateColumnRelationBehavior.php
Merged with condition
Merge remote-tracking branch 'upstream/master' into aggregate_condition
Merge remote-tracking branch 'upstream/master' into aggregate_condition
Merge with Propel/master
Merge pull request #265 from rozwell/aggregate_condition

Optional condition in AggregateColumn behavior
Fix typo in the database.xsd file
Merge pull request #437 from oziks/master

Fix typo in the database.xsd file
add more filter options and improved math functions
pass in range to updated constrain func
tweak the scaling logic and colors
major sound tweaking. added eq and more compressors.
changed v0.3 to v0.4 in the html
renamed Template to Templates.  Template is not a non-visual element.
Update README.md

update link to documentation following f44e984217a3645a093f1a3921a633fdfe598965
Fixed some things with allocation.
close ws session on sockjs close
don't swallow mongodb errors on save
Merge branch 'master' of github.com:purplefox/vert.x
Three columns for cities list
Fixing https issue
Adding new version of nerdcommenter
add ssh proxy to rc.lua
move zeitgeist skeleton to libbiji
use date tagging
#361 fixed, remove participant when all participantVideo of user for current event removed
vk api key changed
Revert last four accidental commits:
backport wmts support: 50ba9929afaf470e9417b4779e85835648f022cc
WMTS/WMS updates: 84959cb891348fa498a3eadd4b4b464dbd7f5901
missed a dialog: 4b5d2652adda3f411a37691effc435b3cbdce53a.
[FEATURE] WMTS: 2130b02c20ed66095f448cb16a4e9ec2459da9e7
Fixed bug using multipleinputpanel in modeler
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
QgsMalloc, QgsCalloc, QgsFree
Update help for console
- header icon changed
- re-organized text
Added keys binding to view the command history
- added new command to clear completely the command history
- fixed copy,cut command in keyPressEvent more minor problems
- update for help
- update for Italian translate
Improved the console toolbar
- added menu for class import
- added menu for open/save script
- update help and Italian translate
Merge pull request #248 from slarosa/master

Several fixes and added for python console
fix some leaks and cleanup
Merge branch 'release/v2.3.0'
mv NEWS.md out
Merge pull request #27 from why404/hotfix/mv_news_md_out

Hotfix/mv news md out
Update steps
Merge pull request #20 from s3u/master

Update steps
Modified Epic theme
Merge branch 'master' of https://github.com/qmanjr5/dotfiles
Modified config
put name of game into fisrt in-game string, yo!
More work on area selection widget (refs #16)
More work on area selection widget (refs #16) - not yet finished
echo space when RPROMPT = ""
Merge branch 'daley', remote-tracking branch 'origin'
Update initialization logic to set the first validator with default='true' to be the default, instead of using the last one with default='true'
Merge branch 'master', remote-tracking branch 'origin' into daley
Pagina principal da WebApp com o mapa ajustado para 100% da tela automaticamente.
"new template added for allkey_nowise" column rearrangment
"Daily + Shrt_extra + m/c listing report changes done."
template was missing got added , machinesummaryreport.rhtml
Added tag FENNEC_18_0b6_RELEASE, FENNEC_18_0b6_BUILD1, FIREFOX_18_0b6_RELEASE, FIREFOX_18_0b6_BUILD1 for changeset 420f9fd1da86
Merge branch 'master' of git://github.com/mozilla/build-tools into release-kickoff
Merge from rail's comment branch.
Merge branch 'release-runner-comments' of git://github.com/rail/build-tools into release-kickoff
Refactor main loop of release runner.
Merge branch 'release-runner-comments' of git://github.com/rail/build-tools into release-kickoff
Add a bunch of comments, small refactoring.
Print out errors if sendchange fails, otherwise it gets eaten.
Fix a few more comments.
Use strict checking template variables.
Move symlinks to config
Merge branch 'release-kickoff' of git://github.com/bhearsum/tools into release-runner-comments
README update: SASS section.
3번째 탭 멤버 이미지 받아오도록 설정
에러 보여주도록 수정
Merge remote-tracking branch 'origin/master'
优化了一下搜索
adding page fault support and enhancing the screen
Adding v1 with hcat and vcat
fixed graphing of All Time timeframe
Draw a flot pie chart for the terms facet page
fix some score bugs and issues with analyzing multiple fields
Null values no longer listed as 'null' in multi-field terms
Fixed multi-space split bug.
Merge branch 'nitpers-pie-graph' of git://github.com/rashidkpc/Kibana into kibana-ruby
Merge pull request #142 from awheeler/kibana-ruby

Null values no longer listed as 'null' in multi-field terms
Merge branch 'object_values' of git://github.com/nitper/Kibana into nitpers-pie-graph
merging nitpers pie chart commented out until I clean it up a bit
Handle two-spaces.
Merge pull request #39 from kcrayon/patch-1

Handle two-spaces.
* Learned how querystring.parse works.
PAHMA-400: Add homeCrate to collectionobjects_anthropology.
CSPACE-5359: Added comments to code that needs to change in order to prevent the infinit loop.
CSPACE-5359: Cleanup to improve clarity of program flow, variable naming, log statements.

Conflicts:

	services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
CSPACE-5289 Added default ORDER BY clause when finding docs with mix of doc types.
CSPACE-5359: findDocs now accepts an ORDER BY statement, while still defaulting to returning documents in descending order by updatedAt timestamps. When updating display names in authority references, we now obtain documents in ascending order by createdAt timestamps, which should be static for existing records.

Conflicts:

	services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
	services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java

Some changes were made in the conflicting files to remove dependencies on other changes that were made post-2.4.

A change was also made to:

services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java

This was to make the class compile, with the new RepositoryJavaClientImpl.findDocs signature required by CSPACE-5359.

When upgrading, all of the above changes can be discarded in favor of the 2.5+ versions of the files.
PAHMA-412: Add anthropology acquisition extension.
UCJEPS-279: Added loanoutItems string field to loansout_naturalhistory.xsd
Merge branch 'ucb-deploy_2.3' into ucb-deploy_2.4
CSPACE-5433: Left most of the code alone, but added a synchronization flag to the shared list item structure.  Now this list item array gets modified only once and in a synchronized manner.
NOJIRA: Add claim to services/pom.xml, so it builds from the top level.
Merge branch 'ucb-deploy_2.4' into ucjeps_2.4
NOJIRA: Change a bit of whitespace.
integrated images from DB with ajax functions. added additional screens for clients.
removed everyting
removed everyting
fix KickedChecker thread exit hanged bug when data not refresh
Update README.md

with new script to populate the database
atualizando o parser-adicionando constantes no modelo
Set up guard, spork, and rspec
Add left out Guardfile
tests: use column 10 by default
l2hash: remove _eblob_realloc_l2hash() function
l2hash: move eblob_realloc_l2hash() to common eblob_realloc_base_type()
Eblob version update: 0.17.5
Updated the test read() method to use the Savon body hash feature instead of building the SOAP request manually.
in RHodes device capabilites doc, added that RhoContact create! returns new contact as a hash
change behavior of "all" property in RawSensors
LucasArt SMUSH demuxer with video and audio decoder
port to new api
cloud with future categories, main category selection
Merge branch 'master' of github.com:ridike/Pitchfork
UI fix of comments
Code restructuring
DatabaseManager does operation, Database only store data.
Encryption not decided yet.
Corregido el chequeo de handshake que llega del servidor al cliente.
added routing table logic and started arp_cache
Working on TNT ownership (needed for source protection - #14)
Arrow fire recorded only when match in progress
Fix minor error on README.md
Added some comments for the previous commit

Whenever RedisClient is ready, all sequential commands either succeed or fail, never go into the offline queue until connection is gone.
Update flagging for lists and draft revs #1313
Models updated for notifications
API includes notification functionality
Fixed validation of end time when adding discussion.
Connect the "changed" signal too for stringlist modifications, to allow
saving reorder
Add U in object crud just for the sake of form
Fixed how rootProcess was being accessed (wasn't static), fixed HashMap instantiation in constructor
re instaling demo app
Extra whitespace removed
Added class method distance(p, q) to module Math to calculate Euclidean Distance
Merge pull request #48 from jurisgalang/math.euclidean-distance

Added Math.distance(p, q) to calculate Euclidean distance of points.
ST: Updated code documentation
Version bump to v0.3.1
Fixed ge/le mnesia db adaptor find sort order: they were reversed.
boss_db:validate_record_types did not handle fields of type 'atom'
Merge pull request #32 from LordIvan/mnesia_adaptor_ge_sort_fix

Fixed ge/le mnesia db adaptor find sort order: they were reversed.
Merge pull request #33 from LordIvan/atom_fieldtype_validation_fix

boss_db:validate_record_types did not handle fields of type 'atom'
Support case-insenstive regexes
Merge branch 'master' of github.com:evanmiller/boss_db
Actually support case-insensitive search in Mnesia
Support case-insensitive matches in Mongo (maybe)
Update riakc, move to tiny_pq
Avoid variable name conflicts in set/2
::uuid() is now a valid Id type
uuid type IDs now CRUD correctly
removed uuid library: without a random seed v4 UUIDs were coming up identical; switching to avtobiff's erlang-uuid lib
changed uuid libraries, updated rebar.config accordingly
removed extraneous debugging line
refactored keytype into boss_record_lib
Pack null atom
added PK blurb to readme
Merge pull request #38 from kevinmontuori/explicit-keytype-2

Explicit keytype 2
Support ID searches for 'in' and 'not_in'.
README added with screenshots

- taken from apple app store cache. apple app store account already
expired.
forgot some metadata files
Fix command installation error
fix a cp932 decoder's table selection bug.
joomla 1.5 support
Basic QKinect Project setup
config-desktop-x86_64-3.3 modified for use bld scheduler
[Form] Implementing Closure support on "property" for ObjectChoiceList
Bash: aliases to sync Git repos with GitHub and Bitbucket.
Added radvd as default package.
Added tinc as default package.
Removed wpad-mini as default package.
rails plugin added
nerd-tree updated
syntastic installed
Merge branch 'master' of github.com:sarattall/dotvim
Pragya/Megha Adding the Frankified app for automation testing
Richa/Isha: 128: Added a add event form
added socket.io client
BookMaster: Suche nun doch ohne filter Implementiert
Login is now in upper right. logo on the left side.
Fixed few things...
added "Logged as ..."
Merge branch 'master' of https://rhopp@github.com/sbunciak/restman.git

Conflicts:
	restman/src/main/resources/import.sql
Minor cleanup of compute server.  Still need to get off synchvar.
Merge branch 'master' of github.com:scala/scala-dist

Conflicts:
	examples/src/main/scala/computeserver.scala
Implement withFilter for strict and non-strict collection ops alike

One of these things is not like the other, sing it!
Bug fixes on bullets and shooting
Once again, start the repository.
Port GameArea.on_draw

Signed-off-by: Ezequiel Pereira <eze2307@gmail.com>
Making expectations easier to write.
Implemented pixel statistics to analyze intensity histograms of individual pixels
Jsonify reponds with http cache header of the actual source uri
Added the multiValue facet datastructures
[bunchr] fix provider for service resource
Merge pull request #3 from portertech/bunchr

[bunchr] fix provider for service resource
Fixing protocol check accepting invalid options
Initial commit
Setup up the repository to push to github
Merge branch 'master' of https://github.com/sevenmaxis/tryit

Conflicts:
	README.md
clean up the readme
Merge pull request #2 from sevikkk/linux-run

Changes to make linux happy
Update README.txt
Fixed typos in readme
openscad_cl now static linked release version
Removed stray file
Added a z-motor-bracket to allow the Mendel90 x-axis to be fitted to a Prusa.
Merged credots into README.txt
Fixed config file names
Improved the text
Removed redundant parentheses
Some simple word-smithing and clarification
Removing cosmetic linefeeds for better viewing on github
Merge pull request #3 from dacarley/master

Fixed some typos and flow
Removed another newline
Extracted all color resources into a common file.
Removing accidentally added files
Merge pull request #4 from dacarley/master

Common location for colors
Fixed replaced nut_grey with nut_color to match nuts.scad
allow building selected stl's
Changed wades hot end size to 16mm standard. It was set to 12, whoops.
Can now make a single STL regardless of whether it is on the BOM.
Move sandstone pages a level deepder, under the 'websites' section
Fix possible crash when player triggers rust trap without helmet.
Remove two column gap that special level loader introduces when loading left-aligned map chunks, which caused a gap on the left end of the map to appear in e.g. the Ranger home level. Fixes C343-3.
Fixed navbar defaulting to open on mobile.
Add fix for colors of tmux under ssh
Add fix for colors of tmux under ssh
Add support for columnar output.
Source ~/.bin/p4_init if devsrc2.eng.citrite.net:2555 is unset.
Fix screensaver locking (--activate does not lock).
fix for determining latest version: if source isn't configured, will fall back to trying publisher.
Reorganised test to use Twisted Trial
clear gem file
fix for admin api and free ip list in CLI/IP.pm
detect installed packages before it does install
Merge branch 'master' of github.com:shuge/sa_scripts
語尾の修正
Correcting README, deleting mention about ruby
retirando bootstrap de assets/application.css
i18n refactored
Modified view path

정산에서도 사용하고자 view의 액션 경로를 수정
Delete return button

되돌아 가기 버튼 삭제
Merge branch 'modified_path'
Update the usage for these two, it was wrong.

Kent
uncomment entry add
add mog message
Adding 'list' command
Added escaping to mustache
MariaDB module bugfixes
Fixed null pointer exceptions.
Merge branch 'fm_5.10' of https://github.com/skoster/Activiti into fm_5.10
fix for username sometimes being authenticatedUserid instead of the actual
fixing materials in apply mode, messing with normals
Fixed newline charaacter in adding monster and playerMonster sprite
generate User with random pass
v0.8.11.28 - maybe fix the chatting the correct way ^^
modified mew biff at mode line
Add a group.adj field to fix rain levels

as some groups may have wildly differing actual evaporation rates
which the "normal" rules don't handle sanely
record the fake migration caused by renaming a few model fields
recalc: uncaught StopIteration error
runschedule: be a bit mroe verbose reporting future schedulings

try to figure out why sometimes schedules are ignored
Adjust evaporation rate by valve.groups.adj
a few template fixes
Win32: remove deprecated libpng defines (aphanic)
Intermediate progress with Image Uploader plugin
Initial release of Image Upload Feature
Corrected error message in exception
Merge branch 'YUIUploader'

Conflicts:
	www/js/qa.js
Added tz.js to find timezone with javascript and set tzn timezone cookie. Then use tzn as value of timezone during registration. This replaces the tzo cookie usage.
Removed debug echo code from Contacts import script
added searchByMgmtHostname
Added @secureUrl() for securing (https) an URL
Really return the edge class in the abstract engine
adding vimrc and bashrc
add vim-foreplay
Remove default text. Add our own.
added torrent adding abilities
harry: activity
Corrected PeopleRelationships upoad
internals: removed dashes from hash keys
Added statsd as a dependency
added demolink to readme file
While the timing issues are being sorted out, turned on "diagnostics" for
both the tala and nadai demos. Also made use of the new 'ontick' facility
in the scheduler for drawing the KineticJS stage.
fixed some template errors
added some more variables
made it dumped some files for host along with network.xml
new priority icons
priority icons
Merge branch 'master' of git@github.com:ssesha/Fibonacci.git
spinner working
Merge branch 'master' of git@github.com:ssesha/Fibonacci.git

Conflicts:
	ProjectManager/res/layout/newproject.xml
create project and project list working
Complete my ufw ruleset from the stuff in netstat that shouldn't be blocked
Fix a few oversights.
unspecified server error on importxml
Update notes for submitted changes

* HAProxy `cookie` option must be in backend.
fixed historyfile bug
added more util methods to Parser to handle escaped space
added handling of spaces in filenames for Console and
RedirectionCompletion
FileUtils also support escaped spaces
+ more tests
Prepare to introduce 8.6b3 srcs
Prepare to introduce 8.6b3 srcs - few more to remove
Update tcl srcs to 8.6b3
Update tk srcs to 8.6b3
Optimize writing of simple-base-strings on SBCL.
more 6 fixes and cleanup
more 6 fixes and cleanup
Wrap socket.error in ConnectionError (+ unit tests)
Fixed a warning in the event form.
Handle ISO8859-1 encoded response correctly.
Moved all out of ITI320
modified beforeSend to pass xhr as argument
multi level geos
changed font; updated SVG bg/fg colors
messing with github - just trying some stuff
Updated JavaDocs for OpenSourceProject
adds account widget to home screen
removes not needed specs for widgets
fixes problem with track spec
adds user model for client side
sets up ajax sign up of users on server
adds sign up form and wires it up
cleans up unnecessary specs
adds styles for account widget login form and sign up form
enables cancel button on sign up widget
disables login button
adds better button styles for chrome
adds temporary redirect to sign in widget after sign up
fixes minor issues of pull request
changes naming of view domain methods
changes to please the event / method name king
clarifies difference between event-like and method names
Merge pull request #126 from stravid/feature/ajax-registration

Feature/ajax registration
added web transformations
Update html/js/livevalidation_image_upload.js

Updated to include capital letters
fix history setting
v3.0

Nearly Complete Rebuild.
Significantly lower Memory Usage.
Profile Management via Reflux added.
Track PVs (exact number) (bugid:49556)

git-svn-id: https://svn.wikia-code.com/wikia/trunk@61476 e846bd91-c042-42a7-a218-4b65e2c1904d
added additional increment to preserve wfMsgHTMLwithLanguageAndAlternative() behaviour BugzId:50016

git-svn-id: https://svn.wikia-code.com/wikia/trunk@61477 e846bd91-c042-42a7-a218-4b65e2c1904d
argh

git-svn-id: https://svn.wikia-code.com/wikia/trunk@61478 e846bd91-c042-42a7-a218-4b65e2c1904d
Bots API

git-svn-id: https://svn.wikia-code.com/wikia/trunk@61445 e846bd91-c042-42a7-a218-4b65e2c1904d
Video ingestion: check provider's status when fetching a thumbnail

git-svn-id: https://svn.wikia-code.com/wikia/trunk@60900 e846bd91-c042-42a7-a218-4b65e2c1904d
trunk: reverting change to ApiJob count

git-svn-id: https://svn.wikia-code.com/wikia/trunk@58523 e846bd91-c042-42a7-a218-4b65e2c1904d
M .bash_profile
 M .bash_prompt
 M .exports
added basic start to composites.
Added instance registration.
Add main script to use parser and extract desired log
Disable current line highlighting
Revert to desert colorscheme
BF: Don't rely on OrderedDict in tests (only from Python 2.7 onwards).
Merge remote branch 'mh/master'
Extend map and build basic arena
[#13] - Added a routes with the params in it, then changed the mobile leaderboard links to not have data-ajax=false.  This means the mobile leaderboards can use the ajax loading instead of reloading the entire page.
Back to previous behavior for closing button after http://cgit.scilab.org/scilab/commit/?id=5eeaf92f7b6261ead279ed5c74afaa529b7b337e

Avoid to close the tab when we just want to select it.

Change-Id: Idaeaf20b6d4dad215f59e0b9d2cd17d5d3c84606
Add an item in Scinotes menubar/toolbar to launch preferences/help

Change-Id: Ib1cb1c5f9a5444f73f223609b0624272a7e3fbab
Fix a translation mistake

Change-Id: Ic76d67c0b04e456bbb8976da9308aaf6deb884be
Changed save button
updated with livestreaming info and engine licenses.
Add basic iCalendar support
more format errors
No se que pasa??'
foefelen aan message
Almost done spnz image
added embed iframe results, and a simle embed example
Merge branch 'master' of github.com:tblom/tw_example
a few change in the appearance of global header buttons
New Comment
New Comment
Don't use kill 0 to determine if Xvfb is running

This prevents using an external Xvfb process since the ruby process
doesn't have privileges to send 0 to the Xvfb process.
fix layout setting in a newer dancer version
Use Meslo LG M font (patched for powerline) in gvim
add if stmt
Now able to handle input files with non-ASCII characters even when the locale settings of the environment don't match the file encoding, using new --encoding option.
add chromium.ppt
test: add FetchMany
retriever error from db
fix retrieval of error messages
Completed  PING_EVENT packet
Update README.md
Merge pull request #17 from theopak/master

Adds Purchase.addToCart()
Increases PEP8 Conformity.
Makes no funcitonal changes.
Expands inline comments but makes no changes to the program.
Closes #9 and remedies the `cart` maadness.
The list of tuples at Purchase.info['cart'] is now handled correctly by the code and instantiated correctly in the test function.
esim.py: use datetime for PartyMember.joined
removing subclass lib
Corporate Action listing
updating for new servers
add support for new servers.
Preparing for clyde-1.0.10 release.
Add shouldExecute handling for compound actions
Mark layer as dirty once image is loaded.
Preparing for vilya-1.4.1 release.
Fix option name. props ocean90, see #21719.



git-svn-id: https://core.svn.wordpress.org/trunk@22070 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Compress scripts/styles: 3.5-alpha-22071.

git-svn-id: https://core.svn.wordpress.org/trunk@22071 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Remove 'hwstring_small' from attachment metadata and deprecate get_udims(). props SergeyBiryukov. fixes #21518.



git-svn-id: https://core.svn.wordpress.org/trunk@21808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Bump default memory limit from 32MB to 40MB. fixes #21646.



git-svn-id: https://core.svn.wordpress.org/trunk@21809 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Use site_url() in WP_Rewrite::mod_rewrite_rules(), rather than get_option(). props JustinSainton. fixes #21186.



git-svn-id: https://core.svn.wordpress.org/trunk@21810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
adding the greenland 1km scripts provided by the pism folks
css changes

Signed-off-by: Theresa Leonard <theresa@fiddleface.com>
Assignment, not comparison.
Configure for new QT version. Add sms.ru balance function.