labofsahil/github-event-dataset-2012 huggingface dataset:
make hdd standby optional, default timeout is 15 min
Removed 'MCE' customer code restriction in command decoding to allow for other compatible remotes.
Merge pull request #1505 from stefansaraev/standby

make hdd standby optional, default timeout is 15 min
Merge pull request #1508 from drachul/linux-rc6dec-fix

Removed 'MCE' customer code restriction in command decoding to allow for...
linux: update RTL8168 patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
distribute: update to distribute-0.6.31

Signed-off-by: Stephan Raue <stephan@openelec.tv>
harfbuzz: update to harfbuzz-0.9.7

Signed-off-by: Stephan Raue <stephan@openelec.tv>
pango: update to pango-1.32.3

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc: update to xbmc-f14f5a5

Signed-off-by: Stephan Raue <stephan@openelec.tv>
new package: add package 'xf86-video-nvidia-legacy' to support GF6 and GF7 GPUs too, thanks to 'chewitt'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
projects/ATV/options: switch to 'xf86-video-nvidia-legacy' GPU driver, thanks to 'chewitt'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Added Patches needed for Bitstreaming Audio on Intel Hardware.

4 Patches: 3 Kernel Patches, 1 ALSA Patch

I do not take credit for these patches, I only want to make them easily available.

Credit for the patches goes to Wang Xingchao and his collegues at Intel
Fixes #947

When upgrading to samba 3.6.x they changed the default for NTLMv2 auth
from false to true. This causes xbmc to fail to connec to OpenSolaris
based distros like Nexenta or IllumOS which use the native in kernel
CIFS server. This patch resets the default back to false.
alsa-lib: fix file permissions

Signed-off-by: Stephan Raue <stephan@openelec.tv>
samba: rename patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xf86-video-fglrx: update to xf86-video-fglrx-12.10
alsa-lib: remove patch which breaks audio via HDMI

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xf86-video-intel: update to xf86-video-intel-2.12.14

Signed-off-by: Stephan Raue <stephan@openelec.tv>
harbuzz: fix install script
pango: fix install and config files
delete bin directory 2
Basic tile done. Fixed a big bug in sprite batch...
fixed initial axes on graphs work
Incorporated original stylesheets and header/footer html

- Implemented Wordpress title & slogan
- Incorporated the original trovster.com stylesheets and header and footer html.
Added the header menu

The theme's header menu can now be populated by Wordpress.
Fixed the Museo font.

Added the individual font files and correctly linked them to their location in the theme folder.
Fixed the current active menu item styling

Added the Wordpress default 'current-menu-item' class reference in the original Trovster stylesheet.
Added the loop in the index.php file

- Fixed some code indentation in the header.php file
- Character problem in footer read more link
- Added the loop in the index.php file
Added single.php and page.php templates
Added templates for categories and archives
Styling adjustment for single posts/pages
Added a bookmarks template
Turned the footer columns into widget areas
Added theme settings with an option for the copyright line
Fixed a problem with quotes around blockquotes
Modify
add files
remove file
modify again
Mixed
Removed legacy examples.
Reject bad regular expressions with a proper error message.
Preparing for access control
Refactor. Nuevas applicaciones
Basics
Version 0.1
Version 0.1
V 0.1
fix crash on donations screen
avatars removed from events listing
imagem do status do build do Travis-ci
added base for mysql setup, moved apache config to class
树的遍历 非递归 完成
Adding tabularize vim plugin
Environments should interact with Vars, not scala symbols.
Initial version for presentation

This is the version with which we'll start the presentation
New webview at mapview
Actualizar regex para español

Aceptar específicamente caracteres en español y :
store redirects from circa in circaimport sample file

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@18659 a0171fae-0946-0410-966d-b1775066cd26
search by lot bbl
Don't align on ':' in maps anymore
Fill in Growth Gaps/Reading subcategories
Add 'eligible' points for Growth Gap categories

It's only static for Academic Growth, not Growth Gaps
Show lists of a repository's issues

Four pages in the ViewPager:
* Open
* Closed
* Assigned to You
* Mentioning You

Signed-off-by: Eddie Ringle <eddie@eringle.net>
Add resources for future Issue filtering support

