labofsahil/github-event-dataset-2012 huggingface dataset:
Added a simple menu bar containing shortcuts to website main pages.
test
Added menu
Merge remote-tracking branch 'origin/master'
version change 0.2-0.3
[CORE] Fix vmm_net_port_can_rx_t return-type

can_receive() hook has no significance unless it tells the rx capability

Signed-off-by: Anup Patel <anup@brainfault.org>
[ARM] vexpress-a9: Added support for local timers for per host CPU clockchip.

Signed-off-by: Anup Patel <anup@brainfault.org>
libwinpr-utils: added printing of default boolean value
libwinpr-utils: improved command-line API
removing tons of files
Add spec for handling an empty .awestruct_ignore file
Ctor default-getters unique name and are typed in constructor context
Streamlining calls so success/failure go through complete, also made sure completeWith doesn't crash on multiple attempts.
Introducing tryCompleteWith for symmetry and for the possibility to treat racing completeWiths as a problem or not.
Removing a lot of residue and superfluous method declarations. Moving out newPromise to the implementations instead of having it inside impl.Promise
Removing some verbosity in Promise.tryComplete
Rewriting the doc message for tryAddCallback so it reflects the semantics
Removing the wrap-method from Promise
Cleaning up DefaultPromise.onComplete
Adding FIXME to ExecutionContext.fromExecutorService
Changing impl.Promise to return this.type
Unbreaking tryComplete + Future.apply since resolver must be use both for boxing of callback and for execution
SI-5543: Merge with trunk

Reverts name unenmanglement that was objectionable in the previous patch
commit 47bfd744177121de08fed489a5b0b1b59a1ae06a.
SI-5543: Ctor default arg wrongly scoped (revised)

This patch fixes the motivating bug by detecting when a method is
the default arg getter for a constructor parameter.  That requires
fixing a secondary bug where an arbitrary string was used to encode
<init> in lieu of <init>.encode.  There is no speculative mangling.
Merge pull request #15
Merge branch 'master' into wip-sip14-fixes
fixed typo in documentation of @cpsParam
small tree attachment refactoring: firstAttachment
move more of match translation out of typers

reduce duplication in [typed/translated]Match & co

in preparation of moving match translation out of the type checker,
setting everything up so that we can simply type Match nodes first,
then translate them separately

using DefaultOverrideMatchAttachment to remember the default override for a match
that defines a PartialFunction

only strip annotations when translating match
or cps in matches fails

widen selector type when translating

match-derived partialfunction slightly less cps-specific
moving patmat to its own phase

sort field accessors, necessary after typers -- apparently...

don't throw TypeError, use issueTypeError
don't run patmat phase when -Xoldpatmat
only virtualize matches when -Xexperimental

recycle cps type of match for re-typechecking:
  when one of the internal cps-type-state annotations is present, strip all CPS annotations
  a cps-type-state-annotated type makes no sense as an expected type (matchX.tpe is used as pt in translateMatch)

don't synth FunctionN impls during typer, only do this for PartialFunction
updated check now function synth for match is deferred until uncurry

patmat-transform try/catch with match in cps

cleanup in selective anf
remove TODO: can there be cases that are not CaseDefs -- nope
partial fun synth typing under correct pt
updated on Fri Oct 12 02:14:33 UTC 2012
removed index of array
1. Updated artifact
deprecation fixes
Merge branch 'master' of github.com:azgo14/CS169Project
eclipse-java integration
eclipse-java integration



Change-Id: I05ccda80f5d8cd54ccdb914acb87a4899802a5a5
Signed-off-by: Travis <corasian@gmail.com>
eclipse init
eclipse init
eclipse init
Merge branches 'master' and 'pe387'
Update Commit

- version update for MPlayer...
- *.xz added to gitignore...
- bugfix for keepassx (in-file patching done!)
Update Commit

- template update: check ownership in do_download!
Update Commit

- version update for apache-ant...
- removed pmount, sdcc scripts...
match more things
Added scaffolding to student class
Integrating slide show
commit before pull
removed some random comments
test project added
Comment added
Reorder menu by dragging
* Working on HTTP request class
Merge branch 'master' of https://github.com/banDedo/iOSTemplate

Conflicts:
	BDUtilities/.DS_Store
	BDUtilities/BDUtilities.xcodeproj/project.pbxproj
Nachführung von Listen hierarchisch tieferer Ebenen verbessert
Removed max width in grid component
linter fix: AttributeError: 'NoneType' object has no attribute 'declared_at_loop'
do not return trailing slash when no arguments
Fix left/right ordering of diff
adds group sidebar brief view of subgroups similar to members view
Fixed unicorn/development mode chunky error
Change version
Update README.md
Update README.md
Update README.md
Merge pull request #1 from behere/v1.1.0

V1.1.0
submodule 제거
edited models & admin
testing Navigation template in main
BS Mockup for Simple Content App
BeanUtils support
Google Analytics Simple portlet
BeanUtils Removal, not needed as Map is supported by Mustache
Added support for PCA objects from FactoMineR package
Sixth.
GFF3Parser - passed test for multiple parents
floats, negative numbers, and some syntaxic sugar added.
Replace deleted line breaks with ↵ (to improve readability) and add ↵ before all other line breaks to aid in recognizing where line breaks are present (and added).
add basic ordering ability,  start to move headphone/bluetooth stuff to service
Finished with lexer
Use json instead of strings
Added some statistics
Commit file#1
added new branch index.html file
fixed email thingy
finished the footer on the issue
Merge branch 'iss53'
last session for day
- Updated JQuery UI library
- Finished loading of objects per type
- Made all functions working again
Add config/ey.yml
Add deploy hook for public symlink
Added needed @script{ignore} tags to appropriate functions in gameplay.
Added code to gameplay-luagen that cleans the output directory of all .cpp and .h files before generating new ones.
Verified and updated memory management with Lua scripts.
Minor update to the script for the Lua sample.
Minor changes to Font class to make the inner class Glyph and the related create() function private.
Merge pull request #547 from blackberry-gaming/next-cculy

