labofsahil/github-event-dataset-2012 huggingface dataset:
removed vid file, fixed sample_pic_flicker_without_content.json format, fixed the failed test
add sample of multi photo and video, and initialize test for photo and video
add mock embedly for flickr and smugmug
add video, picture and link share
add video, picture and link share
fix fail picture test
reformat line based on pep8
remove debug code
Rework fimware extractor
Extractor progress
Revert "Extractor progress"

This reverts commit 65d90c338eec9d4890da803c89daa1bdefc4ca83.
Revert "Rework fimware extractor"

This reverts commit 7e333512ab431237557fdba29469fd42a3d50b94.
Added php engine
Fixed PHP
Fixed script engine
Updated scripting engine
Fixes in script engine
Updated some functions
Fixed double-enter bug
Added new function
Last test
Added demo scripts
Added post-build script support
Release
Added conflict resolver
Zrobione liczenie hash-a, dorobione tworzenie tabeli w skrypcie.
Added ToLowerInvariant ToUpperInvariant

Added ToLowerInvariant and ToUpperInvariant string methods to the
recognized linq string methods
Unit tests for ToLowerInvariant, ToUpperInvariant

Unit tests were added for the invariant versions of the linq string
methods.
CSHARP-629: add support for ToLowerInvariant and ToUpperInvariant in linq queries.

Conflicts:
	README.md
Ashish | #00 | Setting up batch so that postgres on slave stops at 00:45 AM and restarts at 02:00 AM. It needs to be done because backup is being taken in that period.
Also, making sure that nagios does not check slave services at the time.
Swiching to mockmyid.com
(YourKit) Ensure archive is only downloaded if needed.
release camel-in-daily-use 1.1.0
systemd nfs server. my-utilities
Added Key::json method.

Using it lowers requirements on PHP version and guaranties consistent
behaviour regardless of integer size (32 vs 64-bit PHP).
Update the styleguide Sass to account for more weird stuff.
npe fix
added basic generation for bracket expression
show 'Runnable' icon when class has entry point(main(String<Array>))
preparation
Updated to support spine.activator.js
Adding examples for .call() and .apply()
Update README; correct location of gh-pages branch
adding recipes for rabbitmq_plugins and elasticsearch_plugins
[sensu-build] use 4th 0.9.6 package iteration
Merge pull request #52 from portertech/sensu-build

[sensu-build] use 4th 0.9.6 package iteration
[version] minor version bump, new sensu build
Merge pull request #53 from portertech/version

[version] minor version bump, new sensu build
[init] sensu init scripts support status and restart
Merge pull request #54 from portertech/init

[init] sensu init scripts support status and restart
[version] cookbook version bump
Merge pull request #55 from portertech/version

[version] cookbook version bump
on rhel family use node.platform_version to build repo url
Merge pull request #57 from webframp/bugfix/redhat-repo-url

on rhel family use node.platform_version to build repo url
tweak some timings and add in the debugging for the loop times as this seems to make things work!
Merge pull request #2 from neothermic/master

