labofsahil/github-event-dataset-2012 huggingface dataset:
make sure the user is persisted before trying to tack on bookmarks
update to use devise-guests ~> 0.3
Merge pull request #505 from awead/release-3.8

Update to devise-guests ~> 0.3
Added a .app file
vinh first commit
Actually make this a gen_server2, duh, we were hibernating after every call before.
GC rabbit_event on all nodes pre hibernation
Explain
Changes for homework 3b
Remove Hashr dependency.
Refresh button added for dynamically fetching contacts
changed the url in like.html for css
fixed bug in locations that caused player to not be able to leave restroom
fixed issue with take treating corridor as if it had items
fixed closet to disable correct button
Add support for Windows platform
Merge pull request #3 from rskvazh/master

Add Windows OS support
Update master
Finished GameOfLifeGrid and rename it to grid. Passed unit test.
Merge?
Merge branch 'master' of https://github.com/rellik6/zmz-lsh-game-of-life

Conflicts:
	CellGrid.h
	grid.cc
Changing the menu parent paths
version 1.2.7.10
only run if it compiles
Added TDW loading source
Repo from Teena
Added directories to the repository
First prototype of transformation. Work in progress
Demo app to verify things work as we want them to
Added Base Images and Media; Updated Media Extras and WYSIWYG
Site updated at 2012-11-06 16:14:01 UTC
added code for pointer locations for the selected entity
Zoom in UIImage
Rebase from 'release/test_nodelet' @ version '1.7.11'
Generated debian files for quantal
Move Resource and ResourceImplementation specs out of spec/models since
they are not models
fix file headache in c9.io
add out#index
Use path defined in constants.
First working version of record dialog.
Site updated at 2012-12-15 18:14:11 UTC
Site updated at 2012-07-03 12:35:51 UTC
Site updated at 2012-08-06 21:03:43 UTC
Basic site going.
File path doesn't resolves correctly on Windows. Closes #6.
Win condition screen

Signed-off-by: Phill Tew <peatew@gmail.com>
Merge branch 'master' of github.com:samphippen/explaygamejam2012

Conflicts:
	gdx/src/com/samphippen/explaygamejam2012/GameHolder.java
	gdx/src/com/samphippen/explaygamejam2012/GameLogic.java
	gdx/src/com/samphippen/explaygamejam2012/ResourceManager.java

Signed-off-by: Phill Tew <peatew@gmail.com>
Merge branch 'master' of github.com:samphippen/explaygamejam2012
end of caelum-estoque
Add syncdb url
Fix error sys_view
Fix Error import sys_view
Add UserProfile model
Show profile info
Merge branch 'dev'
Fix error geting myself user
Add syncdb url
Remove unnecessary info from main page
Fix test
Test modyfied
Main page complete
Revert "Main page complete"

This reverts commit 299ca15f8003cba88899a22030b298fecfbc9227.
ticket:1 test modify
ticket:1 main page complete
Merge branch 't1_contact'
ticket:1 add requestlog application
ticket:1 add tests
Add RequestLog model
ticket:3 Add resolving url
scoop-outer-expertpar resume
scoop-outer-expertpar pause
scoop-thresh-expertpar resume
scoop-thresh-expertpar done
scoop-winnow-expertpar resume
scoop-winnow-expertpar pause
remove out of date declaration
scoop-thresh-expertseq resume
scoop-thresh-expertseq pause
scoop-thresh-expertpar resume
scoop-thresh-expertpar pause
scoop-winnow-expertseq resume
scoop-winnow-expertseq pause
scoop-winnow-expertpar resume
scoop-winnow-expertpar pause
scoop-outer-expertseq resume
scoop-outer-expertseq pause
scoop-outer-expertpar resume
scoop-outer-expertpar pause
scoop-product-expertseq resume
updating chapel to remove constants
updating graphs use expertseq as speedup reference
Merge branch 'scoop_expert' of github.com:scottgw/concurrent-languages into scoop_expert
Add more html_safe calls for latest Rails
Update gems
Update gems
Add second visit to page to work around Chrome multiple download protection
Merge master
Add just execjs
Added a screenshot for MyProfile.
Added a link to the project page for MyProfile.
Merge remote-tracking branch 'andrei/master'

Conflicts:
	paper.tex