Next cculy
Fixed xcode project and android makefils for additional lua changes.
Merge pull request #216 from blackberry-gaming/next-setaylor

Next setaylor
Fixed gameplay-encoder to support FBX SDK 2013.1 and 2013.2.
Updated the pre-compiled gameplay-encoder.
Updated the encoder readme. (wininet.lib not required anymore)
Merge branch 'master' of https://github.com/blackberry/GamePlay
Merge pull request #281 from dgough/master

Fixed gameplay-encoder to work with FBX SDK 2013.2
Exposed linear and angular factor methods for PhysicsRigidBody; modified lua bindings to match.
Merge pull request #521 from pooerh/7cb4da33e9fe55606d632f387439fa30a26b7c0f

Exposed linearFactor and angularFactor from Bullet to PhysicsRigidBody
changed links to github links
Don't bother linking macvim or emacs into /Applications
roles[dev]: don't install virtualbox
add homebrew::usr_local
High PingIt Limit
Return change to 101 taint
Disable SOFORT euro
Check Object.prototype is empty
Removed uncommented previous version of DOM building.
azetuop
zmiana koncepcji przepływu danych
dodawanie, edycja, usuwanie stacji
Added MeanCols()
First pass at kmeans() that compiles.
barcode scanner support
lesson 9 checked and good to go
added videos to Intro-to-Booleans lesson
store enum values as strings
changes to rot13.py - first attempt and Unit 2 problem set
Add a StaticPages controller
add rspec staticpages
Finish static pages
Fin du prototype de commerce
new code
code changes
Added another item. Got poison working. Now, normal insects attack other trees before they attack the player.
refactoring the structure
just kidding, forgot package names in the files, and also came up with better names
Merge pull request #2 from tquan/refactor

refactoring the structure
Removing App.java

Signed-off-by: Chris Aniszczyk <zx@twitter.com>
Merge pull request #3 from womensp2p/removeapp

Removing App.java
imported twilio
Added two input fields for number and message.
call me, maybe?
call me, maybe?
with a form now
allowed method
omfg forms
fixup endpoint
Added SupplementalSetup.md. This file contains information on Maven, Heroku, Git, Python, and general environment variables.
Bug fix so the External Data Loads feature works in Ubuntu 12.04
removed anything that uses an external resource
added mobile web app meta tags
Brought in my 2011 blog posts, and added styling for "plain" images.
Allow drawing J in the AA color scheme.
Adding rudimentary json merger and quickcheck/proper properties
Updating dev start script
Added read me images to an etc directory
dump line segmentation info
6iAUAAAAQAAJ completed
ioBind refactors
Modifications diverses

Modifications diverses
updating

updated version to 2.0.0
copy-edits the docs of 9ee0ffb
When a route references a missing controller, raise ActionController::RoutingError with a clearer message
Fixed DataMapper namings in symbols and constants.
Refactor define_restrict_dependency_method using reflection
#read_entry in ActiveSupport::Cache::FileStore should log details of the exception when an exception is thrown.
when using a preloaded array and the uniq flag is set then return the size of the uniq array
Allow manual rollbacks in after_save to reset object correctly
[#5559] Do not black out the system timezone DST jump hour if Time.zone differs from that.

The system timezone DST jump hour should not be blacked out by Time.zone.parse if current Time.zone does not do the jump at that time.

Fixes #5559.
Remove sort on attributes.keys
allow the :converter Proc form composed_of to return nil

This makes it possible to filter invalid input values before they are passed
into the value-object (like empty strings). This behaviour is only relevant
if the :allow_nil options is set to true. Otherwise you will get
the resulting NoMethodError.
Adds migration and schema dump support for INET, CIDR, and MACADDR
Initial proof reading of getting started guide
Converts inet and cidr columns to NetAddr::CIDR
Compressed all images from the guide through ImageOptim which saves sometimes up to 74.6% in size [ci skip]
Removes NetAddr dependency
has_secure_password shouldn't validate password_digest.  It should also take options to turn validations off.
Updated tests for has_secure_password.
Postgresql doesn't accept limits on binary (bytea) columns.
[guides] add local precompilation section
update docs on Object#try
Update docs to public_send for Object#try
remove exceptions in tests
Textured block 2
copied all the files into the repo
Site updated at 2012-09-22 07:11:22 UTC
Add UserAgent#device_type
Update to version 1.1.2.
creating a SQLite DB with sample data
Ficheros .gitignore
first commit
Merge https://github.com/calabria/WHAnalysis
First commit, Added TypeI pfMET and correct JEC
added debug.php
recommit footer
We have PP variables!
Automatic commit of package [candlepin] release [0.7.11-1].
Fix subscription signup copy
Changed format and wrote it up
changed the name of target file
continue writing
cstruct cleanup
icon for the 'create new statement' button of the conclusion
refactoring of the models and views
Bugfix: Now works with the 5 boards from HW1
expand returns the final state instead of a bool
немного изменила конфиг, зависимости и вторую форму
Merge pull request #1 from teefero/master

gimme your stuff
Merge pull request #2 from DariusTClark/master

gimme your stuff
Merge pull request #3 from cdunn711/master

gimme your stuff
Merge pull request #5 from cdunn711/master

forking spooning knifing
Merge pull request #6 from juliets27/master

gimme your stuff
just added the usability test day documents
check out this report, the color scheme doesn't have to be blue ... the
name is NOT tyd, and what I left blank was either a diagram that
doesn't make as much sense anymore or things that will change. see
EMAIL.
code here from now this will help us keep track
commititng all of this
added a sign in page :)
Merge pull request #7 from cdunn711/master

Take the new code
Merge pull request #2 from teefero/master

whatevs
1.9.2 BasicObject does not include object_id, also hash was not returning varying values
Merge pull request #80 from JustinLove/basic_object_identity

