labofsahil/github-event-dataset-2012 huggingface dataset:
Define test task before gettext tasks
Set local Ruby version
'rbenv local 1.9.3-p194'
Replacing version-controlled NERDCommenter bundle with submodule.
Merge remote-tracking branch 'origin/master' into feature/discussions

Conflicts:
	app/coffeescripts/discussionEntryReadMarker.coffee
	app/controllers/discussion_topics_api_controller.rb
	app/models/discussion_entry.rb
	app/models/discussion_entry_participant.rb
	app/models/discussion_topic.rb
	config/routes.rb
	lib/api/v1/discussion_topics.rb
	spec/apis/v1/discussion_topics_api_spec.rb
	spec/factories/discussion_topic_factory.rb
	spec/models/discussion_topic_spec.rb

Change-Id: Ifa63b4961ad0182f20ec6cb493b951fa91ec2ab1
Fixed bug introduced by updating underscore.
first working version of javascript
fix content-type charset issue in Cache add
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/fr/univmlv/qroxy/download/Download.java
Write directory detail
路徑錯誤修改
Added different filenames for different builds
Added ninja syntax highlighting
Moving to Inconsolata as my primary font for gvim
added atom status stuffs
Only define class Cloud in cloud.py
Merge pull request #107 from jesusaurus/feature/oneCloudToRuleThemAll

Only define class Cloud in cloud.py
Initial commit of something or other.
test for masking parent contexts with false keys.
null values can shadow parent context now. Improve test a little.
Merge pull request #22 from tominsam/master

allow inner null values to mask parent context values
FUNCT Add the README
FUNCT add the doc target to the Makefile
BUGFIX Fix wrong type specs
FUNCT better property wrapping as eunit tests

 * Use the property name as eunit title. This leads to better error reporting
 * Small refactoring for better readability
Add contacts info and image_src.
No smaller than 3
added root hint
added README file
Changed build dirs from ´stylesheets´ to ´css´ and ´javascrit´ to ´js´.
Ask before adding repositories from repos.fedorapeople.org
removed a committee member
#144 - edited abstract
#144 -edited introduction
44 - edited background
#144 - edited methodology
#144 - edited gsd course chapter
close #144 - edited discussion
Implement code controller, model, spec to add individual codes.
sort club memberships
Ruby 1.8 hashes
AS7-5341 export-native-configuration jgroups operation does not include properties specified via socket bindings
[AS7-5272] fix validate-address
[AS7-5349] Upgrade HornetQ to 2.2.19.Final
[AS7-5352] IllegalArgumentException in AS7MetadataRepositoryImpl
AS7-5323 component upgrade of Hibernate to 4.1.6
AS7-4967 Upgrade Infinispan to 5.1.6.FINAL
new file:   insscript.arch.sh
Error handling for file loading.
Merge branch 'load_file' of github.com:seanfisk/cpg-islands into load_file
multi-head support
Give word spacing to pages
minor gcc flag changed
Adding in woo commerce stuff
Added support for ItemDescriptions in main
Update post_xml.php
For Privacy
Updated apis/sv.php
fixing responsive design css bugs - overflow & font size
(change:minor) In method 'alive' don't check for an invalid PID.
just bug fixes and such.
Restyle the header
Make keyup work for keys other than id_rsa
Release v1.1.25
Bang into same shape as HashDiff.
hist improve
added plot track
make players list thread safe and accessible
Add forgotten files from the last commit 324543d8a8af3e6b74ad706597dc62fea5047bc5 .
Adds comma between reputation and badges on user's micro info.
db version init and clean logout
storeUodate
convertet old database.doku.php

convertet old database.doku.php from InnoDB to MYISAM
Endret navn
blitt til .ino
oppdatert
2012
2012
.ino
ny fil
.ino
.ino
Endret
lagt til
slettet
cups dependency not necessary
display favs
Merge branch 'fav'
README spelling changes and formatting fixes.
added get_or_create_location, and made default for search; + tests.
fixed resource detail to autozoom to include multiple locations.
put test so only autozooms resource detail if > 1 locations.
修复summary提取小bug
Adding images to Twitter and News items
#37 - Method is binary in new cowboy

Should be atom
#41 - don't disconnect websockets if 'receiver' doesn't come back in 5 seconds

Timeout mechanism is broken with regard to websockets. cowboy process might be overloaded by incoming messages (And session not being able to pick them up quickly enough). If that happens, it's quite likely that session process will receive a timeout after 5 seconds of not having the 'reply' call. This seems to be less of a big deal for non-ws transports as they don't neccesairly come via a signle bottleneck process - receiver is different than sender.
Fixed issue #19 - normal services names for any service - local or third-part; Fixed issue #65 - showing errors for nonexistent services
[NEXUS-5302] Update jetty version to 8.1.7.v20120910
Merge pull request #4 from sonatype/NEXUS-5302-update-jetty-version

[NEXUS-5302] Update jetty version to 8.1.7.v20120910
tas: lua: official source code for 5.0.2

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
x86_64 patch from Bernd

from: eda03ea1f7554d8bc24c6443b7a405d0ed84e9a0
tas: lua: run gnu-indent.sh script

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
cleanup, 1. step (to get some local changes away):

from: 6ff6c1cc6464a9ca6ac1d3961fc044960a402e5b
* added -Wbad-function-cast

from: ee7eeb6d7f7b5a23830402c6b346d8db93995d41
* added -Wcast-qual: this killed lots of unnecessary type-casts

from: 17271941ffaa174ee45959effee041831b489d00
Fix sytax errs and line break quirks for gnu-indent

from: 0e3c43820a333bea7863e08208de22d77dc828aa

corrected gnu-indent quirks

from: 29d2799ba478fc0354596ff132128e873454bb20
ARM alignment warnings fixed

from: d1656d8112d5605cd709c211960ab71b34a49bed
Patch ALIGN_NOWARN_ARM macro for better priority handling.

