labofsahil/github-event-dataset-2012 huggingface dataset:
fix mimetype detection in case of application/octet-stream is found
merge bugfix from Evolvis: circumvent forum/read RBAC check for news_bytes
add checks for forum pages for whether the group actually uses the forums tool
with careful checks to avoid breaking the news feature
merge from Evolvis: make id-less tables sortable

revno: 10146.1.25
committer: Thorsten Glaser <t.glaser@tarent.de>
branch nick: theme-tasks
timestamp: Thu 2011-12-08 18:17:43 +0100
message:
  [#1910] make Tasks browse table sortable

  use sortable.js this time, and make id-less tables sortableable
merge from Evolvis: do not make table columns with empty th sortable

revno: 10146.1.26
committer: Thorsten Glaser <t.glaser@tarent.de>
branch nick: theme-tasks
timestamp: Thu 2011-12-08 18:19:25 +0100
message:
  ignore empty column headers for the purpose of sorting
merge from Evolvis: reduce diff against upstream sortable.js and include literal licence

revno: 9827.53.44
committer: Thorsten Glaser <t.glaser@tarent.de>
branch nick: small-fixes
timestamp: Wed 2012-03-14 17:12:10 +0100
merge from Evolvis: remove n#n-ASCII chars (replace by Unicode escapes)

revno: 9827.53.47
committer: Thorsten Glaser <t.glaser@tarent.de>
branch nick: small-fixes
timestamp: Wed 2012-03-14 17:56:39 +0100
merge from Evolvis: add arbitrary sorting value attribute feature

revno: 9827.53.48
committer: Thorsten Glaser <t.glaser@tarent.de>
branch nick: small-fixes
timestamp: Wed 2012-03-14 18:25:02 +0100
message:
  if a node (table cell) has an attribute "content" take that ipv. its innerText

  the "content" attribute is provided by the RDFa DTD, we misappropriate it
  here to allow sorting by arbitrary values instead of the innerText

This makes things possible like:

<tr><th>Foo</th></tr>
<tr><td content="bar"><a href="99">bar</a></td></tr>
<tr><td content="baz"><a href="100">baz</a></td></tr>

This will now sort on the string 'bar' instead of on the
string '<a href="99">bar</a>'.
merge from Evolvis: drop borders around sort arrow images

revno: 10629
committer: Thorsten Glaser <t.glaser@tarent.de>
branch nick: tarent-5.1
timestamp: Tue 2012-06-26 14:57:58 +0200
message:
  another case of M*zilla Firef*x displaying too many borders
merge from Evolvis: make JS sorted tables use a stable sort

revno: 10878
committer: Thorsten Glaser <t.glaser@tarent.de>
branch nick: tarent-5.1
timestamp: Thu 2012-11-08 10:59:52 +0100
message:
  add a stable sort, inspired by SortTable v2 by Stuart Langridge

  (who’s also already one of the authors of our sortable)

  also, revamp reverse sorting support, all on my own though, luckily
  we’ve got the “JavaScript: The Good Parts” thin booklet here at work…
merge forum and sortable fixes from branch 'Branch_5_1' into Branch_5_2
merge forum and sortable fixes from branch 'Branch_5_2' into master
KRAKEN-7 - Support collection return parameters in GWT services
Fix bug preventing creation of new items in publisher.

The JSON returned from panopticons api does use 'id' instead of '_id'.
Fix a bug viewing an edition with a newer sibling.

When viewing a published edition which had a newer, unpublished sibling,
Publisher would fall over with a NoMethodError. This was due to a
misnamed method call in the admin buttons.

Added a basic test to catch this particular bug: we could probably use
more comprehensive tests around the edition workflow to catch any other
bugs.
Fix space in PersonPresenter name HTML

This reverts the CSS introduced in
60b01391f7552f15c263057aaff486dd30e8dd2a, and adds the space in the
content as it should be.
a whole tonne of refactoring
adding new files
Fixed functionals tests with the help of Tom.

Most of these tests were broken because content_tag_for wasn't being used to generate wrappers for individual records.
Merge commit '1d98923e777df98c8eb7680ecd6aff18e5212e96' into HEAD
Use presentation format and humanized format names from rummager.

Rummager has been updated to provide both the real format names to
use and the presentation format for each result.
Remove redundant if statement.

The only place this partial was being used is checking this condition
anyway.
Allow policies to fetch their associated case studies
Add headings to guidance search page
The Jenkins build should fail if production asset precompilation fails.

A comment block around commented out lines in a SCSS file causes asset
precompilation to fail. When this happened in
c4fee13facd26839130f6936aa9e8fc529681501 this had the unfortunate
consequence that after a preview deployment, the server was left with no
`current` directory and therefore the app was responding with a 403
Forbidden.

In order to avoid bringing the preview environment down when
precompilation fails on an automated preview deployment, we can make
the build fail to highlight the problem as soon as possible and
hopefully make it easier to diagnose.
Remove unused partial.
Remove duplication in custom show templates by reusing partials.

I'm hoping to completely consolidate the different admin document show
templates. This is a step in that direction.

Doing this will make it easier to then change the layout of document
previewing in a consistent way, with increased confidence that changes aren't
adversely impacting other document types.
Merge commit '6ff020437eaeb39715d9d08885375ee4c3b10688' into HEAD
working state for power & display
db utils javadoc
Completed, but with inefficient join
added Lenna sample image
removed pngwriter
Motion of the ocean (BROKE)

I've added a physics component to the entity base class. Pretty sweet
component that you can apply acceleration to and the acceration is
reduced by drag. Thought it would be good for player movement and
gravity. The major issue right now is that the damn sprite won't move
anymore.
Mention gem's name in the README.

That way you don't have to open the .gemspec to see what to add to your Gemfile.
Modifiche sporadiche

Così per brindare all'inizio dei lavori
YARD docs
use partitioned matrix (without precon ATM)
finegrain-uprobes.sh: set 0755 permissions.
full-trace.sh: integrating library functions from finegrain-uprobes.sh

This commit is a first step towards making full-trace.sh a single BASH script.
All library functions from finegrain-uprobes.sh have been inserted into
full-trace.sh.
full-trace.sh: integrating the main loop of finegrain-uprobes.sh

This commit integrates the main loop of finegrain-uprobes.sh into
the full-trace.sh script.
full-trace.sh: integrating library functions from trace-process.sh

This commit is a first step towards making full-trace.sh a single BASH script.
All operations in trace-process.sh have been refactored into functions and
inserted into full-trace.sh.
full-trace.sh: integrating the main loop of trace-process.sh

This commit integrates the main loop of trace-process.sh into
the full-trace.sh script.
full-trace.sh: integrating library functions from rewrite-address-split-trace.sh

This commit is a first step towards making full-trace.sh a single BASH script.
All operations in rewrite-address-split-trace.sh have been refactored into
functions and inserted into full-trace.sh.
full-trace.sh: add a -h switch to display usage
full-trace.sh: add a -c switch to clean the files of a previous run
full-trace.sh: make user probing, tracing and output decoding optional

This patch adds three switches:
	-u: computes all userspace probes for an application and its libraries
	-t: traces the process
	-o: decodes the resulting trace (0xhexaddr -> library:function)
full-trace.sh operations are now decoupled; this allows, for example, to
capture different traces (corresponding to different command invocations)
with the same set of userspace probes.
full-trace.sh: trim the trace file

This commit allows write_trace() to discard everything unrelated
to the traced process in the output trace.
full-trace.sh: improve the output of usage()
full-trace.sh: dynamically compute BUFSIZE if unspecified

This commit introduces the dynamic computation of BUFSIZE if unspecified.
BUFSIZE is the size of the per-CPU ftrace buffer (KB). It is set to
F / (4 * N), where:
	* F is the free memory
	* N is the number of CPUs
upload fixer
added create users functionality through the admin backend
Generated pkg/
Fixed meta fetching and displaying
little refactor to get some states in the player
Merge branch 'master' of https://github.com/anhero/bivouac2012

Conflicts:
	application/PlayState.h
ISPN-2103
various fixes
make Math work
Cleanup of old code.
Update php/jqGridLoader.php

method load: require_once - including the file at start. include_once - including the file at runtime
authentication section.
Re-add the outline tests
Fix APSTUD-4493 - Error formatting PHP in some cases + improved error logging
Add don't deploy flag
Update README.md
Merge pull request #3 from lianqin7/patch-2

Update README.md
Device opening - tutorial
Filter options - tutorial
Packet sniffer v1- tutorial
Prettify README
Correct type hints

During the mass adding of type hints they were sometimes too strict and/or
just wrong.  Plus, the great class rename missed one instance where a class
name was typed in caps by mistake.  Silly case-insensitive PHP.
Add aliases for the old dialect names
Merge pull request #162 from aredridel/readme-pretty

Prettify README
Merge pull request #164 from iarna/bug-fixes

Bug fixes
Removidos espaços ao final das linhas (configuração do Kate)
. Se cambio el nombre del directorio de testcase "unittest por unittestcase" por conflicto con el paquete unittest.
. Se cambio el nombre del directorio de testcase "unittest por unittestcase" por conflicto con el paquete unittest.
. En las pruebas se adiciona una para TokenEndpointTest
. Se quita la referencia de "self"  en el metodo create_token_response de TokenEndpoint para recuperar el query_params
. Se cambia la validacion el TokenEndpoint para obtener "grant_type" ya que estaba invertida la comparacion entre "body_params y query_params"
.El body_params en TokenEndpoint se deja  en {} si no se tiene nungun valor
More updates to location manager, region handling, still nasty
Also need to deprecate engine first. We are using this in Rails
Added test script to populate db with test data (npm run-script testData). Also hooked up couchdb to node layer, with route /board/:id, where id maps to a couchdb document id
Merge remote branch 'origin/master'
git周りのエイリアスなんかを追加
bindkeyをいくつか
first コミットにタグをつけるalias
[tig]ページスクロールも出来るように
vimでもマウスを使えるように
tabを無条件でspaceに変換するのはやりすぎ
brewのパスを先頭に持ってきた
Added sql template
partial refactor of net code
Added Oxygen_Scope::registerAll(array)
[UI] Replaced defaults LuCI icons

* converted icons from GIF to PNG
* pngcrushed
* renamed from GIF to PNG

Signed-off-by: Vladimir Petukhov <kavinator@gmail.com>
[UI] SVG-icons

Signed-off-by: Vladimir Petukhov <kavinator@gmail.com>
change migration varchar to string
updated GameTest
removed unused method
Merge branch 'master' of github.com:atamon/ProjectFive
Fix error in `shader01.vs`.
initial group commit
Fix in regex for matching scripts with more than one word.
Add EXECUTE command. Register TELEPORT and EXECUTE command.
Kitchen test setup
rename ipv4.ml to pcap.ml to reflect its use better
Fixed up option parsing bits.
Remove categories from template
Cleaned up comments, Ruben added some comments, added todos
finished the cone with the circle base with triangles
Added a species import documentation file
Ajout des phpDoc
Updated to include a mouse-based clipper so it is easier to see what is going on.
add missing case for Future:Waiting handler
Bunch of starter files and boiler plate
Some changes
working one to many association between locations and theatres
added showtime model
a
initial
Fixed csv2fits alias
Technically correct way to display a file in bottom right corner, but about to change it because it looks weird
Create sample.json

Created File, Basic 1.0 implementation
Rename Directory to LDirectory to not clash with PHP default classes
Tidy up some loose ends on asset manager
changed from in comments mailer back to none
Cleaned up the titles from our old ChickenMole name
Asciidoc syntax file added, + a shortcut for Ruby/Coffeescript
minor edit
fixing message bar bugs
fixing date js bugs
Feed and input page times are now local time corrected
minor edit
feed and input time that works?
Internet explorer fix
Updated flot library
updated flot lib
Merge branch 'master' of github.com:openenergymonitor/emoncms3
Updated for IE compatibility
Updated for IE compatibility
updated IE compatibility
Fixed kwh to kwhd processor
New database setup script that enables easy database migration
setup script runs once at setup - to migrate db uncomment runnable
upstream merged
Redesigning things so that falling is simpler
Major refactoring, things compile but are still buggy.
Falling is kind of working, but still very buggy
Cleaned up some bugs and can now fall on non-combos, but still buggy
Misc. cleanups

Remove dead packages
Remove AV.mm and AV.h and some unnecessary libav imports.
added help text

Help message (oops, std::cout added)

Fixed output to use UTF8/printf

...typo fix.

was stupidly not quitting when showing help, so display would switch off, was developing over ssh, so didn't spot it before, all tested now.
adding version 1.1.1
Y Pentomino unit tests
xmonad, haskell, .emacs
Añadidos los antecedentes a la historia del paciente
fixed a bug on fetch post by tag.
	1. import yii-bootstrap to project.
	2. implements roles management.
communicates serial data
Remove specs that we dont need now
Added testing shit maybe.
Merge branch 'master' of https://outlulz@github.com/blanglan/Swordfish.git
Added handling multiple errors in MyParser.java
Team colors start at a random color index.

Fixes #12
Fixing undefined bug with max special units.
Get BUILDER and initial BASE off edges!

fixes #11
Start quadrants opposite now.

Should fix a little bit of #13
Last round winner display, refactoring.
Randomize where tanks go to heal, evade switch cool down.

Randomize heal x,y is part of #16. Should use DestX and DestY when we
do #15

- Random point in a healing circle picked for an evasive location to
move to.

evade switch cool down fixes #17
- Cooldown of 5 seconds before a tank can switch in / out of EVADE.
- stopEvading() is created to help with this.
Reduced max units, squashed more EVADE bugs, better call for help.

- 80 units max (down from 100)
- EVADE is more random (more range of health to go into/out of).
- Improved random EVADE location (ensures will be in
heal circle) fixes #16
- New isEvading() helper method.
- Found places where state could be switched out of EVADE (call for
help).
- No longer help attack enemies if taking damage resulted in death.
Target selection de-emphasizes special, uses health %

- Special tanks are a 'OMG ATTACK' anymore, this was making enemies
walk into their death as mammoth went to heal.
- Targetting takes into account health PERCENTAGE, not just the hit
points left. ;)
Don't EVADE if too damaged, tweaks on hit %.
Nerf mammoth; slow down it's turret, move and reload.
remove {{children/}} in favor of {{neighbors/}}; print a nice default
navigation
revs
revs
Remove trailing comma