1.9.2 BasicObject does not include object_id, also hash was not returning varying values
Add distribute that works
[ASan] support for running OS-specific tests using lit, port clone_test as an example

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@161864 91177308-0d34-0410-b5e6-96231b3b80d8
Use a switch instead of a simple condition in force_interface_symbols().
Otherwise Clang eliminates everything after the first interface symbol that is marked noreturn.



git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@161573 91177308-0d34-0410-b5e6-96231b3b80d8
[msan] Remove an extra semicolon.


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@169967 91177308-0d34-0410-b5e6-96231b3b80d8
getObjects.cpp
修改了代码结构,添加了form_validation处理
added a simple templates directory and a sample file
add echosvr
Validate Email Address function added.
Update java/OauthManager.java
About screen: make the text translatable again and escape <img src=admin_url(), see #20423

git-svn-id: http://core.svn.wordpress.org/trunk@20847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Use mdash. see #20423.



git-svn-id: http://core.svn.wordpress.org/trunk@20848 1a063a9b-81f0-0310-95a4-ce76da25c4cd
About screen: fix typo, see #20423

git-svn-id: http://core.svn.wordpress.org/trunk@20849 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Media: Activate the featured image toolbar when the media dialog is first opened. see #21390, #21776.


git-svn-id: http://core.svn.wordpress.org/trunk@22561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Sharper HiDPI alignment icons for TinyMCE. props lessbloat. fixes #22431.



git-svn-id: http://core.svn.wordpress.org/trunk@22562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Revert accordion-delay code from [22400] that was causing problems. props lessbloat. fixes #21283.



git-svn-id: http://core.svn.wordpress.org/trunk@22563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Pass the post ID from the_shortlink() to wp_get_shortlink() to avoid a change in filters. props SergeyBiryukov, fixes #21309.



git-svn-id: http://core.svn.wordpress.org/trunk@22564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Avoid notices with [22426]. props pross. fixes #22420.



git-svn-id: http://core.svn.wordpress.org/trunk@22565 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Pass 'blank' to Gravatar rather than sending blank.gif for Gravatar to proxy. props miqrogroove, fixes #22354.



git-svn-id: http://core.svn.wordpress.org/trunk@22566 1a063a9b-81f0-0310-95a4-ce76da25c4cd
this is now a pypi package! i think
Added lock-get-pdu
Fix for dynamic VBO update support for >65k indexes
Remove SLN

Appears to be system dependent as well
removed 'alias' from release script
Code cleaning and refactoring (3 : DependencyInjection)
Added texture mapping.  Still working on the sky and ground.
Add health check for state file

Change-Id: Iceb1ae07981183f1a2028e7a1782a276eab4fda2
Adds a geppetto.themes plugin for juno
Adds the geppetto.themes bundle and set the default preference

The default preference is set to the "Geppetto Classic" theme included
in the geppetto bundle.
Implemented SOIL image library and internal texture ID management
Updated spacebrew config description
created dashboard app skeleton, made settings a module

Settings is better as a full module, to allow dynamic loading
of local settings (will be useful later when we deploy).

dashboard app is where the bulk of the code will live: models,
views, tests, etc.
root url points to welcome page

Activate root url, pointing to welcome page view. Add basic
welcome view and template.
forgot to add template file.
added my name to welcome page
Merge pull request #20 from jlowdermilk/master

Added app skeleton, welcome page.
Added a context to the template.
Merge pull request #21 from jlowdermilk/master

add missing template file
Merge branch 'master' of https://github.com/Full-House-UW/fullhouse
Set up the welcome.html template
Set up template with names on new lines
Merge pull request #23 from creisman/master

Set up the template for welcome.html to use an array of names.
Merge pull request #24 from jlowdermilk/master

add jlowdermilk to welcome page
add my name to welcome page
Merge pull request #25 from natmote/master

add my name to the welcome page
Adding my name to the start page
changed file name to YYYY-MM-DD_hh-mm-ss.*, save to subdirectory of external storage
Monsteriluokat, testejä ja javadocseja
add relation_n_n templating system
Merge pull request #87 from goFrendiAsgard/master

relation_n_n with template system. Need some small changes but it is ok in general lines. Thanks @goFrendiAsgard :-)
Some small fixes from the pull request.
add where clause as the last parameter in set_relation_n_n
Merge pull request #88 from goFrendiAsgard/master

add where clause add last parameter in set_relation_n_n
#88 - Adding a where clause in set_relation_n_n
Sorted out merge conflicts
Added tests for ConfiguredCommand
Merge pull request #103 from axemblr/configured-command-test

Added tests for ConfiguredCommand
config: change # of post to be show

Signed-off-by: Kyoungdon Jang <alex.jang@samsung.com>
theme: round for code block

Signed-off-by: Kyoungdon Jang <alex.jang@samsung.com>
update

Signed-off-by: Kyoungdon Jang <alex.jang@samsung.com>
minify setted up out of module dir
editor.js now minimizing and loading
fixing logo link to root_path
add ./components to npmignore
add padding to component-build(1) verbose output
add dup ignoring functionality
add component-open(1)
refactor component-build(1) with new builder.js lookup paths
add writing of obj.require to component-build(1)
remove require.js script
add build dir to component-create(1) .gitignore
fixing minor XSS in composer image cropper
[AddressBook] Added initial code for AddressBook.
[docs] Added SQL templates for creating examples user and addressbook table.
Added GPL license header to files..
[AddressBook] Added edit function.
Merge branch 'master' of github.com:cooljc/web-examples
JSCBC-5: Change writeability notifications to async_t

Refactor from uv_prepare_t to uv_async_t. This ensures that write
notification requests made from within a different prepare phase ends up
being delivered immediately after control is returned from the (non-lcb)
prepare callback

Change-Id: Ib8fc34847f3855707c9968456e296422887af086
Reviewed-on: http://review.couchbase.org/22908
Reviewed-by: Brett Lawson <brett19@gmail.com>
Tested-by: Brett Lawson <brett19@gmail.com>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
MB-6918 Remove memcached dbdir from default config.