Signed-off-by: Eddie Ringle <eddie@eringle.net>
Merge branch 'issues' into next
tab settings, filetype specific settings
[PHOTO] +: Show first image longer
topo Vila
link professor content
paginação limite
firstrun detect update
add spring config file
Fixed a testcase failure from Token::stringifyList change.
Fixed #4024 (Tokenizer::simplifyFlowControl removes pieces of code inside a class if 'exit' is a member function).
Fixed #3963 (segmentation fault of cppcheck (invalid typedef code))
fixed testrunner assertion
Tokenizer::simplifyFlowControl: separated the 'throw' case because it's not a reserved keyword in C, hence the function shouldn't simplify in C source files.
TemplateSimplifier: Fixed wrong match when inner template parameters are wrongly counted (#3818)
Fixed wall draw glitch, added chameleon sticking ability, fixed head position, added simple hud, a simplistic kind of error display switch, removed jump ability, added weld hinge support in universe
DOn't recompute mock data all the time
MORE POD changes (yawn)
Remove all traces of 'verbose' from Test::Compile

It has been in a few relased versions but
- not documented
- not required (it was intended for testing)
upgraded and some fix to default.css
beautify code and some fix
Merge pull request #6 from Mte90/master

upgraded default.css
First cut at message documentation, works for at least one service generation
Update for navigation bar and fixed footer.
write out setence-rules
refactored homeview
added some comments
some more refactoring of the homeview
use webworker to hide text
modify about me layout
code to convert all files to new date format, new date format, including days on market in inactive
TEST = FALSE
checking add remove options
testing again

because i still can
Comandi vocali: iniziata la guerra!
Sistemato gli indici del menu
Voice control: sistemati le classi per il riconoscimento
BaseActivity: aggiunta voce al menu
AndroidManifest: aggiunge modifice per riconoscimento vocale
rimosso xml
aggiornamento file di progetto
pocketsphinx.xml: layout temporaneo del riconoscimento vocale
file jni-swig e classi libreria pocketsphinx
SplashScreenActivity: ora viene usato il metodo del pAdapt pper la disconnessione
Add "(modified)" indicator to status bar; smarter disable/normal of menu items
Removed non multi-threaded cruft.
Added a malloc implementation 'verifier' and a BrokenHeap layer to test it.
Nova análise do estatus do rastreamento: se pelo menos um registro
estiver com o status 'entregue' a encomenda será considerada entregue.
Close documents
Adding ip to the ATSRecord Object
updated slot api and method of calling slots
jckarter/clay@4d06887 (2012-08-11 07:19:18 -0700) Tests Failed:0, Passed:302
Make setTotalFitness() and mouseClicked. Add box around selected.
Update to reflect Mark and Jacob's departure from Twitter.
adjusted outline tree
version 3.51
adicionando arquivos de votos e eleitorado do PSD
Corrigindo arquivo 'votos_partidos.json'
add xcode files back to project
add back xcode project files
Mocks elgg_normalize_url
ECMS/FQA-40 SE - Podcast
ECMS/FQA-184 : Admin/Content Presentation/Manage Template/add
[~] not warning in release mode
add comment saving if provided
basic multistage capistrano support
Removed: deprecated eZFile::getContents() method
Changed Locale to contain lat and lon instead of one GeoPoint, fixed data error for UC coordinates
move the initrd support to only run on popcorn
action forward/backward
control panel underlay
grid move constraint
grid panel mouse handler
key controller
McGill: do not force comma separator for locators, apart from theses and newspaper articles.
Package jar?
O itinerario enviado pelo server agora é processado no respectivo device e sua lista é atualizada no reinicio da aplicacao.
alterando estrutura
Merge branch 'master' of https://github.com/felipewebdf/femubra

Conflicts:
	src/Femubra/SiteBundle/Controller/SiteController.php
	src/Femubra/SiteBundle/Resources/views/Site/cadastrarBanda.html.twig
Re Init code, add fullcalendar assets
Fixed some warnings caused by the docs.
Finished creating wrap_title. Also made the Spaces a wee bit bigger.
Update README.md

Added PDF link to Sekhon paper.
improved test_scaler_without_copy
replace printf with FLOG_xxx
Mark errors coming from remote Error console with a prefix
Do not use tabId, it's always null on Fennec
Update gitingore
Explicitly set display='none' on Accept & Decline
Refactor new project generation in its own Cli class.
Removing extraneous svn directories
Configured travis.

Added the build status image to the read me.
change min-height .vote-box
add link to documentation
deleted the nbproject folder
Datenbank aktualisiert
Update src/rabbit_types.erl

fm: representing delivery_count per msg.
[20121004]added the README file
Removing forms from the photo manager.
cambio posicion
Clean up imports, add overrides
Add rooms support (fake).

Signed-off-by: François de Metz <francois@stormz.me>
improved buffer switch
removed slander
Fix a bug with Eloquent model classes and isset() when eager loading a relationship returns an empty result set.
Minor restructuring into Extras module
- Merge the following from the English version:

  r13563 -> r16346       head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
pgmdump: few small tweaks
fdre: update some register names
fdre: add initial texture support

Still need to do some tests w/ multiple textures and enable/disable
various texture settings to sort out some of the bitfields that are
hard coded right now.  But this works for simple stuff.
fdre: add cube-textured test

Similar to cube test, but with a texture.
скопировал из сайта список
diabook-themes: minor bugfixes
Update install wizard
- writable .htconfig.php not required
- add test for working .htaccess/mod_rewrite configuration
- fix last pass: create tables, eventually show config text and print a "What next" section
Merge pull request #309 from fabrixxm/master

Update install wizard
bug #447 - make followed feeds private
v0.4.2/2
Posted open source post
hidehomedirs with every cds
intento arreglar error choto
Disables item rebuilds when in admin menu
Reverting memory related changes.
don't need this module
Changed the style of the list.
Gabriele: Search template and Press/Product faceting
Correctly running around the board.
2012.12.19
setup correct workflow on authentication app
Convert DataTable in Team - Update
Login with start of DAL
Add multi-line case formatting option.
corrected some config files
show a pen when show the draw.
connect the change room action
update image
Merge remote-tracking branch 'origin/master'
fix bug of sync level&exp service for draw pro version
changed SpriteActor to use values from the actor to the sprite, added a new actor converter for the size of an actor
Merge branch 'shared-projects' of https://github.com/geosdi/geo-platform into shared-projects
Merge branch 'master' of https://github.com/geosdi/geo-platform into shared-projects
Merge pull request #10 from geosdi/shared-projects

Merge for FIX on WS tests
WPS Geocoder Improvments
Fix bug
Re-Enable PrintTemplate and add combo in Print Window
Merge branch 'shared-projects' of https://github.com/geosdi/geo-platform into shared-projects
Merge branch 'master' of https://github.com/geosdi/geo-platform into shared-projects
Merge branch 'shared-projects' of https://github.com/geosdi/geo-platform into shared-projects
Notification messages implemented
Merge pull request #11 from andypower/shared-projects

Shared projects
Added the files necessary for creating two custom rules GP0001 and GP0002
Added a sample project for showing the Custom Rules in Action
Copied in the StyleCop Contrb project, and started the work to use this framework to test a custom StyleCop Rule.
Add information on 'status' command about what still has to be pushed
percona_toolkit recipe
testing anonymous:
in vimrc vundle -> NeoBundle
EsyVIP v0.5.1

Fixed:
- Codes generated with "flatfile: true" not being saved.
Added:
- Messages to tell if the generation was a success.
MobSpawn v0.7u1
Cosas locas con los grafos de flujo, no consideré destinos de saltos
adding getFilterForm method in admin controller
cli: added clicmds

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
fixed bug: is replaced by getHasValue throws sql exceptions
Only 1 Out of Range Date Warning Per Day +

list will refresh after date warning accepted
fixes bug: potency cut off on right side
fixed bug in single time out of date warning prompt
Highlight Item in History
all .py and .sh files added
Lint NS.
Change production config to serve static assets and compile assets if missed
updated Readme with overview and some important notes on building the project
Put GPS init/thread code into its own file
Changed some files, Basic GUI Constructed

Changed the name from BookFrame to BookPanl, made more sense. Also made
a basic GUI, should be changed soon.
Blah

Blah blah
init
Merge blog:grgizem/simple-blog
fixes #104: use commons-dbcp as the connection pool for the metastore.
And increase the default max number of pooled connections to improve performance under concurrency.
Beginning of cli app

Not sure if I'm liking the stucture much yet, will probably
undergo a few iterations
Changing title of demo page
Add screenshot and URL to subscribe
Merge pull request #7838 from guilleiguaran/extract-rack-cache

Disable Rack::Cache by default
Fix the coffee-rails dependecy version
Use flat_map { } instead of map {}.flatten
Revert "Use flat_map { } instead of map {}.flatten"

This reverts commit abf8de85519141496a6773310964ec03f6106f3f.
We should take a deeper look to those cases flat_map doesn't do deep
flattening.

irb(main):002:0> [[[1,3], [1,2]]].map{|i| i}.flatten
=> [1, 3, 1, 2]
irb(main):003:0> [[[1,3], [1,2]]].flat_map{|i| i}
=> [[1, 3], [1, 2]]
fix Example: Rename tools/profile_requires -> tools/profile
Merge pull request #7852 from rochefort/fix-example

fix Example: Rename tools/profile_requires -> tools/profile
Fix middleware cache tests enabling rack_cache
fixes vim quirk when pasting onto charwise visual selection (prefixes blank line)
[cron-git-commit] @ 02.43
- template, makefile and storage for suggestion forms
Merge remote-tracking branch 'upstream/master'
Merge pull request #203 from adamarla/master

Additional files to generate suggestion forms
Added calculator package
New command - \gsign - to typeset variables with proper sign
Merge pull request #351 from abhinavc/master

Included new calculator package and added a new sign-aware typsetting command
we can now generate a list of stories for the demo.
アノテーションで追加ルールが指定できるようにしてみた。
wording cleanup
Player cannot join roster until event prerequisites are met.
Editable events attached to a league.
Enable event listing and multi-select in edit screen.
init leagues array
only use logs if set
comment out lines that should be comments
whitespace
ignore mac files
remove unused $id

- this $id is causing an warning when creating fields
Merge pull request #5 from TheKrush/develop

Maintenance, plus a couple clean up catches
Merge branch 'develop' of https://github.com/h07r0d/leaguerunner into develop
identify registration entries for add/delete, and send down to db
fix for the null array

- my previous fix didn't actually work
state names

- adding in state names
- making the maps open in new window
add the 30->31 changes to fresh installs
Merge remote-tracking branch 'remotes/h07r0d/develop' into develop
Merge pull request #6 from TheKrush/develop

Fresh Install
per-league prerequisites back in.
removed some SUC-isms
Merge branch 'develop'

Conflicts:
	perl/lib/Leaguerunner/DBInit.pm
whitespace correction

Make the markdown render correctly
Syncing with latest H5BP `.htaccess`
Merge branch 'leek-patch-1' into develop

Conflicts:
	nginx/mime.types
normalize whitespace

make it easier to keep this file and the .htaccess file it is based upon
in sync, by using the same indent
more macosx results.
broadcast bar gone, MessagesController no longer looking for #broadcasts
message creation returns tokens of mentions
labeled the language selector.
Updated README

Added some information. Will some people actually read this longcommit?
without files
A Test of experimental braches.
A test of braches. I added a line in the experimental branch
A test of branches. I added a new line in the master branch
Merge branch 'experimental'

Conflicts:
	Bioscope/zephyre/Bioscope.py
Add other projects such as FireGrab_swig, etc, to the repository.
1. Now there is a smarter device loader. If there's anything wrong during
the initialization, the operator will be informed.
2. There's no need to stop acquisition before setting ROIs any more.
3. Now the user can setup PID parameters in the preference dialog.
1. Check if the data location exists during initialization.
2. Set the data logger
3. Menu items
4. Velocity control in the feed back.
Deleted cachefile
basice setup.py file
upgrade susy to 1.0.4
upgrade zurb-foundation to 3.2.2
Added rgb and hsl labels
fixed isbn bug, fleshed out search ui
当阳之吼 描述调整
代码调整以及 删除踏青，涅槃里面没有的武将战功，以及无法实现的战功

踏青没有 card:hasFlag
New passThrough mouse listener which passes all events through the
selected element to the element given to it - mainly for use with
textPane
8888888

000000000
(cherry picked from commit 3b0fa32d3c5ed469eb97784a7a5c21ccdab533d9)
(cherry picked from commit 4dc5030f3cbdc34f4c078f7dfbdfd5f28c0f2ec5)
small documentation fix(cherry picked from commit cfd48c267a76224eaf61f66631c7f58b18762559)
(cherry picked from commit a20570962249445f3a67924a3ebcd66a0b66eebc)
Revision Chapter 13(cherry picked from commit b7d6772a99320735a6f1c4762b97702d6c680b14)
(cherry picked from commit f44e8705acc4d993c823883529fce344f4a982c7)
Fixed client config builder address delimiters.
(cherry picked from commit 07993b5aa51168d0941f6cce055ac85a8d541f08)
(cherry picked from commit 6d4fa9981b92a0f76f97dd825c06758660dfc981)
Updated graceful shutdown process. (from commit 8b21bcadf289e2aaa5a3dbc1c7365cbc0db09e69)
Added watchdog routines (comm timeout)
Two new scripts:

confirm.sh allows easy bash confirm. See http://wuhrr.wordpress.com/2010/01/13/adding-confirmation-to-bash/
make_bootable.sh calls hdiutil convert with a format of UDRW to create
bootable images from unbootable images.
successful upload
readme
new mongo connection structure
.vim, .vimrc: Adding nerdtree, solarized color scheme
Update MIME data files
Changed some plist settings: support automatic termination and shutdown processing with the main window is closed.
Setup a minimum size.  This is to hopefully help with issue #6.
Code prom 2006
Removed extra field in location to comply and changed hnode jid to hnode@domain to comply with hubiquitus v0.4
Updated header format to hubiquitus v0.4
Added Weapon Atlas
Images can now be loaded from CSV
add node-gyp compiler
fixed .gitignore content
remove build/
Fixed test for existence of macports.
Using go to route, when loading the linked to route.
Changed geocoder viewbox to DK and Skåne.
When removing from/to points, the next via point become from/to.
Merge branch 'dev' of github.com:ibikecph/osrm-rails into dev
Updated node sample app readme
Added Objectify caching to UserDetails with removing old deprecated memcache boilerplate. Added feeds query
help setup
admin:help
remote help access
removing debug prints
readme updated
Version bump to 0.5.0
Regenerate gemspec for version 0.5.0
<a> elements fix

+Fixed images wrapped in <a> elements problem
+Tags image containers affected by .PIFlexImage() and now recognizes
them in showImage function.
Add png thumbnail replacement option.
Update readme from github
use vundle
use the molokai color scheme
revert vundle
headerserializers: compile fix for Visual C++ 10.0 and later

they finally have <stdint.h>
taking html into account on the intro shortening
fixing a typo
Merge branch 'dev' of github.com:infinitas/infinitas into dev
Use FileList in build.rb
Add couchdb support

	* Add couchdb files
	* Add couchdb function to main activity
	* Change requirements for app to SDK v.10 (2.3.3)
changes to run mine webapps in tomcat7
update model and test
Moved the oj.util.string methods into oj.util.framework.
Moved unit tests accordingly.
Re-order hosts entries
down move for beefy
Dirty Frames
mails notifications bug
DRYed out my test, added in tests for the links, added a test for the full_title helper
Done with room schema for teamleader
Merge branch 'issue#24'
Tweak application generators
something
gem bootstrap
cut down on whitespace clutter
grammer error
added early stage python script to Do This Right
document all the things
added all chaged files, framework and requirements
Implement link module. Closes #2
Correct instructions for running the tests
Started adding support for persisting ignores. Adding tinyxml as
a depenedency. Need to figure out the best way to manage project
dependencies in C++.
Linux: 3.0.52

Change-Id: Ie0cb065fe8f36a433478db183cc3b4053cd221a4
added meteor bootstrap module, cleaning up css to reflect this
fixed merge conflicts
Updating readme to remove rails boilerplate
Update post01
device now fully implemented and working
upgraded to 1.4.0
Flesh out the nested algorithm section a bit
Merge branch 'develop'
Release the first stable version.
Update screenshots.
Update README.
Fix the strange button style.
Update LICENSE.
Display added style if song is already contained in the playlist.
Add the missing semicolons.
Check undefined variables by === instead of ==.
Use the array literal notation.
Extract event listeners.
Extract html template.
Merge branch 'maintain'
Update README.
Revert "Extract html template."

This reverts commit 301cc3221363b69959640652e6bb024e60af2dcb.
Specify 'manifest_version': 2.
remove git script
update folder structure of javascripts
collection view allows custom props to be initialized at construction
Added gitv and ruby-refactoring plugins
Cambiada toda la configuración del Front Controller
Fix a few bugs with mask handling
Fix bug where undefined values were introduced when shifting more than 32 bits
Javi file
Javi file
working RKS
Added num_dirty_occurrences per species
Start debug tool closed. Removed 'some-tool'
Doco formatting
Start of support for rebasing
Add a basic toggle view for completed/incomplete on uploads page
Primitive 'save for later' (can't yet upload, but can view in uploads list)
Merge branch 'master' into upload-tabs

Conflicts:
	assets/www/js/app.js
fix save for later with new photo code
Merge branch 'master' of github.com:wikimedia/WLMMobile into upload-tabs
localize upload mode toggles
upload later

add an upload later button to the upload screen
add upload later confirmation screen with links to welcome page and
uploads page
add generic rule to display link underlines (.visibleLinks a)
apply to upload later confirmation popup
add missing test for ebc26923b68708131da8ebc06f6bf5d5d7a2d66b
Merge pull request #136 from jdlrobson/test

add missing test for ebc26923b68708131da8ebc06f6bf5d5d7a2d66b
Merge pull request #138 from jdlrobson/testfix

fix broken test introduced by 400b815cf772a4c6e0ca2a8a4a9092c4c90e9685
Merge pull request #135 from jdlrobson/uploadLater133-new

upload later
Stop escaping pipes in admintree names

I updated the API to handle this for you - which makes the API
more friendly to current API users and also makes the escaping
headache in the app a little less severe than it already is.
The API now automagically knows the difference between a | used
for separating adm levels and a | inside of wikitext.
As such, this has a dependency on r862 getting deployed to the
API servers.
Merge pull request #139 from awjrichards/stop-escaping-pipes-because-its-dumb

Stop escaping pipes in admintree names
Merge branch 'upload-tabs'

Conflicts:
	assets/www/js/app.js
	assets/www/messages/messages-en.properties
	assets/www/messages/messages-qqq.properties
quick stub for different display of incomplete uploads, add a stub upload now button which is non-functional

The completed- and incompleted- displays should be separated out into separate pages, which will help with back button behavior etc.
alert() calls should be replaced with use of the error dialog.
Upload should be made to work, etc. ;)
Smaller thumbnails should be created and stored with both complete and incomplete uploads.
Merge pull request #140 from brion/upload-tabs2

quick stub for different display of incomplete uploads, add a stub upload btn

Merging this for now per Phil -- we know it needs work but we needed some bits in a hurry. :)
Adds support for uselang param in API requests for admin zones
Fix formatting in function signatures in monuments.js
Merge branch 'master' of github.com:wikimedia/WLMMobile
Incrementing androidVersionCode for beta2 release
Implemented caching during tokenization.  Added a script for testing performance.  Bumped the dev version number.
Testing std lib
Problem solved. THOU SHALT DRAW IN MAIN THREAD ONLY! So I added the possibility of sending signal to main thread to do some extra work apart from drawing by  special_call( function_to_call, Data ) . Finally the mystery of failing anti-aliasing is unraveled - same cause. +Mutex for FPS
Upped __chunk_size to 64kB
Incrediblify
Remove example generation task
Add collections#join and collections#sort. Closes #20
Implement stacked area plots. Draw stacked bar plots top-down.
Merge branch 'master' of github.com:jeremysanders/veusz
Cleaning up zsh prompt
Adding reverse i-search for zsh.
Switched 2.0 over to using phpdoc too.
Pagination option override replaces whole array
Patched a XSS hole where redirect_to could contain a malicious URL.
Travis blacklist
Include master branch to blacklist
Merged conflicts in users.php
Make error reporting be always true, just HIDE errors in production.