Adds tricolour LED
Merge branch 'master' of github.com:ashirley/arduino-milestag
use a higher baud rate for the serial which should be reliable over USB to the pi
confirm to the pi that it has connected
don't repeat the trigger every tick
MDL-31270: add $module->component = 'mod_assign' in version.php for good practice.
fix for Cognition files - added all on last commit
update to include Cognition cites - git diffed this time...
Added complete .NET project
fixing some code smells
Make exhibits searchable.
Upgrade to Rails 3.2.8.
Fix whitespace.
setq -> defvar
Add sample/ascmd-c
Prepare 0.2.1
Merge branch 'develop'
[api] fix username encoding after updating from OBS 2.3 (bnc#788734)
Update notes for submitted changes

* Add instructions for finding libvirt version
Update notes for submitted changes

* Q-Admin Guide: one more hunk that should have gone with previous commit (which was already merged, sorry!)
Trying to be too clever with number -> value conversion
missed file required by my previous commit.
fix when repeater
Add models category, order, product and references between them.
link directly to the added comment on an IssueCommentEvent
First commit of Regularized Linear Regression
Complete "Events and Signals" tutorial
fix omniauth to provide the getuser functionality
get this thing somewhat working with django-cms 2.4
finished with 12.1 - continue with 12.2 A web interface for following and followers. Work version.
committing changes from a few days ago
completed views for follow/unfollow forms
added follow/unfollow controllers (without AJAX)
added follow/unfollow actions using AJAX
added a correct user feed
update to latest hibernate
add less for bootstrap and font-awesome
enhance to use lesscss
- added script to compile on save of less
- combina into 1 style
Fix topicBox for closed claims
add motd files; fix puppet password mgmt

- puppet needs libshadow to be installed, else it silently refuses to
  manage passwords properly, so we need to get the gem installed before
  we puppet
- manually verified each login once i got everything working
basic layout and partials + fix for folder
Revert "simplifying travis.yml"

This reverts commit 416140cd6a4a8b56543b18e0ce02ac6331db2d90.
sub isLoginAvailable implemented
use link instead of @import for css resources
Updated german translations.
#3 Added ability to control the text/layout size from the prefs.
Updated german i18n and removed i18n for spanish and french.
Update application version to 1.1 and code to 2.
#1 Allowed to shrink widget below initial size.
dicionado tppi.cpp
Issue #505 fixed
Merge pull request #36 from chrysopoulos18/master

Issue #505 Fixed
Updates to webapps installer overwrite flags.
tiling corrected(hopefully)
Update Line Limit

Update code to have a line Limit of 120
Moved XML

I moved the XML file into it's own folder so that the main solution
explorer won't get so crowded when all the XML files exist.
refining map functions
add the schedule function
Switch everything to javascript and combine html and csv outputs into one xslt
con 1 cau hoi to ko tra loi duoc
adição de binds customisados para utilizar com o knockout.
fixes path to json data file
Added some flash notice
Added some hourglass wait cursor changes for db access
Started to add basic support for dialogue processing in the test client
The comments in get_chatlogs need an update
Add EDB reference
MDM update.
zapped submodule
lets talk about tests
Rough in support for extended GPS debug info

Add framework for GPS part number, serial number, software version, software date
Aleluia
Merge branch 'master' of github.com:renan1010/AndroidEssentials
funfa
Some minor bugfixes - stepped back from libgdx.GestureDetector because it's slow and buggy

git-svn-id: http://ridiculous-rpg.googlecode.com/svn/trunk@262 9d6b9411-3931-cc8d-638b-e64c526c23be
improved Debuging

git-svn-id: http://ridiculous-rpg.googlecode.com/svn/trunk@263 9d6b9411-3931-cc8d-638b-e64c526c23be
improved screenshot function

git-svn-id: http://ridiculous-rpg.googlecode.com/svn/trunk@264 9d6b9411-3931-cc8d-638b-e64c526c23be
improved screenshot function

git-svn-id: http://ridiculous-rpg.googlecode.com/svn/trunk@265 9d6b9411-3931-cc8d-638b-e64c526c23be
renamed screenthumb to screenshot

git-svn-id: http://ridiculous-rpg.googlecode.com/svn/trunk@266 9d6b9411-3931-cc8d-638b-e64c526c23be
TODO comment added

git-svn-id: http://ridiculous-rpg.googlecode.com/svn/trunk@267 9d6b9411-3931-cc8d-638b-e64c526c23be
Edited alfa2_templates.hak to correct bad hash
gemfile POSTGRESQL
empty? error fix
Guava and IOUtils
MINOR Allow the execute command for scp things to indicate if they're allowed to fail or not
MINOR Updated testing config for better use with sqlite for testing + mysql for running
Rebase from 'release/interval_intersection' @ version '0.9.21'
Generated debian files for precise
updated css
removed slider test from events.erb
more css edits and added slider
added slider to events.erb
added slider to events.erb retry
removed text shadow
cleaned up styles
created test.erb
added test links to index.erb
fixed test.erb
trying to fix conflict
re-watch as soon as possible
Revert "Minor. Doc enumeration label change."

This reverts commit 463c0bad1d11ede1c5a8ec9b29479a97ca3f0404.
Use python SimpleXMPRPCserver library for word index
cleanup examples
use build-in deploy-definition
update and fix phpmyadmin example
skip nfs client recipe if server
skip NFS client if there is no NFS master
allow all clients in order to prevent race condition
example to override deploy-user shell
fix setting deploy user shell
update Java cookbook to work after Ubuntu removed the Sun packages
fix name of SSH service
fix gitosis for Ubuntu
rename gitosis user to git
fix typo
Update PostgreSQL to 9.1.3
create directory even if no EBS volume is attached
Add pound example for SSL termination
WIP: fix awefull code - exchangen global var run_as for a attribute.
introduced new attr for the build user
added undocumented opcode side effects
Fix bug in skeletonize LUT
Merge pull request #256 from NeilYager/skeleton_fix

BUG: Fix skeletonize LUT.
Updated proxy to include caching (file-system based)
Edits to visualization view/edit pages

Add EV_BASE_URL javascript variable
Add tool CSS links where missing
Minor change to visualzation page layout
Addition of chart_loading.gif for EV-T2
Updates to ev_editor and ev_loader

Removed create_div from loader and editor, in favor of including this function in tool files for now.
Added tool CSS retrieval to loader.
Edited comments for consistancy
Changed editor to use the "label" parameter as the configuration control label and deprecated the use of description.
Fix syntax of Travis config file.
Compile fixes for Ubuntu.

vomplock isn't actually used and could be removed but I presume it
will be used later.
HW3 and HW4 draft (all done except bonus)
testing bringing in index file
version 2 of miisi
latest gui with comments and star
updated operation feedback. updated parser for search strinf 3pm @work
debugging undo for delete, toggle functions to undo and redo for multiple selected objects
recurring tasks working
committed the star images
Added a map pointing out our dear vikingship on our big globe.
works for small matrix
firsth commit of List
released 0.38
Acentos en mytrips.html

Málaga por M&#225;laga
spanish language files
readme
add 'raw' as default property
pass post-ID to JS also on post-new.php
screenshots
new rainbow-supported languages
readme
v1.1.0
move screenshots to assets/
sort the languages by name
better readme.txt for wordpress.org
fix bug with unfiltered output
static instance for the main plugin-object
version 1.2
version 1.2
Merge branch 'master' into stable
Todo items database + background added
updated gemspec so that building doesn't bark at me
Give avahi_dbus an abstracted name
Merging master
Accounted for plates not being able to reach target weight.
Put bar loading behind a feature toggle
Added timer countdown. Need to change display/flash/make sound or something whent he timer finishes
added test for invalid game creation
removing #.
Initial tweaks in preparation for adding the requirements web service code.
Update bookmarking/templates/bookmarking_list.php

Fixed >> Parse error: syntax error, unexpected T_ECHO line 51
Merge pull request #1 from tigefa4u/patch-1

Update bookmarking/templates/bookmarking_list.php
Get the drag element, event when a convertView is used

This is because some listView items can be reused and the drag can be disabled
scide: MainWindow - fix crash in focusCodeEditor

Signed-off-by: Tim Blechmann <tim@klingt.org>
scide: restore clock widget when loading full-screen session

Signed-off-by: Tim Blechmann <tim@klingt.org>
server plugins: fix division

with the efficient reciprocal computation, 1.f/a and a.reciprocal actually
yield different results. while the accuracy is pretty good, it is not
sufficient for some applications like the frequency scope.
in the long term, freqscope should probably be rewritten with Phasor to be
immune from floating-point rounding errors.

Signed-off-by: Tim Blechmann <tim@klingt.org>
supernova: fix parallel group detection

Signed-off-by: Tim Blechmann <tim@klingt.org>
supernova: fix boost.thread move semantics

Signed-off-by: Tim Blechmann <tim@klingt.org>
Confirm drag-and-drop binary files

Signed-off-by: Jakob Leben <jakob.leben@gmail.com>
sc ide: redesign the method/class definition lookup dialog

Make a generic LookupDialog, which allows to look up both class and
method definitions.
sc ide: no need for PopupTextInput in MainWindow::lookupDefinition()
sc ide: LookupDialog: provide instructive default text in query field
Now it works, maybe
Fix up reinstall script
What's in the build dir
simple_feature_model
Merge branch 'master' of github.com:takmid/QGIS-Training-Manual
some new api classes
I learned to read documentation.
fixed the url of the flattr button
update released files
Fixed 7-12 scripts
Adds panels
Merge remote branch 'upstream/ics' into ics
cm9 on weight watchers
forgot something
fix end build file naming
copypasta error
fix Sprint mms
fix apn mms issues
fix build errors
LatinIME: Add official Czech, Russian and Dutch dictionaries

Change-Id: I6a7e097613d866c463d591968b367233d5113b0d
NOTE: Please test them if you use any of these languages.
Add SoundRecorder.apk to -userdebug

Change-Id: I096ab50a56c658db570cc99021a466bb24174b8c
handle_compcache: update props to match MemoryManagement in settings

Change-Id: I74ebcb03d5e096b8e9c71672a23b1c5a70eaef37
use PRODUCT_DEVICE everywhere instead of PRODUCT_RELEASE_NAME. It is more consistent and friendlier for automated tools.

Change-Id: I48c6779fa1ef7b59662a21dfdc0400c80b0e2eaa
cm verison cleanup, modversion legacy support

Change-Id: I2af5640ff319bb5861df08338e612c5eab3c6831
fix buikld

Change-Id: Id6fb8c83566aa678bb90ebb85bad4d06b2559916
fix up the version/date so it actually goes in ascending order.

Change-Id: I0172d1e8afd0556a22cbccc93597f33e3b9ca99e
Ensure backup of voice search

Currently the tool only backs up the lib, but not the apk.
Seeing as how the market version of voice search is still not
up to date with the current release, it should still be backed
up with this script.

Change-Id: Ia130bb3e289fc3c2206a60ed0fcfd7dab816425d
Merge "LatinIME: Add official Czech, Russian and Dutch dictionaries" into ics
Merge "handle_compcache: update props to match MemoryManagement in settings" into ics
Merge "Ensure backup of voice search" into ics
vendorsetup: add galaxys2 lunch combo

Change-Id: If66d8f1fc0521e7fb67711ff8b7a59eb57b1b606
Fixed autocomplete from not showing up correctly. Modified paths so reverse proxy *should* be working fine in the Config now.
up grade source
WIP: start using composite pattern.
Add tests for CompositeMatcher.
move with message matcher into seperate file and fix issue with nil message
WIP: refactor shoulda matchers
WIP: refactor shoulda matchers
A bit of cleanup.
fix a few broken tests after changing the design of CompositeMatcher
Allow bundler 1.2.0.pre.
Refer to fully-qualified class name.
Whitespace.
Test for the correct thing.
Test pretty_error_messages.
Typo.
Correctly disambiguate class name.
Passing tests for WithMessageMatcher.
All specs passing. Cucumber fails.
Ensure generation of test rails app succeeds.
WIP-WIP-WIP: extract formatted error message to a third class

Currently Dis/allowValueMatcher uses the mixed-in pretty_error_messages method.
Since DisallowValueMatcher isn't a perfect logical inverse of AllowValueMatcher,
we need to have a third class that handles error messages for us.

Future thoughts:

Have a PositiveErrorDescription and a NegativeErrorDescription, which will
compose FormattedErrorMessageList into a "Did not expect errors, got errors: "
vs "Expected errors, got no errors". Idea: one of them can decorate the other
and return the other's negative message as its positive message and vice versa.
WIP: Positive error description
WIP: refactor shoulda matchers
wording
Merge branch 'master' into timc
Removed stuff we don't use from properties
And moved it around a bit sho it's cleaner
More definition to JPA entities
Basic entities and database operations
add gem dependency to rake, rdoc
Patent article.

Reviewed by @tolmasky.
Added a helper dict function and other small changes
before changing update to save
a
Style scrollbars
Move angular specific for hiding templates in uncompiled format at the end of the css file.
Style the calendar
move add page below the header and above the filter
Added scripting hook to the main plugin, for other plugins.
Greenlit background steps
Implemented restrict movies scenario
Added list check / uncheck rating step
Added all ratings , no ratings tests
Added 'all of the movies' step
Implemented sort movies scenarios
Added x before y step
Add explicit original source information to README.
[Yahya, Charles] - Revised layout of the users list page
Merge branch 'master' of github.com:twu28-TeamC/twu-zombie-dash
now service stops automatically when wifi and/or location are disabled
Abs val circuit
const. current
Studentview labels added
created entityType hierarchy
reordered some stuff
reworking entityTypes
filehandler changes
Merge remote-tracking branch 'origin/louis' into dev
manual merge of clara into dev
merged
First pass at reverse engineering layout.less from layout.css
Don't need quotes
created index.cgi
FNContainer instead of FNAContainer and FNGenericContainer
implemented FNContainer for Python and PHP
Setting environment right
cleaning and DRYing
Criado metodo para recuperar Senha.
Otro cambio hecho poryooooooooo....
TODOs and bug fixes for CreateImageFolders
Implemented front-end with validation for create election page.
heroku test deploy
t
Merge branch 'master' of github.com:wassimlaffet/Pointage-rails

Conflicts:
	app/controllers/demandes_controller.rb
added updown mode
Changed readme file to use markdown syntax.
added file after changing name
continued effort to completing set parameters test.
saving before my computer melts down
License and version confusion
Added and included icons for index.php
Added ON DELETE CASCADE to ensure correct deleting. Also fixed a update-bug in trip DAL
cambios y validaciones extra en el agregarconcurso
Nearly finish scoring feature and misc tweaks.

Still need interesting reasons for scores.

Tweak miscellaneous other bits elsewhere.

Add a wrapper for Say which inserts an artificial, simulated typing
delay for messages passing through it.

Take into account ops/voice when processing nicknames.

Misc tweaking of formatting & comments.

Added more notes/TODOs in the README.
pause plugin
Released 3.7.0-1 of pause-plugin
Set development version of pause plugin to 3.7.0-2-SNAPSHOT
Fix name Screenshot.png
Edited eventbrite-client.gemspec via GitHub
ruby 1.8 hash syntax
ruby 1.8 hash syntax
Merge commit '70a92265fa88b24568b647ac4694092ea7da123d'
Implemented random AI, force turn switching every game, fixed winning condition
heavy refactorings; more bootstrap usage for sidebar
montage building for each day for better web performance, sharing improved
adding missing shebang
Reverting steamrolled changes
Efficient update of node structure list
fix read value from sharedane
add submenu & rafe bud submenu !!
Pushing Tests and XML to Public Repo
Do not use pypy
Add back updates.txt

Hate you Git
ref/settings - 16%
Fix/Add some doc to the cesium viewer widget.
Add to previous doc commit.
Merge some doc fixes from @bagnell.

Merge remote-tracking branch 'origin/doc-widgets'
Merge remote-tracking branch 'origin/master' into sandcastle-gallery
Remove redundant window resize handlers, and some jsHint warnings.
Cleanup, fixes, make CentralBody use EllipsoidTerrainProvider by default.
Close gallery by default.
Add search box.
Restore LinkButton.
Default to reference frame view instead of providing a button.
Sandcastle - Move branding to corner of CesiumViewer, replace with more subdued title in Sandcastle frame.
Merge branch 'sandcastle' into sandcastle-gallery

Conflicts:
	Apps/Sandcastle/gallery/Camera Reference Frames.html
Re-add LinkButton files.
Incorporate @emackey's Cesium logo placement changes.
Add a more vibrant Imagery thumbnail.
Fix billboard point and reference frame examples.
Fix highlighting objects that have a color and not a material.
Merge branch 'sandcastle' of github.com:AnalyticalGraphicsInc/cesium into sandcastle
Categorize material menus.
Rename Skeleton Demo to Starter. Tweaks to Starter demo.
Replace object literals passed to setViewport with BoundingRectangles.
Set showGroundAtmosphere to false in Minimalist.
Use a Cesium Color object instead of an object literal.
Move sensor selection to a drop down button. Modify CesiumViewerWidget so
conic sensors can be highlighted.
Merge branch 'sandcastle' into sandcastle-gallery

Conflicts:
	Apps/Sandcastle/Sandcastle.html
	Apps/Sandcastle/gallery/Sensors.html
	Apps/Sandcastle/gallery/Starter.html
Flash added to the base!
apns: Add SK Telecom roaming APN

Change-Id: Icfd0ae2cdb6d1b684f796f74d55b6237add7cad3
Add toroplus build to repo

Change-Id: I2e25df4c80ac6ad0bcd11c0e953d8e4a44bfc733
Enable HSPA icon on all devices

Change-Id: I0f3c04d2f4648a0d649fa393ec8cee878de29ae7
Disable menu-key in unlock screen

In CM, this is a user-configurable setting, and that setting doesn't
work unless the default is disabled

Change-Id: I2f009a48d1d730c804cb0887f445b5ef54ea738e
some graphics files for the Store
Merge pull request #235 from Applied-GeoSolutions/fix_django14admin

Upgrade to django 1.4 broke admin
allow initial login on session begin
Second attempt at fixing issue #59.
roll back to the long definition
Test class
Merge branch 'master' of github.com:BieberFever/CompositeService
vettiga kommentarer i funktioner.js
ipsum/place holder text snippets

bacon ipsum based place holder text
chrome frame snippet

chrome frame meta snippet
Merge pull request #29 from CS-Worcester/develop

Updating Master with current stable code
Merge branch 'dhimitri-dev'
Merge branch 'jon-dev'
Merge pull request #49 from CS-Worcester/jon-dev

Merge swiping/gestures (please test)
Added persistent notification
Revert "Added persistent notification"

This reverts commit e3b718a9666aa1e1052442e8d0398525cc45ff92.
Merge branch 'dhimitri-dev' into develop
Merge pull request #50 from CS-Worcester/jon-dev

Merge fixes into develop
Implement EditTaskActivity

* Tasks can now be edited from long pressing the task in MainActivity
  or from ViewTaskActivity
* Due date/final due date/repeat interval logic is not yet fully
  implemented
Merge pull request #51 from CS-Worcester/jon-dev

Implement EditTaskActivity
Merge branch 'develop', remote-tracking branch 'origin' into dhimitri-dev
Merge branch 'develop' of https://github.com/CS-Worcester/CS499Summer2012 into dhimitri-dev
startActivityForResult for edit task activity

Reset alarm after edit task activity is completed successfuly.
Update README.md

Added details on `data-bound-attr` and `data-bound-method` and some philosophy bits.
adding one new post (first one)
UI redesign adjust
deal xml add
Review.xml
create baton edit
Merge branch 'master' of github.com:ChoJaewoo/BatonTouch_Android
Disable_with on buttons to avoid duplicate submits
More disable_with on buttons
add gData code
Convert graphite-web to pip package
Merge pull request #3 from iawells/folsom-expt

Convert graphite-web to pip package
låsfunktion, och bokningsfunktionen fixad.
made it usable by rtfd
Site updated at 2012-03-29 00:32:14 +0800
Site updated at 2012-03-29 02:40:55 +0800
typo og error when non-existing search_profile


git-svn-id: svn://oss.dbc.dk/sync_php/php/OpenLibrary/OpenSearch/trunk@46233 30e9dc4a-7611-4fbc-83ba-eecf79b76bd0
using custom adapter to illustrate setTag
Added computer class
Added loadfile
Started implementing Interfaces
Removed useless Init of string
Added class to handle loading of plugins
Implemented loading of plugins
Added loading of plugins to the Settings Form
Created a screen sample plugin
Pagination (WIP)
Pagination
Pagination (WIP)
Pagination (WIP)
Pagination (WIP)
Clean up grouping list logic
Clean up grouping list logic #2
Merge branch 'pagination' of ssh://github.com/DigitalRiverConnect/Win8-App into pagination

Conflicts:
	SoftwareStore/SoftwareStore.jsproj
	SoftwareStore/default.html
	SoftwareStore/js/src/datasource/MultiplePaginatedDataSource.js
Pagination (WIP)
Merge branch 'pagination'
Interface Graphique Basique (à commenter)
Merge remote branch 'DjTrilogic/master'
Merge #32
Merge branch 'master' of https://github.com/Emudofus/BehaviorIsManaged
Merge pull request #1 from Emudofus/master

MàJ
Auto search

Auto search even if autocomplete is off but textbox is not empty
Site updated at 2012-04-17 05:59:07 UTC
Comments count on main page
actor is nullable on actstream
manager for user actions now includes 'system msgs'
do not return beforehand.
wrap the sync method in a promise.

backbone's sync methods have been returning promises for several versions.
Alcune aggiunte

- Logout (dovrebbe funzionare ma come per software non mi invalida la
sessione)
- Corretto alcune robe sul filter e web.xml
1.4 API docs
Camera: Restart preview if video resolution changes in application

- Check for previous and current video size to restart the preview.

Change-Id: I875421487051f48f3ec9e9132c5813b13a11479e

Conflicts:

	src/com/android/camera/VideoCamera.java
Add All Camera Resolutions

Change-Id: I2c1af0db81700e0eeaf95f5d97a7ad3f6a475890

Conflicts:

	res/values-rm/strings.xml
Se agrega CSS de nuevo evento así como se realizan algunas modificaciones en el archivo de nuevo evento close #18
Release 1.0.0
Merge branch 'master' of https://github.com/ForbesLindesay/base64-decode
Release 1.0.1
Changed width of two new logo images to 500px.
Catch errors in namespotter extension
nested routes, item add forms work properly
fixed user settings page
Updated github page for plugin
yeaaaah, now doesn't need to specify child page ID
alignment issues for section 3
add horus testimonial
vegar.py: Use the programmer-friendly API.
vegar.py: call the correct method to clean up the curl object.

This fixes the backtrace when the song ends.
Merge pull request #9 from rene0/master

Use the friendly API in vegar.py and properly close the curl object.
gitignore
Lot of minor changes and improvments
Merge remote-tracking branch 'origin/master'
New unit test for determining an NA.
View for metadata.
Change installd tests to native test target

Change-Id: Ifb2ba004e74d55ffbf01557b59ceef3232762d28
Change androidfw tests to native test target

Change the androidfw tests to the BUILD_NATIVE_TEST target so they end
up in the correct directory. Also remove the module tags and C include
paths. The include paths are automatically added when the library is
used.

Change-Id: Ia47f6c25130c5068b89d6dc067e5d9c714a6d08a
fix wrong substring

The tokenOffsets is the offset from trimed contentLine.
But it is used in substring as the offset from un-trimed contentLine.

How to reproduce bug (ICS and before):
1. Add a contact record with name and a phone number (ex. 090-1111-2222)
2. Search by "0" in Contacts app
3. Contacts shows a wrong number something like "0900111102222"

Change-Id: I1e1cb2f3bd135d98e1573a50aa6ddc021af35b9f
PackageInfo class incorrectly referenced as a struct.

Change-Id: Ie38b2b3ed82a6d5f99b6c574af53ae5bda7371d5
add SheepCycle
dynamic loading of hash tags
Added an ampersand to line 276.
Added some memory leaks to prevent segfaulting.
show ADB logs in console and when ADB crashed (cherry picked from commit d7e15e7)
EA-34609 fix assertion (cherry picked from commit 3e3694c)
EA-33751 fix assertion (cherry picked from commit 8ebcdd236c437aca1391d5497c7cf2442c3fed58)
EA-34581 fix IVFAE (cherry picked from commit dc55325)
IDEA-70202 Spring Integration fails to recognize existing constructor
sort arguments by type
remove duplicating token sets
correct control flow for prefix and postfix ++, --.
get rid of GrPostfixExpression. use GrUnaryExpression.isPostfix()
check control flow issues in class initializers
unused ++, --
'dump groovy control flow' prints text of control flow owner
more demonstrative constructor for ReadWriteVariableInstruction
correct GrUnusedIncDecInpection
refactor UnusedDefInspection
refactor UnusedDefInspection
Merge remote-tracking branch 'origin/master'
short diff: merge neighbour highlighters with same text attributes - save memory
Merge remote branch 'origin/master'
take sdk minir version into account when choosing sdk to run the build process. From several sdks of the same major version prefer the one with higher minor version
IDEA-97505 Map External Resource from hidden directory not possible
(cherry-picked from 7043a11)
IDEA-86978 'IDEA' in a tooltip for 'Update Project'
[merge] Fix LineBlocksTest: TextDiffTypeEnum can be null.
Untangle Java-based parsers
non-prefix matching in goto... actions
Remote interpreters: path mappings are taken from vagrant.
Simple vagrant paths detection added.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
replacing == and != for strings where appropriate
close streams where appropriate
test fix
idea.properties was packaged in a wrong place
handle jdi internal exceptions
rendering thread dumps: handle jdi bugs
wording
EA-35306 - assert: CaretModelImpl.moveToOffset

Debug check is added
ambiguous method calls: conflict resolver, tests
(IDEA-67832; IDEA-67837; IDEA-67573; IDEA-57306;
 IDEA-57535; IDEA-57269; IDEA-57278; IDEA-57317)
IDEA-97130 IDEA cann't debug Griffon integration tests
(cherry-picked from e4c1938)
reviewer: Peter Gromov
fix compiler options loading for eclipse (IDEA-97059 Problems view doesn't display errors in other modules)
Merge branch '123' of git.labs.intellij.net:idea/community into 123
latest netty bundled
[upgrade] Cambio carga de parámetros de la aplicación
span
Merge branch 'master' of github.com:JowC9V/Ressources-Naissances
Added Things you might want to add to readme
changes to CGNew.htm
Added todo (pw changing)
Add AboutActivity and pass extras to ItemActivity
test
add file8
add file9
Started to split profiles. Mistfall Village profile.
Site updated at 2012-11-24 05:01:23 UTC
all auth reversal certification tests run
all echeck certification tests passing
Added receivers and they work, still no roboguice tho
Site updated at 2012-10-29 11:21:03 UTC
Dodelan strom z 10. prednasky
Dodelana 11. prednaska.
remove WEB-INF/web.xml and /META-INF/beans.xml
studying synchronized, change @Author signature
マスター検索、カナ処理の修正
Bumped version, removed requests library

Bumped version several times
Enabled appstats
Removed requests library
Replaced all requests library calls with calls to the urlfetch appengine
library
Cleaned the mailer.py file
Removed some unneeded code
Permissions should default false.
updates to support deployment to android tablets
Merge branch 'kindle' of github.com:ModusCreateOrg/DiscoverMusic into kindle
updates to get the GenreTOC rendered on the 7 inch tablet
updates
install file
initial support for login
fallingBalls demo + bugs fix
cleaned up sound loading by creating a helper function
 Steps randomly selected from the loaded steps
Add documentation in .erb
Merge branch 'Mysql' of github.com:NewpTone/puppetlabs-keystone into Mysql
Added hp, level and magic
"Sandor fixes"
Finished some Controller and Manager stuff. Check the TODOs
try factory_girl
try factory_girl
Update Readme for 0.4
Added DependencySaxParser
do
Merge branch 'master' of https://github.com/RobocodeRNG/robocode23122012
created teams and relation with users

Users can are now linked with a team.
Users can be added to teams

Teams are registered for compos, and teams can have many users,
depending on the group_size the compo allows. Users can register for
teams.
All tests pass, and population script is updated to incorporate teams.
Users can now leave teams

all tests pass
Added navigation pane

did some styling too
Added logs for users, added html titles to pages

All test succeed. Using the nifty generators style of adding titles to
the html pages. by using <%= title titlestring %> instead of the regular
<h1> titlestring </h1>
Merge branch 'develop' of https://github.com/RoelandMatthijssens/lanparty into develop

Conflicts:
	db/schema.rb
조태상 커밋 합니다.
Merge branch 'master' of https://github.com/SaturdayPeople2012/GIFViewer

Conflicts:
	GIFViewer/GIFViewer/AppDelegate.h
Merge branch 'master' of https://github.com/SaturdayPeople2012/GIFViewer
Added support for using the enabled property to disable the refresh control.
Merge pull request #15 from nicklockwood/master

Added support for using the enabled property to disable the refresh control.
Added singular java doc
file
Merge branch 'master' of github.com:Shell-Wataru/AutoRecognition
第1回 Java研修 練習問題
第1回 Java研修 練習問題 
Merge branch 'refs/heads/master' of https://ShohichiNaitoh@github.com/ShohichiNaitoh/JAVA_TRAINING.git
Change markdown interpreter to kramdown
Replace social texts with icons
mm-core: Add MPEG-2 extension and user data types

With this commit, OMX_ExtraDataMP2ExtnData and
OMX_ExtraDataMP2UserData eTypes are added to support
MPEG-2 extra data types.

Change-Id: Iffd6e216d9f6fdf30f6a99410c353a37bbe14dc7
mm-core: Add support for Smooth streaming for secure mode playback.

   - This change will add the extension index required for

   - Smooth Streaming for both secure and non secure mode video playback.

Change-Id: I461a0267d0d1ef8524d5db9330b23b7108616640
CRs-Fixed: 368333
mm-video: vidc: Add support for Smooth streaming for secure mode playback.

    -When secure playback enabled, extra data parsing can't be done to
      find new resolution.

    -This change will add the extension index required for
      Smooth Streaming for both secure and non secure mode video playback.

Change-Id: Ifbab34b3f56a7054a62588bacd618c0f68eddc5b
CRs-Fixed: 368333
mm-video: vidc: Try to open secure video decoder again.

Try to open secure video decoder again if first
open fails.

CRs-Fixed: 380161
(cherry picked from commit e1cc857273d078b6a30f9f171564e95fe017935f)

Change-Id: I276b0bd62dbd4def6b8d6a99a4a263c304fa3c06
mm-video: vidc: suppress non-fatal error messages.

These messages are non-fatal and appear frequently
during the video session. Hence suppressing them.

CRs-Fixed: 389408
(cherry picked from commit 21459ebf9bdc1fb22e5af62dcd4678eca7607474)

Change-Id: Iee1d87baadc626310b1463ae26951fd9305397e2
vidc: Align ion buffer length before allocating it

Align buffer legnth to the required alignment before
allocating it to resolve mmap issue for ion memory
allocations on kernel 3.0 version.

(cherry picked from commit f0324d92bc4611ee8b65763ffd5d6fb6151abe11)

Change-Id: I354918e29188d935c124447a341093d6486bfc95
Always generate the toolbar container.
[maven-release-plugin] prepare release sonar-l10n-zh-plugin-1.2
Fixing the URL and updating the version.
Merge pull request #8 from SourceNinja/renaming

Fixing the URL and updating the version.
Some minor changes that caused unnecessary 500s
Merge pull request #45 from Lotuscms/master

Changes to remove errors that caused 500s. Including Closed #44
Merge pull request #46 from Specialkbyte/master

Imports in Request
Standardisation
initial impl of ListenerContainer durability when Handle method not found
Refactoring code into separate files
Bug fix of edge case in studentGrowthPlot with gap year
Bug fix of edge case with abnormal grade progressions
Merge pull request #270 from dbetebenner/master

Bug fixes of grade progression edge cases in studentGrowthPlot
Updating tack version to use Eclipse project files and most recent android support lib
Repaired bug with extra rows and columns saving
Added time spent/remaining to assigned effort report, changed bar shading
reverse vendorsetup.sh check
Added format and comments to all classes in .mybar
Merge branch 'master' of https://github.com/TeamLegendaryAwesome/WYSIWYD.git
Import checkpolicy 2.1.0 (Release 2011-07-27).
Support for building on MacOS X as part of Android.
checkpolicy 2.1.8
Merge branch 'upstream'

Conflicts:
	.gitignore
Added plotting capabilities, and error history
Got rid of constant initialization errors, got the cukes to freakin run
Got rid of constant initialization errors, got the cukes to freakin run
Login feature now working
@dchetwynd, @bamdadd removing unnecessary puppet modules
Database export 16:00
Delete Temp, Edit _config.yml
Change CloudBaseCmdlet.cs to emit enumerable object
Merge pull request #760 from ogail/cloud

Change CloudBaseCmdlet.cs to emit enumerable object
added ff.spawnadmin permission and fixed the permissions check for mods/admins
More artists properties are set
Fix run all.

Fixes #1
Bump version 0.1.1
style tweaks / narrower layout
try to fix a concurrent modification exception when creating ROIs
throw appropriate errors when working on an empty sequence
AEROGEAR-523 "ErrorServlet should support POST"
Merge branch 'AEROGEAR-523'
Fixed the style in a few places, among other minor edits.
Added the login activity. Not done yet, but mostly there.
1. Update auto-planting function to support multiple planting events in one treatment
1. Add calculate root distribution function
1. update calculation for mid point
2. update test case
1. Add a function to update data with calculated soil growth factor
1. update soil distribution function
1. merge pull request
1. add assume-engine
1. merge pull request
1. remove debug info
2. remove unused methods
Merge pull request #2 from MengZhang/master

Pull request from Meng
Fixed a bug in guigraphcut

User specific pixels should be within the image boundaries
Use GLESv2
Update native code
- Adding the initial module file.

- Adding an initial test file.

- Updated the README.

- Updated .gitignore so that local .tmp scratch files won't be committed. Also, removed the original "_site" line from .gitignore since this plugin won't be creating an actual Jekyll site.
Merge branch 'dev'
added gitignore
Added sql
fixed visualizer vector module import
Merge pull request #5 from gaborpapp/visualizer-vector-path

fixed visualizer vector module import
openssl wrapper
modifying profile name for cucumber tests
rubygems bookmark
con modificaiones
Landscape mode :: enlarged image view will show in portrait style
Update library is hosted in Sonatype OSS repo
Add method to get authorize url.
Added supplier contacts, fixed delete bug in tree view - not reporting back. Still need to add foreman scope to in charge dd list in crew. Also not yet restricting to scheduling days by available resources. Building daily brief report, about to start writing stored procedure to retrieve task list with dynamic columns. After this will do day sorting in planning view.

next commit:
need to rewrite Main form view file as abstract base class with 4 subclasses for create and update in both modal and non modal or potentially split modal and non modal into abstracts as well

shift common js functions into a js file
re-structure generic and remove commons switches - possible factory method

2nd next commit:
unit test - better later than never

3rd logging/audit scenario

4th selenium functional tests.
Update packetfu to 1.1.4
Don't read in the whole pcap file when importing

Still not amazingly fast (about 500 packets per second in my tests), but
now it won't eat all your ram and start crashing things when given a
large file. Requires an upgrade to PacketFu containing pull request 5.
Revert "Update packetfu to 1.1.4"

This reverts commit 24e6131ad7876f8b177a7e35bce77ecc4fb09d52.
Exploit for Snort CVE-2006-5276 on Windows
Show vuln.info on db_vuln command

IssueID #5837
Don't need to require net/ftp anymore

Nothing actually used it anyway.
tomcat_mgr_deploy may report successful creds

Using following code for 'check' as 'exploit':
               report_auth_info(
                       :host   => rhost,
                       :port   => rport,
                       :sname  => (ssl ? "https" : "http"),
                       :user   => datastore['BasicAuthUser'],
                       :pass   => datastore['BasicAuthPass'],
                       :proof  => "WEBAPP=\"Tomcat Manager App\", VHOST=#{vhost}, PATH=#{datastore['PATH']}",
                       :active => true
               )

Resulting in:

Credentials
===========

host           port  user    pass    type      active?
----           ----  ----    ----    ----      -------
192.168.x.xxx  8080  tomcat  s3cret  password  true
replace spaces with tabs
Add a few fingerprints. Thanks browsershots.org!
Merge branch 'rapid7' into bap-refactor
More fingerprints from browsershots
Tidied up the exploit
Fix broken nessus_safe

Kudohs to 'freaky clown' for the initial patch
IssueID #6597
exploit module added for CVE-2012-1195
Use rport for modicon_password recovery, not 21.
deletion of the ASP script
added references for cve-2012-1196
Merge branch 'CVE-2012-1195_thinkmanagement' of https://github.com/juanvazquez/metasploit-framework into juanvazquez-CVE-2012-1195_thinkmanagement
Cosmetic changes, mostly :-)
Make target_uri default to "/" in case the TARGETURI option is nil or empty
File Name fix

File Name Fix
Removed dead code: last_print_out was never updated so the if was trivially true.
Stopped vector fade for fun
なんとなく形になってきた
X,Y軸が逆になってるバグ未解決

Signed-off-by: unknown <aoisensi@satoru-PC.(none)>
[TIMOB-10928] Set fullscreen when playback state changes
[TIMOB-10928] Ensure fullscreen is called only once per unique url
Merge pull request #3010 from vishalduggal/timob-10928-21X

Timob 10928 21 x
Fix open and close events for tab group.

[TIMOB-11031]
Merge pull request #3134 from joshthecoder/timob-11031

[TIMOB-11031] Android: Fix open and close events for tab group.
Fixes a crash seen when backing out of an empty tab group.
Set native view for tab group.

This fixes view property and methods
(ex: backgroundColor, animate()) from not working.
Fixed issue by properly setting the native view of the group.

[TIMOB-10065]
Merge pull request #3251 from joshthecoder/timob-10065-3_0_X

[TIMOB-10065] Android: TabGroup - Tab bar does not animate on Android (backport)
Converted hasCompass to a property
Merge pull request #2422 from bryan-m-hughes/master

Changed hasCompass to a property in Mobile Web
lab_08
tidying bracket
Leitura de Arquivos.

Signed-off-by: Antonio Armando Couto Bem Filho
<armando-couto@hotmail.com>
Adding an about link in the sidebar
case 905 - JS fix for panels IPE mode.
Merge remote-tracking branch 'origin/develop'
Bumped version to 0.3.0, see changelog for full details
Bumped version to 0.3.0, see changelog for full details
Site updated at 2012-09-19 10:45:53 UTC
mmm I don't know
Order navbar according to the `order` field of the page

Use disgusting nested loops to build correct links order.
Everything's working?!
q2 now complete
Smarty isn't displaying right in the readme file
add my name on contributor's list \o/
start oauth2 config refactoring in http client
Merge branch 'master' into oauth2-refactor

Conflicts:
	pom.xml
	resthub-web/resthub-web-client/src/main/java/org/resthub/web/Client.java
Update pagination strategy.

Here are the new routes:
* /entity?page=all       -> findAll
* /entity                -> findPaginated(page=0, size=10)
* /entity?page=1&size=20 -> findPaginated(page=1, size=20)
Merge remote-tracking branch 'resthub/master'

Conflicts:
	resthub-web/resthub-web-server/src/main/java/org/resthub/web/controller/RepositoryBasedRestController.java
	resthub-web/resthub-web-server/src/main/java/org/resthub/web/controller/RestController.java
	resthub-web/resthub-web-server/src/main/java/org/resthub/web/controller/ServiceBasedRestController.java
	resthub-web/resthub-web-server/src/test/java/org/resthub/web/controller/JsonRepositoryBasedRestControllerTest.java
	resthub-web/resthub-web-server/src/test/java/org/resthub/web/controller/JsonServiceBasedRestControllerTest.java
Update JavaDoc for paging.
Return a Page<T> when retrieving all entities for consistency.
Merge pull request #97 from loicfrering/master

Update pagination strategy
fix ugly merge. Sorry!
Merge pull request #96 from bclozel/oauth2-refactor

OAuth2 refactor
Paginated resources now start at page 1.
Merge pull request #98 from loicfrering/master

Make paginated resources start at page 1 instead of 0
Fixes issue 89 : More flexible Spring context.xml configuration
Merge remote-tracking branch 'origin/master'
Merge pull request #100 from sdeleuze/master

More flexible Spring context.xml configuration
set pagination default value to 1 because 0 is now forbidden
Merge pull request #101 from bmeurant/master

update pagination API
ignore .versionsBackup files for versions-maven-plugin
release 2.0-beta2 version
Update to 2.0-SNAPSHOT version
Caching bug fix in tool script
Don't rely on custom method for emitting YAML

Custom method misses edge cases, such as strings containing quotes.
Allow URI-escaped username, password, and database

This allows the encoding of previously unusable characters (such as
double quote and backslash) in the username, password, or database
portions of DATABASE_URL.
refactored tests, introduced common base class
ARM: topology: Update topology according to current sched_mc
break solution into two files
add notContainsKey in Assert
Header: level 2
updating packaged
Styling for server generated hebrew texts
Site updated at 2012-10-19 03:19:47 UTC
change to correct nvm funcion
chmoding preinstall
Create model User, Micropost and Relationship
Create UsersController and create model UserSession
Copy already created stylesheet to app/assets/stylesheets
init domain CNAME
Add dashes to `PSR-n` :)
Merge pull request #13 from bobthecow/patch-1