from: 7fce805df297d920e5c65e537f610fa7da75bab5
use the POSIX standard '__linux__' macro instead of 'linux'

"Use __linux__ for this purpose, not linux. Although the latter is defined, it is not POSIX compliant."
    http://www.faqs.org/docs/Linux-HOWTO/GCC-HOWTO.html#INDEX.25

from: 485c4d5ca8ad403b27afd39d3016f9741f28867a
tas: lua: run gnu-indent.sh script

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
tas: lua: sync up to official source code with fixes

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Merge branch 'lua-official-502'

* lua-official-502:
  tas: lua: run gnu-indent.sh script
  use the POSIX standard '__linux__' macro instead of 'linux'
  Patch ALIGN_NOWARN_ARM macro for better priority handling.
  ARM alignment warnings fixed
  Fix sytax errs and line break quirks for gnu-indent
  * added -Wcast-qual: this killed lots of unnecessary type-casts
  * added -Wbad-function-cast
  cleanup, 1. step (to get some local changes away):
  x86_64 patch from Bernd
  tas: lua: official source code for 5.0.2
[Fix #202] Load modules all or nothing
Increase heading readability
Wrap editor module documentation at 80 characters
Clarify a comment about GNU utilities
Rename templates to runcoms
Ensure that $terminfo values are valid
delete
nonoe
CC-3452: Live Stream: DJs assigned to the show and Program Managers should
be able to control switches and able to kick out connection

- kickout buttons and switch buttons are now visible to everyone.
- clicking buttons without correct permission will return proper error msg.
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Removed profane logging message
Refactored sql substition into pdo
Fixed typo on class reference in README

* The class is ActionController::HttpAuthentication::Basic rather than
  HTTPAuthentication.
Merge pull request #4 from dyba/readme-fix

Fixed typo on class reference in README
Remove useless features. Remove needless code duplication.
Fixed minor bug on dashboard with relative time display
Update docs/config-carbon.rst

fix typo: to change storage aggregation, whisper-set-aggregation-method.py must be used, not whisper-resize.py
Removed Internet Explorer incompatible hashmaps terminations

Found four hashmaps that had their last value terminated by a comma. 
Chrome and Firefox ignore the non-javascript compliant extra comma.
Internet Explorer errored and the dashboard fails to load.

Dashboard should now work in Internet Explorer. Tested on IE9.

Errors found and fixed by Glenn de Smidt.
fix bug in cactiStyle (failing when no series data is available at all)
mention Therry
add Vimeo to who-is-using doc
Merge pull request #98 from obfuscurity/master

Add Therry to the docs/tools page (master)
Added Graphsky to tools documentation
Merge pull request #59 from daveconcannon/master

Cosmetic Dashboard Fix displaying relative times
Merge pull request #105 from vimeo/who-is-using

add Vimeo to who-is-using doc
Merge pull request #107 from lensen/master

Added my dashboard/webinterface to tools directory.
Merge pull request #95 from davecoutts/master

Removed Internet Explorer incompatible hashmaps terminations in dashboard.js
Merge pull request #96 from keves/master

Fix bug in cactiStyle (failing when no series data is available)
Generalize time period of series bootstrap
Merge pull request #52 from seveas/master

Make moving(Average|Median) generate complete graphs

moving(Average|Median) used to start graphs with a bunch of None's due
to missing data. Instead, fetch the missing data and complete the graph.
Merge pull request #83 from iFixit/functions-movingAverage-time-interval

Allow moving{Average,Median} to take a time range
Merge pull request #74 from cbliard/patch-1

Update docs/config-carbon.rst
Merge patch from https://bugs.launchpad.net/graphite/+bug/1079885

via Charles G Waldman (~cgw)
Fix intervals.union_overlapping to work regardless of interval order
Merge remote-tracking branch 'upstream/master'
CHANGE use git protocol instead of http for dependency + remove rebar binary
Fixed formatting bug
Added optional parameter pathVariables

so that extra variables can be parsed (Formatted) into the path
Pass the vaultname to the path
fixed the email out from the registration
Issue #2 Resolving

When adding a product or product group, should only show the items that are in the users default warehouse.
Merge branch 'master' of github.com:ssommerfeldt/TAC_EAB

Conflicts:
	Extra/EAB_Custom/EAB_Custom.suo
Removed jasmine package
changed project domain
drobna zmiana wyświetlania poszczególnej książki
Added support for Geoscience Australia's data format and added offline option
update ru translation
update ru translation
Bump Mezzanine version to 1.1.2
Merge.
Version bump to 0.5.2
Update auto-generated CHANGELOG.
Merge branch 'master' into russian
Remove old product class. Closes #42.
add SHOP_USE_VARIATIONS option
fix SKU field
fix product saving
update migrations
pep8 fix
update copy_default_variation method
clear imports
sales updates priced_objects after saving
Added Stephen's name and link in README.
Allow the discount percentage to be 100%. Subclass DecimalField and define our own formfield method to ensure that in the admin the fields enfore the upper and lower bounds of 100 and 0 respectively.

--HG--
branch : allow_100_percent_discount
Merge
Added Ross Laird and Pink Twig to sites in README.
Correctly handle empty password in login form. Closes #439.
Update ivl.def to support new ivl interface functions
Very simple smtp tester
basic overviews
remove version parameter / cache-busting stuff (for now?) per mozill appcache docs
fixed getting "seems game is over" problem
can not attack the attacked place
Tweaking models an sample data.
Completing bulk of rest services.
impl done
Fix incorrect ordering when refreshAll, and duplicate rendering.
Fixes #1367: Added facade for CyColumn which properly handles deletions and renames

git-svn-id: http://chianti.ucsd.edu/svn@30186 0ecc0d97-ab19-0410-9704-bfe1a75892f5
added the initial required css
Fixed code examples in components/di/intro
Fixed code examples in components/di/types
Fixed method chaining indentation
Merge pull request #2013 from WouterJ/patch-22

Fixed code examples and format in the DI component documentation
refactored and added a test for a not correct login .... 
* clean up
* formatting for better reading
* removed unused proprietary apple import
support json output using picojson
Remove entry which may be useless in app.config, fix bugs
pushing after WFH
favicon 调整
公開に向けての整理
adapting to new install
ruby mode on ruby files
add org, refactor package lists
do require org-install
safe local variable values
new files
flyspell true
keys need cleanup
new package setup
Merge branch 'master' of github.com:teaforthecat/emacs.d
Updated submodules: eiskaltdcpp, psi-plus-i18n
Updated questions, added notes
adding ace editor.
Added Manual::Introduction.
make all working (postgress)
Adds bug fixes to data encoding/decoding

Adds bug fixes to TextLineCodec and LengthPrefexingStringCodec
Updates socket UAT
Adds unit tests for new error cases
비공개 그룹은 공개 그룹과 다른 아이콘으로 표시되도록 수정
Fixed paste problem in admin file
FInalize attachment size validator
added documentation to showcase sample yammerclient
Created validation flow for server request
added untracked migration files
adding copy of "raid" plugin from https://github.com/munin-monitoring/contrib/blob/master/plugins/disk/raid to start making changes
Merge pull request #2 from timoschilling/mount_engine_in_scope

Fix Problem with mount engine in scope
Merge pull request #3 from timoschilling/backends

adopt DelayedJob Backend model to DjMon
Merge pull request #1 from timoschilling/config_auth

make HTTP authentication configurable
Created a new QueryTestSuite. More tweaks to test cases.
Neo4jElement now accepts Collections.

Neo4j accepts primitive arrays.  Neo4jElement has been modified to accept a Collection as a property and converts that to a primitive array.  All graph tests had to be changed to cover the new test case to support this.
Added magic groups to json file
Adding some examples for those rusty with Nose.
Added Google VetNet to sites in README.
Added missing word in Blogger import notes
Change feedparser URL to authoritative fork

 - The original author's website(s) returns HTTP 410
 - Refer to:
     http://en.wikipedia.org/wiki/Mark_Pilgrim_(software_developer)
Resolves html entity output re: #482
trying to solve messaging bug
adding a review step for fact checking
updated headers
yay
Improve archive page.
new array file
0.0.3
oops
0.0.4
add new convention and reading record of lkd3: lock
change file structure
topic: bh
accidental file delete
btTable: function update_databes delete
bug fix to version 0.5.4.
facebook item has no opreration.
Added a mura icon and admin link back into the header.
Tightened up the UI of top logos
Added some default filtering to the order fulfillment list
Added ajax loading elements to make the UI more friendly.
Resolves issue with paging through skus
Fixed spelling of 'eligible'
Merge branch 'develop' of https://github.com/ten24/Slatwall.git into develop
Listing Logic Hotfix 2.0.19
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge remote-tracking branch 'tony/spelling'
Updated the version file for pull request #798 that I merged.
Merge branch 'master' into develop

Conflicts:
	version.txt
Fixes for brand and product type display
Merge branch 'develop' of git@github.com:ten24/Slatwall.git into develop
brand and producttype display
Fix for null custom price 
fix for old custom tag
Added generic export setup to all lists issue #668
Removed default setting that was setting track inventory to 1 for
merchandise
Resolves Issue #809
Refactoring for better routing
autoscrolling of the log tail when you're at the bottom of the page
show the explicit commands used to resolve conflicts
Better action error reporting. Change default action to 'action'.
adding taglist bundle
extends template fields of database
	match drmaa2 structure now
implements get reservation template function
adds reservation interface test
little progrss
Removed old vim plugins
Readme
since when.map does not ensure order of execution (just order of result) we should use when.reduce. closes troopjs/troopjs-core#51
MEMORY is redundant
don't return from signals (as we don't give a shit about the result);
formating
Installs the zurb foundation gem
Installs the actual foundation files via a rails script that's included
with the gem.
Converts and renames HTML to Haml, CSS to SCSS, and JavaScript to
CoffeeScript.
Adds a meta tag to disable zoom and such on mobile devices
Merge branch 'master' of github.com:troyshu/hackny-f2012