Signed-off-by: Phil Sturgeon <email@philsturgeon.co.uk>
Don't really know what that was doing.
Added $vars back, which should go soon.
Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/develop
Merge remote-tracking branch 'upstream/2.1/develop' into 2.1/develop
Equality doesn't need to be treated separately (here).
No need to treat equality specially.
Quotes.
Used premises of a solution.

This stylesheet doesn't consult the original TPTP problem.
New utility for a naive conversion to LaTeX.
more tidyall
Content for settings menu
Added a simple check for missing version control files.  If there is existing information in vc.tex, it will still be printed in the file but it won't try to run the vc.bat file.
Moved hyperref package to its usual place at the end of the order
v1.0.3 -- minor doc updates
Merge branch 'master' of https://github.com/jlombardo/TicTacToe
v1.0.3 -- updated version number in GameWindow title bar
rename main to server.js
Support 7 digit SLGs
Switching MultiJson from deprecated decode to load method
Stiffen the multi json requirement.
Lower multi json version and feature detect to avoid deprecation warning.
Require newer multi json for tests.
Added specs for using decode when MultiJson doesn't respond to adapter.
Main page main layout

Finished main page layout (except the title bar)
Missing all javascript
Edited fit to normalize to prevent fit hangs
Moved fitTimeModel() into catSyncTrack.m
Auto-update: 06-Dec-2012 12:59:55
Auto-update: 06-Dec-2012 14:31:34
Comitting everything
Merge https://github.com/joejeet/auto-mobile
Bump ammount of allocation to do in test
html5 default
commitou
Experiment with switching from ODE to bullet
Clean up collision bits
Wrapped entire hector in convex hull. I think it is impossible to get a GeomNode for parts of the actor, so I think it will be necessary to create separate eggs for various parts of the hector.
Merge branch 'bullet'
Simple filetype detection

