labofsahil/github-event-dataset-2012 huggingface dataset:
Merge remote-tracking branch 'tapalilov/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'absolu7/master'
Merge remote-tracking branch 'snowsunny/master'
[wip] get initial exams /refactored/
[backbone] start templating grading
[wip/backbone] grading table heading
[backbone/table] all columns + portion scores
[backbone/wip] update db,on save handler, but not update layout
[backbone] make call to rails action to get calculation(just placeholder)
Merge remote-tracking branch 'absolu7/master'
mini fix
[view] add course group index
[fix] fix backbone path
test fix
[view] add course groups link in main menu
[view] show for course groups
[seeds] fix syllabuses seeds to create trough model
[gems] add attr_encrypted
[model][controller] add Student encryption
Further updates, day 3 of study
Merge pull request #160 from martinpovolny/csv-dep-fix

attempt to fix #158 -- missing csv dependancy
API: Deployments #index gives full resources

Both for /deployments and for /pools/:id/deployments.

Part 1/2 of issue #202.
API: Show hrefs of deployment collections

To distinguish between /deployments and /pools/:pool_id/deployments,
@pool variable had to be defined for deployment API #index action. There
was no apparent clearer solution. (I didn't want to go peeking into
params[:pool_id] from views/helpers. Checking if @pools has only one
element would not be enough either, because this situation can occur
even when listing all deployments, not just deployments of one pool.)

To keep things as unobtrusive as possible, the @pool variable is defined
only for XML response, to avoid defining a variable for HTML response
that would go unused.

Part 2/2 of issue #202. Closes #202.
Update spec and submodule to use converge-ui-devel-1.2
Merge pull request #221 from jeckersb/converge-ui-1.2

Update spec and submodule to use converge-ui-devel-1.2. Works for building new converge-ui-devel, and also tested 'make rpms' for conductor
Added tests for ODBundle calculator
added page tracking with page view
nuevo .sql, tiene algunos usuarios cargados
Removed ESR as a prerelease version
Adding readme and license
Updating ignore file
Updating Xcode to use "Latest SDK"
Plugins updated to latest version
Initial pass at sbt integration with vimux
Updated vim-scala to include the hooks for running sbt
Rm newline padding. Convert to 2-space tabs.
Fully working cycles-style node-based material ui

Nice!
- debug
got a few things done on the decoding method, and fixed the collision bug in the key creation.
Recruitment AI: rename recruit_type= to recruiting_type=
Trapping attacks now move units out of way

This fixes a bug spotted by nelson that previously moved trappers off
village(s) if they are next to the enemy already.
feito a parte para redimensionar e baixar as imagens da página
end and opening credits
Bug on initial street

Signed-off-by: Pamela McA'Nulty <pamela@webreply.com>
3x hermite results for N=100, eta=0.1
fix ticket #874, apply this patch http://drupal.org/node/1857706#comment-6845870
fixing bug where I forgot to reference core file
Add more elpa repositories.
Add feature-mode.
Add function to beautify json.
Rename hash-boundary to hashrocket.
Updated to account for Vlad's content scraper.
added class descriptions for displaying on the QueryBuilder page
Fazit hinzugefügt
Merge branch 'matze'
Merge branch 'master' into timon
javadocs for 2.3
Updated Forge to Build 312, added alternate method for Creeper Nest gen.
Pure windows commands
Misha's game version beginning
git ignore
Merge branch 'master' of github.com:michaelleb/SpaceShutter into Mishas

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex
	res/values/strings.xml
	src/com/andrapp/spaceshutter/Constants.java
	src/com/andrapp/spaceshutter/MainActivity.java
Moved file path creation to separate function.
Fixed input not being displayed
moving maldet config and updating post
chat
delete
Merge remote-tracking branch 'origin/ch_mn' into chats_desine

Conflicts:
	src/main/java/com/web/app/worldgames/domain/monopoly/GameBoard.java
	src/main/java/com/web/app/worldgames/domain/monopoly/Player.java
Merge branch 'master' of
ssh://git@github.com/milky-way-crew/WildWest.git into chats_desine

Conflicts:
	src/main/java/com/web/app/worldgames/domain/UserStatistics.java
	src/main/java/com/web/app/worldgames/domain/monopoly/GameBoard.java
commit 
monopoly
Merge branch 'master' of
ssh://git@github.com/milky-way-crew/WildWest.git into chats_desine
game commit
game next
com
Merge branch 'master' of ssh://git@github.com/milky-way-crew/WildWest.git into chats_desine
Merge branch 'master' of ssh://git@github.com/milky-way-crew/WildWest.git into chats_desine
monopoly Service manager
Merge remote-tracking branch 'origin/chats_desine' into mono-js

Conflicts:
	src/main/java/com/web/app/worldgames/listener/ContextLoaderHandler.java
	src/main/webapp/resources/js/test.js
No changes
Updated to 3.5.1
Updated to 3.5.1
No changes
Rewritten for performance in mind
Some minor revisions
No changes
More Windows fixes

AS_TRADITIONAL_FORMAT not set if cross

--with-{as/ar/etc} use EXEEXT

Split gid_t, uid_t checks

 as uid_t now provided by mingw headers, gid_t is not
mingw-w64 fixes

uid_t, gid_t, caddr_t configury fixes

force use of autotools-2.59 from autotools-20101121-chmod_fixed.tar.xz
Testing no orientation pref.
Changed %e to %f in test printout. The output of %e is non-portable.
Remove warning
Merge pull request #144 from maxcanna/Customizations

Remove warning
Fix for NSJSONSerialiation crash
Fixed problem with NSJSON when base SDK is < 5.0
Merge pull request #148 from semka/master

NSJSONSerialization on iOS 4.x fix
Cleaned up NSJSONSerialization code
Fix issue #133: invalid test for 1st batch of data in didReceiveData
Merge pull request #150 from epyx-src/master