Quick Syntax fix
Update life_expectancy.R
Add Mendeley OAuth support
Merge branch 'master' of https://github.com/edy-b/everyauth into edy-b-master

Conflicts:
	README.md
	example/conf.js
	example/server.js
	example/views/home.jade
Update for new action-ids

Add action-id 37 and 38 (spawnegg and HeroChat)
Update german lang-file
Merge pull request #7 from untergrundbiber/master

Update for new action-ids
Google Loader over SSL
19-10-2012-2
Bug 818470 - [Contacts] typing and scrolling is slow because of -moz-element() usage
PermissionSettings API test application
Bug 802648 - Update browser icons

Graphics only.
Bug 813140 - Apply patch from f4fdd305b24ac62248f28ee7cebde966f4f3d804

From f4fdd305b24ac62248f28ee7cebde966f4f3d804 Mon Sep 17 00:00:00 2001
From: Peter La <pla@mozilla.com>
Date: Thu, 29 Nov 2012 12:45:52 -0500
Subject: [PATCH] Bug 813140 - Contacts iconography fix for contact
details screen

Bug 813140 - Contacts iconography fix for contact details screen

This change fixes Bug 813140: [Gaia::Contacts] Contact Details page not
using the latest iconography from Visual Design.

Applying as patch to keep commit history clean.
Bug 802935, 806972, 806974 - Apply patch from e3767047bec0f40f92cf42c7d62d6b3ecb630736