It's not needed in 2.0. And with recent change that synchronizes it to
database_dir and view_index_dir it may be confused with genuine dbdir
left from the older version of couchbase server. Particularly, if some
node is removed from the cluster its config gets cleared and dbdir
will again become part of memcached config. It means if this node had
a custom data path it will be overwritten on the next restart.

Change-Id: I158309323506863790044285a9fb04cd2d3718da
Reviewed-on: http://review.couchbase.org/21696
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Tested-by: Aliaksey Artamonau <aliaksiej.artamonau@gmail.com>
CBD-181: added cancel bucket compaction button

Change-Id: I44529c04feb03a3fc6d325dc98ab64711d18804d
Signed-off-by: Aliaksey Kandratsenka <alk@tut.by>
[alk@tut.by: removed not really needed stopRenderBucket thing]
Reviewed-on: http://review.couchbase.org/19408
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Added content and background script loading, as well as an initialization function with an onInstall call.
signal work
~~~~~~~~~~~~~~~~~~~~~~
BuddyMessage Works.
bug 792436 - added support to route all stacktraces through metlog-sentry

also added an option on the zadmin.generate-error button to send
sentry messages
Added licensing information.

Generated a Creative Commons Non-Commercial Share and Share alike
license and added it to the README. Also attributed the source of the
work.
Tweaked Creative Commons License text.

Minor tweaks to use text generated by creativecommons.org.
Updated model User, Content
Filesystem bug fixes.
added online links where link is on holding 856 (gw, egovdocs)
added box-sizing reset
check for new version of Modernizr
Move database import to database dialog
Set output destination directories

Needed on Windows.
workbook.rb : initialize(), write_book_views()  to CPAN_0.47
worksheet/test_cond_format_01.rb added and pass
worksheet/test_cond_format_02.rb added and pass
worksheet/test_cond_format_03.rb added and pass
worksheet/test_cond_format_03.rb added and pass
worksheet/test_cond_format_05.rb added and pass
worksheet/test_cond_format_06.rb added and pass
worksheet/test_cond_format_07.rb added and pass
worksheet.rb : typo
worksheet/test_cond_format_08.rb added and pass
worksheet/test_cond_format_09.rb added and pass
worksheet/test_cond_format_10.rb added and pass
worksheet/test_cond_format_11.rb added and pass
worksheet/test_cond_format_12.rb added and pass
worksheet/test_cond_format_13.rb added and pass
worksheet/test_cond_format_14, 15.rb added and pass
worksheet/test_cond_format_16.rb added and pass
worksheet/test_cond_format_17, 18.rb added and pass
worksheet/test_cond_format_19.rb added and pass
Merge branch 'master' of github.com:cxn03651/write_xlsx
cleaned up main folder org
moved css to new file
remove changelog-table.sql not needed anymore
added rulesets for phpmd
changed the public-htacces location to github
Merge branch 'staging'
Renamed "properties" controller to "property". Added respond functionality
Updated controller to handle arbitrary buffer sizes
Fix BGP template properties (sizes and wrong white spaces)
Merge pull request #416 from logoff/fix/bgp-template-properties-corrections

Fix BGP template properties (sizes and wrong white spaces)
I seem to have broken something
Fix glob installed volo not finding local modules

Update volofile format
Update README file to reflect new volofile format
Merge branch 'volofile' into dev
Add async script loading
Merge branch 'async' into dev
Add tracking codes to index and 404 pages
Merge branch 'tracking' into dev
Fix tracking command never finishing
Merge branch 'volofile' into dev
Fix HTML pages not validating

Change conditional IE tag to match one another
Remove X-UA-Compatible meta tag (send it using header instead)
Merge branch 'valid-html' into dev
Fix AppCache offline fonts (finally!)

Add dependency to scrape Google Webfonts
Write script to scrape FontAwesome fonts
Use protocol-less FontAwesome CDN in order to cache the fonts
Merge branch 'offline-fonts' into dev
Bump version to 1.1.0
Merge branch 'dev'
improve type handling and incorporated ideas from gist.github.com/3164289
hard spaces as well
add Tweeting
Added obj models for pieces
Wrote small tools to translate coords of models
Replaced mocked pieces with more realistic pieces
Added PLONE_SITE_ID configurable with environment variable. (Not for plone.app.testing-based tests, but to override variables for pybot.)
Added instance into buildout and updated robotentrypoints to set variables to point 'instance'-based Plone-site.
Form & Table
Updated file: logo.svg
[DF-427] Scene textures reload after changes in textureBrowser
Merge branch 'ResourceEditorQt' of https://github.com/dava/dava.framework into ResourceEditorQt
Meta small fix. GetSize - added const
davawidget refactor
[DF-387] draft implementation
[DF-387] added single material selection. added draft drawing in material view
Merged with development branch
fixed custom build command - qt generation

Make available to run vsproject custom build steps via teamcity build.
[DF-387] templory returning back to old material editor
Merge branch 'ResourceEditorQt' into development
Merge branch 'development' of https://github.com/dava/dava.framework into development
Add: libzip for android
Add: lightmaps compressing
Visibility check tool, beta
Small fixes and improvements in win proj file
Fix undo memory bug.
DF-406 Fix uninitialization issue.
[DF-406] update
Change  visiable points testing alg.
Merge remote-tracking branch 'upstream/development' into ResourceEditor_LevelVisibilityTool

Conflicts:
	Tools/ResourceEditor/Classes/SceneEditor/LandscapeEditorCustomColors.cpp
	Tools/ResourceEditor/Classes/SceneEditor/UNDOManager.h
undo refactoring. fix small ui issues
[DF-406] Merge remote-tracking branch 'origin/ResourceEditor_LevelVisibilityTool' into ResourceEditor_LevelVisibilityTool

Conflicts:
	Tools/ResourceEditor/Classes/SceneEditor/UNDOManager.cpp
[DF-406] Fix cursor drawing over result layer. Fix drawing cursor to saved texture. Fix input actions. Fix deleting saved file in UNDOManager. Fix crash when visibility area partially outside of landscape
[DF-406] Remove unneeded code and comments. Small fixes
[DF-420] Merge remote-tracking branch 'upstream/ResourceEditorQt' into ResourceEditorQt-DXT-dev