Fix issue #133: invalid test for 1st batch of data in didReceiveData
Removed a macro if
Copyrights changed
Post Data encoding fixed after frozen operations are resumed
Merge remote-tracking branch 'MugunthKumar/master'
migrate README to AsciiDoc
Added homework #2, lecture 4, and other stuff.
New modules devoted to samples and initial version of the DSL for mediation composition
Binding between the internal DSL and mapping repository
Moved download_theme function to new OO module.
There files were not in use inally.
missing import.
mrepo has moved to https
Bug 493544 - Don't decode the encoded text until it ends. r=smontagu
Bug 805440 - Mozrunner installed from pypi when running setup_development.py;r=jgriffin, DONTBUILD, a=NPOTB
Bug 800102 - Work around adb deadlock when installing gecko in emulator, r=ahal, DONTBUILD, a=NPOTB
Bug 800102 - Retry adb push if it times out while installing gecko, r=jgriffin, DONTBUILD, a=NPOTB
bug 818454 - backout change from bug 722137, no longer needed. r=smontagu
Bug 782818 - Temporarily enable compartment assertions (r=luke)
Bug 773214 - Make AddonInstall/AddonInstallWrapper aware of different icon sizes; r=Unfocused
Bug 786688 - Part 1: Add chrome only openForPrincipal() and deleteForPrincipal(). r=bent
Bug 786688 - Part 2: Code cleanup. r=sicking
Bug 786688 - Part 3: Automatic tests. r=sicking
bug 753022: debug builds should have marionette enabled and tested. r=bhearsum,ted
Bug 780653 - Make CellIter work during incremental sweeping (r=jonco)
Bug 819342. Start generating gaia-tests.zip. DONTBUILD. r=aki
Bug 781439: Trim js/src/jit-test/tests/debug/Environment-find-06.js, and remove assertions. r=luke

slotCount() is O(n) on BlockObjects, so that, when used from a loop, those
assertions brought about quadratic behavior. The test creates 'let' blocks
with thousands of bindings, making the quadratic behavior show.

The assertions are unnecessary, as getSlotRef and setSlot do their own
bounds checking. I believe the test can be just as effective with smaller
'let' blocks.
Remove aPresContext parameter to nsStyleContext constructor and document parameters to constructor.  (Bug 791416)  r=bzbarsky
Bug 774169, patch 1:  Make the property_database.js-based tests call getComputedStyle() for all properties that are expected to have longhand behavior.  r=bzbarsky

This currently only affects the testing of overflow, but it will also
affect -moz-transform (and any other aliases implemented the same way)
after the later patches in this bug.

This special-cases text-decoration because text-decoration: inherit causes
the color to inherit in a way that we can't serialize the result (since
it's no longer "foreground").  (This isn't great; we might want to
consider fixing it somehow.)
Bug 774169, patch 2:  Add property_database.js entries for property aliases.  r=bzbarsky

This adds entries for property aliases as though they are shorthands.
This fits with the CSS working group's recent resolution to describe
aliases as shorthands, recorded in
http://lists.w3.org/Archives/Public/www-style/2012Aug/0770.html .

The property_database.js entries themselves are copied from the
non-alias entries for the properties, with these changes:
 (1) The property name is changed to the prefixed form
 (2) The domProp entry is changed to the prefixed form
 (3) Adding alias_for entries for each property.
 (4) When type is CSS_TYPE_LONGHAND in the target of the alias, type for
     the alias is CSS_TYPE_SHORTHAND_AND_LONGHAND and a subproperties
     entry is added with the target of the alias.

There are also some indentation fixes to the copied entries in
property_database.js (made before they were copied, and thus affecting
the original as well).
Bug 774169, patch 3:  Treat -moz-transform as a shorthand rather than an alias so the parsing function can know whether it is parsing a prefixed transform.  r=bzbarsky
Bug 774169, patch 4:  Revert bug 719054 for prefixed -moz-transform but leave it for unprefixed transform.  r=bzbarsky
Partial fix (all but test_0201_app_launch_apply_update_svc.js) for - Bug 762032 - Intermittent test_0201_app_launch_apply_update.js, test_0201_app_launch_apply_update_svc.js test_0203_app_launch_apply_update_svc.js | WindowsError: [Error 13] The process cannot access the file because it is being used by another process: '...helper.exe'. r=bbondy, a=test-only
Backout Bug 810164 due to bustage. r=bustage
merge backout
Bug 765411 - about:home loading performance optimizations. r=dao
Bug 730574: handle quoted-string unescaping in RFC 2231 continuation parameters. r=jduell
Bug 778560 - Fix typo that prevented JS from ever using zlib. r=dmandelin
Bug 777190 - Don't compress files with huge strings; reenable source compression. r=jorendorff
Bug 779010 - Use nsStyleCoord equality operator to compare nsStyleSides and nsStyleCorners. r=dbaron
Bug 776606 - Possible chrome-level JS injection attack with user portraits in the Social API. r=gavin
Bug 804460 - Patch 1: Failed to set audio stream volume to correct value by bluetooth headset, r=qdot
Bug 804460 - Patch 2: Failed to set audio stream volume to correct value by bluetooth headset, r=djf
Bug 770524 - Fix FuzzyEqual to not return false for equal floats which are smaller than -2048.0f. r=roc
Update pom.xml to version 1.0.6.1
Added optional block for find method
add CSVDE details
player ok !
Merge branch 'development' into bug/bja/paste-plain-text
Merge branch 'bug/bja/paste-plain-text' into development
Update description and add munging.