Use the Jam syntax for various flavors of Jam files.
javadoc 문서 등록
create css changes
BGP Capability skeleton.
BGPCapability implementation using AbstractCapability.

No IBGPCapability implementation yet.
Add BGP and Policy objects to router model.

BGP objects come from old model.

Policy objects have been generated using translatecim tool and cim mof files version 2.27.0.
Some transformations have been required to accommodate these object to existing data model.

The hierarchy to model BGP can be found in http://confluence.i2cat.net/display/OPENNAAS/Router+Model
Merge branch 'issueJSPlumb' of https://github.com/logoff/opennaas into develop
Add associations in router model regarding BGP and AS.
Update BGP and policies router model to use Association.link
Define routers BGP capability interface and implement it (velocity template missing)

BGP capability exposes two single methods:
- ConfigureBGP(BGPService)
- UnconfigureBGP(BGPService)

Velocity template to transform given BGPService into junos 10.10 configuration statements is not yet implemented.
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into feature/vrrp-builder
New updateIPs visualtion for client
Merge pull request #402 from jordi-puig/feature/vcpe-network

 Different changes. 
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into feature/vrrp-builder
VRRP Builder not working
Merge branch 'feature/vrrp-builder' of git://github.com/logoff/opennaas into feature/julio-vrrp
VRRP Bugs resolved
Merge pull request #403 from jordi-puig/feature/julio-vrrp