Conflicts:
	Tools/ResourceEditor/Classes/EditorScene.cpp
	Tools/ResourceEditor/Classes/Qt/mainwindow.h
	Tools/ResourceEditor/Classes/SceneEditor/LandscapeEditorCustomColors.cpp
	Tools/ResourceEditor/Classes/SceneEditor/UNDOManager.cpp
	Tools/ResourceEditor/Classes/SceneEditor/UNDOManager.h
	Tools/ResourceEditor/ResourceEditorQt.xcodeproj/project.pbxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj.filters
commit after merge
[DF-420] Small fixes after merge with dava.resourceEditorQt
[DF-350] Add custom colors texture loading. Add storing custom colors texture save path to landscape node custom properties.
Merge branch 'ResourceEditorQt_CustomColors' of https://github.com/adebt/dava.framework into exttools-merge

Conflicts:
	Tools/ResourceEditor/Classes/Qt/mainwindow.h
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj.filters
Merge branch 'development' into exttools-merge
[DF-350] Fix: updating property panel after saving CustomColorTexture
[DF-185] Fix: inverting UIControl::WillDisappear calls from children to parent
[DF-350] Fix: disabling fog when CustomColors editor is enabled
[DF-185] Added Removing of heightmap file in undo-redo actions
Updated readme, npm package manifest, and removed travis ci for now.
added access to get and post vars
added access to get and post vars and disabled access to the global alternatives
Updated project meta-info (e.g. SCM)
fix the real report page
Return* simplified
Fix zelda-battery scripts

The output of `pmset -g ps` becomes three lines when your battery
approaches critical levels (under 20% remaining). I've updated it to
pipe to `awk 'NR==2'` instead of `tail -1`.