Munge tag values. Add munging for policy tags.
make package optional.
eGurukul.PersistenceLayer project committed
added code to remove items from the list
Open links to Wikipedia in new window/tab.
Use the 'W' favico instead of the official Wikipedia logo.
Make google static map fit into fieldset.
Use other context for classification level. Avoids translations like Order (en) => Reihenfolge (de, should be Ordnung).
add function to get an artgroup
add style for observation show
update observation array to bee fully informal
add functions for observation show
fix a wrong funtion name
add file
function for show a observation
add site title
add template for show an observation
functional update to show obs
Add functions for custom attributes
update form reset functions
add function for custom attributes
update to work with the new observation data
add to work with custom attributes
add function to delete custom attributes
add function to save/update custom attributes
add a  new path for update a observation (with acl check)
update the table fields
editing work now
update that custom attribute work
add custom attributes delete icon
add function to delete custom attribute
add path to delete custom attribute
add possibility to edit a geometry for annother module
fix editing map 
Merge remote-tracking branch 'origin/ramongamma' into retoschneider
Enstandene Probleme für Dokumentation
Updating BaseForm & MainForm
Catch :task_has_failed on the cli. (Fixes #88)

Since the server throws the Guard symbol :task_has_failed
to exit quickly, the cli wasn't catching it at all, leading to an
abrupt process termination and leaving the server running.

Now that :task_has_failed is catched, the cli runner tries to
run the specs anyway and terminates the server properly if
the runner is not available.
Customized welcome page
Added a line to Done-Done
Added the gemrc and the gitconfig
Removed redundant parameter in Setup constructor.
Multisite settings conf added
added regex.rb
images added now
Add CakeNumber::fromReadableSize() and Validation::filesize()
Update lib/Cake/Configure/IniReader.php

Copied standard path from PhpReader
Update lib/Cake/Configure/IniReader.php

Updated docblock and set NULL as the default value of $path
Remove unused variables and code
Merge pull request #810 from schrolli/patch-2

Update lib/Cake/Configure/IniReader.php
Merge pull request #818 from shama/patch-unused-vars

Remove unused variables and code
remove cookie reading in startup
Added MailTransport test class refs #2824
Fix parsing '0' as a url.

Fixes #3198
Fix notice error.
Fix failing tests in PHPUnit 3.7.0-RC2
Revert "Fix failing tests in PHPUnit 3.7.0-RC2"

This reverts commit d26040e3aa2173dfc3562ceb522287eb1083a5db.
This change causes tests to fail in PHPUnit 3.6, this will have to wait
until 3.7.0 stable.
fix incorrect docblock
Forward model option to PaginatorHelper::link().

Fixes #3193
Fix required field detection.

Fix required field detection to match documentation and behavior when
validating. Having `allowEmpty` in the first validation rule, makes the
field not 'required' as the field is allowed to be empty.

Fixes #3194
Make connection exceptions more helpful.

Fixes #3204
Tidy doc block.
Fix null not stopping model callbacks.

Add a compatibility shim into CakeEventManager to fix `null` not
breaking model callbacks.  This was a regression created when model
callbacks were re-factored to use the event manager. This code should be
removed in 3.x as its inconsistent with events used everywhere else in
the framework.

Fixes #3123
Revert "Fix null not stopping model callbacks."

This reverts commit 82a8400deff6fe56f3ea2b3bc8c59556419d1075.

The previous change broke a number of tests as existing tests expect
that a return value of null will not stop events.
Handling a fatal error on console should call Shell::_stop(1).
Just like we do on web, any exception or fatal error will result into a InternalErrorException/FatalErrorException.
Add missing urlencoding to nested named parameters.

Fixes #2988
Clean up Router tests.

* Fix long lines.
* Remove dead code.
* Fix commented tests, Router::parseExtensions() with no parameters
  no longer parses every extension.
Update to last BukkitUtils
Make component system more flexible.
Clean up
Add missing permissions inheritance
Add useful.inventory.open.notify permission
CODE STYLE messages_Delete.php
New Opencode stuff
SITE: changed charset from utf-8 to [2~
API: corrected various api glitches
APP: added geolocation
Update src/edu/sju/egroup/AddLocationActivity.java
Cleanup.
Merge branch 'master' of https://github.com/nseidm1/LoadingFragment.git
Rework to add variables to the CDS objects
Merge branch 'topic/cds' of github.com:nstchedroff/OG-Platform into topic/cds

Conflicts:
	projects/OG-Analytics/src/com/opengamma/analytics/financial/credit/cds/CDSApproxISDAMethod.java
fix jumping up walls
webgl texture working
NXCT-1: Add newest launcher as "altnuxeoctl" to use new functionalities (packages/connect) on older distributions
NXP-9417: Avoid NPE on UserManagementActions#selectedUser if opening a new tab then trying to update user preferences
Starting time class
'acc_add'
All images now being drawn from single sprite sheet
Add section on programming
fix virtuaenv path variable
Updated README.md file with Contributor procedures.
Fixed an invalid procedure in README.md.
Made another correction to README.md.
Merge pull request #1 from rafidzal/feature_001

Feature 001
Merged the update of the README.md file into the develop branch.
Initial port of the OpenADK project from LaunchPad to GitHub.
Initial port of the OpenADK project from LaunchPad to GitHub.
Merge pull request #2 from rafidzal/feature_002

Feature 002 - initial port to GitHub
Port the .NET code from LaunchPad to GitHub.
Remove spurious copy file.
clear store before load and make sure list does not remember selected item
Compiled documentation removed

Should you need it, just compile it with the provided Doxyfile:
./doc/doxygen/uros.doxyfile

Andrea Zoppi
Downgraded missing term migrate exception to warning.  #725

An uncaught migrate exception will halt migration.  One of these was holding up biblio term migration because a term was missing.  Changed it to a logged warning, so the rest of migration can proceed and we can troubleshoot the missing term.
IQSS Theme: more style edits (Merce)
#719: Change unset() to #access = false

I glanced through comment sources quickly, and it seems that it expects the comment settings for every node type in the same form. If a node type isn't in a given form, then its settings are bulldozed. Changing the unset() call to set access = false instead seems to fix the issue.
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into master7
Add memcache modules to openscholar
Remove 'filter' session information from biblio, TODO this will need a proper patch, #1159
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
#24: Close the colorbox modal when we open an overlay.
#166: Use after_build to prevent advanced options from appearing if there's nothing there.
Found where the error was, needed to add image type as an EFQ condition. #1232
reform the get_all_gears call and add capability to reserve a specific uid from a district
Merge pull request #953 from rajatchopra/master

improve get_all_gears call
Added basic ASCII output. + Several fixes.
languages updated in plugisn
committing - tweet & github version 1.8
First commit this index page
added item amount
Adding graph stuff for presentations.
presentation ready!
Revert: Set CONFIG_MSM_CPU_FREQ_MIN=480000 for better response after sleep.
13122012
added plex media center - media app
add a sidebar block about LinkedIn
Merge pull request #49 from parisjs/linkedin-link

Add a sidebar block about LinkedIn group.
Enhance install / BASE_PATH
Fixed some broken code for Retina 4" screen support with the postContent UITextView resizing upon rotation.
Autoload StepFabricator upon access of Cucumber
Fix to text rendering for single lines. Tweaked the Stars camera, again.
fleeing and feeding working - but not both at once
tempo, playback
fixed conflict
Improved the import_titles script
import_tex now links to the correct URL and it has nicer output
Started using a config.py script
Moved all Python scripts to the scripts/ directory, using scripts/config.py in all scripts now
First draft of a static browse page
Dynamic (up to a certain extent) browsing page
Fixed the LaTeX escaping to HTML escaping issue with \'Etale and added the browse page to the .htaccess
Adding try catch blocks to the database interaction code and fixed an issue in the table
Implemented the RSS feed containing recent comments
Implemented POP operations. Fixed PUSH operand read is now a NOP.
Added Integration tests for ADD, SUB, MUL, DIV and MOD operations.
Added unit test to verify that POP increments StackPointer.
Fixed loop regions
specify std::dtring
CPAN preparations

Ticket: 59 (8af01bf2-7400-41fc-8d01-5d535f1b7d13)

  Rename to 'Debug-Fork-Tmux'

  'Debug-Fork-Tmux' is a more appropriate name for the module. This includes
  but not limited to:

    - Namespace change from Spunge::DB to Debug::Fork::Tmux;

    - Repositories rename from Spunge-DB to Debug-Fork-Tmux.

Ticket: 61 (4d0f20cf-f671-41ac-b8aa-1f6b42e8c1b4)

  Skip tests when no 'tmux' binary found

  Tests should be skipped if any of this:

    - No 'tmux' binary is found for execution;

    - 'tmux' binary returns the version < 1.6;

    - test is trying to run not under Tmux.

  'TMUX' environment varuiable seems to show if we're under Tmux.
Fix for issue#97 (Pass project as a parameter in the request)
eclipse removed
set default runs to max int, rather than 1
BeautifulSoup is not required.

It used to be required when inlines were built in.
Add "UseOpenGLDXTnTextures" to graphics settings via "config.ini".
Add it to the video settings passed to renderer.
Propagate compressed texture flag through renderer(s) and down to TextureGL.
Requires some more thought, also think glTexSubImage2D call will need branching to compressed variant (if possible).
Switch to using working enums for the format DXT1 and DXT5.
Correctly calculate the image size.
Still puzzled why the glTexSubImage2D works... at all, worrying and slightly perplexing.
Appears that I misread the doc's glCompressedTexImage2D is for loading in textures that are already compressed, to get the driver/GPU to compress textures before use you just have to pass the compressed texture type into the usual glTexImage2D function.
New settings text in languages for COMPRESS_TEXTURES, also change to two existing strings OTHER_GRAPHICS_SETTINGS and USE_SHADERS.
Just a comment
Add the toggle button for COMPRESS_TEXTURES text and to alter the relevant config setting.
Allows player to toggle texture compression by the driver on or off.
The toggle button is only added *IF* the extension is supported by the opengl version, done via glewIsSupported.
Implement Loumo's suggested changes.
Merge branch 'OGL_DXTn' of github.com:fluffyfreak/pioneer into OGL_DXTn

Conflicts:
	src/graphics/Graphics.cpp
Fix the line endings, got mangled somehow.
Make GameMenuView use the "UseTextureCompression" config.ini string.
Correct the line endings.
Remove the check that conditionally adds the texture compression.
Removes the dependency on Glew from GameMenuView.
Decided to do this rather than query the renderer as it is more consistent with the other toggle buttons.
Added support for texture compression to the texture descriptor and TextureBuilder classes. This means that most textures will request their textures are compressed whilst UI textures won't be.
Merge remote-tracking branch 'fluffyfreak/OGL_DXTn'
Fix warnings in ObjectAL
Standardise return values of GetStaticType
Add initial dynamic body component
SQL Klasse vorbereitet
Don't let the docking windows steal focus when they're open
update to 21.0.1180.57, adobe-flash 11.3.31.222
- use make -j1 to avoid "Unbound module" errors
- import

Changed files:
    python-ooolib.spec -> 1.1
Move KSS-specific CSS to plone.app.kss.
Remove plonekss.css registry entry.
Move content_status_modify script from Products.CMFPlone to plone.app.content and transform it into a BrowserView
adding folderpublish view
register content_status_modify view and folder_publish view. Merged them into conten_status_history view
clean up code
split in seprate views
added contentstatusmodify view and folder publish view
Fix typo and added content_status_history form browser tests
Update changelog and change permission to accss content modify views
Merge branch 'mat-plip-13260-content-status-modify' into plip-13260-cpy-removal

Conflicts:
	CHANGES.txt
	plone/app/content/browser/configure.zcml
Work on the Logger Class
Correction des tabs/espaces
Only create/copy project if it's not already there, for now
Fixing HTML mistake
Let list schema customize the list *item* template with 'listItemTemplate' option
docs for listItemTemplate
Merge branch 'list-item-tpl' of https://github.com/elasticsales/backbone-forms

Conflicts:
	README.md
Merge branch 'fix-userinitiated' of https://github.com/elasticsales/backbone-forms

Add addItem docs
Use newer minimum south dependency
Add a static page controller
finish static page
Create error and success text styles.
Change well-small paddings.
ajout des statuses lors de load:fixtures des places
fel model implemented
fixed my merge stuff
Added solution to question 4.1. And corrected the mistaking of 4.2 to 4.1.
Transacciones JDBCs 2º Iteracion terminadas
Merge branch 'master' of https://github.com/psylock/Diaketas-Manage.git
Initial commit
initial app structure
ignore eclipse project
shows the month!
can advance to next month
Add bootstrap
month tick skeleton
add underscore
Cleanup
move sources to /src/
show budget, add skeleton equipment
Apply happiness to occupants.
CrappyBoiler consumes energy
Move occupants.
game knows weather
Fix styles. Using express now
CrappyBoiler makes people unhappy.
Change bg colour
show weather
Boiler unhappinesss is based on average low temperature this month
Added new file
text added
Keep RSS articles sorted by date in memory do avoid sorting them all the time

Optimization to address issue #34.
worked on less warnings during build
comentarios y contacto
Added infinity function
NOJIRA rev minor version of artifact id
updated cookbook from tracing-chef
Use 'unstable' instead of 'hg' to load development builds
adicionando parte 3 e 4
first commit
Commit inicial
Merge branch 'master' of github.com:rafaelvzago/c_faculdade
Talk about nested permit
Bump gem now that we support nested permits too
Fix end-of-buffer edge case for duplicate-line
update structure, add example RSS feed
Merge branches 'rubyProblems' and 'master' into rubyProblems
Merge branches 'luaProblems' and 'master' into luaProblems
Merge branches 'master' and 'luaProblems'
Merge branches 'master' and 'rubyProblems'
Ported the heartbeat fixing from Inspire branch
Removed stylesheet by TeK
Postgres for production
Gemfile update after postgrsql changes for production
Updated some files for UTF-8
Rollback from previos db-migration
removing unnecessary files from repository
included example how to use the API
Adding flickr social icon support to pelican.
Password input strange behavior

If no password was present, a password was being inserted.  This should
prevent that from happening.
edit by basco
TODO update.
A little code clean up and documentation.
Own php snippets
specify version of connect and express
use node 0.6.16
on connection error try to log in
on app cache update ready reload form
Added UnparseAsTextHandler.
Updated the plug-in for the commands. Includes the SerializeHandler for
debugging purpose.
Fixed problem with instantitation if feature group refers to prototype
but prototype has not been bound yet.
Support the p4api 12.2.

This adds support for p4api 12.2. The main differences that affect us is
that P4Error was renamed to P4Exception, and there's a different error
when we can't reach a server (for repository not found).

This change adds compatibility for the new API, which we'll be able to
switch to later, hopefully successfully. It also keeps compatibility
with the old API for existing users.
Update our settings documentation.

This updates our settings documentation to cover all the changes that
were made in 1.7 (and even some that we made late into 1.6). That
includes new settings like the cache fields and max diff size.

The optimization page also got some changes. It was referencing
CACHE_BACKEND, which is gone, and so was updated to point to the Cache
Settings. While I was there, I added an important note to the web server
scale-out docs.
Added some overview docs on extensions and management.

These docs are somewhat basic, but give a summary of what extensions
are, some basic info on installing them, and what to expect on the
Extensions page.

We can probably fill these out more later, but there's not really a ton
to say at this point in time anyway.
Replace the Windows installation docs.

The Windows installation docs are gone now. In its place is a note about
why we don't support Windows, and some alternatives. These include
trying it yourself anyway based on older docs (and a mention that we
don't support it), using Linux (optionally in a VM), and using
RBCommmons.

Let's see how long until people get mad at us.
fixed super_counter_test
fix a bug in solver
Fix some more head glitches but not all.
Make the head look around when the player looks around. Creepy!
Updated to include nodeunit integration
final commit before first attempt
adding models controllers etc.
add squishy header template and fix minor syntax issues with Double Mobile Menu
'arquivosApresentacoes/qualqué coisa.doc' deletado
updates to graphing
Show routing key and improve client building
Renamed project to BitBuilder.
Initial commit
First test
Second test
Removing files
Merge branch 'gh-pages' of https://github.com/rodrigograf/blitz-fonts into gh-pages
Test font-files
fix package install failure - README.md missing from manifest
photos
resolved conflicts
Added outro stuff, enhanced animations, fixed bugs, created remote gui
Update LittlePyGame/README.md
modified from local repo repo_temp on br exp2
using getTreeDepth to define the amount of pointcloud instances required for voxel rending
Merge pull request #96 from jkammerl/groovy-devel

using getTreeDepth to define the amount of pointcloud instances
Merge pull request #4 from rosstimson/master
Switched to 130 chars per line, closes #6
Adding HAML definition.
Add config options to automatically generate LDAP attributes for new entries
Updated Changelog
Merge branch 'master' of github.com:roundcube/roundcubemail
Features to App Requirements, Cucumber Folder Convention
fixing optical flow based reconstruction
looking for bug and adding OpenMP to some loops
Only creating threads for the tasks defined in the project.clj; renamed all task to haml-sass task (I was affraid all would be confusing/conflicting with other plugins)
Adding some begining of usage documentation
Fourth Commit - Added at_subtheme & business theme
Bumped version in getting started
renamed:    main.c -> sol_4.c
Solve problem #5.
added transition/title screen background sprite
Merge branch 'master' of https://github.com/schonstal/ludum-dare-24
Added MapView support - zoom in/out/to, list markers.
Attempted to implement "pinch to zoom" but it doesn't seem to work.
Scenario Outline works.
Added assert_no_duplicates_in_grid
Added FeatureNameMemory.invocation and changed "feature_name =
scenario.feature.title" to "feature_name = scenario.feature.name" to
enable screenshots for each invocation of a Scenario Outline.
GetMapMarkers was adding duplicate results to the static
Result.sucessfulResult.
WaitForViewById is used by new Actions GetViewProperty and
AssertViewProperty.
Added GetMapBounds, GetMapCenter, GetMapMarker, GetMapZoom, PanMapTo,
TapMapMarker, TapAwayFromMarkers, 
Added get_list_item_text action.
Added wait_for_tab and select_tab actions
Added get_activity_name action
Added get_list_item_text, assert_no_duplicates_in_grid, 
assert_view_property, select_tab, wait_for_screen
introduce is_enabled for View
Added get_list_item_properties action.
Merge remote-tracking branch 'origin/master'
merge with latest master branch
merge with master
Check execute_javascript syntax + handle exceptions
Removed map classes to make it easier for Jonas to merge
Merge remote-tracking branch 'origin/master' into no_maps
Merge pull request #79 from leviwilson/is_enabled

introduce is_enabled for View
Merge pull request #85 from plaa/master

execute_javascript updates
Ignoring url prefix
Version 0.2.11.

Added is_enabled action that determines if a view is enabled.
Cleaner return values when executing javascript.

Thanks to @plaa and @leviwilson for contributions.
Adding more documentation to the Util module.
working on config file systems
deleted:    ati/amdpcsdb
	deleted:    ati/atiogl.xml
	deleted:    ati/authatieventsd.sh
	deleted:    ati/control
	deleted:    ati/signature
	deleted:    Xorg.0.log
fix :development
fix environment
Set table td width to 100px instead of 75px.

Fix different table td width at admin dashboard.
Revert "Merge pull request #10 from sigmavirus24/master"

This reverts commit 691050ca311e1f87250962d94a3926f71d48cb2c, reversing
changes made to 9c1a974f14d8a70527285df4e02f6346ea9681e9.
Added support for C# generic type constraints on methods.
Use indices from shalma
switch to handlebars.js templates
Test Fixes - portal/controlpanel/roles
Test Fixes - portal/controlpanel/roles
Source formatting - rename confusing parameter
LPS-30708 Reverting b2cdb36
Add simple win lose
Couple of warnings.
Better diagnostics, and finish Linux.
copy() recessively copies a folder to the set destination
HelpCenter template with conditional fields
Receive message switch extended to all messages to avoid unhandled messages
Reached previous spline drawing by using trajectoryEditable in wp Manager. Splines going through Golf of Guinea (0,0) and not updating yet
notifyOfChangeEditable did only emit signal for QGCWaypointList.. Emit also other signals and now trajectory is always at right position
Working version of spline interpolation in 2dmap
Debug: Investigating texture bindings during busy progress
Fixing dedicated mode
qmake|Mac OS X: Improved configuration robustness

Allow using the QTDIR environment variable to override the default
Qt frameworks location.
Dedicated Mode|Fixed: Engine startup works, keyboard input via curses
Dedicated Mode|Unix|Fixed: Keyboard events via curses
Mac OS X: Hide dock icon for Doomsday.app

Currently Doomsday.app is internal to the "Doomsday Engine.app"
bundle and is not launched independently. Also, in curses mode
the icon should not be shown, as the app must behave like a regular
text mode app.
libdeng2|Documentation: Small apidoc update for Writer and Reader
libdeng2|Guard: Minor tweaks
Builder: The Snow Leopard builder targets 64-bit arch

Use "64-bit" in the platform ID on Snow Leopard.
Builder|Mac OS X: Allow skipping the wait for an updated Doomsday Engine.app
Replaced old master server comms with Qt based MasterWorker

libcurl is no longer needed. Also gets rid of the extra thread that was
reserved just for talking to the master server.
Removing libcurl from the repository
Cleanup: Deleted obsolete and unused code
Refactor|Window: Separate private header for consolewindow_t

No need to have platform-specific headers present everywhere
(previously via sys_console.h).
Network: Always initialize network by default

By default the network is started in client mode. This makes the network
subsystem always available right from the start.
Multiplayer: Messages from system operator marked with [sysop]

Chat messages sent from the dedicated server are now marked
as such.
Network|Fixed: Basic network communications via de::Socket

Also, cleaned up console messages printed by the network subsystem
so that they are more user-friendly.
Multiplayer|Fixed: When server stops, forget all client IDs

The server was remembering an old client's ID after having been stopped
and started. Reconnection of the client failed because the server thought
there was someone in the game with the same ID.
Network|Fixed: Closing sockets properly

When a ListenSocket is deleted, it automatically destroys all socket
instances that have been created by it.  Now de::Socket notices
when its socket is gone.
Win32|Fixed: System/Qt header include conflicts
Tests|libdeng2: Added the vectors test

Also modified the Vector template classes to remove the automatic
casting to String, as that can easily cause some unexpected
conversions.
Fixed: Define qchar_strlen() inside the 'de' namespace
Tests|libdeng2: Added the Record test

These tests, including the script test, run de::App in non-GUI mode.
Fixed|libdeng2: Log message wrapping cutoff

If a log message contained an empty line (..\n\n..), the message
printout would be cut off.
Tests|libdeng2: Added the Archive test

Tests reading and writing ZIP archives using de::Archive and de::FS.
Add status bar

Issue #10
version 0.1.3
version 0.1.4
Throttle sleep now works, will sleep as instructed by server, then try again.
GUI와 다른 클래스들 결합시킴
petbottle
petbottle
petbottle
Removed write dialog from DisplayFileActivity
[Fix #41] Do not truncate the commit id
Remove unnecessary key bindings
[Fix #75] Bind history-substring-search in itself
Remove the vi what-cursor-position binding
Remove the vi beginning/end-of-history bindings

The bindings do not work as expected, and begging-of-history is pretty
useless.
Rename keyboard to editor

It is not the keyboard that is being set up but the Zsh Line Editor
(ZLE).
cleanup
site update
version bump to 4.1.3
vdfv
dfb
paper edits
paper edits
fix if
more zset commands
one zset entry left then on to blocking code
add a test for bytekey equals
groups
command grouping support
group the implementations
Switched to Builder on real main(). Changed all strings in builder
interface to const char*. Fixed some builder bugs and enabled debug-mode
compilation.
Removed user project description (.creator.user) from repo. DO NOT DELETE YOUR ONE, JUST KEEP IT UNTRACKED.
Support for the Sydney region
Added a reference to Python's standard csv module.
Fix temp_gc
Added note about firewall to troubleshoting doc
Attribute task failure messages to the correct host. fixes #267.
discooutputstream: check outputstream size and hunk size
Merge pull request #272 from dangra/chunker-forgets-hunks

Chunker forget chunks if input matches hunk size
Merge pull request #266 from stillinbeta/master

Added notes about firewall to troubleshooting doc
Merge pull request #264 from jamii/master

Fixes regressions in temp_gc which prevent purged jobs from being deleted
Merge pull request #253 from JensRantil/master

Documentation improvements
Make gc_get timeout longer in ddfs_gc. Closes #268
Change ddfs_gc back to normal priority from low priority, to ensure that GC'ing does not starve when master is under heavy load

related to issue #268
Change shuffle back to normal priority from low priority to make shuffling faster in a heavily loaded system
Fix worker protocol document. Closes #273

Thanks to https://github.com/LukeHoersten
add release notes for 0.4.1
Merge pull request #276 from pmundkur/patches/issue267

Attribute task failure messages to the correct host. fixes #267.
Another fix to the worker protocol document.
make ddfs xcat and chunk input consistent with other commands
add scheme_dir finally
add a simple dsorted function to disco.util for easy disk-sorting
bugfix: read correct number of bytes for jobenvs from packed jobpack
assign default value for enc parameter passed to jinja2_cui.render.load_contexts()
Objects passing.
complete postcode cart and session management
Removed session id - not needed anymore
Removed unnessecary properties
Basic statistics
Merge remote branch 'pullstream/master'
Merge remote branch 'pullstream/master'
excluded new algorithms from benchmarking
back to normal
excluded randomsampling for now (not stable yet)
Merge pull request #46 from honkdamonk/master

excluded randomsampling
added global_assets
Added ruby reaper, expiration attributes
search the path for bash
Report events back to iframe so these can be tracked to GA in turn.
Changing featured project captions
Updated to use namespace aware parsing indsl4xml perf test
Install "File-line" bundle as a submodule.
Fix namespace problem for Spree::Core::FileUtilz
HPCC-8013 Ecl Packagemap add needs to add logical file info to dali

Fix issues mentioned in code review

Signed-off-by: Stuart Ort <stuart.ort@lexisnexis.com>
[AS7-4332] - Allow expressions for messaging attrs

* allow expressions for some attributes that may be
  configurable depending on the hardware running them
  * size of pools
  * memory
[AS7-4322] Add support for RepositoryContent API. Add Resolver extension API
[AS7-4395] Downloaded repository resources do not survive server restart
Add security domain dependency to ORB service
ejb-client 1.0.6.CR1
Fix problem with appclient.bat
hold original request for MAC target
.
Merge branch 'master' of github.com:stuycs-ml7/project1-pd6
lastfm:
Make a basic User model (includeing secure passwords)
Finish user signup
changed to_d to to_f
split done and open arrangement into two views
conditionally hide missing info blurb
switch to get_absolute_url in events section
django template syntax OCD
Merge branch 'master' of github.com:sunlightlabs/openstates
capitalize roles
fix for contact information missing
Merge remote-tracking branch 'origin/master'
site: removed collected_static files
 added site/collecteds_static to .gitignore
public: more template work
added url files for 14 states
Merge branch 'master' of github.com:sunlightlabs/openstates
begin flatpage migration
migrate flatpages
Merge branch 'master' of github.com:sunlightlabs/openstates
Update liblastfm.cabal.
Cosmetics.
Continuation function API is reworked.
database file commit
SQL statement to create the results view
code demonstrating how pmatch & mv-let actually works
enable localization of the tree view
localize the tree
fix test
Merge pull request #144 from symfony-cmf/locale_tree

enable localization of the tree view
added tpl for artwork
custom vimrc files
snippets
templates
templates
Updated code to match v1.2 to fix floating point error
Minor changes
Updated TODO
var-ified some variables to prevent global clobbering
Basic game is done
[Remove] spacial event banners
Fix problem with binding events to calendar events after ajax call
removing fadeout if op=1
rev 5027
create project POM
very big refactor
User.exists()
update plugin definition
add last_wrapper (same as jcvi.apps.last, but this is the standalone version)
更新说明

git-svn-id: http://code.taobao.org/svn/tdhs-java-client/trunk@62 1726f5df-c87a-424f-a4b2-8e54330702e5
[maven-release-plugin] prepare release tdhs-java-client-0.3.2.4

git-svn-id: http://code.taobao.org/svn/tdhs-java-client/trunk@63 1726f5df-c87a-424f-a4b2-8e54330702e5
[maven-release-plugin] prepare for next development iteration

git-svn-id: http://code.taobao.org/svn/tdhs-java-client/trunk@65 1726f5df-c87a-424f-a4b2-8e54330702e5
兼容日期简短格式


git-svn-id: http://code.taobao.org/svn/tdhs-java-client/trunk@66 1726f5df-c87a-424f-a4b2-8e54330702e5
release新版本

git-svn-id: http://code.taobao.org/svn/tdhs-java-client/trunk@57 1726f5df-c87a-424f-a4b2-8e54330702e5
[maven-release-plugin] prepare release tdhs-java-client-0.3.2.3

git-svn-id: http://code.taobao.org/svn/tdhs-java-client/trunk@58 1726f5df-c87a-424f-a4b2-8e54330702e5
[maven-release-plugin] prepare for next development iteration

git-svn-id: http://code.taobao.org/svn/tdhs-java-client/trunk@60 1726f5df-c87a-424f-a4b2-8e54330702e5
changed db to postgresql
changed back to sqlite for testing
blog index, updated gemfile, other stuff
search works>
g
Shortener blacklist: Add j.mp, alias of bit.ly.
Merge pull request #14 from minecrafter/patch-1

Shortener blacklist addition
Added CallNativeFunction() using a modified version of Incognito's Invoke.
$status can be a boolean.

Drop the misdirecting equal operator.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4932 2fea6a4d-a838-0410-917b-93a53c48e9d2
Cast user_name to string before passing to sanitizer.

Don't let the DB layer to decide what to do with booleans
and stuff.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4933 2fea6a4d-a838-0410-917b-93a53c48e9d2
Admin->Users buttons as anchors. Use sLink() instead of href()

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@3841 2fea6a4d-a838-0410-917b-93a53c48e9d2
List banned IPs as anchor

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@3842 2fea6a4d-a838-0410-917b-93a53c48e9d2
Button spacing

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@3843 2fea6a4d-a838-0410-917b-93a53c48e9d2
Make Classic/Remora alert messages more noticeable

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4039 2fea6a4d-a838-0410-917b-93a53c48e9d2
Changed to new style for chart page
Cleaning up javascript files
More cleanup and experimentation
Basic load works
Bootstrap and main module load work using require.js dependency and module model
cpufreq: backport cpufreq code from 3.0rc6 kernel.
Update network interface
Fix compiling and changes for smartassV2 governor.

Fix compiling (2/2)
Added clear_cache() method.
Added clear_cache() method.
Bump version.
Added clear_cache() method, for real this time.
If given a distribution path, try hitting the actual URL.
Update change log.
Bump version.
Fix P::C violations
Fix P::C violations
v0.006

    Added clear_cache() method on the Package::Locator class.
    This deletes the cached index files, causing subsequent
    calls to locate() to fetch the index files anew.

    When calling locate() with a distribution path, we actually
    try and fetch the corresponding URL at each repository.
    This allows you to find distributions that are not in
    the index (i.e. older relases).
Wingkwai Game 001
Game 001 - Before go to home.
Глобальная чистка кода и верстки
select correct category for planning issues (fixes #1714)
correctly update milestone statistics whenever an issue in a milestone is saved
Added d3 libraries
foreman/precise/nightly: Test for Gemfile.lock and behave appropriately
Simpleform didn't pass :enctype or :use-ajax-p which broke file uploads
Identify widgets, fixd added to main lists.
Unknown changes
Merge branch 'master' of github.com:thevoiceless/wc-testing
Include Identification window in Layout Editor

The Layout Editor for WahCade now includes a new panel
(accessible via radio button) for the user identification
window.
Merge branch 'master' of github.com:thevoiceless/wc-testing

Conflicts:
	wahcade/config.dist/ctrlr/default.ini
Resolution:
	Take github version
ITP185: Fixed another bug causing Rcade to crash on errors in gstreamer. I renamed a function and forgot to change it in one place.
Merge branch 'master' of git://github.com/thevoiceless/wc-testing
ITP197: Disabled all video chat functionality when an error occurs during loading.
tower mesh :)
Root routes

+ Updated readme for root routes
+ New RootRoute constraint
+ Unit test for constraints
+ Match multiple file extensions
display gpx-route instaed of kml which isn't given anymore
make route blue and thick
What? Get out of here DS_Store you're not even a person
Try to create a .desktop entry
Updated manifest
JSON to MsgPack
still in the home stretch of GenericParsers, but now realize that
we need Shared parsers, too
Added user password validation and confirmation using has_secure_password; migrated password_digest to database
Update gemspec to require latest release of openstack gem
(related https://github.com/ruby-openstack/ruby-openstack/issues/9)
EC2: Fixed unit tests to use '/' as a root_url
Remove forgotten invocations of 'convert_to_json'
Centralize where we store the current API version

We had way too many places where we stored the current API version;
forgetting to update one of them upon release spelled certain doom.

The version of the API is now kept in one place, lib/deltacloud/version.rb,
and everything that needs the current version loads it from there.
Version 1.0.3
Raise on error.

Raise on error on http failure.  This allows authentication to failure
gracefully among other things.

Signed-off-by: Ian Main <imain@redhat.com>
Python client: add an instance-by-id lookup

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
Python client: add `refresh` to Instance

Calling `refresh` on an instance makes it to fire a new request to the
Deltacloud API and update the attributes.

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
Created a base AjaxController.

This controller will be used to handle Ajax requests. Duh.
Started work on the MarkdownProcessorController.

The MarkdownProcessorController will be responsible for processing
markdown on the server side.

I just can't find a Javascript based mark down solution that I like.
Only save line length changes.
Taustakuva fiksattu, sisältöä tungettu yhteystietoihin.
Working on post method
Updated README
rng-tools version bump
remove old stuff

Signed-off-by: Eduardo Tongson <ed@gimokod.org>
Copy libs into the build dir rather than using from the local repo to work with javadoc.
リンクを更新
Update code to manage authentication
Update autologin
Update database file
Update css
httpsでの再生に対応
Merge branch 'master' of github.com:ts123/SubsonicPlayerCLI
Maps for the Way to Yurt
fixes for map 049-1