From pull request #34:

From e3767047bec0f40f92cf42c7d62d6b3ecb630736 Mon Sep 17 00:00:00 2001
From: Peter La <pla@mozilla.com>
Date: Thu, 29 Nov 2012 12:13:57 -0500
Subject: [PATCH] Updating E-Mail App Iconography

Updates graphics. Applying as patch to keep commit history clean.
Bug 814753 - Apply patch from 6df8fa7b7cd66181d081a0211eea724f808d34fb

From 6df8fa7b7cd66181d081a0211eea724f808d34fb Mon Sep 17 00:00:00 2001
From: Eric Pang <epang@mozilla.com>
Date: Wed, 28 Nov 2012 17:15:58 -0500
Subject: [PATCH] bug-814753_statusbar

Update graphics for status bar.
Bug 813275 - Browser font tweaks
Bug 802747 - Update gallery icons
Bug 811640 - Reduce the width of highlight key at the right end of the keyboard. r=vingtetun
Bug 813091 - Dialer Iconocraphy Fixes
Bug 817117 - Apply patch from 0334d16704439f0ea997c4a24fa25a8386037229

From 0334d16704439f0ea997c4a24fa25a8386037229 Mon Sep 17 00:00:00 2001
From: Patryk Adamczyk <padamczyk@mozilla.com>
Date: Fri, 30 Nov 2012 15:48:41 -0500
Subject: [PATCH] Bug817117_Dark_Header_Update