Signed-off-by: David Celis <me@davidcel.is>
Use option() instead of set(... CACHE BOOL ...)
Fix casting error.
started writing viirs2merra method
Adding note for wpd on dms vs cms
Merged pull request #9.
Merge remote-tracking branch 'origin/master'
Error message in a bootstrap div for the resetDB action (ticket #6)
Temporarily stop requiring podinherit on < 5.10.1, until we fix it
Fix incorrect handling of $? in travis preconf script
do pub sub staff
#119 Configuration: validation of values at server side
switched to SASS
Threw out unneccessary echo in build script
2-gram letter model
updated jquery plugin included by default to 1.7.2
GRAILS-9213 - Optimize hibernate plugin reload
Merge pull request #227 from longwa/GRAILS-9213

GRAILS-9213 - Optimize hibernate plugin reload
fix failing tests
Merge pull request #225 from bobbywarner/jqueryUpdate

updated jquery plugin included by default to 1.7.2
BaseX client library now an external project
Merge pull request #528 from delving/basex-client-external

BaseX client external
Making fileStore multi-tenant
Making imageCache multi-tenant
Temporary directory
PrincessehofSample now called sample-a, and now sample-b added too bootstrap.
text expand/contract tranlations
Fact definitions can now be found under prefix "facts" and version "1.0.0"
#201 Adjustment to abm recdef, avoiding NPE in ShowOptionsMenu
フリースペース用のCreate文と初期データを追記した

テーブル名はfree_space
閲覧画面でフリースペースの内容をDBから取得できるようにした

フリースペースの取得条件は、idが一番新しいものを取得する
現在のところ、フリースペースは１件しか保存できない仕様
ナビゲーションにフリースペースへのリンクを設置した

フリースペースの画像の代わりに、アカウントの画像を表示している
管理画面のフリースペースの表示部分の作成

フリースペースの画像がなかったため他の部分の画像を表示しています。

□ナビゲーションの画像
ナビゲーションの画像は画像がないため、アカウントのものを表示しています。
application/modules/admin/configs/navigation.xml
の212行目ぐらいのsrcを変更すれば
フリースペースのナビゲーション画像を変更する事ができます。

□編集画面の(indexアクション)の見出しの画像(文字列)
FreeSpace/indexの
hAreaの画像は、サイト情報のindexアクションの画像を表示して
います。
フリースペースの実装完了した

将来的には、TinyMCE等のエディッタを利用したいけど、
とりあえずtextareaで入力欄を作成した
ページ編集のコンテンツをTinyMCEのエディッタを使用することができるようにした。

dojoは使用できない設定になっている
Datepicerを使用できるようにした。

フォーマットは、YYYY-MM-DD HH:II:SSではないので、変更する必要がある
ページ作成の作成日時のUIを変更したので、バリデーションとフォームの処理を変更した

作成日時は、作成日と作成時刻の入力をひとつにまとめたことにより、作成時刻の処理を削除した(バリデーション等)
ページの作成日時の変数をviewで使用できるようにした

変数名は$createDate
HTMLのレスポンスだけ、ナビゲーションを表示するようにした

XMLとJSONのレスポンスの場合は、ビューに共通のパラメータを設定しないで、アクション内だけのパラメーターを設定するようにした
メディアデータをJSON形式で出力できるようにした

JSONの出力方法(postJsonContext)を変更したかったので、Action_Helper_SetucoContextSwitchを
作成した
API専用のモジュールを作成して、そのモジュールにメディア情報をJSON形式で処理させる処理を移動させた

内部処理でもAPIモジュールを利用する
Mediaサービスの基底クラスのCommon_Mediaクラスを作成して、モジュールをまたいで使用するものを移動させた

データの作成、編集、削除に関連するものはAdminモジュールの方に残してある
ApiControllerの共通処理を定義する基底クラスを作成した

ApiControllerは、基本的にJSONで値を返す
エディタのアイコンの整理、横幅合わせと日本語化

Signed-off-by: aki.star02 <aki.star02@gmail.com>
エラーコントローラーの修正をした

エラーの場合、エラー用のビューが表示されてしまっていたのを空のデータを渡すようにした
メディアデータのファイル名をフルパス(URL)にした

http://setucocms.localdomain/media/upload/1.jpg みたいな感じ
httpsには対応していないので、httpsに対応するときに修正する必要がある
TynyMCE導入後どのページでもtextareaが変更されてしまうのを修正。
対応していないファイルが登録されていても、取得しないように変更した
エディタのテンプレートを作成するモデルのAdmin_Model_Templateクラスを作成した
more spelling mistakes corrected
test case to proof that less between strings also work and do not error
prepare release
[maven-release-plugin] prepare release paulparser-1.0
Fixed bug in removing avatars for increasing numbers of avatars per organism. @JJB
fixed currency and date format
Forgot to remove stray line: cleanup.
sdfsdf

Signed-off-by: Dimon <dimonpvt1236@yandex.ru>
added end date option to date field
Merge branch 'refactored'
adds a dashboard and removes the navigation; adds all js and css as local files; adds a cache page for two actions in the coursescontroller
makes the twitter page look nicer
Refactor witchifier to use hinder input

Update Rails
Accidentally made a funcall when trying to make an apply lambda...
going on with italian localization
Merge branch 'master' of https://github.com/xponrails/askbot-devel
some more translations
some more translations
some more translations
translated fuzzy and js messages
minor changes on translations
fixes on translations
locale/it/LC_MESSAGES/django.mo
translated missing bundles
translated fuzzy bundles
translated js bundles
translated all bundles
little fixes
Merge branch 'master' of https://github.com/ASKBOT/askbot-devel
minor translations
upgraded translations
some more translations
added test cases for making private posts, some tests fail
added test cases and fixed some issues related to posting of private questions and answers
Update RemoteSync tools

Signed-off-by: Oleg Bulatov <oleg@bulatov.me>
Packages/SidebarGit
minor fix to schedules.php
Merge branch 'master' of http://github.com/dnoe10/cs147project
improve disgin
document
0.0.2
Partie 3 : site et ip dans DNSFILE marche
FTP script update
Empty
Update:LTS
final
no change
Adding regular expression constants
Select vundles from dotvim
Fix settinsg that needs changing

and remove my name
Add hlsearch and <C-l> mapping to set nohlsearch
Fixed error on no match
Merge branch 'drac_dns'
Add a license and fill out the README
debugging decomp rxns
kings done
Adds modal popup when earning achievements
rename
Merge branch 'dev'
Made sure that in case of empty document_verifier option, a the default document verifier is used in the SolrClient class.
Merge pull request #10 from drotschmann/fix/document_verifier_issue

Made sure that in case of empty document_verifier option, the default ...
Added getPropertyOrElse.
Refactored Topi API to include state for efficiency when translating
incremental queries. Changed TopiProcess.ExpTranslator to use
StringBuilder instead of PrintWriter.
funcion para encontrar los puntos cercanos a un punto dado
Merge pull request #76 from amscanne/master

Always fetch the descriptor in a migration.
Fixing up a small log message error.
Merge branch 'master' of github.com:gridcentric/openstack
Ensuring that variables are defined.
Frontload the sanity checks for migrate into the API.
Merging front-loaded checks.
#208: We ignore image not found errors when deleting images from the image service during discard.
#212 Network servers are now cleaned up properly after a migration.
Merge branch 'master' into stable/diablo
Merge remote-tracking branch 'gridcentric/stable/diablo' into stable/diablo
Merge commit 'ecbb7886ddf1385379e7ac2a0ee2677c0050c96a' into stable/diablo
Merge branch 'stable/diablo' of github.com:gridcentric/openstack into stable/diablo
Not displaying cancelled sessions
Add error handler when read image data using libjpeg.
Fix errors when read image using libjpeg.
Fix errors when read image with broken data using libjpeg.
Merge pull request #1532 from wenbin1989/gles20

Add error handler when read image data using libjpeg.
Update AUTHORS
fixed #1545:remove the usage of CREATE_FUNC
Merge pull request #1559 from minggo/iss1545-not-use-macro

fixed #1545:remove the usage of CREATE_FUNC
add Win 8 Metro and WP8 description into readme
fixed #1556: Set a defaut texture for CCParticleFire, CCParticleFireworks, etc.
Added some static constructors.
fixed #1556: Added a newline at the end of firePngData.h file.
fixed #1556: Removed CCParticleFire::create(const char* pListFile) since particle can be constructed from plist by CCParticleSystemQuad::create(plist).
Merge pull request #1560 from dumganhar/iss1556-particle

fixed #1556: Set a defaut texture for CCParticleFire, CCParticleFireworks, etc.
Redirected cocos2d-html5-tests to cocos2d-js-tests
Made sys.localStorage support for jsb, works ok on win32.
pyqt  qml
[zsh] Fix errors on haku.
PDF conversion.
bundle config build.pg
Removed unnecessary file.
Finish sign in
- Users aan een event toevoegen, verwijderen en ophalen
Merge branch 'master' of https://github.com/edeckers/rendezvous
archivos en css
Minor updates
Sketches ACM

Código produzido nas aulas de Arte e Comunicação Multimédia.
crm
Merge branch 'master' of github.com:edse/cmais-frontend
banner home tv
i18n made
Add .Xdefaults
Add RVM variable
Order calendar groups by name.
Change default occurrence cancel redirect URL.
Sync git submodule before updating them

From the git submodule manpage under sync:
   Synchronizes submodules' remote URL configuration setting to the
   value specified in .gitmodules. It will only affect those submodules
   which already have an url entry in .git/config (that is the case when
   they are initialized or freshly added). This is useful when submodule
   URLs change upstream and you need to update your local repositories
   accordingly.
Adding About page to the view and testing the content of the About page.
Fixed Custom.css
change net version
changes to support centos/redhat
pristine-tar data for glyr_0.9.9.orig.tar.bz2
unvendor grape and bump to version 0.0.5
unvendor grape and bump to version 0.0.5
Change wording of README a bit
Added "blast_parser_generic.py"
fix PdfPages.savefig does not pass kwdarg when figure is None
Merge pull request #858 from piti118/pdfpages_missing_kwdarg

fix PdfPages.savefig does not pass kwdarg when figure is None
added documentation to bbiopy
Set the UDP socket receive buffer
add user profile and options for delete links
add a comment regarding the tests
RecipeScraper
Fix metadata to work with unknown and SYSTEM/STATIC network types
Ensure we only create connections once in Eucaops. Also ensure that a
new logger is not created in Eutester if it has been created already.
Merge pull request #68 from eucalyptus/testing

Ensure we only create connections once in Eucaops. Also ensure that a
added VObject\StringUtil tests
Merge pull request #5 from DominikTo/stringUtilTests

added VObject\StringUtil tests
handle collision results at the scenario level
collectors/http - touchup, etc

collectors/http/http - requires don't belong where they are not used
Merge pull request #17 from ewilhelm/collector_http

collectors/http - touchup, etc
adding alex's bulbs interface
Displays a nicer looking apostrophe in the task list
Redirects to the page the user was trying to get to upon sign-in.
removed github API token references
comparison expressions (==,!=,>,>=,<,<=) with feature model expressions
mess up with header files
clean non-annotate tags commit message

most of the info in the message are incorrect and it is complex
to gather them because the tag is written on disk only after the
update hook is executed. In most cases it was not showing
the correct diff either.

Drop all references to commit and spin a simple tag message instead.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Added libuuid globally.
peut être..
décommentage
Merge branch 'master' of github.com:fablike/Stencil-GPU
tentative d'augmentation de BP
Generalize video rendering code a bit
Revert "Generalize video rendering code a bit"

This reverts commit 3e45f67ada1e744cdf97fcd0f9b3a804fae53835.
js: Fix race condition with paginator
glw: Fix problem with not invoking prop_want_more_childs() if model have <= 20 items
spotify: Fix some ref issues in search
videplayer: Extract canonicalUrl when scanning video queue
Fix compile error
blobcache: Fix double unlock
Update Russian translation
Fix problem with audio time staying at 0:00

AVFormatContext.start_time can be AV_NOPTS_VALUE, deal with it
Update dutch translation
Add new INITME() macro that can be used to init subsystems

Replace src/api/api.c and src/ipc/ipc.c with this

More to come
Add a 'sync' argument to backend.be_open

This requests the backend to populate the datamodel
synchronously (ie, not spawning a thread or something like that)
video: Better support for continuous playback

The main video player in Showtime can now query plugins in order to
resolve URLs as given in the browse result and resolve them into
real video URLs
js_page: Fix use after free
fix Youtube Playback
Merge pull request #105 from alexandrezia/fix_youtub_playback

Handle pagination events during video playback
Update Slovenian translation
Add htsbuf_hexdump() helper
Add an option in settings:dev to debug all HTTP requests
models and entry submit
update entry list
update entry list
project tree
boothstrap added
layout
folder reorganization for flask
folder reorganization for flask
separation of modules
loot fix
Refresh tests for online video cite
Abbreviations as appropriate for EComHR reports.
All styles: ECommHR report.
All styles: use page for anchor pages, not section.
kskf
Support relayable_retractions that are relayed to us by the top-level post owner
Personal modifications:

        - Add privacy policy and terms of service files
        - Add links to TOS and privacy policy to login, registration, and help p
        - Quick hack to remove personal content from emails. Should be made a pl
        - Setup home page to guide users to use only encrypted pages
Merge branch 'windforest-deployed' of github.com:fermionic/friendica into windforest-deployed
added require for active support in user model
add C-coroutine
fix fco_create bug, return subco not current co
adjustment arguments of co_main function and add a waring string
add register plugin and can create different types of coroutine - alone|child
add unit test
fix fco coredump
HashMap Problem -Spas
Made inflections compiled in, to get rid of the only external dependency in the project
Fixed iPhone target
New option html_ascii_notification allows ASCII part in HTML output

There are still problems with HTML output and ASCII notifications.
The new switch html_ascii_notification (default:0) provides ASCII
output inside the HTML output, embedded in comments and also
embedded in two ASCII lines ASCII_NOTIFICATION_{START,END}.

Example:
$ check_multi ... -r 2 -s html_ascii_notification=1
...
<!---
ASCII_NOTIFICATION_START
OK - 1 plugins checked, 1 ok
[ 1] date Tue Jun 26 13:32:12 CEST 2012
ASCII_NOTIFICATION_END
---!>
Methoden van BookingSystem verder ingevuld.
introduce asset-url
fix typo in scss format
fix asset-url format
Merge pull request #14 from lidaobing/master

support asset-url
move fav links into config
Added some more tests, made the batch file that calls the other test
batch files, if the customer object returns null for the barber in their
loop, we sleep to give the salon a chance to close (like in customer),
decreased the time customer waits from 10 to 5 ms, removed an unnecessary
comment.
updates reflecting Madars' comments
Merge branch 'master' of github.com:fmoda3/VerifiableDB
Item11267: Correct version strings.

For simple "Decimal" version,  use the parse method with no leading "v".
For a dotted triple, use declare method with leading v required.

git-svn-id: http://svn.foswiki.org/trunk/TablePlugin@15979 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
working gstreamer based player
new version
ht: fix serializescellsreader loop, rm file index
Merge pull request #10 from slackhappy/new_hypertable_api

ht: fix serializescellsreader loop, rm file index
Änderung auf dem Branch features-1
Merge branch 'features-1'
Update `lastbump` on reply posting.
Remove a variety of dead links. Fix bsdcan links by adding missing
periods.

Submitted by:	db
Approved by:	bcr
Suppress HTML Tidy's version string output.
Add Stephane Lapie <stephane.lapie@darkbsd.org> for japanese/gjiten.

PR:		ports/171226


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@39563 ba62deef-0ea0-e111-9166-001e4f0fb9b1
Add Solutions Linux 2012 event for French FreeBSD User Group.

Submitted by:	Rodrigo OSORIO
Approved by:	gjb
reset qcomment selector after insert.
provide ability to autofriend ostatus accounts
4月23日のサーバーメンテに対応
removed the notifier function
added SingleprocessManager
Adds caching of items, fixes layout in admin item view
improves argument conversion
more comprehensive test case
deleted CPUExSolver2.pro.user
collecting useful functions
normalize different methods to iterate over a dictionary
This is a REALLY old script for the call email alerting. Still works a treat, but its embarrassing to look at.
Getting ready for alerting action.
added wrapper element to differentiate Xincludes in ECL scheduler doc
[maven-release-plugin] rollback the release of launcher-0.0.1
export: eof-object
scons .gitignore
fixed destination being modified by spec
Added mean and std to N as I forgot to use them :þ
完成基础文章编辑提交页面
Modified UserAccountLogic.cs
Add files SQL
rc initscript for OpenWrt
removed dependency on simplejson
add dice avatar view
add dice avatar view
Merge remote-tracking branch 'origin/master'
update project for adding the image files.
data rescue
Merge remote-tracking branch 'origin/master'
rescue data
use latest ruby
use ruby 2.0 preview
Updated jetty to 8.1.7 and solr to 3.6.1
Updated README.txt
Replaced start.jar with new one from 8.1.7
Pckaged -> Packaged
Merge pull request #1 from AlistairIsrael/master

jetty 8.1.7 and solr 3.6.1
default transports set
Added parameter to the apt-get install command to prevent interactive conflict resolution
Allow camelCase variables in varreplace.
Added a new fact: network address for an interface
Don't read from Paramiko's stderr since there isn't one.
Add test for large output; fix indentation.
Merge pull request #365 from jkleint/devel

Fix hang on large command output.
Merge pull request #364 from lcosmin/a5b13fe4ce7e3d3846999ae35127fbe4095ee6c3

Added parameter to the apt-get install command to prevent interactive conflict resolution
Merge pull request #362 from jhoekx/uppercase-vars

Allow camelCase variables in varReplace.
Fix for sudo to another non-root user (issue #353)

mktemp creates the temp directory 700 only.  If the sudo-user is not
root, the other user will not be able to run the command (Permission
denied error).  This adds the executable bit for all on the temp
directory.
Merge pull request #370 from sfromm/issue353

Fix for issue 353
Merge pull request #371 from lcosmin/devel

Added the network address of an interface as an ansible variable
Allow service 'enable' parameter be 'enabled', which is what I'd personally try to use.
Fix correct variable expansion in includes only_if.

There's not need to run the complete include through the templating engine.
Several variables were not included before the conditional was evaluated.
Merge pull request #363 from jhoekx/template-only-if

Fix correct variable expansion in includes only_if.
Do not run unit tests against the EVENTS code because it is subject to change and that does not mean anything is broken.
If we want to test playbooks, it's best to test the result of a playbook to make sure it does the correct thing.  Also
remove playbook2/3 yml which were not used.
Allow hosts not in inventory to override inventory with -i "host1,host2:port" etc, which is the original intent
of --override-hosts.
Update development changelogs
Do not read user's SSH config file because only reading it partially is confusing to everyone :)
update comment about branch support, now that supported
Default git module to master branch so branch= is not required.
Some Improvements
Merge
- JIRA: GEOS 5099

git-svn-id: https://svn.codehaus.org/geoserver/trunk@17038 ef1d6e69-97e5-0310-af46-8a06194da32a
Documentation fixes for a range of license issues including Apache 2.0 and Apache 1.1 see GEOS-5454, GEOS-5460, GEOS-5470, GEOS-5453
using git config to set author for release commits rather than --author option
Added sample code in index.php
Adding sample code in index.php
my modifications from 2011
made some text color changes
added slideshow images and added header banner and some body intro page text
Reducing model tests further
Enable column mode.
Enable iswitchb mode.
Reenable autocomplete.
Added extra keybindings.
Starting multiple workers at once
Avoid relying on install_name_tool to modify the python binary on OSX
inclusão de manutenção de caracteristicas, e alteração na classe Base
balancer: changing active server if playlist not modified for a while
adds ElasticSearch to travis.
support Python 2.6 and 3.3 from setup.py
Sequences are create before the tables
Made val declarations more readable
Added tests for File
dev changes
Merge pull request #10 from gmartinez/support

Merge r2465 into master
Add optional callback to codemarklet
rgb+alpha colors for aquaterm
README changes to reflect that getopt is no longer used
Adds basic lint/formatting and compile/run support for go.
Caption na gumbu za print test
Dodano zaokruživanje
Algumas melhoras
Fixing images on IE
Attempting to remove resharper files from solution
Attempting to remove resharper files from solution
Added parameter attribute to the activateAgent property in AbstractGrailsMojo.java to allow toggling of reloading agent.

Signed-off-by: clatimer <clatimer@netjets.com>
Added ability to pass arguments to the forked VM:

<configuration>
  <!-- Whether for Fork a JVM to run Grails commands -->
  <fork>true</fork>
  <activateAgent>true</activateAgent>
  <forkedVmArgs>
    <forkedVmArg>-Dsomething=something else</forkedVmArg>
    <forkedVmArg>-Dname=value</forkedVmArg>
  </forkedVmArgs>
</configuration>
Merge pull request #17 from chrislatimer/master

Code changes for Agent Reloading and Forked VM Parameters
Using the system-dependent default name-separator character instead of "/".
Smart GWT repository was added.
Added checking for JBoss serialization
Fixed logger name in JBossBufferedLogWriter
Replaced alias "reportingService"
Changed source for baselineTaskId in MFC

Conflicts:
	chassis/configuration/configuration/reporter/reporting.conf.xml
Comments added
Merge pull request #52 from nmusienko/master

Added checking for JBoss serialization
TextFieldTextRenderer: set multiline to true
Merge branch 'master' of git://github.com/joshtynjala/feathers
tonido boot stick build script
bind zones
nginx tweak
nginx: moved out
show up table list correctly
add php for loading mysql data
Serving static files in DEBUG mode
add Legokichi.coffee
preparing for test deploy to production