additional url updates
updated icons-small
related_label used for autocomplete list, see #219
Fix PHP-doc class description for Generator\DoctrineEntityGenerator class
merged branch michaelperrin/fix/php-doc (PR #162)

This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #162).

Commits
-------

bad9a8f Fix PHP-doc class description for Generator\DoctrineEntityGenerator class

Discussion
----------

Fix PHP-doc class description for Generator\DoctrineEntityGenerator class

Previous description was based on a copy & paste from the `Generator\DoctrineFormGenerator` class
Allow generating of bundles into empty directories
merged branch SamsonIT/2.0 (PR #163)

This PR was merged into the 2.0 branch.

Commits
-------

47bdf69 Allow generating of bundles into empty directories

Discussion
----------

Allow generating of bundles into empty directories

Allow generating of bundles into empty directories
Merge branch '2.0' into 2.1

* 2.0:
  Allow generating of bundles into empty directories
Merge branch '2.1'

* 2.1:
  Allow generating of bundles into empty directories
  Fix PHP-doc class description for Generator\DoctrineEntityGenerator class
Simplify event names and add 'batch' event.
Site updated at 2012-11-02 09:44:41 UTC
cpufreq: add 1500MHz freq, some clean up of MPLL/APLL vals and voltages

Change-Id: I4ef577d3f9279a016843bed3485877cfd7dbff94
blah blah
Merge branch 'master' of github.com:shaunplee/shaunplee-.emacs.d

Conflicts:
	init-python.el
Fixed link to part 1
catch serial.SerialException and print
uses Datastore::InMemory, adds boilerplate
Site updated at 2012-10-02 13:06:20 UTC
show only medium sized images
tanvir #01 commit

commiting my first commit with index-T.html
node management
adding Node MAC and Interactable
adding nodeMac details to registry
interactable added to cssmanager and webapp
added interactable to cssregistry
resolve conflict
commit
resolve conflict
minor change to nodeinteractable in webapp
resolve conflict
resolve conflict
?
Merge branch 'development' into LiamNodeStuff
readded node mgmt page link
CIS creation and membership changes published in its activity feed
Merge branch 'thomasFeature' into development
temporarily removed Apache XML Security dependency
Merge branch 'development' of https://github.com/societies/SOCIETIES-Platform.git into development
Uodated common-ext-libs to include apache shindig
fixed jaxb to simple bugs in android pubsub
partial and non-working integration with privacy policy negotiation
caui prediction restructuring
Merge branch 'development' into MitjaPolicyNegotiator
Merge branch 'development' into MitjaPolicyNegotiator
Cosmetic fix to platform webapp
invoking privacy policy negotiation

changed reference (interface) that is being invoked for privacy policy negotiation
INegotiation: added flag to start also privacy policy negotiation or skip it
weight type added
types moved to internal list
Add plan for integration test #1083.
API changed. Privacy Policy Negotiation is now optional
Merge branch 'MitjaPolicyNegotiator' into development
type weight added
types set in alphabetical order 
value metric added
Merge branch 'development' of https://nikoskal@github.com/societies/SOCIETIES-Platform.git into development
Merge branch 'development' of https://mvardjan@github.com/societies/SOCIETIES-Platform.git into development
javadoc
duplicated type fix
Merge branch 'development' into MitjaPrivacyAssessment
Device Management - SLM integration
Merge branch 'development' of https://github.com/societies/SOCIETIES-Platform.git into development
Fix for test
updating server URL
Update ICO CLM interfaces
increased side of H styles
Added the document.
created the initial makefile and buildout script
ignore the src/ folder
ignore bootstrap.py
Implemented prim's algorithm
added buffer_size readout
treeview mit Liste und icons
Rework the make rules for the build automation tool:
 * Simplify the rules used to typeset the documentation and to build programs.
 * Move each generated program into its own subdirectory, so that the standard
   `<bsd.*.mk>` rules can be used.
 * Improve a few comments.

Ticket: #297

git-svn-id: https://elftoolchain.svn.sourceforge.net/svnroot/elftoolchain/trunk@2546 95820547-d848-0410-985e-9ae8fe0fa350
minor bugfix: RRDStorage generating Perl warnings upon RRD creation
Cisco cbQoS plugin: minor improvements and Perl warnings
uploading original files for second time
Added responsive bootstrap so pages scale well
Added CSS for widgets on profile pages
Added CSS for graph on profile pages
Changed size of H3 for widgets on profile pages
Twitter bootstrapped profile page
Names adjust to training session.
Fix broken specs, update to latest fakefs

Ensure that the fake temporary root directory is always created
before adding files to it.
Merge pull request #12 from ldenman/master

Fix broken specs
Added Similar Projects section to readme.
add some style, update some common jar to latest.
AES Fault Analysis (Impossible DFA)
method header for managing errors
allow offset time in seconds
fix in participant view the display of schedule of separate message
fix scheduling unattach message at participant optin
Merge branch 'release/0.4.11'
upgrade backend
fix notification to worker
update backend
fix notification to worker
fix registering keywords at program settings update
update backend
Merge branch 'release/0.4.2'
fix admin/special_pages#index
Filter the votes rake task for Post only. [#28819553]
Remove Founder Name
Spec sugar for not_found
Adding erubis dependency
Code cleanup, Added vault support
If no text in note don't show
Commit from Xcode
minor fix before release
Before release
events loading
merge follow system again
Added licence file and initial README
separate configurations
readme
root readme
readme
more readme
Added 'Recent Episodes' option to TV shows sort menu to get recently added episodes
Wrap RST lines at 72 columns
Update Arch Linux URL
Version 1.0.3.2
Date 2012-05-24 14:50:26

* StageMover corrected: will not prevent application from closing.

-
Version 1.0.3.1
Date 2012-05-22 17:58:10

Small modifications for a better compatibility with other microscopy
plugins.

-
Version 1.0.3.0
Date 2012-05-15 17:18:43

* Updated to last version of µManager 1.4.10.

* Painters are not visible anymore, they will be reimplemented soon as
Daemon Plugins.

* Please do not forget to update needed files along with the update of
the plugin (thus, install the last version of µManager to get them).

-
Version 1.0.2.3
Date 2012-04-16 14:05:49

* inversion of Z
* switch X and Y (if camera rotated 90°)

-
Version 1.0.2.2
Date 2012-03-05 14:23:22

Small fix concerning exitlistener error.
Add find for merchant, item, invoice
Merge branch 'master' of github.com:travisvalentine/sales_engine

Conflicts:
	coverage/.resultset.json
	coverage/index.html
	lib/sales_engine/merchant.rb
	runner.rb
generator source 1.0
fixed an invalid composer.json file
Test friendly forwarding done only on first attempt
Admin users cannot delete self
Updating JqueryMobile assets to 1.1.1 Final
Updating gem's version to 1.1.1
Fixed a few embarrasing errors in standards
Updated .min.js to stable version
Unify colours for layers
man!! this utilty functions comes to model
refactored preiodict task
no new line in this file
management command does same thing as task scheduler
migration for new table
Shorter file button title
Latvian locale
forms and urls
Login data and dev form for login.
Main class now has access to the tags for each word.
don't specify shell
some minar changes
changes in test branch
some test in test branch
some text in testing branch
accept a memory_limit of -1 (default on cli on debian)
Fix title to first version
メニューを日本語化
comply to the new ecto API
use a Frame Buffer Object and move code to the Display class
Merge pull request #7 from whitetigerisme/master

Uploaded audio
Move css to folder
URLize song names, add song data
Add defaults to song
Fix error with missing colon on property
Add menu view, appears as first view
Add event bus for menus
Update style
Add menu selection via mouse and keyboard
Update with temporary readme
Wire up song view
Restyle song view
Add credits view
Add destroy function to views to clean up zombies
Update credits template
Update placeholder logo
Merge pull request #8 from conzett/master

Styling and menu work
fixed a few pesky div closings
Adding in taglib with Spring EL support
Finished Lesson4 Registering Users
V 1.0 Aritmetic Basic
First round of adding back features
Second round of adding back features
Third round of adding back features
Fourth and hopefully final round of adding back features
Tweaks on variable names
編集後記文言修正．
Added body-background.gif
add ga
adding images
Creando nueva vista modulos y controlador
Fix some spelling
Merge pull request #3 from xrmx/README-spelling

Fix some spelling in README.rst
start map loading
1.1 Added Permisions support for PermisionsEX
trying to add bdd testing with zombie
update slide show
Merge remote-tracking branch 'origin/master'
超クールなアップデート！サイトバーの過去の開催が全然DRYじゃないから気になってけどそいつを直してやったZE☆
Auto-convert object parameters to JSON.

Note: this assumes JSON.stringify is available, so json2.js may be needed in
older browsers that don't support it.

This change means you can do something like:

    search.summary({
      annotations: {
        loc_1: "miami"
      }
    });

Whereas previously you would have had to call JSON.stringify on the annotations
object to make it work.
Merge pull request #2 from jasondavies/json-params

Auto-convert object parameters to JSON.
Wrapped upload_blackbox() in a try..except to avoid

generating new exceptions when blackbox upload fails
Update notes for submitted changes

* evita: add modifiers and verbs for Play VOIP/Voice Call IP for mic
curren mailxpert usage
Nu möjligt att skapa vissa former
beaglebone-tester: bump SRCREV to fix serial console race

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
beaglebone-tester: re-enable pmic test

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
linux-ti33x-psp 3.2: update to 3.2.21, add libertas fixes

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
linux-ti33x-psp 3.2: fix audio/spidev clash on beaglebone

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
beaglebone-capes: use backlight hack for all LCD4 variants

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
linux-ti33x-psp 3.2: add camera driver for beaglebone

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
linux-ti33x-psp 3.2: add support for audio cape and disable LBO gpio for battery cape

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
u-boot 2011.09+git: update to latest version of Tom Rini's tree

All patches have been rediffed and boot tested

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
linux-ti33x-psp 3.2: add fixed for cssp, fbset and OPP50

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
linux-ti33x-psp 3.2: enable more tracing features for beaglebone

This makes powertop 2.0 happy

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
linux-ti33x-psp 3.2: update to 3.2.23

Regenerate all beaglebone patches and add one vfs tracer patch for powertop

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
u-boot 2011.09+git: update to latest version of Tom Rini's tree

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
linux-ti33x-psp 3.2: LCD7 A3 support, eMMC cape support, camera cape improvements

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Fix graphicalobject. 3D object demo now working.
Work in progress.
Current work, totally a mess.
Update shader. Now fully working.
removed superfluous html
v1.0.1 - 8/8/12

- Changed: CustomLayoutHandler changed from property to method calls. New Signatures follow:
- - SetCustomLayoutHandler(handler:Function, originatingModule:String)
- - The addition of originating module allows responsibility for the Custom Handler to be checked easily and securely. If possible module name should include versioning info as appropriate.
- - GetCustomLayoutHandler():Function
- - Returns the current Function

- Added: GetLayoutHandlerOrigin():String
- - Returns ModuleName that originally attached the CustomLayoutHandler.

- Added: ClearCustomLayoutHandler():Void
- - Resets any Layout Handler to default status.
using Discretization to sum up rectangles area
url encoded params values
Made the about page look nicer

moved the whole page down by 35 pixels so that it looks slightly better.
Added myself as contributor for Croatian translation

Change-Id: Ibee9d41d7cadce29949c16d59a29d1901acf1a0e
Merge "Added myself as contributor for Croatian translation" into jellybean
Merge remote branch 'cm/jellybean' into jellybean
fix install target
fix install target
fix install
Upgraded to Infragistics v12.2

Faster controls. Wooo
Changed branding to Build2012
Exception handling & added link to session
Speakers are now being downloaded from JSON feed
Added the boost program options library and started using it.
mapping apontamento
insert is working for cliente
Decreased entity movement packet size.  (Just send direction, no
location)
Added walking animations.
Added tweening in tile movements.
Added rendering of entities near the client.
added extra help section to README
errores menores corregidos de pruebas
Segmentation images for Wiki
modif du application.ini
Version 1.0 of the  RetroCade MegaWing Test Plan
Several fixes to the dashboard

-SynthMaker Dashboard
-Added Midi In and Midi Out Selectors to the front panel.
-Added SID Volume
-Fixed CC#'s for all Presets
-Renamed Presets from Hoppa to User
Com port support added to Flowstone Dashboard
Список совместно просмотренных гитар.
Remove Images from default dir
modify doc on ex07/08/09.

Owner: Guangwei

Issue: N/A

Description: modify doc on ex07/08/09.

Root Cause: N/A
Removed some test asserts that fails when the computer running the tests is not on a domain.
Changed behaviour of HansKindberg.Validation.ValidationResult.
PDF-file for the nonlinear example created and added to the appendix
section of our documentation.
Fix image validation on shared hostings by a config value
Added xtion45 clips. Minor changes to GUI.
Correction and translation

* Correction in all files

* Translation of a short paragraph in plugins_exercises.rst
Initial bit of poking, to start using AJAX.

Might be better off ignore the bit of stuff in the JS files...  I have
probably missed a number of the changes in the AHAH stuff.
Mostly working

AJAX itself seems to be there...  Styling of tab(panel)s may require
jQuery UI...  Tags seem to be a little broken--editing causes weirdness.
Tabs 99% working

Just the tool tips that aren't quite there.  Also, the tags are
still broken--adding and deleting are largely there, things fall
apart when editing though.
Refactor to use form_load_include

"Tags" don't quite work, because the input field is not being cleared...
Causes issues when selecting one of the already added tags.
Get a bit further with tags...

Adding/deleting seems to work...  It's just editing which doesn't seem
to work.
Merge 6.x branch.
Fix tabpanel tool tips
Fixed tags and windows line endings.
Fixes for tabs
Merge remote-tracking branch 'origin/merge-6.x-with-7.x' into 7.x-attempt-tabs

Conflicts:
	builder/js/ElementForm.js
	elements/js/tabs.js
Removed unused functions.
Merge pull request #44 from nigelgbanks/7.x-attempt-tabs

7.x attempt tabs
separated CSS from JS
well at least you can compile it now, still needs some fixes but i m very close to the end now
Improve normalizeString.
Update readme.
Add support for inline bold, italic and strong tags.
Pushing poster info
Merge branch 'master' of https://github.com/Kleptine/MachineLearningFinal
renamed AdminNode
Added an untested phantomjs script.

This was my attempt to use phantomjs to scrape the data from the website. Entirely untested because comcast chose this exact moment to upgrade their website. I may end up using some other tools to make this process easier. I don't think the form is actually being submitted at the point. This might be my mistake as my javascript is a bit rusty.
Updated functionality of buttons and text area history
Updated GUI
saving
fixing conflicts
Dev team push code to Repository
history again
Modificado KERNEL y TIMER
sdlfkjsd
salkjhasdf
fix mask for detectextract
Cleaned up eclipse workspace and moved it to a zip file.
Setup will extract it if it doesn't already exist.
updated pagination across subjects
Fixed signal strength default
Set the same package and project prefix for all demo projects.
Update the .ois to use the current cinematic release.
Update the .ois sample.
Fix an acceleo problem with some "let".
Add an explicit link with environment for Acceleo template resolutions.
Update the aird and the project nature. We can not retrieve quickly all
cinematic viewpoints...
Added link to Mark's blog
Added default cave to center of gnerated map.
Initial commit
task popup v0.0.1
small beautifying
Merge branch 'master' into gh-pages
page changed
More work on the Data chapter
Update quartzScript.js

added func cls
Cleanup unnecessary junk
add pas_lin_separable_pol_deg2.png
[documentation] update standard sensors structures
Merge branch 'master' of https://github.com/RobotML/RobotML-documentation
17：26
fixed lqfb link on login page
Fixed conflicts
Skeleton class and test for tfile_export_algorithm
tfile_export_algorithm now accepts a TFile in the constructor
Tested to make sure the passed ROOT file is valid
Added a derived class tfile_converter_algorithm which will convert from an input ROOT format to an output ROOT format
Fixed conflicts
Some fixes so that I can compile - very slapdash so might want to check
This produces a TFile with one tree and one branch and fills just one value from the dummy values in the test.
Read in all the data but TTree format definitely needs more work. Atm it just has one leaf for each channel and hit for the TDC (needs to be an array
merge with andy
criação da parte de movimentacao
Add getSessionEcardUser()
Begin creating admin interface.
Add .less file to category page.
Update dates for controller.
Add base project with ui layout using ActionBarSherlock.
added roottools library to source for easy compilation from any device
update hive app to use hive-runner
Polish PathVariableMapMethodArgumentResolver

Return an empty map when there are no path variables, rather than
raising an exception. This is consistent with similar resolvers for
extracting headers and request parameters.

Issue: SPR-9289
Add onTimeout/onCompletion callbacks to DeferredResult

Issue: SPR-9914
Polish methods to register async interceptors
Replace reference to aspectjrt with aspectjweaver

Replace reference to aspectjrt.jar with aspectjweaver.jar since
aspectjrt is a subset of aspectjweaver and the full jar is required
by Spring.

Issue: SPR-8896
keypress module finished but not tested. module class claculateResult bug fixed
Merge branch 'master' into moritz

Conflicts:
	StressYourself/config/configuration.xml
	stress_yourself_modules.jar
fix in keypress module
refactored math modules
show thank you message aftere register experience
Added cm repo and theme chooser
2.2.60!
Game crash fix!
Configured for deployment to Heroku
Configured for deployment to Heroku...again
Configured for thin on Heroku
I don't know what I'm doing but more commits is better than less
manifest:  pull build from platform_build at Vanilla-AOSP
remove some lag before the tower signal connection process after boot

Change-Id: I2bbc3e00b71ae5e030fd0ac880b8e36c85f4c4d5
Adding MoreCCACK file..
Adding simplyNC code
Updates to specs

Added color to spec output.
Updated depricated methods in specs.
user password changer
Implemented hook_requirements to check if the private file stream wrapper has been configured.
Improve androidiness, browseriness

The logic to look for a snique message in a sequence of bytes is now a Service.
This allows external applications to access the snique-decoding service as well
as hopefully making the transition to multiple tabbed browser windows simpler.

The title of the activity is now set to the title of the web page, making it
more browser-like.
Start to exploit newer Android features

Avoiding using deprecated features

Build SDK is now 4.0.3

Message posting uses the Notification.Builder class on SDK>=11 and manual construction on SDK<11.
A massive refactoring.

All test passing on the server. I've got rid of the very-difficult-to-use 3 model system that I had before, and have broken it back into proper and reasonable sub-classes, more like I've always had. It should be much easier to work with the models on the server now, to optimize and create better versions and ways of doing things. Right now it's a little slow, but I can move on from here.
Fix kang failure

Change-Id: Id14653dfc92801a5c3b0aaad5b0600c2d74fc605
Update addSpell
check if $argv[1] is set before trying to access it
Renamed package to zf-commons/zfc-user-doctrine-orm
Include commit id
Video thumbnails added
New look and feel. Youtube search capabilities
Watch on site options added. Remove videos options added
- fbx: skeleton for DOM -> aiScene converter.
- update CMakeLists
- fbx: converter now handles FBX mesh to aiMesh conversion.
- fbx: create dummy root node and assign converted meshes. This is a temporary solution to be able to test mesh reading.
making jshint compatible, adding grunt, minor repo restructure
Updated many styles.
Timestep drag-drop UI cues
drag-drop works, but makes right clicking on timestep more difficult.
Fix to right click difficulty -- only consume left mouse down events
Easier to drag
Merge branch 'devel-dragdrop' into devel-1.62
Merge fix
Added drag&drop feature to release notes
Refactoring some names
Refactoring / code cleanup. Removed a bunch of mystery "NiSync" code from production
Removed unneccesary parameter from RefreshSequenceDataToUI and RefreshSettingsDataToUI
Changed build targets of all projects to target x86, instead of "Any CPU", as an attempt to fix the "BadImageFormatException: An attempt was made to load a program with an incorrect format. (Exception from HRESULT: 0x8007000B)" exception being thrown when trying to use Opal Kelly FPGA on new versions of windows.
Copied the NI4882 fix that was necessary for SettingsFiles to work over to the deserialization code for ServerSettings.
Update README
Merge branch 'master' into devel-1.57

Conflicts:
	AtticusServer/AtticusServer.cs
	WordGenerator.suo
alt. change calculation
alt. change calculation
minor fixes
form registrar
Make jenkins.sh work

- @maxfliri
- @pbadenski
Remove accidentally added spec reports
Fix .gitignore

- @maxfliri
- @pbadenski
Add validation on edition part slugs.
try and fix rabl issue
Cleaning up telescope and eyepieces tests. Fixing manifest
Minor fix to the manage equipment screen so it start the right activities in the tabs
����˽�����ƽ���

�����û��Ļ�����Ϣ�͹��ܵı�����
Added more assertEquals to InitializerTest.testImportStudents
Make it bigger!
Tweak footer
Gralloc error
Refactor test code to improve extensibility
Added test
AC: Update session max lifetime defaults in LAMP install.
get date on same line index
Removed pseudo-metafield values
Flushing out query functionality
Added URL module
Merge pull request #19 from anilsaldhana/master

http changes
first commit
Changes to the PicketBoxManager
Changes to the PicketBoxManager
code cleanup
Merge pull request #20 from pedroigor/master

Picketbox core and http module changes.
PB core and http changes.
Changed to the new configuration.
Merge pull request #21 from pedroigor/master

See comments for each commit.
Changed to the new configuration
Merge pull request #22 from pedroigor/master

See comments.
Some small fixes.
Test fixes.
Merge pull request #23 from pedroigor/master

See comments for each commit.
improved migration script and test script
updated readme
added textsync executable
name=glite-yaim-argus-server.
SMALL XFont TWEAKS
remove star in row header.
Set center of the toast in answer activity
enable editing of lifestages
Version bump to 0.2.0
Fix for failing rebuild spec
Mondoid 3 API
Gemfile and spec updated to mongoid 3.

* Version bumped to 0.2.0 to leave room for versions that support mongoid 2
* Added dependency to ruby 1.9 or newer
* Added dependency to mongoid 3.0.0 or newer
* Simplecov used instead of rcov
* DB cleaning on test done with mongoid's own purge! instead of third party gem
took gallery off nav
merge from vlc upstream

android: 040b723be1
vlc: 3d3db0e575
membuf: fix hanging after seek around boarder between 2 segments
add .gitignore
Revert "Fix launching the display configuration tool"

In 2.32, we still want to use mate-display-properties.

This reverts commit 03112091d18ad0f9cc66b5f8835aadb1c47bc9ee.
(randr) bnc#647304 - If the stored configuration fails at startup, use the fallback configurations

Previously, if a stored configuration existed but it could not be applied due
to nonmatching monitors, we would do nothing else - potentially leaving the user
in whatever startup state was used by the X server.  Now, in that condition
we simply fall back to trying the system-global configuration or the boot-time
configuration.

Signed-off-by: Federico Mena Quintero <federico@novell.com>
RANDR - Add mateconf key for disabling boot time configuration

In a lot of situations it is undesirable to have g-s-d change the XRandR
settings, because it overrides X.org customizations, leads to unnecessary mode
switches, or increases boot time.

Add a mateconf key "use_xorg_monitor_settings" to disable
apply_default_boot_configuration(), in which case the XRandR configuration will
not be touched unless there is a global or per-user configuration file.

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=631388
Bug-Ubuntu: https://launchpad.net/bugs/640807
xrandr: Use Xorg monitor settings by default

So as not to break the default behaviour.
media-keys: React to stream-removed signal from GvcMixerControl
housekeeping: Don't access free'd memory if a volume is unmounted whilst the dialog is displayed
Updated RDNPlus
Merge https://github.com/bit-shift/rainbowdash-network
Fixed problem with .live()
R+: Unitalic
Staff: Owners to "head administratorss"
Applied same .notice fix in overlooked spot.
map zoom, locationlist, many updates
uploads_functional
Set gaelyk.preferPrecompiled system property in dev server in non-RAD mode
Can't get old fortran working on Arch Linux. First time for a fail
Corrected Value in Second Unit Test
Reverses logic of newKunde/existingKunde-button
updates
fix merge issues
turn ons is updated
use chef_gem instead of gem resource, this ensures the embedded version of ruby in
the omnibus-installed client has the gem
Updated .gitignore to avoid commiting .user and .suo files.
updated version of currency generating
Added fancy planet animations

added the css animations from the old system builder,  made the orbits a
bit bigger.
Merge pull request #11 from Chrizzoo/master

Planet animations
- Subtitle might be srt
- Escape serie name

TODO : exception for Hawaii five-0 2010
- add py2exe
Simplification du type Point
Merge remote-tracking branch 'tmo/themes-2.3.1_r1' into themes-4.1.1
ch.

Now, when the theme changes we reinflate all status bar views and
reattach them.  This is an approximate simulation of the normal Activity
onDestroy/onCreate cycle that the system goes through when a config
change (in our case, a theme change) occurs.

Also reverts "Hack to update status bar service drawables on theme
change.", a478f39ef58713a8c64823988b952f1d596123f1

Conflicts:

	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/res/layout/status_bar_expanded.xml
	packages/SystemUI/res/layout/status_bar_latest_event.xml
	packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/TrackingView.java

Conflicts:
	core/java/android/app/ActivityManager.java
	core/java/android/app/ActivityThread.java
	core/java/android/app/ContextImpl.java
	core/java/android/content/Intent.java
	core/java/android/content/pm/ApplicationInfo.java
	core/java/android/content/pm/IPackageManager.aidl
	core/java/android/content/pm/PackageParser.java
	core/java/android/content/res/AssetManager.java
	core/java/android/content/res/CompatibilityInfo.java
	core/java/android/content/res/Configuration.java
	core/java/android/content/res/Resources.java
	core/java/android/os/SystemProperties.java
	core/java/com/android/internal/os/ZygoteInit.java
	core/jni/AndroidRuntime.cpp
	core/jni/android_util_AssetManager.cpp
	core/res/AndroidManifest.xml
	data/etc/platform.xml
	include/utils/AssetManager.h
	include/utils/ResourceTypes.h
	libs/utils/Android.mk
	libs/utils/AssetManager.cpp
	libs/utils/ResourceTypes.cpp
	media/java/android/media/Ringtone.java
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/TrackingView.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/PackageManagerService.java
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/am/ActivityManagerService.java
	test-runner/src/android/test/mock/MockPackageManager.java

Change-Id: Ibefc480062e356805e979d0326d7d95fd2f4a60d
TD4 Prepa
JSF Myfaces
JSF Myfaces
README.md alterado
added ability to pass the appropriate classLoader to Akka
Add ignored files
Remove binary files which can be generated from source files
[indicator-sound] Drop GTK 2 build
Partway through switching from ranged to melee
Added new material for Thursday
Update notes for submitted changes

* Rails 3.2 app to test assets:precompile
dropped debianization
added paging to find_datasets, added find_view_details
Remove some bugs for iPhone for Vacations
Versión 2.11

+ Código JS para salida y entrada de perfiles con tecla Escape y Enter
Fixed next spamming. Back is disabled. Added DockType to LocalTrans.
Merge "Fixed next spamming. Back is disabled. Added DockType to LocalTrans."
added functions for compute forces and tests
Stop testing on GraphicalSystem
UCJEPS-121: Patched RecordSearchList.java with the advanced search fix (collectionspace/application commit 4b803f2164eca5230d8ac24554454018ced74e02)
UCJEPS-141: Removed tbe include to ObjectExit and Acquisition from our-tenant-tenant.xml
Add routes file

Signed-off-by: Chris Toynbee <ctoynbee@gmail.com>
Merge TodoMVC example, by replacing the mirror version with the template_tool version.

Review URL: https://chromiumcodereview.appspot.com//11053006
Fix browser_test to work after latest merge
Also make it work from file:// URL.

Review URL: https://chromiumcodereview.appspot.com//10905121
Removed obsolete compiled class
Implemented dateutil's relativedelta Class, for correctly getting the previous months last day (with year correctly catered for) and next months first day (with year correctly catered for)
Auto updated to indexes
Added today as datetime for events calendar view
Removed debug line
Added Server Side Event (SSE) / EventSource example
Corrected SSE controller
Updated wp-config.php
added post_name() function to functions.php
Merge branch 'responsive'
Changed More Info links to display block, to center them
Corregidos bugs menores
- Corregido fallo a la hora de editar los parametros
strip spaces
use $.inArray (indexOf not in IE)
Refactor Channel to ChannelMetadata, spec it
Wuerfel Augen
Update README.md

upgrade php & apache
add php zip support
Première partie de la re-rédaction du code

But : Un code plus léger, lisible, et rapide
getTweetById() should check rate limit, the tweet id is included in
$base URL string.
All those 'var' statements are making me nervous. Use let everywhere, reworking code flow a little where necessary
Add unit tests for base sidebar functionality
wijziging methode controleDag en kleinerDan + wijzigin klasse DatumTest
Code Datum Noella ingevuld
releases/1.0-alpha-2.txt translation
Update intro/index.txt, intro/install.txt, intro/overview.txt, intro/whatsnext.txt to [17812] #162 #163 #164 #169
seeds and ids
Fix for an end_src.
Borrada version vieja del tp
added smushed and built a copy for DB
initial changes
added extra information
Added missing module __init__.py
Initial commit for crosscut menu API
New property exposed through API ui.contextmenu.enabled
Fixing lint error
Refactor webviews to support contextmenus as an API
Refactored blackberry.ui.contextmenu
Moved generateMenuItems from overlay webview into the API
Added actionIds to all the menu items.  Added touch listeners for the menu items which fire rpc into the controller.  Enabled listener in the controller
Refactoring the action methods into blackberry.ui.contextmenu
Mergin changes together in refactor
More refactoring context menu with actions now enabled
Fixing the invocation targets and menu
Fixing invocation after re-factor
Fixing export for enabled/disabled to work with re-factor
Menu unfolding first pass - outstanding long press change focus not resolved
Fixing some of the unit tests after large re-factor
Updating Test cases for refactor
updating test and lint cases for refactor
Test refactor for passing jake tests
Refactoring tests and the actions file
Adding missing action.js file
Add js to display delivery points on google map extract from json data (url)
Work on style.css on menu
Change classLoader (Compatible with Thrift include)
added jcr 223 support and some languages.
migrated to jcr-223 and added more languages
Changed README
Added fotki downloader
changed sample_{2,3}_in.jpg size again
readme: add notice about being available in Debian
readme: indicate support for Transmission 2.52
add index href
Added UI elements for golem customization. No effect yet. Also started status table
added instructions for defining app id and og actions, objects
Finished application setup
Finished application setup
獵人cd
Configures application to use new Open Graph Election and Vote objects
add touzi
Added twitter bootstrap
Added settings file
Gem file name changed to avoid conflicts
ignore rspec file
neue textdatei
luajit2-2.0.0-1-x86_64

* version bump
mumudvb-1.7-1-i686

* new package
tracker-0.14.2-1-x86_64
* Version bump
digikam-2.7.0-1-i686

* version bump
darktable-1.0.3-3-x86_64

* rebuild with lensfun-0.2.6
kernel-3.3-4-x86_64
* bump to patch level 3
mercurial-2.4-1-x86_64

- up to 2.4
wapreader-1.1.2-1-x86_64

- bin, dead package
wavemon-0.7.5-1-i686

* version bump
ipbt-r9487-1-i686

* version bump
keepass-2.19-1-x86_64

* version bump
* reflect changes in sourceforge shema
jgraphx-1_10_3_1-1-i686

* version bump
keepass-2.20-1-x86_64

* version bump
polkit-gnome-0.105-8-x86_64
* Rebuild with latest polkit
glorious funtoo updates

merged:

  gentoo: a8835809c10d5bb0be12683e3e964aeb9d11bde0
  funtoo-overlay: 8267fbc10cf999c23d07c6ed3a54206973e732a1
  foo-overlay: 6d128ac65f6ebc196314bc1fa6473281b3cae87c
  bar-overlay: f4de124575d7b52467a0bfa4839a96eac3098528
  flora: accfdee6ca9a368924940a87b0b5acf2e4d8029b
Started #1129
Allows to use userMainInc for other things that users
Alteracoes de algumas telas e criacao de novas
Novo commit depois do pull
Correcao de bugs da versoa anterior
yah... nambah lagi...!!!

Signed-off-by: Gangsar Swa Purba <gangsar.swapurba@gmail.com>
No longer copying libDragon.so to PWD
Got rid of memcpy in ReadBufferOffline()
 Some changes (bug fixes) to the ODB and makefile... Now linking to the dynamic version of libmidas, which fixes issues with the ODB (previously the static linking resulted in 2 versions of globals, so connection to an experiment wasn't shared across different dylibs)
Doxygen only
 Made MidasBuffer bufsize dyanmic
Change in malloc method
 Fixed malloc bug, now disallow copy/assign for MidasBuffer
Played around w/ event buffer size and ended up leaving it the same - apparently some events are quite large (footers???)
Now reading variable values from ODB upon ConnectOnline()
Moved Scaler::set_aliases to bgin a template function - gets rid of the #ifdef USE_ROOT stuff
Doxygen
Doxygen
Changed comment fields of static const VME stuff, now it's not included in ROOT streamers
Moved histos.dat to home dir
Documentation mainpage updates
Pre-pull from jabberwock
Merge branch 'dev' of jabberwock.triumf.ca:/Users/gchristian/soft/develop/dragon/analyzer into dev
 Doxygen PLUS makefile update with -I/include part of CXXFLAGS when USE_ROOT == YES
Switched Makefile back to using the static version of libmidas (dynamic version wouldn't
compile on ladd06). To fix the "double linking" problem, removed multiple links to libmidas.
Now only libDragon links to libmidas.a - anything else needing midas should link to libDragon
anyway, thus it wouldn't need linking to libmidas.
Temp before merge
packaging: Updated cleanup to show error message to user (#818230)

https://bugzilla.redhat.com/show_bug.cgi?id=818230

* Updated engine-cleanup to show an error message during DB drop
about possible external connections to the DB and print it to
the user in addition to the log.

Change-Id: Ia11d0604f5e476f5359b7d13dc5bc3934f119897
Signed-off-by: Alex Lourie <alourie@redhat.com>
webadmin: removing VmModel

unused code.

Change-Id: I2f67e1b47e3933e3f0607af72e4359e30c01a552
Signed-off-by: Gilad Chaplik <gchaplik@redhat.com>
core: Random can-do-action message (#827014)

https://bugzilla.redhat.com/827014

A custom validator should disable the use of the default message, if the
validator intends to provide its own message, else if no default message
is defined, an empty string will be added to the can-do-action list,
ended up as blank message to the user.

Change-Id: I8c56651784e59d258753d1d25ac4546cc02ae915
Signed-off-by: Moti Asayag <masayag@redhat.com>
core: CommandBase: removed commented out blcoks

Removed commented out blocks of code that there was no purpose in
keeping.

Change-Id: I783c848000700360d050ec5deb77bed337f91cc2
Signed-off-by: Allon Mureinik <amureini@redhat.com>
engine: Run Once dialog ingores emtpy boot options (#857848)

https://bugzilla.redhat.com/857848

When you set the linux boot options in Edit dialog,
than in Run Once dialog remove this options, the run once will
use the boot options set up in the Edit dialog.

The problem was in RunVmCommand.refreshBootParameters method
which expected, that when the parameter is empty, it is run VM,
when it is not empty, it is run once VM, which is not true in
this case.

Fixed by moving the run once specific code to the RunVmOnceCommand.

This patch contains also the following refactorings:
- the refreshBootSequenceParameter inlined to the
  refreshBootParameters
- setLastStartTime removed from the refreshBootSequenceParameter
  and moved to places where the refreshBootSequenceParameter
  has been called

Change-Id: I32e59783d9c4d8e8b61ec96c6bae5577fc59756c
Signed-off-by: Tomas Jelinek <tjelinek@redhat.com>
engine: Add sync networks to Setup Networks (#838300)

https://bugzilla.redhat.com/838300

Added list of networks that need to be synced to SetupNetworks
parameters. The list allows to specify which networks should be
synched.

Setup Networks will now sync the network if it needs to be synched (i.e.
specified on the list), but if network is unsynched then it's not
allowed to be edited until it's synched.

Change-Id: I433e684f09b104c8eda82b21129bba3e019c58d6
Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
core: AuditLogDirectorTest: partial UnPowerMock

Used regular Mockito (instead of PowerMock) to mock DbFacade's behaviour
in AuditLogDirectorTest.

This change is incomplete, but it's a step in the right direction of
totally eliminating PowerMock from the project.

Change-Id: I77b34c76484feaa18887501fa40c55a7868f843b
Signed-off-by: Allon Mureinik <amureini@redhat.com>
core: Remove unnecessary methods in ImagesHandler

These methods are no longer needed, so deleting them.

Change-Id: I2c274f7a7ab85da764081319e4cdfa0642312d4b
webadmin: Control refresh behavior (#802378)

https://bugzilla.redhat.com/802378

This patch modifies the data grid auto-refresh behavior in the
following way:

- when the application window loses focus, the auto-refresh
  interval for each grid is set to 60 seconds (previously,
  auto-refresh timer was simply stopped)

- when the application window gains focus, the auto-refresh
  interval for each grid is restored to its original value
  (previously, auto-refresh timer was simply resumed)

Relevant focus handling logic was moved to AbstractRefreshManager.
Added 60-second refresh interval to refresh interval options for
all data grids.

GridController's toForeground() and toBackground() methods were
removed since they're not needed anymore (their implementation
stopped/resumed the UiCommon model's refresh timer).

This patch also does some cleanup regarding login logic shared
by both applications:

- AbstractLoginPopupPresenterWidget prevents common code duplication

- LoginModel fixes to eliminate TODO/FIXME application code:
  - LoginCommand is the "default" command
  - LoginCommand is added to LoginModel's command list
  - upon failed login, corresponding EntityModels (userName,
    password, domain) and LoginCommand are re-enabled again

Change-Id: I08c6dd9fe2c63d58b7a2d865552564d7e73425c2
Through a Product's Claim, a Chemist can assign a Label Claim to himself.
An Admin can assign a Label Claim to anyone.
+ ‘apps-symbolic/gnome/scalable/apps/documents-symbolic.svg’
Re relic
Add tests for media upload
More tests for media upload
Initial support for service accounts
Allow credentials on per-request basis
Resolve merge conflict
Fix IndexOutOfBoundExceptions on invalid repository URLs.
Fix more exceptions from invalid URLs.

URLs such as /screencast/show/<string> and 'show wiki tab' were throwing exceptions because of assumptions that the corresponding URLs were valid. So I've added some URL constraints and updated controller actions to further check request parameters.
Fix invalid method arguments and scope of methods in URL mappings.

The `populateVersion` closure had the wrong number of arguments for a method call. Fixing that then highlighted the scope of the private methods on UrlMappings was incorrect. Made them static as the mappings closure is static.
Update MySQL tables to InnoDB.

This finally brings transactional behaviour to the application. Most of
the work is done by the migration changelog, but some invalid data had to
be removed from the database first.

The app is now at version 1.2.18.
Added message for no results