Graphics only. Applying as patch to keep commit history clean.
Bug 806963 - Apply patch from dc95a252597892fbd775f744f2a3a6019e537b58

From dc95a252597892fbd775f744f2a3a6019e537b58 Mon Sep 17 00:00:00 2001
From: Patryk Adamczyk <padamczyk@mozilla.com>
Date: Tue, 4 Dec 2012 12:24:14 -0500
Subject: [PATCH] Bug806963_Updates_Incorrect_Design

Applying as patch to fix whitespace errors in pull request.
Bug 814688 - Update calendar icons
Bug 802782 - Update camera icons

Conflicts:

	apps/camera/style/images/grid.png
Bug 819625 - Ensure start/end(Date) is present when creating the event model.
Bug 815504 - USSD/MMI Dialog should close itself when it is being dismissed (r=etiennesegonzac) (squashed after comments 2).
Bug 804459 - [Settings] Can't re-enter Wifi password if password is incorrect after attempting to connect
Bug 819968 - Misspelled id for l10n [r=vingtetun]
[Bug 813026] refactor - remove external Zepto library, change _this to self, and add names to anonymous functions [r=crdlc]
Bug 819189 - Persist calendar permissions, don't return calendars without read permissions
config, readme and runnable server
maven plugin
Merge branch 'master' of github.com:fred-o/oh-my-zsh
mvn plugin
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of git@github.com:fred-o/oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
.gitignore
Added a plugin for GNU Screen.
Merge branch 'master' of git@github.com:fred-o/oh-my-zsh
fix to avoid parse errors if $TERM is empty
Merge branch 'master' of git@github.com:fred-o/oh-my-zsh
Merge branch 'master' of github.com:fred-o/oh-my-zsh
figuring out home dir on unix systems as well
Merge ssh://spix-dev01/home/fredrik/.oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

Conflicts:
	lib/termsupport.zsh
Replace "git-diff" with "git diff" in the git plugin
add rails runner alias
Slider da Home
Image Rotator
Merge branch 'master' of https://github.com/brajola/maxirubber
Banners da Home
Updated string title of MainActivity to "WorkSys"
Merge pull request #11 from breadbros/master

This is some stuff Grue did I think? Whatever.
Optimized map loading. Disabled music for now. Removed sprite demo.
Merge pull request #20 from Gayo/master

Optimized maploading; some miscellaneous tweaks.
Use foreground service so log capture service won't get killed by system
Commit Kernel pendencias
Changing the name. Gobias was... too on the nose.
Eliminating built in ENV variables.
Adjusting the interface requirements.
Merge branch 'master' of github.com:brettbuddin/victor
Syntax
sass and haml working properly
Added some notes about what to expect from the project.
Starting using markdown
Add gitignore to ignore byte-compiled lisp files.
setup: Don't attempt to get numpy.
website: Start Bootstrapping.
website: Regenerate styles, and get content colorized again.

Bootstrap's default grays are so...drab!
website/templates: Separate blog posts.

And fix up the lead copy on the front page.
Finish cleaning up old styles, and redo footer.
website/content: New post.
website/templates: Link to ReadTheDocs for docs.

Starting earlier today, RTD builds API docs correctly, so docs.bs.org can be
retired. This is good because I think somebody already retired it last year.
:3
website/content/about: Namedrop PyPy.
chunk: Add a helper to slice arrays up into smaller chunks.
beta/packets: Clean up chunk packets.
chunk: Fix up chunk packet generation.
beta/packets: Fix incorrectly-named field.
weather: Update state packet.
region: Don't load pages on initialization.

Wait until we need to do it.
beta/protocol: Update packet for timekeeping.
beta/protocol: Remove usage of prechunk packets.
chunk: Chunks are now 256 blocks tall.

Yay!
chunk: Send the proper mask for chunks.
chunk: Send continuous chunks.

Without this flag set, the client will not acknowledge terrain.
beta/protocol: Fix up equip() hook.

The packet contents changed slightly.
refactored new criteria view to use django ModelForm
just added the database starter info
Removed extraneous <<<<<
find sleep 3.5s is reasonable
Merge branch 'master' of github.com:bubargaininc/weibo
ignore debug output
server try config sleep time
merge done from master to master@uhquan.com
Correcting a bug in index.php

Path to config file was not correct
init a3s
clark inc history fix
Added the ability to require a specific rig config for stimuli
Goole analytics
Fix display of series/dataset in search results. Switch old metadata.show.embedded service to view service.
paper 1 images fixed
Testing out different test frameworks.
Quick measure run
Merge branch 'master' of github.com:capecodehq/mojitos
Substitue 0 rows/columns with the default row/column values

Fixes a bug with Heroku, which reports 0 columns/rows for its terminal
adding color/no-color to list
Fixes #834 Percentage calculation not used when value is expression
Fixes #828 Add 'x' unit for image-set (synonym to dppx).
Fixes #814 Add property function with media query
Fixes #807 directory with `.styl` in the name and local install of stylus
Fixes #819 Extends generate duplicate selectors
Merge pull request #860 from tonistiigi/807-styl-named-dir

Fixes #807 directory with `.styl` in the name and local install of stylus
Merge pull request #864 from tonistiigi/834-mixin-differences

Fixes #834 Percentage calculation not used when value is expression
Merge pull request #863 from tonistiigi/828-image-set

Fixes #828 Add 'x' unit for image-set (synonym to dppx).
Merge pull request #861 from tonistiigi/814-add-property-fn-media