VRRP Builder
Changed views
Resolved problem with updateIPs
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into vcpe-gui-update-ips

Conflicts:
	clients/opennaas-gui-vcpe/src/main/webapp/WEB-INF/messages/messages.properties
	clients/opennaas-gui-vcpe/src/main/webapp/WEB-INF/messages/messages_en.properties
	clients/opennaas-gui-vcpe/src/main/webapp/WEB-INF/messages/messages_es.properties
	clients/opennaas-gui-vcpe/src/main/webapp/WEB-INF/views/tiles/header.jsp
	clients/opennaas-gui-vcpe/src/main/webapp/WEB-INF/views/vcpeNetwork/createVCPENetwork.jsp
	clients/opennaas-gui-vcpe/src/main/webapp/resources/js/script.js
Merge pull request #404 from maneljara/vcpe-gui-update-ips

Vcpe gui update ips
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into feature/vcpe-network
added ssh-agent info to readme
Added statistics start.
Fix ___.ejs undefined problems on IE; see http://forum.javascriptmvc.com/topic/ie-only-errors-view-name-ejs-is-undefined-breaks-loading
Fixed some ignore rules
add a todo: If a file is deleted, we don't want to launch tests on it
add a pre-commit git hook, useful for Koha
Another rework for the IE6/7 rgba hook
added the ignore file to exclude the class files
add validation on register page
Signed-off-by: jrlilley <jon.r.lilley@gmail.com>
Success: devel/p5-MooseX-Declare v0.35
Success: devel/p5-MooseX-MultiMethods v0.10
Success: devel/py-Products.PloneTestCase v0.9.15
Success: www/py-plone.app.content v2.0.11
Success: devel/p5-MooseX-CompileTime-Traits v1.102570
Success: textproc/p5-POE-Filter-XML v1.102960
Success: devel/py-Products.CMFPlacefulWorkflow v1.5.7
Success: www/py-plone.app.contentmenu v2.0.6
Success: devel/p5-POEx-Role-SessionInstantiation v1.102610
Success: mail/squirrelmail-user_special_mailboxes-plugin v0.1_1
Success: www/pear-Structures_DataGrid_Renderer_Smarty v0.1.4_1
Success: devel/p5-POEx-Role-Streaming v1.102610
Success: finance/p5-Business-OnlinePayment-MerchantCommerce v0.01_1
Success: www/p5-Catalyst-Authentication-Credential-OpenID v0.17
Success: net/p5-POEx-Role-TCPServer v1.102740
Success: databases/pear-Structures_DataGrid_DataSource_DBTable v0.1.7
Success: textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer v1.1_1
Success: www/p5-Catalyst-Component-InstancePerContext v0.001001
Success: www/p5-POEx-Role-PSGIServer v1.110670
Success: www/p5-Catalyst-Plugin-RunAfterRequest v0.04
Rename project-specific fields for consistency with global fields
#JC-1127. Removed notify me checkbox.
Merge branch 'develop' of jtalks.org:jcommune into develop
#JC-669 refactored after review
#JC-669 resolving conflicts
Mejoras para aplicar documentos