Add dashes to `PSR-n` :)
Port to Jekyll for great justice.
Merge pull request #17 from bobthecow/jekyll-port

Port to Jekyll for great justice.
Update README

 * Add links to homepage and GitHub issues.
 * Explain Jekyll a bit.
 * Add "contributing" section.
Merge pull request #18 from bobthecow/patch-2

Updating explanatory text on how to setup jekyll locally. General readme content.
Adds proper CSS classes
Use a different method to toggle Permissions summary on page load
Bugzzz
show show post translation
Added Fluid Carousel
move image capture up a dir because of lib. add a debug line.
pushing project first time
Small adjustment to asides
Small adjustments to not be so OOTB
Added: missing constant doc and default settings
Removed: obsolete ?>
Changed: refactored cluster gateways to provide db info in CTOR

... and additionally corrected usage of mysql_error on mysqli resource
Changed: cluster refactoring: be more OO and testable
Added: method visibility
Added: FIXMEs
Added: TODOs
Updated autoload with missing cluster index files
Added feature doc for cluster index
Fixed #015035: Webdav Media access buggy when accessing in accentuated language
Fixed #19116: Using parameters not supported in custom HTTP methods
Fixed #019098: preview is not working for items in search result (back office of ezp 4.6)
Fixed #18886: New user registrations only viewable by Administrator