Fixes #814 Add property function with media query
Merge pull request #859 from tonistiigi/819-extends-generate-multiple-selectors

Fixes #819 Extends generate duplicate selectors
Fixes #619 Support slash in media
Added Punch as one of the supported CMS
Merge pull request #880 from laktek/patch-1

Added Punch as one of the supported CMS
Dont treat imported files that have `.css.` inside of the filename as literal CSS
Added optional way to make precision roundings, also tests for them
Mentioned precision in docs, renamed tests
Fixes #879 Extends with parent reference
Merge pull request #892 from tonistiigi/879-nested-extends

Fixes #879 Extends with parent reference
Merge pull request #891 from tonistiigi/619-slash-in-media

Fixes #619 #888 Support slash in media
Merge pull request #890 from kizu/precision-rounding

Precision rounding
Minor fixes and the whole S3 FauxAuth chain complete/tested. Tests in the S3Seed test runner class. - Fixes #215
user_password is set below, this call is not needed and causes a PHP Notice since $system_salt is undefined
Merge pull request #224 from jeffsheltren/missingsalt

user_password is set below, this call causes a PHP notice
[FEATURE] Hiding events newly created on the frontend.
[FEATURE] Notifying staff by email when new events are created on frontend.
Revert "Use bower for dependencies" - Looks like Travis CI is on node 0.6.21pre and bower needs >=0.8.0

This reverts commit 820688712317d1fa35be85e0d56cc1ac189891c0.
Create a polyfill for testing

Now instead of only testing the functions a particular platform has access to, custom implementations of those functions that do the bare minimum necessary are used instead. The polyfill is linked against in the test runner to simulate as if those function had been provided in libc.
Polyfill working on Mac way of replacing functions
Comment on why the dup2 call
Fix typo
Merge branch 'polyfill'
Use attribute constructor to init lib
moved joda into the project
strip indent from multi-line quoted literals
single-quoted literals have type String
Adds ALL stock property constants
Move all common compiler options to common.props.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseIDiff@23717 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
fix the C4100 warnings

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseIDiff@23718 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Remove leftover from win2k-builds: no need for delay-loading gdiplus

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseIDiff@23721 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
TortoiseIDiff.vcxproj: remove empty properties

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseIDiff@23722 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
use angle brackets for system headers

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseIDiff@23723 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Use empty() instead of size().  Patch by Sup Yut Sum <ch3cooli>.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseIDiff@23730 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
rc files: use the unicode copyright symbol, change encoding to UTF-16 LE and use EN USA as the VersionInfo language

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseIDiff@23733 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
No svn:eol-style property for *.rc and *rc2 files but set the svn:mime-type to "text/plain;encoding=UTF-16LE" instead.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseIDiff@23734 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
use the built in Visual Studio macros to specify the IntDir and OutDir

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseIDiff@23738 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Added pagination and fixed [flash]
before merging
Merge branch 'master' of github.com:cherrot/govProject
将Term分离成Category和Tag，便于管理
Only selecting visible links
Bump to version 1.1
added some style for the slider, fixed livevote bug
se arreglo el score, ahora se usa una variable en lugar de framecount
Demo v1. complete
prepping a css release list
added navigation
Merge branch 'header-nav' into Test-Release
Merge branch 'Test-Release' of github.com:chrisgeyer/prodcss into Test-Release
Add test project and KeyRing class.
Configure localeapp properly
Initializing the apphost in one baseclass now. Hadi will be happy.
deleted init and teardown and moved dataspecificationbase to helpers folder.
Replace sensors of subtype "change layer" by usual ones.
Replace sensors of type "return from bad ground" by usual ones.
Remove the subtype of sensors. No more built-in sensors.
Remove the subtype of sensors in existing maps.
Remove the sensor subtype in the map editor too.
Don't die so easily.
Fix a syntax error.
Making some notes about how things are going to work
market update v1.7
GUITownPanel теперь главный контейнер
pass Ex4.1
pass Ex4.2
pass Ex4.3
Fixing lower-cased constants to match style guides
heroku settings
improved design
log message in cidsbean.set/getProperties changed
Merge branch 'dev' of github.com:cismet/cids-server into dev
working on #16 ... don't use the usergroup in methods anymore. try to use user.
working on #16 ... don't use the usergroup in methods anymore. try to use user.
working on #16 permissions from user
Merge branch 'feature/16-permissions-from-user' of github.com:cismet/cids-server into feature/16-permissions-from-user
- removed: plugin to test hot distribution
Adding maven-scala-plugin and ugly eclipse hack
Pass a non-const pointer rather than a non-const reference.
Add better text to trivia page
have not touched this in a long time do not know how relevant it is need to reorganize
YAY! this is import, it changes the port
changed model for heroku
Updating requirements.txt
updated
indexpage
indexpage
indexpage
Large update for file, adding more classes/tables
deleted test db
i hope this runs
yay
yes plz
please
fixed the position
reversed
try again reverse
Search hienost
handle with des decryption for data source
everyo was a pseudo relation, rename to everyg. update bench.clj. add distincto relation which uses !=.
* README.md: clean up the main README
Substitutions now implements clojure.lang.Associative, prep for multistore refactor
* src/main/clojure/clojure/core/logic.clj: organize protocols
Initial pass at hypermedia API.

Change-Id: I623e48fa58e2a3a67ed74bff39d74093f6e57889
Merge "Initial pass at hypermedia API."
api_client now encodes spaces in arguments for query string transmission
ecosystem class FromName, GetObjects and GetLog functions.
API now has configurable response formats (xml, json, text)
oops, log files don't belong in /opt
Add success/error/complete hooks.
Update user example.
Update hookError/hookSuccess to error/success.
Syntax highlighting.
* removed unused helpers
* updated fanart endpoint
tooltip: fix background drawing
[s1831] Fix and improve last commit