terminacino de la aplicacion  de los documentos en la tabla existencia
bodega, falta guardar los datos en las tablas de transaccion inv y
transaccion inv detalle
cambiando radme
add OrtMitgliederMatcher
Agregando hibernate search
RC to stable
[Add] Added custom 4xx and 5xx error pages.
[Edit] Add cURL requirement to readme.
Add incomplete channel key support to channels script. There's also a
bit of code to convert the old database entries to the new format. That
will be removed eventually.
fixed state control show in admin
Merge branch 'hotfix/remove-state-admin'

* hotfix/remove-state-admin:
  fixed state control show in admin
Merge branch 'hotfix/back-state' into develop

* hotfix/back-state:
  fixed state edit in admin
fixes #40. admin member update
fixes #30. flash show
fixes #39. member auth
fixed syntax
fixed #41. account page
fixed auth after singup
fixes #50. skill levels
fixes #45. singup message
fixes #42. welcome email body
fixed admin state updated and acoount update
updated gems
fixes #44. added pages
fixed tests
some update
update layouts and add sharethis
update footer
form fixed
fixed translates
fixed footer
Miniunz: Add warning / todo if hcd zip selected
Added is_same in God and length() in txt

We have added two new methods. The "hello world" example looks
beautiful now.
ArrayList works.

The array works. And it is a structure. We are still finding a way
to assign it value by reference.
We have put all the dependency in vapi directory.

Now the compilation is easier. We are trying to write a object
context.
We have added Set and Factory.

We just added Set and Factory. We can do some task for those set or
factory. We are thinking to add an interface to create scalable code.
We have added an iterator.
We introduced factory and embeded txt(struct etxt)
We have added factory for memory allocation.
We have added constant integer and enum value indexed array
Bugfix and rearrangement

	1. The bug for tests/namespace/namespace_with_enum test is fixed.
Rearrangement and Bug fix.

	Now it fixes the struct copy function generation.

	The aroop code generation is now in aroop directory.
Rearrangement and bug fix.

	- Please refer to the bug for test aroop/tests/encapsulation_test/multiplefile_test/
It passes simple struct type test.
Fixes no vtable issue.
Fixes God.pin God.unpin Bugs.
Fixes casting problems
Fixes method override bug
Fixed issue related to base access
Delegate test successful.
Fixes static array declaration
Fixes interface implementation bug
checkmonkey -> checkmoney
Making some adjustments for smaller devices.
Merge branch 'master' of https://github.com/karma4u101/cms_site

Conflicts:
	site/src/style-app.cms.xml