Conflicts:
	Gemfile.lock
fixed Exceptions namespace
inputs and outputs are no longer part of the guerilla!
Merge remote-tracking branch 'origin/master'
zamykanie konsoli
Merge remote-tracking branch 'origin/master'
expt1 discussion check it PLZ
YARN-63. RMNodeImpl is missing valid transitions from the UNHEALTHY state (Jason Lowe via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379498 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-8684. Deadlock between WritableComparator and WritableComparable. Contributed by Jing Zhao

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379506 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3833. TestDFSShell fails on windows due to concurrent file read/write. Contributed by Brandon Li

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379525 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-8727. Gracefully deprecate dfs.umaskmode in 2.x onwards (Harsh J via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379537 13f79535-47bb-0310-9956-ffa450edef68
YARN-60. Fixed a bug in ResourceManager which causes all NMs to get NPEs and thus causes all containers to be rejected. Contributed by Vinod Kumar Vavilapalli.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379550 13f79535-47bb-0310-9956-ffa450edef68
YARN-60: Fix minor merge conflict (bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379555 13f79535-47bb-0310-9956-ffa450edef68
YARN-66. aggregated logs permissions not set properly (tgraves via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379565 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4612. job summary file permissions not set when its created (tgraves via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379584 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4614. Simplify debugging a job's tokens (daryn via bobby)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379595 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4611. MR AM dies badly when Node is decommissioned (Robert Evans via tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379599 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3873. Hftp assumes security is disabled if token fetch fails (daryn)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379615 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4604. In mapred-default, mapreduce.map.maxattempts & mapreduce.reduce.maxattempts defaults are set to 4 as well as mapreduce.job.maxtaskfailures.per.tracker. (Ravi Prakash via jeagles) 


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379617 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3852. TestHftpDelegationToken is broken after HADOOP-8225 (daryn)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379623 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3466. Get HTTP kerberos principal from the web authentication keytab.
(omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379646 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-8736. Add Builder for building RPC server. Contributed by Brandon Li

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379652 13f79535-47bb-0310-9956-ffa450edef68
Update on uniqush-push
gcm support
build using fpm
we don't need it
need test
Now can correctly produce deb/rpm pkgs using fpm
All build process are put into one script
uniqush-push
build script need to change
updated contacts page
Merge branch 'master' of github.com:uq-eresearch/oztrack
style changes to breadcrumbs and login block
Particle tracking keep developing.
Beta level design strucutre + bugfixes
Added kill_switch script object
Script object arguments to generate function support.
All switches from beta level done
Wrapped builders.
Dart trap complete!
Removed verbosity.
change "usv-10" to "komp"
add iptables.debian
modify
delete
画像の依頼と画像のnew

#11 #2 #1
update CHANGELOG
docfix
static ffmpeg build: restore x264 copyright
Merge remote-tracking branch 'upstream/master' into pms-lv
cleanup servlet code
Greek typo
Premod: Use 'verified' flag as whitelist
Premod: add 'back' link to spam view
coin animation when kill alien
destroy planets if blocked
Version 1.0
Cleaned up before pushing.
Some formatting of the README.markdown file.
Formatting.
Edited README to be more specific.
Some more README.markdown tweaks.
Work on the readme.
Votifier 1.1 - added RSA encryption.
Replaced the JAR file with version 1.1
Updated the README file.
Cleaning up after the vote information is received, and README modificatiosn.
Better protocol documentation.
Better protocol documentation, and added a socket timeout so that the plugin doesn't hang on slow connections.
More README modifications.
Yet again, more README modifications.
Removed size checking in the encrypting/decrypting process.  There should be no problems as a maximum of 256 bytes will be passed as the block argument.
Fixed part of the README.markdown file.
More README editing, man I'm OCD about this.
Edited README and removed the JAR file.
Modified the .gitignore file.
Show rock shelters etc. with cave symbol
Fixed bug that made it impossible to check if the currently rendered article was a child article in the jQuery template
git-svn-id: https://python-hge.googlecode.com/svn/trunk@2 7847f1e2-8d6c-11de-b724-014a55cca6f9


git-svn-id: https://python-hge.googlecode.com/svn/trunk@3 7847f1e2-8d6c-11de-b724-014a55cca6f9


git-svn-id: https://python-hge.googlecode.com/svn/trunk@4 7847f1e2-8d6c-11de-b724-014a55cca6f9


git-svn-id: https://python-hge.googlecode.com/svn/trunk@5 7847f1e2-8d6c-11de-b724-014a55cca6f9


git-svn-id: https://python-hge.googlecode.com/svn/trunk@6 7847f1e2-8d6c-11de-b724-014a55cca6f9


git-svn-id: https://python-hge.googlecode.com/svn/trunk@7 7847f1e2-8d6c-11de-b724-014a55cca6f9


git-svn-id: https://python-hge.googlecode.com/svn/trunk@8 7847f1e2-8d6c-11de-b724-014a55cca6f9


git-svn-id: https://python-hge.googlecode.com/svn/trunk@9 7847f1e2-8d6c-11de-b724-014a55cca6f9


git-svn-id: https://python-hge.googlecode.com/svn/trunk@10 7847f1e2-8d6c-11de-b724-014a55cca6f9


git-svn-id: https://python-hge.googlecode.com/svn/trunk@11 7847f1e2-8d6c-11de-b724-014a55cca6f9
clean out source code

git-svn-id: https://python-hge.googlecode.com/svn/trunk@12 7847f1e2-8d6c-11de-b724-014a55cca6f9
add license

git-svn-id: https://python-hge.googlecode.com/svn/trunk@13 7847f1e2-8d6c-11de-b724-014a55cca6f9
implement more core hge methods

git-svn-id: https://python-hge.googlecode.com/svn/trunk@14 7847f1e2-8d6c-11de-b724-014a55cca6f9
add hgeSprite and update tutorial 2

git-svn-id: https://python-hge.googlecode.com/svn/trunk@15 7847f1e2-8d6c-11de-b724-014a55cca6f9
add tutorial 7

git-svn-id: https://python-hge.googlecode.com/svn/trunk@16 7847f1e2-8d6c-11de-b724-014a55cca6f9
delete useless file

git-svn-id: https://python-hge.googlecode.com/svn/trunk@17 7847f1e2-8d6c-11de-b724-014a55cca6f9
hgeFont完成

git-svn-id: https://python-hge.googlecode.com/svn/trunk@18 7847f1e2-8d6c-11de-b724-014a55cca6f9
add printf of hgeFont

git-svn-id: https://python-hge.googlecode.com/svn/trunk@19 7847f1e2-8d6c-11de-b724-014a55cca6f9
progressing on the api - still need to fix the xml encoding issue in DocumentImpl
fixed a bug in the use of file descriptors for select
initial steps for creating tcp lib
Additional servlet dependency changes and changing name to ezvents.
agrego de manera muy mula la creacion de usuarios con roles desde formulario
Initial commit
Merge branch 'master' of github.com:vongosling/cglib-ext
Sup Brah
Merge branch 'master' of github.com:vwirantana/eNotebook
Fixes 191 php codesniffer style errors and warnings in the helpers directory

Includes change to turn off a PEAR standard that requires functions that
have an _ in the interior of a function name to start with an uppercase
letter because it is assuming that they are related to a package name.

JOINDIN-230
More cleanup
Fix = alignment and spaces in reqkey_helper.php
Code cleanup for src/system/application/hooks/csrf.php

Removes 24 codesniffer errors and warnings
Updates to codesniffer to add a few more sniffs and ignore some that will
be added back later but would require refactoring to fix
PHP Codesniffer cleanup for controllers directory
fixing a syntax error in the tabs helper
Merge remote-tracking branch 'dstockto/codesniffer'

Conflicts:
	doc/codesniffer/JoindIn/ruleset.xml
Fix for syntax error in talk.php
Combine short split if statement back into a single line
Fix comment on token generation method
Fix missed line ending removal on former multi-line if
Fix comment spacing
Merge remote-tracking branch 'dstockto/clean_controllers'
Codesniff fixes for user.php
Remaining cleanup for controllers directory.
Cleanup of helpers directory
Codesniff fix for config/autoload.php
Cleanup on config.php.dist
Codesniff fixes for constants file
Added FRBDatePickerActionSheet class (work in progress), updated pod spec.
did the 14.27 pset and deleted some 6.02 stuff.
Implemented beam search.
wsa4000demo: correction and calibration code
Updated README with command statuses.
Zadanie MongoDB: Poliqarp + frekwencyjny.
linux 3 - funziona
linux 4
Updates for today's release
Added for test
get_value as dict
fixes in data import tool
Merge branch 'master' of github.com:webnotes/wnframework
Add /tmp monitoring to conky
Add xml and json formatters to vim
Add zsh config
Fix two compiler warnings

  system-upgrade-fedora.c:239:5: warning: suggest parentheses around
  assignment used as truth value [-Wparentheses]

Well, if you say so, gcc.

  system-upgrade-fedora.c:242:17: warning: too many arguments for format
  [-Wformat-extra-args]

How did I drop the '%' from '%s' on line 242? If anyone finds a '%' on
the floor, let me know...
Added support for Belarusian

Added both transliteration into cyrillic and Łacinka.

As there are two kinds of diacritics used in the alphabet (breve and
acute), these adding = or - before the letter (appropriately).

All additional characters: Ć, Č, Ł, Ń, Ś, Ś, Ź, Ž (and lower-case
letters)
UNIX line endings
Cyrillic first

Łacinka is just an additional option, and transliteration is to be used
by default.
Merge branch 'belarusian' of git://github.com/wizardist/jquery.ime into wizardist-belarusian
Fix docs to show correct version
proper variant notions
Ajout d'un carrousselle pour le front
WatchExam improved + login for patients
added files
added sample
Sample modifications to show possible issue with typed method parameter.
Sample modifications to show possible issue with typed method parameter.
I'm getting tired.
Yet another attempt.
upped log level
added java class
Sample code to 'get' the generic parameter real type of generic methods
added toggle for endpoint cache
added new alt listing syntax
added new alt listing syntax
added clean version with base class
removed tabs
updated to new listing style
added resteasy example
formatting
updated to new listing path
updated to new listing path
removed files
second stressed
Fixed versions make. DO NOT EDIT!!!
inscription + verification + message erreur valid
if normal completo y funcionando
Tweaked script 'teapotDemo'
Reorganised boot script dirs
Removed some erroneously added files.
Less code is less bugs, Add new tests
Merge branch 'wysiwyg' of github.com:xwiki-contrib/wiki30 into wysiwyg
Revert "[misc] Fixed conted dirty flag."

This reverts commit 2fb3eca1dac593751165d1d521218ad799ab2649.
XWIKI-8398: Content dirty flag isn't cleared when document is loaded
XWIKI-7793 : Dot (Fullstop) in Document Name prevents documents from being displayed in Lucene search results

Conflicts:

	xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-lucene/src/main/java/com/xpn/xwiki/plugin/lucene/SearchResult.java
	xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-ui/src/main/resources/XWiki/Results.xml
using a separate template for posts
connection retry
RESTClient: dropped proxy support but provided access to HTTPWorker for
fine-tuning.
testUniqueAndNullable()
miss out .htaccess configuration file.
Autoban check.
added scn section and reorg the pom.xml
updated getting started page with new screenshot and wording
Update javadoc, minor reformatting
Lingor variables for WC_fnc_commoninitconfig.sqf
Updated desciption.ext with Lingorian parameters
First port of WiT to WiL new version mission.sqm
Made vehichles towable and liftable
War in Lingor intro music
War in Lingor loading picture
Updated missions to War in Lingor

Have not added in additional missions yet!
Additional Lingorian missions (not defend telescope yet!)
War in Lingor Strings table
Added in Commander and Pilot classes
Personal todo list for War in Lingor
Enabled Commanders and Pilots ability to unlock vehicles
Commented out debug mission select
Merge remote-tracking branch 'origin/1.6' into 1.6

Conflicts:
	description.ext
more todo's
Added in press civilian faction
more corrections to the stringtable
updated crates and also removed the random appearance of a drug lord in enemy units! oops!
add polling worker thread 3
add backup key of startssl
first page of recipe
No, I do not support Android 2.1
Increment versionCode only
Edge changes, disabled plugins including unite
Make it so we can get POD from more .pod files
Make result sets sortable, sort the modules for release list
Basic fixes to get the release view operational for tablets

It's not using the view pane yet as it should.
suo
made the form a bit more compact
completed day/nightmode (not yet satisfying method, objects in tabs cannot be reached - compacted the form, left the statusStrip until better solution
added topmost checkbox
added sizeable sifalabel and lblflag. fixed grunddaten and bremsen checkbox issue when data panel is removed
fixed lblsifa sizing
added neutralstellung fahrschalter checkbox, working great. also fixed an issue with topmost (checkbox seemed to have a second method assigned - vs bug?
moved cbFahrschneutral to Anzeigen tab
added page functionality to Anzeigen tab; fixed Grunddaten foreach issue (removing non-checkboxes before foreach, must find better solution), changed Fahrschalter checkboxes layout
demo 3 done. maybe spruce up with some interface i/o stuff if time. need to package and put onlline. test test test.
Azoth: fixed style.
Azoth Vader: protocol logging is now optional.
Azoth Vader: removed one excessive auth request.
Azoth Vader: set proper name on account addition.
Azoth Vader: fixed rare segfault on auth.
Interfaces: initial support for new vs top artists.
Interfaces: support for playcount/listeners in IHypesProvider.
LMP: support new vs top artists & switching.
LMP: removed some debugging output.
LMP: properly display info about playbacks/listeners.
TS: madskillz HTML parsing (VK guys are buttheads).
TS: added settings.
TS: proper authentication.
TS: AuthManager fixes.
TS: audiosearch stubs.
LMP: better URL2Info handling.
LMP: Player::PrepareURLInfo().
Interfaces: added IAudioPile.
LMP: added PreviewHandler.
LMP: handle audio preview requests.
TS: parse reply JSON & implement audio pile searcher.
TS: implement IAudioPile.
LMP: handle previews in RecommendationsWidget.
LMP: PreviewHandler::previewTrack().
LMP: preview artists/tracks in Hypes.
LMP: proper track title substitutions.
TS: avoid leaks in AudioSearch & handle errors.
LMP: sameness checking in PreviewHandler.
Merge branch 'master' of github.com:0xd34df00d/leechcraft
onto broacasting api
Fix stupid offbyone
Color the status messages
Got Rid of .classpath and .project
migrated selection process to the module
favicons partial
remove html comments from favicons
Trying to delete some stuff
osx git bash complete
Merge branch 'master' of https://github.com/AldenJole/user-config
сериализация pt. 1
Properties for JCrossWayToolBarButton has been added to properties file
Safer setting of flags.
Some more termios constants.
Some more termios constants.
Добавлены поля phone и avatar в таблице users
Add AE dependency and isPOD test.
Update services/Manager.php

Name Class
Fix for #349
[GWT] Fix nullpointer exception #518
Forgot to square the prices.
Had to break PEP for readability.
A rough draft for the cross.  This is going to be so slow.
ext0055 - Solución de problemas idiomas y traducciones
Revert "Change end of line to LF"

This reverts commit 1ac3a5cc6d0506a9fab8a8f57d53d0f3685798bf.
you need to parse eveything before the comma. Therefore set one counter at
the comma, one moves to next comma. Then parse that string.
Added vanilla ores to spawn in the nether. They need to be smelted
inside the demonic furnace, to keep a balance and add a actual need for
the wood. Also smelts inside the Soul furnace ofc.
[BugFix] when user birthdate is empty
Made additions and modifications to adopt KCH suggestions
modified patient service
replaced ANCService with PatientService
modified the code to use ajax_url
* Added item 13.
* Deleted swap file.
Added item 14, but it's not working yet.
ToolbarDockStation supports Spans
Forgot to rename the xCode Project folder
De-uglyfied a bit the icon.

The actual solution is still to make a png and a ico be loaded to support
transparency on win and linux.
Made a first pass on removing useless headers.
Fixed the save mode title display and made its window drawn in post effects.
Random code and API clarifications and cleanup around the map code.
Made use of the standard video res value throughout the code.

It permitted to remove all the exotic values set at certain places
and permit also to raise up the places where coords are non-standard.
Unified the way map sprites are scaled to the map viewpoint.

I also deharcoded the dialogue icon image along the way.
So stackoverflow is saying you can add actual html into these... testing.
Add sort order
Sort by post_parent manually
is_writeable always fails if file does not exist
fix typo in error message
overhauled component configuration strategy
move feature option delim down the stack
prevent these crucial methods from being overridden
trivial improvements to config file parsing
a default section must exist (that means you bowe!)
feature extensions can now have a bundled options.ini
cleaned up base options.ini file
cleaned up path copy logic, no dot file copying
implemented new bg color css option type
implemented new background image css option type
implemented new background repeat css option type
Limit pagination to not show all pages. This causes usability issues on big sites. Props @shabushabu

Signed-off-by: Bowe Frankema <bowe@bp-tricks.com>
Slight clarification of Sample Code tab based on Siobhan's feedback

Signed-off-by: Bowe Frankema <bowe@bp-tricks.com>
Add additional class actions to let devs easily implement other grid systems using hooks only

Signed-off-by: Bowe Frankema <bowe@bp-tricks.com>
Remove unneeded introduction-box template call.

Signed-off-by: Bowe Frankema <bowe@bp-tricks.com>
Fixed missing Members Sidebar on Member Directory (BP)

Signed-off-by: Bowe Frankema <bowe@bp-tricks.com>
Remove comment functionality for WordPress Pages. This is (and should not) be used by anyone :-)

Signed-off-by: Bowe Frankema <bowe@bp-tricks.com>
Changed extras.css to buttons.css and moved standard table and form styling into layout.css. Changed features/infinity.ini accordingly

Signed-off-by: Bowe Frankema <bowe@bp-tricks.com>
added lxde openbox config
Ajout de 3px dans la width lors du clic sur un bouton avec un popover
Thieving->MasterFamine->Update[2.14];
Added Clear Local Storage Data Function

Added the ability to delete all data in LocalStorage.
preethi_blast_analysis.py: Corrected usage + modified output format for standardization

Signed-off-by: Charles Joly Beauparlant <Charles.Joly-Beauparlant@crchul.ulaval.ca>
New script: miRNAContributionAnalysis.sh

Signed-off-by: Charles Joly Beauparlant <Charles.Joly-Beauparlant@crchul.ulaval.ca>
Changed the "SpectateExtras" class to "SpectateAPI"
Added module support.

Modules must be instantiable and not static.  Modules must also have a
public variable $name to be registered.  Classnames will be dynamically
generated.  Please use "@@CLASSNAME@@" in place of the actual class
name.  Modules also need to have a function isInstantiated() that
returns true.  This function should be used as an initialization
function.
Testing CPU...

Cpu65XX.cpp - Added debug output routine that outputs almost identically to
              test output found in tests/nestest.log
iNESLoader has been renamed to iNESFile

iNESFile.cpp & hpp - Class to load a iNES file. Seems to be working OK. Need to
                     add functionality that will load the file into system memory.
                     Probably need to figure out how to integrate this with the
                     various mappers that exist.

tests/ - Directory for various tests.
tests/main.cpp - A small harness for running the CPU. CPU seems to work to a degree, but
                 is not matching nestest.log so need to go on a bug hunt.
tests/nestest.log - A known good run of nestest.nes showing what the cpu is doing
                    at each instruction.
tests/nestest.nes - An NES rom file designed to test CPU function. Found at
                    http://wiki.nesdev.com/w/index.php/Emulator_tests

Currently the CPU is only half-way functional. Once CPU tests seem to all pass, I'll move
on to working on the PPU.
bug 14301:

1) Drop synchronized call semantic for ClusterManagerImpl.broadcast()
2) Have no choice now but to use an unbound thread pool to notify upper layer. This is to prevent thread starvation when we have cross-management server waitings.

Reviewed-By: Kelven(with unit test)
CS-15077: fixed listPublicIpAddresses in basic zone
bug 14610: cloudstack 3.0 - single sign on - fix a bug that logout didn't work  for single-sign-on.
Merge branch 'master' into ui-system-chart-shortcuts
cloudstack 3.0 UI - VPC - gateways - regular user and domain admin are not allowed to Add Gateway.
Forgot to re-add VPC ID filter to tier select
Changing report format of JUnit tests to xml
Disabling the calls made to cleanup.sql from Junit upgrade tests
Removing obsolete file SearchCriteria2Test.java
Adding missing override implementation for MockNetworkManagerImpl and MockVirtualMachineManagerImpl.Adding super method declaration in Network Service
English translation for the about page
user gets avatar through twitter or gravatar
change avatar image in comments
Merge pull request #57 from CodeandoMexico/gravatar

user gets avatar through twitter or gravatar
Allow hyphens in usernames.
Updated spanish localization from Ricardo.
ched, autogroup: Fix reference leak

The cgroup exit mess also uncovered a struct autogroup reference leak.
    copy_process() was simply freeing vs putting the signal_struct,
    stranding a reference.

    Signed-off-by: Mike Galbraith <efault@gmx.de>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Oleg Nesterov <oleg@redhat.com>
    LKML-Reference: <1293784350.6839.2.camel@marge.simson.net>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
Simple implementation of keeping track of lives. Will add in animation/sound if time permits for death of character - TMS
Fixed spelling of getCompetitions()
Ajout du .pro et settings
Fix bug when no segment of a file was downloaded

I foolishly believed that the os code would handle a nil file. I was
wrong. This fixes that.
Fix pathspec for test code
Better error reporting

Also stop wasteful buffering
Oh yeah, these aren't in, yet.
สองหน้า
l5k
Created analyze package
Fix: If the user is currently focused on the filtering input element, don't overwrite the value that is already shown as this will effect the cursor position.
more stuff :P not important
id-concept added
sassed up custom, began replacing uris with named paths in spec
finished spec and routes update for named route specs to pass
updated partials with named routes and added utilities for spec method assignation
drop notes from Modern theme
added reload,clr aliases, shopt options, editor variable
Post the app menu to widgets.menu, fix menu bugs
批次清除优化删除表数据+更正混合烟道数量有误+优化完成后显示订单总数量
Signed-off-by: Endis <369029432@qq.com>
Grr :<

Tried adding broadcast, no luck.
Fix merge overwrite.
Whatever consistency
Camera controlled by mouse (basic)
Change History
Que es lo que hay que hacer
Interfaces Externas Y Change History
Agregacion del Context Diagram
Prueba Referencia
Prueba de Referencia II
Mapa mental Stakeholders y modificación Context Diagram
Modificaciones reduccion de stakeholders
Modificacion III
Representacion Instrucciones y Reglas (referenciadas)
Se agregaron los roles asociados a cada documento de comunicación
Deleted file
Merge branch 'SPMP' of https://github.com/FifthFloor/FifthFloor.git into SPMP_Katherine

Conflicts:
	SPMP - FifthFloor - CLUE.docx
representacion de instrucciones y reglas2
final representacion de instrucciones
Merge branch 'SPMP' of https://github.com/FifthFloor/FifthFloor.git into SPMP_JUAN
integrar  1.1.3  y 4.2.4 (interfaces internas)
Merge branch 'SPMP' into SPMP_Cristhian

# By Katherine EspÃ­ndola (10) and others
# Via Alicia (1) and others
* SPMP:
  integrar  1.1.3  y 4.2.4 (interfaces internas)
  final representacion de instrucciones
  representacion de instrucciones y reglas2
  Deleted file
  Se agregaron los roles asociados a cada documento de comunicaciÃ³n
  Representacion Instrucciones y Reglas (referenciadas)
  Modificacion III
  Modificaciones reduccion de stakeholders
  Mapa mental Stakeholders y modificaciÃ³n Context Diagram
  Prueba de Referencia II
  Prueba Referencia
  Agregacion del Context Diagram
  Interfaces Externas Y Change History
  Change History Que es lo que hay que hacer

Conflicts:
	SPMP - FifthFloor - CLUE.docx
redirect to https
Merge branch 'master' of https://github.com/FlatTurtle/ControlBay
readme
Now looking to system class loader first before generating a proxy
initial commit of Delete.php
Adding rvm-capistrano gem
SaveTank refactored to reduce duplicate code
With this changes, can say mobile numbers better.
FS-4596 --resolve
Started to add the 'Day Schedule' partial to the main live site.
unused file

deleted unused file home.php -- new version is index.php
RPG Drops diminishing returns
oops :)
Removed unwanted texts in score page of cooking quiz
Hide submenus when changing product in product guide page
Fixing RVM gemset generation. Not working yet.
Merge pull request #2 from Helabs/rvm-with-gem-fix

Fixing RVM gemset generation. Works with latest RVM gem.
Implemented create method in controller to write files to public/uploads, still incapable of displaying with index or show
windows: un-break the build

It was broken in fb64948.
test: remove unnecessary #ifdef _WIN32

This is a back-port of commit 4d17337 from the master branch.
windows: map ERROR_GEN_FAILURE to UV_EIO
build: use link_settings, fix typo

* Use link_settings instead of direct_dependent_settings.
* Fix typo: s/ldlags/ldflags/

Pointed out by a certain R.L. Dahl of San Francisco, CA.

Fixes #618.
Improve 'Getting Started' section, moving section to their own pages
Updating Deployment Target for Mountain Lion Compatability. See https://github.com/GPGTools/GPGMail/pull/13
Eh, why not?
fix getLatPoints error
updating common names
Clarificating
range calc fix & testdata fix
modified AVLTree
Mise a jour de Sample
mysql -> postgresql
updating README with authorship info for sound files
added doc file and format readme
Algorithm1: Sender Rate Update!
Merge branch 'master' of github.com:Josh211ua/TinyControl
Change some methods names and stuffs
properly formated file lists
Update "travis-ci" setup file.
Increase "travis-ci" timeout.
Respawn multiple compilation threads in ".travis.yml" setup file.
Add "foundations.common.dependencyResolver" definition and associated units tests.
Update "foundations.parsers.SectionsFileParser" class.
Update "getSphinxDocumentationApi" utilities module.
Remove execution trace decorations.
Stash verbose code changes.
Format imports.
Start "foundations.verbose" and "foundations.trace" modules cleanup.
Continue "foundations.verbose" and "foundations.trace" modules cleanup.
Finish "foundations.verbose" and "foundations.trace" modules cleanup.
Implement support for untracing in "foundations.trace" module.
Refactor "foundations.trace" module.
Implement "foundations.tests.testsFoundations.testsTrace" units tests module.
Finish implement "foundations.tests.testsFoundations.testsTrace" module.
Add various new definitions to "foundations.tests.testsFoundations.testsTrace" module.
Implement "foundations.verbose.tracer" decorator definition.
Various code updates.
Add cache support to "foundations.trace.getTraceName" definition.
Path, targetCoordinates added to Local Polar Map
permalinks
Merge pull request #5 from tleilax/master

Permalinks
add musiques
The inactived tasks should not be show.
more verandering
Merge branch 'master' into cleanbuild.
Replace 'master' with 'cleanbuild'.
Replaced .release method with replacing the .end method from the Pool
Updated translation: Estonian by klaster
Updated translation: Dutch by mdekker
Fixed issue #6568: Date filters do not seem to work in statistics reporting
Fixed #6299: Slow on randomization groups
dev: first bottleneck eliminated
dev: also added a little cache to survey like on 2.1 to help save some db calls
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git
dev: little optimization for lookup in fieldmap the aid is needed too
Dev : oups
Fixed issue: AcceptPathInfo directory in .htaccess makes application inaccessible on older apache versions
Merge remote-tracking branch 'origin/master'
Fixed issue #6579: Better error messages when using invalid survey IDs
Fixed issue #6363 Statistics repsonse filters don't display speaker icon, show question text twice
New feature Statistics output screen cleaned up, placed inside collapsible divs
Fixed issue #6197: Session expiration timeout is 0
Merge remote-tracking branch 'origin/Yii' into Yii
report for brownbag seminar
Update to Unity 4.0
Adding an infrastructure for notifications and whatnot.
Also added the prefs SINGLETON.
last commit contained an error, fixed it
WebMP: Pass the MovieViewModel class to the views

This allows all views dealing with movies to get the advanced information,
such as the quality, mediainfo and fileinfo.
WebMP: Add a method that returns movie details as JSON

This can be used by skins to do fancy things with the data, such as opening a
popup in the movie list.
Merge branch 'movie-view-model'
achievement model change for queries, controller change - added two queries, added logo file and css
build/assembly cleanup
Fixed #37, can now show/hide min/max buttons from a metrowindow
Borrando todo cake por consejos de Tordek. Lo voy a agregar sin versionarlo, linkeado el proyecto oficial.
Move the generation of the core tables to install

I wanted to merit multiple models. I'm not sure if this is going to
work in the long run, but the generators wouldn't let me run:

    rails g merit user
    rails g merit post

The merit generator was also creating the migrations for the core
tables, like badges and sashes. I moved that to the install
generator and left only the model specific stuff in merit.
add an example model name for in the readme for the generator
user_model_name can be customized in config
don't throw exception if target_object cannot be retrieved in merit_action - this object is not needed if no block or no-parameters block is given
README update (grant_to :allow_multiple option). Default orm option for install generators.
Remove Abstract User from To-do list
Merge pull request #23 from tomgi/customizable_action_user_class_name

Customizable action user class name
Little README update.
Initalisate tornado
cleaned up xosd plugin
Revert "Fix error #20 Incorrect order downloading issues from Bugzilla"

This reverts commit be203d017c83fa85091b4409b3d173c896116215. The bug #20
is open again. In order to solve the error it is also needed to sort the
bugs after the XML is retrieved. Currently the activity is gathered with
no order which breaks the incremental support.
fixes for rename project
Last Time on Windows?
gerijy?
to heroku
wtfmate
quick fix
pushing for jason
for jason
witg assets:
To Heroku
Heroku
With Assets
New Layout
Final Design
Final Design2
With Facebook
with welcome page
longer candidates
longer candidates
longer candidates
longer candidates
Proj Plan
Add slash
Test
Fixade VadSkaGoras filen