Signed-off-by: Schmoozerd <schmoozerd@cmangos>

(based on commit [12285] - 50c2c0f)
[s1739] Fix typo

(based on commit [12176] - 600cc40)
delete file chunks > recordLimit, pretty dates for recordings
removed media query (not necessary due to new logo styles)
added untracked status to gitmodules
gitignore and todo update
changed .gitignore
completed change_photo_edit_url

Some of the table display details is not quite right, but the basic
structure of being able to add pages from the photo index is working.
changed todo
fixing updated submodule jQuery file upload
Fixed a potential problem with the register function and replaced some tabs with spaces
Adding user catalog management
Initial glide_size increase.
fix for bad indentation

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
ED-209 is a security bot, but not Beepski, do not check for ED being Beepski and 'bang' - it appears on security pda as expected
cigars and pipes can be lit by means other than matches

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge branch 'master' of github.com:caelaislinn/Baystation12 into bs12_with_tgport
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Some changes. Untested.
Merge branch 'animation'
Merging animation fixes

Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_movement.dm
	config/admins.txt
Fixes
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
added and tested cycling airlocks to all remaining plcaes that needed them - 4 x solars, engineering aux, medsci aux, research outpost, mining outpost, 2 x mining station

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge fixes part2
Making it work
Split speed from actual delay time
Adapting glide size formula
Now gliding_size for pulled objects and mobs is also changed.
should invert SSD to apply to normal disconnects, but not ghosting admins

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Update code/game/objects/items/weapons/storage/belt.dm

Added tasers and stun baton to the security belt and now has 7 slots.
Updated admin revive to work with organs and bloodloss
Made limbs prepeared for replacement stop hurt.
comment typo
consolidated some duplicate logic (and accidentally overwritten logic)
alter the base module name, and fix the add method
Cutting Stock Model finds proper solutions.
At least in not very complex cases.
But the UI connection needs to be made
Modifying GemFile
use bucket engine master branch for 1.8.1 builds

Change-Id: I5268e0d9caa85f6f521ce3bb0204ac5f2e25bc01
Reviewed-on: http://review.couchbase.org/14449
Tested-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>
display the whole description on simple search as well
Merge pull request #93 from crigor/simple_search_description

display the whole description on simple search as well
fixed bat file to work
Work around missing Uint8Array on Android Honeycomb.
Add site icons for iOS and browsers.
Splash screens for iOS.
One more splash screen format.
Remove dependency on _base/array.
Update cookie test to reflect more mocha-friendly TDD API.
Trying to solve problems with submodule
Took all code from TortoiseMerge and made it compile again

Based on TortoiseSVN revision 23767, but not dropped TGit patches which applied cleanly.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Make applying patches work again

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Updated TortoiseMerge docs from TortoiseSVN source

Signed-off-by: Sven Strickroth <email@cs-ware.de>
added spy.jsp

Change-Id: I3b15dc172baea2d6b1c0459fc20d83da8cf122b8
support hiding Network termination
don't unhide hidden viewer window when selecting children
Merge pull request #324 from shuw/fixes

UI - support removing Network termination
Fixed #215: info popups no longer appear far away from the '?'
Fix: bug related to multiple inclusion levels from different bam files
Added proper ID's to the output file
Lab 16.2
Added a StaticPages controller
Added about page and tests for static pages
Finished Static Pages
atom template fixs
Added: splats
Fixed: error in splats
Refactored: splats using humane lists.
Fixed: bug when array is zero length.
Version bump: v0.4.1
Delete crap files.
Update batch_master.
Add README file describing function calls.
update gems

- lock down jquery-rails, bootstrap-sass, and capybara
- remove repo specification for rails_admin
Merge pull request #12 from devfu/update/gems

update gems
Experiment with github markdown
Added a counter tag to psck xml
Added license information
Final v1 - needs mini css fixes
Merging frontend CSS
Merge Backend Css
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style_frontend.css
Help i'm trapped in a git factory
Merge branch 'master' of github.com:dannenberg/512proj
just some initial cleaning up
move core code
move core code
move core code into picketlink-core module
further cleanup
delete unwanted dirs
PLFED-279: SAML parsing and AuthnContextDecl
PLFED-280: apache xmlsec 1.5.1
Introduce end-of-line normalization
PLFED-281: moving toward consolidated picketlink.xml
PLFED-281: moving toward consolidated picketlink.xml
workaround xmlsec
PLFED-281: moving toward consolidated picketlink.xml
remove unnecessary deps
PLFED-275: let the SOAPSAMLXACMLServlet handle soap 1.2 as well as put a workaround for parsing Saml Query
Santuario 1.5.1 change. Establishing the IDness of the ID attribute.
Changed how nodes are used during sign validation.
Fixed SAML2 signature validation.
PLFED-283: prepare 2.1.0.Final
PLFED-283: next 2.1.1
PLFED-285: sp should redirect to configurable error page
Fixed bug with call_escalation
msm: kgsl: Do not restore per context timestamp states

We do not have to restore the per context timestamp states during
recovery as this data is irrelevant after recovery.

Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
(cherry picked from commit 1caba1c8066b77d3955300c95a9be2489418b094)

Change-Id: I2ebf10cb9fca40fdff9f02978bdcda18dd771871
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>
(cherry picked from commit 5ef7b562609b5b1ac3159f9dfca6d9922ac66186)

Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>
msm_fb: display: fix fake iommu buffer drop

During pipe free, some content of pipe is backed up and then after
pipe is zeroed out, the content get restored, in between there should
be no actions to change the content since any change will be wiped out
by the restore.

Change-Id: Ia6da0162d1f9b614682e1fc36edab1db003b42ab
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
Incremented version number for 0.3.2~a.
Refactored browse views.