add files to page 404 php
addressed Hartmut's edits and included updated measurements
added 'in' before categories
Add Users database table
Updated BlockBreak - check if BukkitForge is installed, as it now
runs the transformer for the mod.
converted travis to use pip for astropy as per Tom's suggestion
(https://groups.google.com/forum/?fromgroups=#!topic/astropy-dev/0IkCf7V7ZUo)
astropy-friendliness
fixed docs, code to agree with get_magpis_image_gal
write: revision detail #10
update readme with better configuration options for accumulo and hbase, include 1B timings for hbase, remove stuff about pre-splitting since these runs were not pre-split
synch with origin/master
updated info about test runs in README
Reviews: just do not show anything when logged out
Started some prototype
a few more small tweaks to read me
Added checking that quote exists when searching
Allow dots in email part before ``@``
Now using the array from generate_lipsum to create the lipsum. Added the copy menu and js
add comments

Adding comments on some possible XML utility functions I need to find
a library for or write myself.
updated the table user_story with project_id in the database "valeu_backlog_2.sql" and added password to database_config.php
mysql pwd sklonio
trebamo i javu
update_semaphore_version regresija - ispravka
pulled html extension into one place
FORGE-481
Fix REST plugin generation on non-standard @Entities
Improved error messaging
в некоторых методах SimplePlane сделана проверка на то, уничтожен самолет или нет, чтобы нельзя было управлять уже дохлым самолетом
рефакторинг. доработки в тестах.
при столкновении игрока и бота оба самолета уничтожаются
+ ‘Base16.sss’
Fixed /job list not properly paging the list.
Examples no longer shows an empty list for commands without them.
Line breaks work now
home y footer
merge
cambios ortografia
arreglando clases arquitectura
add project root to migration-dir search path
Remove unnecessary comments and imports.
Add sensible default locals to partials. Fixes #14.
fuckckck
fuckck
(^_^)
Improved readability and fixed tmux issues.

In tmux the colors changed so that it wasn't possible to see the chosen
entry in vims completion menu. Now it is also possible to resize tmux
panes with the mouse.
Move Details into Display add
Support filesystem notification through inotify on GNU/Linux.

 configure.ac (inotify): New option.
 (HAVE_INOTIFY): Test for inotify.

 src/termhooks.h (enum event_kind) [HAVE_INOTIFY]: Add
 FILE_NOTIFY_EVENT.
 src/lisp.h (syms_of_inotify) [HAVE_INOTIFY]: Add prototype.
 src/keyboard.c (Qfile_inotify) [HAVE_INOTIFY]: New variable.
 (syms_of_keyboard): DEFSYM it.
 (kbd_buffer_get_event) [HAVE_INOTIFY]: Generate FILE_NOTIFY_EVENT.
 (make_lispy_event): Support FILE_NOTIFY_EVENT by generating
 Qfile_inotify events.
 (keys_of_keyboard) [HAVE_INOTIFY]: Bind file-inotify events in
 special-event-map to inotify-handle-event.
 src/emacs.c (main) [HAVE_INOTIFY]: Call syms_of_inotify.
 src/Makefile.in (base_obj): Add inotify.o.
 src/inotify.c: New file.

 lisp/subr.el (inotify-event-p, inotify-handle-event): New functions.

 test/automated/inotify-test.el: New test.
Merge branch 'master' into typed-pseudovector
Switched to base-pair coloring
ParentChild 0.2
ParentChild 0.2
Do not import duplicate accounts during chart of accounts import.
	modified:   SL/IM.pm
	modified:   bin/mozilla/im.pl
增加脚本的高亮显示
Fix picjav.net/picjav2 rule.
Fix for Chrome compability.
to install the sbin into rootfs
added main script and unittest
extraindo task.tag da taskList.tag
buscando tasks por nome e descricao(funcionando no projeto apenas)
voltando o li para dentro do foreach
Update RVM settings to point to my RVM
petit bug ds mainwindow
Issue #409: Moved distribution specific packager code to different files.

Moved distribution specific packager code into cmake/OpenMWMakePackage_*.cmake
files (at the moment RPM and TGZ are empty). DEB support is disabled because
it's created on LaunchPad with dpkg.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
Deleted some obsolete test scripts
Fix a bug about relative path. Add min delay time support and auto-adjust delay time. Wrap an infinite loop on bot.
add safe guard
clean up pinyin_lookup.cpp
clean up phrase_lookup.cpp
update pinyin.*
update pinyin_lookup.*
update utils
update test_pinyin_lookup.cpp
fixes full pinyin parser
add pinyin_guess_sentence_with_prefix
update test_pinyin.cpp
refine test_pinyin.cpp
source format #79
adding component image #79
lazily load the ringtone
back out previous patch, didn't mean to apply to master branch
lazily load the ringtone
Merge pull request #1088 from andreasgal/lazy-ringtone-loading

lazily load the ringtone
use display none instead of opacity to avoid preloading resources
use mozSettings only if its not null
Stop tracking generated code.  It's like committing .or files.
Merge pull request #1090 from cgjones/axe-generated-manifests

Stop tracking generated code.  It's like committing .o files.
Merge pull request #1089 from andreasgal/display-none-instead-of-opacity

use display none instead of opacity to avoid preloading resources
Update VICE to revision 25798
[*] LiteCommerce installation profile: 'Send report' page added when LiteCommerce installation failed.
when app is running and you open /# redirect to last edited document
us2 fertsch.
Merge branch 'us2' into develop
add usage to data_model_loader
Merge branch 'chines' of github.com:liyonghelpme/server into english

Conflicts:
	development.ini
	stchong/controllers/root.py
Merge branch 'english' of github.com:liyonghelpme/server into english
added new phrase
moved iec_60584 test assets to its own directory
refactoring. naming harmonization with its90. add tc corrections
moved example data used in specs to external asset (JSON). naming harmonization with its90
moved example data used in specs to external asset (JSON)
NEW - bug 375339: [ui] preferences not handled when the review navigator
is closed 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=375339

375338: [core] Null pointer exception when adding an existing review
group
https://bugs.eclipse.org/bugs/show_bug.cgi?id=375338
Overview pages
Merge branch 'develop' of https://github.com/lncd/Orbital-Bridge into develop
Move jinja2 environment loading into options and own module.
Improvements to the link between navigation controllers and their child view controllers.
Bug-015
Readme file for AvaTax PHP
Courses added

This is only to testing!
Courses is now Working

Cada aluno tem as suas próprias disciplinas. Estas já são apresentadas.
fixes + cleanup

* removed unnecessary cast
* added NTAPI to ThreadStart function : "WDK docs don't include that,
they assume /Gz (which we can't do due to GCC)"
* Made the array checks a little more robust
Use multiple AnnotationOverlay

Use multiple AnnotationOverlay instead of the AnnotationOverlay in
PolarisMapView
Fix active_admin after update.
Require debugger in specs.

Conflicts:

	Gemfile
	spec/spec_helper.rb
Add some notes about spin.
Better layout for bundler benchmark results.
Create simple class for generating reports.
Create simple class for generating reports.
removed unneeded (and potentially dangerous) .mkv from local format strings
Code cleaning
Exercise 6 now works with cyclic references.
Added Jquery for dinamically adding new language fields in the country form
Alkeellista fysiikanmallinnusta sekä gui:n rakentelua
just using keys node_id and statement_id, seems to work
History: Fix logic error and show history again
History: Show alternating row color on all columns
Conditionally load Javascript whereever it is necessary.
Change the order of icons and add the correct target url for CV.
con todo
Fix for EMStudio disconnecting at the end of interrogation
heavy refactor of tabs
[2503] Add params to GetClosesCreatureWithEntry to also select corpse or alive/corpse creatures. Requires MaNGOS 11942
[2504] Implement script support for quest 4291

Script is based on some old patches

Signed-off-by: Xfurry <xfurry@scriptdev2.com>
[2505] Remove broken hack from Blackheart the Inciter

Note: spell 33676 needs core support and more research
Merge branch 'master' of https://github.com/scriptdev2/scriptdev2
Backup of plugins folder is turned off by default. Added an explanation of the risks.
Backup of plugins folder is turned off by default. Added an explanation of the risks.
my applet
switched first and last adress coordinate
Merge branch 'develop' of github.com:mapmen/mapofdenmark into develop
Add travis yml and empty default task
Add rspec and an empty test for an ApiResponseParser
Merge branch 'master' of github.com:marcbowes/nzbmatrix
3.0.9 - Bug fix for attribute change between float and integer.
User generator.
Better sandbox separation.
Fix many to many relations.
Better change identification in code generation.
Model transformations between entities and command line code generation.
3.0.1 User generator
Added debug option to API
Added debug option to API
Added the update_feature_usage method to User class
bumped version to 0.0.3
Unnötige Dateien entfernt, Standard-Config hinzugefügt.
omg
teste
sd
Added support for <div markdown="1"> syntax.
[markdown mode] Explicitly note dep on XMl mode, make it optional

Issue #626
Commit

Signed-off-by: Mario Pinto <mariojgpinto@gmail.com>
Refactor Form classes. Allow sequential IDs.

Refactored how the Form subclasses are dynamically created depending on
app.config parameters.

Add configuration option to use sequential integer ticket IDs instead of
random strings. Changing this one an existing database is not supported.
using a header for stoch analysis for better separation
signaling extreme zone crossings
Created repo with ToroPHP and php-template
Created HomeHandler, View class and index file
JSON export, home page
redirection problem fixed
blue is easier to the eye
Little fixes in layout
Merge pull request #1 from andresmoschini/making-menu-on-sprint7

Making menu on sprint7
Use × character instead of x when stating print dimensions.
Use × character instead of x when stating print dimensions in passport dropdown.
Updated passport screenshot so that it is sharp.
some refactoring in the Files tests
fixed the server loader call
added json as a 1.8 dependency to run the tests
add basic git instructions for getting started
Added category pics
Removed unnecessary files

- Removed LESS files and grid folder
Removed unnecessary files
added more server side routines
[maven-release-plugin] prepare release constcontj-0.0.3
Alphabetical order

refs gh-51
Module download links now point to remote_location if available

closes gh-122
Ignore MYMETA files and merge backups
did some debugging, and now it works
Merge branch 'master' of https://github.com/mb300sd/Bitcoin.NET
fix for ruby ver in rvmrc
Fixed transparancy. Ex: water gets darker the deeper you go.
* uid changes for sshfs
* add save state foo to emacs
Initial custom Events and EventPump, Widgets now have identifiers.
Modify some attributes from camel case to underscores.
Working Events Pump for UI, template Observable/Observer classes.
Adds Core/singleton.inc.
Avoids empty functions for classes inheriting from Observer.
Plus some other minor changes.
Updates root files (TODO, LICENSE, README.mkd, .gitignore).
Merge branch 'master' of https://github.com/mbuffa/Conversation
updating shell things
tweak freqs and voltages
dbzugriffe mit entitymanager
GUardado

guardadi
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
issue #282
Merge branch 'develop' of https://github.com/meedan/meedan-crane into develop
change facebook comments place
change facebook path to be live
issue #282
test facebook moderation
test facebook moderation
change app id
change facebook app id
issue #462
Prevent endless redirections
Prevent endless redirections
change tables structure for source report
Merge branch 'develop' of https://github.com/meedan/meedan-crane into develop
change facebook plugin width
issue #282
Update views_autorefresh to latest version
Stable
Stable
Stable
Stable
Move initial location to globals file.
Fixed eBooks table
Contacts: Make micro templates work on FF 4.
Contacts: Make micro templates work on FF 4 take 2
Contacts: Added missing SVG files.
Merge branch 'master' of github.com:owncloud/apps
Calendar: Missing variable when calendar is shared. Fix for 337.
Imageviewer: also accept svg as valid images
Provisioning_API: Check privileges of SubAdmins for users / addToGroup
Contacts: Change to black upload icon.
Contacts: Prevent adding new group while editing one.
Merge branch 'master' of github.com:owncloud/apps
Provisioning_API: Check SubAdmin privileges for users / removeFromGroup call
[mail app] restore send mail functionality
[tx-robot] updated from transifex
Provisioning_API: Check SubAdmin privileges for users / removeFromGroup call
some settings cleanup
[tx-robot] updated from transifex
Tagging of eBooks not working
Fixed Tagging, need to work on display
Merge pull request #350 from owncloud/imageviewer_svg

Imageviewer: also accept svg as valid images
Protect PrepareMixin from unexpected change.

Should `self.request`, `self.args`, or `self.kwargs` change,
don't use the old objects.
Fix: photo mover
Re-initialize on the new laptop
Moved COMMON under linux