Make sure the account of the user is removed when manually activating a
user and make sure the unactivated users dashboard is based on
is_enabled settings
Fixed #19113: 404 instead of 405 when accessing a resource with a not-supported HTTP method
Merge pull request #120 from pkamps/master

Dump Operator - enhanced one of the main debugging tools for the eZ Template language
Documentation: dded BC notes for cluster index changes
Added interfaces for cluster event notifier and listener
ClusterEvents: basic implementation in _fetchMetadata
CS: fixed some issues from https://github.com/ezsystems/ezpublish/pull/120
ClusterEvents: added events to the DFS MySQLi backend
trabalho 5b rodando sem travar, com documentacao incial (meio pobre) sem exibir no main os movimentos das torres, mas sem dar segfault. enviarei o trabalho assim e tento adicionar o estado das torres ainda hoje. enviando por garantia. a pilha funciona para as funcoes adiciona() e retira() corretamen
Some changes to make it more obvious that contrib creation has 2 steps.
- Change Submit to Continue.
- Remove screenshot field from creation form.
Completely remove screenshot code from create.php.
Merge branch 'master' into phpbb-com
Merge branch 'phpbb-com' into develop
ChannelBinding equals method
feature: ngx.req.get_headers() now takes a second (optional) boolean argument that can be used to convert all header names into the lowercase form. thanks James Hurst and Matthieu Tourne for proposing this feature.
feature: automatically detect LuaJIT 2.0 on FreeBSD by default. thanks rkearsley for the patch.
Remove automatic compile of CoffeeScript
relocate from googlecode
first commit
fix wrong version
Relevance to alife
Merge branch 'master' into online
Update HuffmanBinaryTree.java
Made frame appear

Created a new instance of the JFrame form and set it to visible.