* Views now in separate modules according to whether they work on directories or files.
* Delete has moved onto the file that's being deleted, not it's parent directory.
* Actions are now dir/file specific, so you can't attempt to delete a directory or upload to a file.
* Slightly improved error checking, including factoring out the ENOENT/EACCES check.
add homepage
Merge branch 'master' of https://github.com/datahacking/robots
Fixed TupleSampler test
Fixed a small thing
distro package completed
Merge branch 'master' of github.com:datasalt/splout-db
slipmap: added icon() method
slipmap: added flag icon
camera: added filtering of regions in the plane
map: use icon() slipmap call
camera: use new cuav_region library
calibrate: update to use camera params
calibrate: load camera params from data directory
camera: cope with running in other directories
sensors: report airspeed if available
camera: default to 4mm lens
fixed the link delay double reporting problem
ignore duplicate nav_controller pkts
slipmap: added SlipCenter object
slipmap: fixed a pipe race conditions by using a queue
transmit image positions
camera: added pos to filtering code
CUAV: added MissionGen module
console: fixed link delay display
camera: record raw frame times
added "wp update" command

allows update of waypoints in flight
Content views: created authorization module
Esborrades les versions exteses dels css i js del Twitter Bootstrap
Subscribe BankTeller
dragon.rb holds a Dragon class with a custom sort method.
my personal branch .. i hope :)
Update master
pravverzija rahlo spremenjenega CSSa. Nekak morm pogruntat kako vse to lepo narest.
Merge branch 'master' of https://github.com/BorisMarn/PiplMesh
reverting (mitar was right ... not having branch got me in to mess)
contact form
improved code
Merge branch 'master' into contact
Make installations more predictable and tested.
small fix
blocktrans fixed and some spaces
added dots
Merge pull request #258 from dcrystalj/contact

contact form
Cleaning the contact form code a bit.
Use lxml 2.3 so that it might be easier to install on Windows.
merge conflict fix, overwritten login.html from upstream with local version
fixed NoReverseMatch and TemplateDoesNotExist at /login/
code cleanup (indention, colors to uppercase, space after :, removed unnecessary empty lines)
improved login screen, modified and combined few css rules
code cleanup and some changes to login form
-g not needed to be send along
Make the comment a bit more clear
Clear screen and history
Don't use the mouse in tmux
Set encoding of the statusbar to UTF-8
Set the left part of the statusbar
add new env and new alias
fix the range query, now just in-memory db issue left and done with range queries and need to add more tests
fix the range stuff for in-memory, test it on cassandra, make api better for cassandra so client injects the builder now as well and move util package
fixed test and scanner
finished up range queries now
implementing iterable so that the loop only occurs at the bottommost layer instead of at every layer and this should be compatible with scala as well
nearly have Iterable all the way through, just a few more changes
fixes for the raw query test so we can add meta and put data and run a query all without the ORM layer now
some simple renaming
moving more to Iterable so all loops can be done in one layer
more changes to get closer to Iterable
more iterable changes
fix the logging one to be an iterator now as well for logging
caching iterables are now in place as well
more iterable changes higher up.  nearly have it all changed over to Iterable so we don't keep looping at each layer
more iterable additions into the typed layer now
more changes over to iterable in typed layer and base entitymanager
add some logging on timing information
use markup now
return IndexColumn instead of just the pk now as we can use secondary indexes later as well as use the indexedval to see if this is an out of date column and drop it
need to move to IndexColumnInfo to wrap IndexColumn so we can keep track of what we anded with and possibly filter it back out later
Output: fix a typo.
t/Output.pl.t: Add test for saving and loading statuses file.
Add BusyBird::ComponentManager module, which is a singleton object that takes care of signals and components such as Input and Output.
Input: now loadTimeFile() and saveTimeFile() methods are public. They are called by ComponentManager. saveTimeFile() method is still called by Input itself, too.
ComponentManager: Add handling of Inputs.
busybird.pl: now config filename can be specified from command-line.
t/Status.pl.t: Add busybird/is_new field to some test vectors.
Input, Output: Add some log messages.
main.js: status.busybird.is_new must be checked against 0. Otherwise old statuses loaded from a file are reported to be NEW (... but why?)
busybird.pl: Add initialization of ComponentManager. This loads saved statuses for Output and time files for Input.
t/Output.pl.t: Add test to check the serialized statuses file is consistent after loading and saving again.
Status: deserialize() method now match a regular expression against the copy of elem_orig. The matching seems to alter some internal structure of the scalar object. This makes an originally pure integer scalar be recognized as a string, especially by JSON encoder.
Input::Twitter: do not _enc() original IDs. Save the real original.
updated vim distro
added initial git setup
Change
Merge branch 'master' of https://github.com/defendrok/GetBlock.git
Дгф ФЗШ сдфыы фввув
profile error display
major update - working design
サブモジュールを一旦削除
submodule群を再度登録
resourcecoach update
fixed bracket error in resourcew coach
updating resource coach
directory resource can do owner, group, mode, using install
direcotry has path, recursive options
direcotory resource has default values, supports create and delete
action
Added an entry in about us
Rahtikirjanumeroksi tilauksen tunnus.
Parempi laskenta rahtikirjan painoille.
Merge branch 'sami/keraysera' of github.com:devlab-oy/pupesoft into sami/logistiikka
Keräyslistaan asiakasnro viivakoodi.
Vaihdettu viivakoodi-funkkariin!
Idhair spessukeissi.

Näytetään keräyslistalle asiakkaan tilausnumero viivakoodina.
Merge pull request #357 from devlab-oy/sami/kerayslistalle_asnro_viivakoodi

Keräyslistaan asiakasnro-viivakoodi.
Kun asn vahvistetaan, ja jos tehdään lapsirivejä, niin tehdään ne myös asn-tauluun.
Vieläkin tiukempi tarkistus onko päivitysoikeuksia.
Korjattu yhtion parametrin "tilausvahvistus_lahetys" tilausvahvistus bugi. Ennen lähetti ainoastaan splittauksen viimeisestä tilausvahvistuksen vaikka koko tilaus piti vahvistaa.
Korjattu ettei mee päällekkäisiä viivakoodeja ja myös korjattu kopiotulostus!
Korjattu valuuttasuorituskeisissä tilanne jossa rahaa jää yli!
Lisätty sarakeotsikot
Uusi tilausvahvistustyyppi!
Jos on yhtiön parametri "Tilausvahvistus_lähetys" asennossa 1, niin kaikilla tilausvahvistustyypeille tulostetaan alkuperäinen tilausnumero.
Merge branch 'master' into jamppa/vakadrerittely
Haetaan tuotteen viimeisin/laskutus kulutusaika riippumatta aikarajauksista.
Merge branch 'master' of github.com:devlab-oy/pupesoft
HOTFIX
Lisätty tuki "tuotteiden_jarjestys_raportoinnissa" parametrille.
Päivitetty ja funktioitu vakadr-erittely. Tehty tulostakopio mahdollisuus tulostaa vakadr-erittely. Päivitetty kerää.php käyttämään funktiota.
Voidaan lisätä negatiivinen alennus tilausriville. Tarkottaa, että halutaan syötetty summa katetta.
Voidaan kopioida myyntitilauksesta tarjous.
Scrollataan vaan kalenterisivua. Pidetään ylätable paikallaan.
Muutettu pikkasen pupemaisempaan suuntaan ja korjattu PDF:n näyttö ruudulla.
Merge pull request #155 from devlab-oy/jamppa/vakadrerittely

VAK/ADR-erittelyn tulostaminen lähetteiden tulostamisen yhteydessä.
Katemyynti-ominaisuus tukee nyt poikkeavia myyntihinta määriä.
Näytetään tuoteperheen isän saldot
Merge branch 'master' into jamppa/tilausvalmis_bugfix
Merge branch 'sami/asn' into sami/logistiikka
Merge branch 'sami/logistiikka' of github.com:devlab-oy/pupesoft into sami/logistiikka
Lisätty päivärajaus-hakuehto
Korjattu päivärajaus-hakuehtoa
Pvmvalikkoon myös laskunpäivä!
Merge pull request #244 from devlab-oy/anssi/laskurajaus

Laskurajaus
Kohde ja projektivalinnat myös yhteensopiviksi budjetoinnin ja myynninseurannan kanssa.
Merge branch 'master' into sami/logistiikka
Parannettu "tulosta kaikki" oletustulostimen valintaa.

Valitaan varaston oletus "keräyslista" tulostin oletuksena "tulosta kaikki" dropdowniin.
Örumin kantaan uusia tauluja, joihin mahdollisuus sisäänlukea dataa
bugifixi excel-raportissa
vaihdettu excel-kirjasto uuteen
Voidaan manuaalisesti triggeröidä kolmikantakauppaflägi.
Merge pull request #403 from devlab-oy/vesa/crm_excel_fix

bugifixi excel-raportissa
Merge pull request #408 from devlab-oy/vesa/myohassa_olevat_excel_fix

vaihdettu excel-kirjasto uuteen
Uudet taulut tännekin
Merge pull request #398 from devlab-oy/satu/uusia_tauluja

Örumin kantaan uusia tauluja, joihin mahdollisuus sisäänlukea dataa
Merge branch 'master' into sami/logistiikka
Kollien pyöristyksiä.
Use lua_equal to implement luaL_testudata instead of slow lua_compare fallback
added Animal.Java
deceptive protected code
improved deceptive protected code
something wasn't saved in eclipse
Fix bug where errors weren't pinned to the top. Cleaner dashboard template.
Fix more exact time
Added a test case to demonstrate the problem that is fixed by disabling the _listdir cache.
models: fix email body.txt path
admin: register types to admin site
Snippet for CharField
CharField with default
CharField with CHOICES
Files moved
snippet for choices
Snippet for ForeignKey
ManyToManyField
Fixed error
Fixed error
Added another snippet for m2m
...
Abstract model
snippet for queryset
First completions
More autocomplete
More completions
More django completions
minor css
Перед получением с сервера правок.
Корректировка стилей.
Корректировка стилей для IE.
отступ 2х полосок
Убрал баннеры со входа в админку.
Базовое решение устранения конфликтов jQuery и старого IE.
Merge branch 'master' of https://github.com/difrolov/insurance
Дифференциации ветки перед слиянием.
Merge branch 'AdminLocal'

Conflicts:
	insurance/protected/modules/admin/views/generator/index.php
Привёл в соответствие с AdminLocal
sss
Merge branch 'master' of https://github.com/difrolov/insurance

Conflicts:
	insurance/protected/modules/admin/views/generator/index.php
ss
ffffff
index
Merge branch 'AdminLocal'

Conflicts:
	insurance/protected/modules/admin/views/generator/index.php
Новые картинки от Оли.
Merge branch 'AdminLocal'

Conflicts:
	insurance/_docs/схема процесса.xlsx
	insurance/protected/modules/admin/controllers/ObjectController.php
Оказывается, дизайн не тот!
Модификация шапки сайта.
Перед переходом на AdminLocal
Добработка стилей макета.
Удалены устаревшие закомментированные значения.
Merge branch 'master' into AdminLocal

Conflicts:
	insurance/css/style.css
Модификация запроса извлечения объектов. По приоритету!
--fixing import error of s3
update submodules (bulk user download)