labofsahil/github-event-dataset-2012 huggingface dataset:
Problems with staticfiles

There's two problems: first an `url()` reference that fails, and secondly, a reference to `wymeditor_icon.png` that fails because it's in the wrong directory.

I didn't know how to go about actually fixing that second CSS file `cms/static/cms/js/wymeditor/skins/django/skin.css`, which makes reference to `../wymeditor_icon.png` when it actually lives in `cms/static/cms/wymeditor/skins/django/` (outside the `js/` directory).

So this is probably not to be pulled, but rather to find a better way to fix these
Gui changes

It has changes for issues 5 & 6. I changed all of the button calls in Driver to use setPanel as opposed to Add since that allows me to turn off the main menu visibility.
Adding RailsAdmin as an alternative admin gem

For users wishing to use the RailsAdmin interface rather than ActiveAdmin.
added new scaffold "opinions" and associated it with a Caffe

Ajde mi popushi
ParserExtension.js coping with async scan.
Fixed a bug setting _refSourceModelProp.
Fixed bug with adding Vip from console or map, who is already on viplist.

....
Line added in branch change-2 of sandbox
Fixed selecting items in ember multi-selects

Worked fine through the API, but when you manually clicked on an option
it would loop around and select the option two in front of it.
Inner view context controller failing test
update docs to reflect new context passing syntax of {{action}} helper a...

...nd its more typical usage when combined with Router.
Design css, correction pour le rôle Etudiant
This commit should fix issue #294
ECMS-3968 CSS priority doesn't work - 

Create new CSS-File comparator for ordering the CSS
ECMS-3888 Error when edit action with html tag

ECMS-3888 Error when edit action with html tag
Standardize rake tasks

Small tweaks.
Fix for classic toUpperCase gotcha when locale is Turkish

When converting to upper case to match English constants, use Locale.English or things will go wrong when running on the Turkish locale.

See http://mattryall.net/blog/2009/02/the-infamous-turkish-locale-bug

and other Google results: https://www.google.com/search?q=java+toUpperCase+turkish&ie=utf-8&oe=utf-8&aq=t&rls=org.mozilla:en-US:official&client=firefox-a

See https://github.com/fusesource/jansi/issues/11
Update for outerWidth()/outerHeight()

Updated outerWidth() to outerWidth(false) and outerHeight() to outerHeight(false) for jQuery > 1.8 - fixes Issue #763
Fixing Cakefile to not use reserved word 'package'

I don't know when the change occurred, but `package` is now apparently a reserved word in node.js (I have v0.6.15).
Allow adding domains to an app that does not have domains yet.

Currently, trying to ``cloud.apps[0].domains.add('mydomain.com')`` does not work if ``cloud.apps[0]`` does not have domains yet, as in this case the ``app`` keyword to ``heroku.api.HerokuCore._get_resources`` from ``heroku.models.App.domains`` is lost. This patch stores the keyword arguments passed to ``_get_resources`` on the ``KeyedListResource`` and uses it in its ``add`` method to update ``o.__dict__`` in case the list is empty.
T07

@hhimanshu, please review
Removing alang to avoid confusions

There are many people asking about --alang/-a at raspberry/raspbian irc channels, as it's not implemented I suggest removing in order to avoid confusions.
Notify all in channel

Use @all, @everyone, or @everybody to highlight the message for everyone in the channel.
Elasticsearch head as a submodule

Bonjour,

J'ai branché le project [elasticsearch-head](https://github.com/mobz/elasticsearch-head) en tant que `submodule` de tatami.

Cela permet d'avoir toujours la dernière version du project elasticsearch-head et non les sources à un instant T.
De plus, github gère les `submodule`. effet visible sur mon [fork](https://github.com/rlespinasse/tatami/tree/elasticsearch-head/etc).

Cordialement,
Romain Lespinasse
Efairbanks highvisbar 340

Pull request because we are consolidating our work and because Skittles says so.
Fixed non working events

 -Removed add events/news from admin page, this is done through wordpressnow.
 -Removed functionality in api for adding events/news because they only went into the db not wordpress

This is a fix for issue #332
-Session uploads now change modified date for the containing experiment.

fixes #550
Compilation Process

#207 notes that inline JavaScript may be restricted (IFAIK, this is true for JS in Adobe AIR). This splits the compilation into discrete parse, render, and compile steps. Compilation is now just a matter of serializing the parsed template and `toString`ing the functions and rendering. The performance impact appears to be negligible*.


* Is there a rigorous way to test this?
Fix for inverted sections where value is an empty string or zero.

This fixes Issue #186
A numeric 0 or an empty string will be matched by an inverted section as they equate to false.

I have also added support for use of an empty inverted section tag {{^}} as an else style tag for sections,
usage:
{{#section}}
    section
{{^}}
    inverted section
{{/section}}

This is equivalent of:
{{#section}}
    section
{{/section}}
{{^section}}
    inverted section
{{/section}}
[AS7-4272] Upgrade to Remoting JMX 1.0.3.Final
AS7-5392 Convert server-config resource to ResourceDefinition

This doesn't include converting child resources of server-config. I want to get this in to make John O'Hara's work adding a launch-command-prefix attribute to this resource easier.
AS7.1-5929

AS7-5929 port to AS7
[AS7-4769] Update of RealmReadinessFilter so for direct /management requests we can respond with a DMR response instead.
AS7-5909 UnsupportedOperationException if a module's resource root defin...

...ed in jboss-deployment-structure.xml does not exist
[AS7-5139] Allow @Resource injection for OSGi components

https://issues.jboss.org/browse/AS7-5139
#### Contains #3036
JBTM-1041 parameter is dead upon entry to a method but overwritten
correction in new MongoMQ() options

`server` should be `host`
Deseason

Uses seasonal trend decomposition to remove seasonal components of a time series.  fastVAR methods can then be applied to the "remainder" component of the time series, which is the part that cannot be explained by seasonality.  For prediction, fastVAR models and predicts n steps ahead for the remainder component, then adds back the seasonal part
Bounce !

Kinda dumb, I needed bounce easing equations for a project, so here they are.
Cheers !
Update ui/jquery.ui.autocomplete.js

Line 157 - A invisible char lead to a failure of the function.
RememberMe + Change PHP
Custom datadir ready for someone to set it through wpf.

propertyname: datadirectory
defaults to: Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Octgn")
NO HOMO
srm_535_div2_500.cpp
Add meta_window_is_demanding_attention and meta_window_is_urgent 

This adds a couple of simple functions to query a metawindow whether it is marked urgent or otherwise seeking attention from the user. It is at this moment intended for use in Cinnamon's Scale view, but it can also be used in Expo and Alt-Tab, to single out windows that need attention.
Fix maximize issue

Fixes linuxmint/Cinnamon#1058 and remove some verbose logging that outputs at about 50 lines/second
Wrap a scipy import and raise a warning if it fails

This is a good commit but the main motivation for the pull request is to see what travis does.
添加一个可运行中修改的jsonp回调函数名

先根据$_REQUEST判断客户端需要返回什么样的回调函数

默认jquery的“callback”
Implement internal RTTI features

Implement an simplified RTTI. libRocket can now be built without C++
RTTI enabled while keeping the dynamic cast feature
Handle case where OpenLayers doesn't recognize geocoding address...

...and returns an empty array with status 200 instead of an error code.
upup

https://github.com/kcard/Wrigley
Bug 808232 - Change button text for "HotSpot Settings" to "Hotspot Settings"
[settings] Do Not Track
[M] refine 2192

Take assignment operator `?=` back to `GAIA_APP_SRCDIRS`
[3G] display a clickable list of compatible <apn>'s

For quite a few cases, the same combination of MCC/MNC values returns several `<apn>` elements, each APN element being a different set of data settings.

This patch still auto-selects the first APN set that matches the data carrier’s MCC/MNC settings but displays a clickable list of all compatible APN’s.
Bug 798679 - Reduce preview pause after photo taken. r=djf
Set title for mp3 files which have no title in the metadata.

This helps fix the cases where mp3 files with no metadata don't
show up in the music app.
[816599] Hide refresh button on language selection screen

r = ? @borjasalguero
[email] lint
[contacts] l10n update
Load the iframe source when it's created, since async animations will ke...

...ep running during load.

@djf can you take a look?

This is step 1 on the path to removing the window sprite.
[Bug 814949] Fix background image to be visible again [r=crdlc]
Remove extra sorting in SMS conversation view.

Gecko [bug 769347](https://bugzilla.mozilla.org/show_bug.cgi?id=769347) had been landed. We can now remove additional sorting in Gaia.
Efficient metadata parsing for the Music app

This pull request replaces apps/music/js/ext/*.js and apps/music/js/MetadataParser.js with apps/music/js/metadata.js and shared/js/blobview.js

This new metadata parser:

1) does not read the entire music file, so it should be much more memory efficient

2) uses typed arrays rather than binary strings, so it should be more time efficient, too.

3) does not extract album art from the music files, but instead just stores the location of the art within the files, to save space in the metadata database.

4) extracts track number metadata, which seems like it might be useful to the music app for sorting songs within an album

5) supports id3 v1 and v2 tags for mp3 files, itunes metadata in AAC .m4a files, and ogg comments for ogg files.

The changes to music.js and utils.js mostly have to do with the new way that album art is stored.  But there are also several changes to remove onload event listeners from image elements.  It looked like there was code that may have been registering the same listener over and over.

I don't have a large music collection to test this against, but it seems to work correctly for me.

@dominickuo would you review this, please?
@timdream are you interested in reviewing metadata.js and the shared/js/blobview.js utility it depends on?
[call-log] Recents DB fix

The delete function was failing, unit tests got this fail ... yay! \o/
Fix Profile Push / Fix Emulator CI Scripts

This changes the profile push step in make install-gaia to push the profile to /data/local/user.js.
The original step will not work in otoro or the emulators (really only sgs2).

Also makes changes to the ci scripts to correctly load apps for multiple directories.
Revert e-mail pushes pushed to nightly rather than master owing to confusion

@lightsofapollo Your assistance in cleaning this up is greatly appreciated.
Bug 796649: Build system support for having pre-installed 3rd party apps
Fix errors when deleting projects. Fix bug 744506.

Also remove the now surpfluous feeds app and models.
Updated README to add GitHub Flavoured Markdown

* The JS, it shines!
Bug 796151 - Boot to Gecko is now Firefox OS

This can go live as soon as the Firefox OS page is live.
Update etc/packs/databases/mysql/commands.cfg

Correction on check_mysql_cluster_ndb_running
Fix broken TravisCI image
remove invalid geometries, when they are generalized
Fixed spelling mistakes in readme file
format date a bit better for user display
New fr traductions

Weblate are currently some errors. Exceptions are raised when traduction are submitted.
Release audio once

Here are the changes which request audio focus for tts and media command players.
Support reusing PG connections

Just for the economy factor
Fix node request adaptor
Gsymcheck i18n

Hi Peter,

Here is i18n for gsymcheck.

Kind regards,

Bert Timmerman.
Comment out unused function parameters to prevent compiler warnings.

Warnings show up in client code from functions that have unused variables in header files.
Fixed maven build for interoperability test.

Edited pom.xml, added the maven compiler plugin with config. Must use java 1.6.
Java 1.6 allows @Override annotations for methods that implement an interface (which the generated code does).
This is also likely to fix the Travis-ci build.
Adding a few unit tests for core
(#158) Add CLI ordering to @req_metadata_hash in Model classes

In Ruby 1.8.7, Hash traveral is not deterministic unlike Ruby 1.9 (which
is insertion order based). This leads to a situation where the Model
metdata CLI questions are asked in an essentially random order.

An order/rank/position attribute in each of the key's subhashes will
provide a way to conistently ask Model-related questions in the same
order across different Ruby versions.
Update debian packaging for ruby 1.9

This commit updates hiera dependencies and modifies
it to use vendordir, for a ruby version-independent
install, which will work for older systems that use
1.8, and newer ones with pull in 1.9.

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
Fix package.json

Simple fix of package.json:

* Fix devDependencies - add underscore
* make ```npm test``` working
supports optional tenant id on kpi command

Also fixes trailing / to prevent unnecessary 301's.
small fix for CSRF tokens 

It helped me( I had an issue with outdated tokens because app caches fragments). Does it look better than Rack middleware solution?
Added check for href extensions

Works on href extensions still need to add 406
Header 'blog' and admin header 'posts' link wrong if photographer.blog_url is an empty string

If the photographer.blog_url is an empty string (as it is when you submit the admin settings form), both the admin and normal layout headers were misbehaving.  They were both checking for nil and did the wrong thing when the value was empty string instead.
Fix export for columns with multiple dots
fix for broken channels with new search rules/options

and bugfix for my idiocy
start a Horde fraction

:) dont merge if you consider this cheating.
otherwise, lets join forces and kill everything else

* beware: some rogues might disguise as hordes and start killing us from the shadows

```ruby
def horde
  true
end
#enemy = Game.world[:players].select { |p| !p.horde && p.alive }.sample
```
fix `hipster-gray` theme for all the Operas

body margin >> padding

adjusted font sizes
fixed changePlayerRanking command
a couple of improvements for attachment performance and compatibility

(core) use X-Sendfile, if enabled
(core) Mac OS switched to \n ages ago
(core) simple caching for attachment dir size

tested on lighttpd only, but nginx and apache both support X-Sendfile if so configured. I used modSettings for caching here instead of the regular caching mechanism because it's just one measly integer value.
php基础库

合并来自iscript的基础库
Picked up a few more -izations to change to -isation

A few more small changes to the en-GB.yml, en-AU.yml and en-NZ.yml files following the -ise and -isation word endings preferred by British English (in place of -ize, such as "Authorisations" and "actualisation").
Code Polishing & Loops support

I made few changes to the code structure, "de-obfuscated" some parts of it, and added the support for loop recording/replay.

= Loops =

Press 'r' to signal "start of recording", the recording starts with first sample played.
Press 'r' once again, at the moment when you want the loop to start playing. I.E. the time between the last sample & "start playing" is also incorporated in the loop, but the loop itself starts playing with the second press of the 'r' key.

Multiple loops are supported, the loops can be deleted by pressing the 'p' key - removes the 'last' loop playing.
Migrate from optparse to argparse.

I felt very uncomfortable with the deprecated optparse and migrated to argparse.
DIYCam: purge should be ok now
Updated for iOS 6 / finished ARC migration

http://www.youtube.com/watch?v=jEBu9cemJJ4

WHY ISN'T THIS HEAT ON RDIO???
merge from himynameisjonas

new photo sizes
Added functionality to reverse log order

This change makes the default setting show the log in reverse order and disables scrolling to the bottom (as it's not needed in this case).

Adding `?noreverse` to the URL disables this and re-enables the auto-scrolling to the bottom of the page.
saying hello !!!

hello !!
リクエストなう

アラートが綺麗になりました。それに伴いjsファイルが増えました！
GH-690 Joyent Cloud Provider

This implements GH-690 Joyent CloudAPI provider support

API Documentation: https://us-west-1.api.joyentcloud.com/docs

Methods implemented (everything in the docs except those under Analytics and Datacenters)

```
add_machine_tags
create_key
create_machine
create_machine_snapshot
delete_all_machine_metadata
delete_all_machine_tags
delete_key
delete_machine
delete_machine_metadata
delete_machine_snapshot
delete_machine_tag
get_dataset
get_key
get_machine
get_machine_metadata
get_machine_snapshot
get_machine_tag
get_package
list_datasets
list_keys
list_machine_snapshots
list_machine_tags
list_machines
list_packages
reboot_machine
resize_machine
start_machine
start_machine_from_snapshot
stop_machine
update_machine_metadata
```

Models provided (and their corresponding vocabulary in CloudAPI terms):

```
Flavor # Machine
Image # Dataset
Key # Key
Server # Machine
Snapshot # Snapshot
```
Replace Ace editor with Codemirror

Codemirror a bit more lightweight editor. It seems to have better support for clojure. @Raynes proposed this feature. I also replaced SyntaxHiglighter with Codemirror so highlighting is consistent on the whole site. Added ability to change higlighting themes. Selected theme stored in localStorage in user's browser. One problem is how to highlight user's solution on solutions page. It was highlighted by gray background before but now user can change theme therefore we can't set background to fixed color.  
Only 7 files from were actually changed. Other 24 files are added Codemirror or removed Ace/SyntaxHighlighter files.
Use the standard Activiti classloading mechanism for resolving serialized classes

SerializableType:
- use the standard Activiti classloading mechanism for resolving serialized classes.
- allow for easy customization in subclasses.

Minor changes to error messages and logging:
- BpmnDeployer: log which deployment is being processed.
- JuelExpression: include the expression that caused the problem in exceptions.
- SerializableType: fix spelling error in exception message.
Fix badly placed include for compas variable!
Added option for additional agency logo
Greater reliability for ZooKeeper interface

Changed ZooKeeper interface used by AppController to specify a longer timeout (avoiding SessionExpired exceptions), and retrying on failed operations (to avoid FailedZooKeeperOperationExceptions).
Added account/update_profile_image

Added method for updating profile image.
Demonstration Update

Have the search bar and "Locate" button on main page. Search bar will take a query and forward to a list view (ResultsListActivity). Locate button does the same. Items in ListView are just an array. Didn't get to location stuff unfortunately. Search query isn't displayed on the ListView but I can try and add that before the critique if you think it'd be good to show that. Not much of an app but I have a grip on it now and feel like we can knock it out from here. See my last commit comment for a note on a bug I didn't have time to fix tonight. May get to it in morning.
adding Rrose to the plugin directory under "Controls and Interaction"

I made my Rrose plugin available yesterday and would love to have it listed on the plugins page!
Changed 'eachLayers' to 'eachLayer' (typo)
root is needed / install jshint globally

when installing jshint using npm, the following warning is shown:
`npm WARN prefer global jshint@0.9.0 should be installed with -g`
Fix tile zoom animation in latest chrome canary 

And remove the translate(0,0) hack for other browsers as this fixes it too :-) Fixes #1056
Translated message was generating an incomplete string

Can do cherry-pick for 3.2 branch
Implement iSCSI CHAP authentication dissector

Hi,

I have implemented iSCSI CHAP authentication dissector. It has been tested with,

1. Dell EqualLogic target and Open-iSCSI initiator on CentOS 6.2
2. LIO Target and Open-iSCSI initiator, both on Arch Linux 2012

Please review.

Thanks,
Dhiru
Keep tab title

Hi,

A little update to keep the tab title.
new font style changes, makes title look bigger

new font style changes, makes title look bigger
pull-request-1354538042248448000

Something
Update rpi-update

Initial if statement was correct, reverted the changes of the last two pull request.
The real problem was that the updateScript.sh didn't pass the argument FW_REV!
Remove some usages of kunena.link.class.php in plugins and attachments
#526 Add Confirmation Box to Restore Default Settings
Get the new HackyAI to play with

http://www.sleipnirstuff.com/forum/viewtopic.php?f=82&t=15984
Use proper account URL

Mite now requires HTTPS (and has for quite a while), so we might as well open that directly.

Without these changes I get the following on the command line:

    $ mite open
    The file /Users/jakob/Projects/OpenSource/mite.cmd/mite.cmd/:/substancelab.mite.yo.lk does not exist.
    ://substancelab.mite.yo.lk
Feature/amount formatting

AmountField widget will accept formatting characters (',', '.'), and will auto-format if required.
A fixed regional settings configuration is provided for now.
Can we add `clojure.repl/source` to tryclojure?
Cancel/Send buttons not dismissing when launched from a ShareMenu

fixes above
Fix unit tests again

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
VS2008 Project updates + Soldier Reordering

Visual Studio 2008 sln update will correct files
Allows the player to reorder soliders on the Equip Craft screen.
Fixed dogfighting scoring.

Cut-paste code had useless ifs.

g++ -Wall -Wextra spotted it!
Update to netbeans project file

Except of the tck part threeten is parsed without errors again in netbeans.
Minor bugs resolved

I faced few problems while compiling verlihub on my 64-bit Arch Linux. Have made changes to solve it. Have tested the changes under backtrack 5 32-bit as well.
Animation Slicing

For #103
parallel excecution of actions

I introduced a simple way to use multiple action queues, the existing  functionality with curAction remains the same, but when performActionParallel is called a new queue is created which is independent of curAction.
My minesweeper finally works with this one, so I thought it may be useful for others, too.
I moved my minesweeper to an own branch and reset master to reflect the base repo so I could make this pull request. Not sure how github handles this, I hope that's ok.
Add semicolon to style data for safety

If the style data does not contain a semicolon, the loop removing @import
statements will run infinitely, because the search for ';' returns -1, which
with a +1 becomes 0, and appends the data variable to itself. Making sure the
data variable has at least one semicolon fixes this problem.
uprava loga
Paranneltu syötteen lukua, io-rajapinta takaisin testauksen helpottamiseksi

-
:) moi
Added spaces

My spaces are better than your spaces
added "main" section to the package.json file.

Hello,

Without the "main" attribute in the package.json file it's impossible to require the server in another project because npm doesn't know which file to include.

// Without "main" it's impossible to require this package like that:
var Server = require('ircdjs');
fixed email sender name
The Content API now does all govspeak conversion

Relevant change in Content API:
https://github.com/alphagov/govuk_content_api/pull/51

This shouldn't be merged until the Content API change has been merged (and that should be deployed first).

AFAICT Frontend handles Govspeak-ing HTML without a problem, so it should be safe to run new API with old Frontend.
Mobile fixes

This fixes the margins on the homepage & browse pages on iPhone/webkit.
Update to support escaped characters and weak linked frameworks

* added quote delimiters to pbxFile paths and names to support an un-specified collection of characters that need to be escaped. (was flagged after "+" broke the xcode project)
* added support for a new option for adding weak-linked frameworks.
Added Mendeley logo to the list of organisations. I hope it is OK. Otherw

Added Mendeley logo to the list of organisations. I hope it is OK. Otherwise, it would be great if we can just be listed under the "And many others" list. We use Redis primarily for handling user feed and user notification data. Thanks.
Added MongoId compatibility

Hi,

I added Mongoid support but I have some questions about how to include store functionality to a Model.
For now you need to include Panoramic::Orm::Mongoid module in your Model to make it work, I prefer this instead store_templates method, maybe with a better name like Mongoid::Panoramic or Mongoid::StoreViews. 
So, how I should implement this?

Regards,
Alessio
Initial commit for BattleEngine prototype

I created some really simple graphics. I'm able to render them. Unit selection is also working. You can iterate through the player units using the arrow keys. The current Solution/Project is setup for Windows but should work on Linux with no code changes.
Disable drive_cache for xen hvm installation

Commit b6bb71130 fix using drive_cache option. However, this is not
supported by xen qemu and so breaks xen hvm installation.

This patch unset drive_cache so it is not used for hvm installation.

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
fixes haml syntax error in app/views/ci_mailer/build_result.html.haml

just a fix for the syntax error
Test: Without a title, a record cannot be opened v2

It is a Selenium 1.7.2 Test.  
I decided to check one thing : 
1. When one submits an empty title form, an error should appear, with the following html value : "class=error"

I wanted to check an non existent page during the test, however, the page exists even though it is not displayed in the list, since there is neither author nor title present.
Branch latlng (Determine, provide and display latitude/ongitude data)

bjornd,

Please consider reviewing and merging my changes. You find the details in the branches commit message. Just drop me a message if something is unclear.
Rupy Brasil

Adicionei um evento que vai acontecer aqui na minha cidade, porém, já foi fechado os pagamentos. É sobre Python, Ruby e Javascript. 
Website: http://www.rupy.com.br

Vale lembrar que o evento foi citado no Smashing Magazine:
http://www.smashingmagazine.com/2012/10/25/upcoming-web-design-development-conferences-2012-2013/


Abs
Stabilize test if some other folders are present

On my machine those folders were present because earlier runs failed so the test would always fail. This is an unobtrusive way to fail only if an additional folder was left over. (It could still fail if another test is running in parallel doe)
web: replace the content of the /users page with the one of the /users/table

The /users page was anyway broken since 43eb37b06ce5c75db9e7c6140782bde05b5a57a0.

I have to confess that this commit is not tested.
fix Button handling code for explain links
Make `View#getTemplateData` handle backbone models / colls.

Closes gh-211.
Don't cache during development, for watch() and refresh() to work with imports

When using watch with a file which has @import statements, the cache prevents automatic reloading of those imported files. I think you can assume that when in development env, and using watch, you really want to reload the file, and just skip the cache.

This should resolve both #346 and #47.

Thanks.
correct working directory for cli commands, fixes #482

Currently commands in GitDriver are executed like this:

    cd "C:\Users\matt\AppData\Local\Temp\/composer--some-repo-url/" && git show "master":composer.json

which internally generates errors e.g.:

    fatal: Path 'composer.json' exists on disk, but not in 'master'.

and as a consequence results in:

    Installing dependencies
    Your requirements could not be solved to an installable set of packages. 
    Problems:
    *The requested package "vendor/other-private-bundle" with constraint [] could not be found.*

This PR fixes the issue. More details in #482.
English corrections and clarifications

Updated the PEAR `vendor-alias` documentation for clarity and proper English
interface change to make required parameter element first argument and optional object second argument

also changed conditional assigments from (condition)?true:false to true||false where applicable
Add Amazon Linux AMI 2012-09
Supply actual classes vs interfaces.

Deserializations that use these classes (like Kryo) need concrete classes, not interfaces.
Added an error with instructions on how to install docutils.
just made README a markdown file for better reading ^^
Implicit wait fix / adding test for it

Synchronous checking for elements wasn't working (I think it wasn't yielding to the thread in order to allow the page to be updated). Also some logic around how implicit wait works with findElements (list) wasn't quite right.
Reshares_count come back! Fix #3370

#3370

![](https://jauspora.com/uploads/images/34545b61ba946fdc7d8d.png)
Add method for updating the asset paths so pages act as they do in app...

...lication - css styling and functionality.

Hi, 
  I am not fully aware of all the functionality of this project, but I recently found your code for creating html templates, and wanted to update the templates to have the correct js / css / image sources in script, link, and img tags.  Maybe this commit is useful.  Maybe not.  Just thought I'd throw a pull request out here in case it is useful for anyone.
  Thanks,
- kikuchiyo
fix the tag handling on the profiles edit page

just fixing something I broke with all the tag followings changes, found in issue #3775
Added get_product_reference method to Product

Fixes #54
Add event to enter function

Updated `enter` function so that caller event is passed along from hover, focus and click eg,

    $("#selector").tipTip({
      delay: 25,
      enter: function(event) {
        var selectedElem = event.target;
        // ...
      }
    });
Initial twitter bootstrap

Hey, 

I added the basic twitter bootstrap to the app.  It'll just be a little easier to work with (in my opinion) for testing.  More design can come once we get the functionality done....and probably the creamery.

-Austin
Libraries refactoring

Lib refactoring. Plugins copy for qbs macosX draft.
SSL recognition added. ServiceGroup function added

Added get_servers() to nsservicegroup.py for getting a list of all servers within the service group

Modified the def __init__ in nsnitro.py to do the following:

Original:
    def __init__(self, ip, user, password):
Updated:
    def __init__(self, ip, user, password, useSSL):

This allows the selection of the SSL https for accessing the URL or not.

Within the __init__:

Original:
    self.__baseurl = "http://%s/nitro/v1/config/" % ip
Updated:
    self.__baseurl = "%s://%s/nitro/v1/config/" % ('https' if useSSL else 'http',ip)

This chooses between the http versus https depending on the True/False value of useSSL set in the __init__ function for the NSNitro class.
Category query problem

I'm trying to understand why its happening and what i'm seeing...  
On the backend my four products all have the correct category in the edit and index screen of products.  But on the front end that category shows only 2 of the products in the category??? all products are Live, as is the category.  

Digging around the select statement ( build_query in categories ) seems to be flawed .. ( maybe im wrong ), there isn't a reason to use a second join to pull the category information when your only retrieving product ids.
Add .npmignore.

There's a lot of stuff that people don't need to download into their node_modules folders when they use director.
Location component for maker

Added a location component for the maker.
Changed to support GateIn 3.5.
A ver si pulias vo.
spelling mistake 'successfull'

:-)
Fixed Postgresql Notes search issue (integer vs string)

Hi,

I override *notes* methods for classes that use **has_many :notes, as: :noteable** Method is manually converting id to string to avoid type crash for postgresql database. I also had to update *mr_and_commit_notes* method. I tested issues and snippets it in production. I somehow cant find where to write wiki note, but it should work as well. And because I don't have any merge requests, i couldn't test changed method either. If anything, let me know.

Jozef
Spec cleanup/reorganization

Part of my ongoing quest to reduce duplication and organize things a bit more.

These were all part of another branch of mine where I was cleaning up the Factories, but that branch got so big with so many changes I decided to break it up into smaller parts. These will all apply pretty easily to current master.
Clean up doc/installation.md

Closes #939, depends on #1368
Fix syntax error in Project.create
Fixed a bug on neighbor tiles elevation reading with normalizeEdges option set to true

I didn't experienced this bug before, so maybe it's related to this commit : https://github.com/gwaldron/osgearth/commit/1d4fbdc43dbfbae48b48d5e5f104dec4bd5bbcc4

The problem is on these lines :

float heightValue = w_neighbor->getHeight( i, j );
float heightValue = e_neighbor->getHeight( i, j );
float heightValue = s_neighbor->getHeight( i, j );
float heightValue = n_neighbor->getHeight( i, j );

i and j index are not always valid on the neighbor heightfiled
New field which allows multiple types of data.

It may be used like this:

    class Config(Document):
        name = StringField()
        value = MultiTypeField()

The value of one Config can be bool, string, int by default, you can specify what are allowed too.
Hope this can help.
Thanks.
Provide context when code block render fails

I updated octopress after a really long blogging hiatus, and so had to update a bunch of gems.

During the next `rake generate`, I was presented with a pygments error, complaining about a missing lexer for a backtick.  This generated previously just fine.

I figured it had to do with me fencing code blocks with 4 backticks instead of 3 + a language (I always mix this up).  But I have over 200 posts, so finding the offending code block was tough.

To assist with locating such errors, this pull request outputs the entire post content if the plugin encounters an error.
Add tabindexes to the input fields

Forgot to send a PR for this last night.
bug 586 13x v3
Ipv6 ipv4 keyword

This is a patchset for #494: this adds support for ipv4 and ipv6 keyword. It also adds a l3_proto keyword.
[2.1] Adds support for ssl-only queries and notices. (m_sslmodes)

Adds user mode 'z' to give users the ability to deny queries/notices from users not on an ssl connection.

Opers are unable to bypass this but ULined servers are.
更新编码规范

更新编码规范
Added Gemfile and fixed spec/ files to run on the latest RSpec

It runs on latest RSpec2 2.10 now:

304 examples, 27 failures, 22 pending.

The half of failures there are because of some stuff wasn't included on my home Gentoo OS libvips portage version. 

I can ensure those are fixed later. Anyway the reason they fail is not related to RSpec migration!

Check it yourself:
```bash
# in your ruby-vips
ruby ext/extconf.rb
make
cp vips_ext.so lib/
bundle exec rspec spec/
```
Change host to region

Should be fully backwards compatible, except in the case of hostnames that are very similar to AWS regions (ie, if you have a hostname such as "my-hostname-3", then it will treat this as a region - these will have to use the newer options format)
Bump to latest rev of Clojure and Compojure. Switch to tentacles.

Had to bump tentacles since clj-github was pulling in old contrib, but I haven't tested the refresh logic.
International logo for Reject.js and fix link to website
Update commonware/middleware.py

HidePasswordOnException was removed from exceptions.middleware, but not here.
.htaccess

Adding basic .htaccess file to public directory
Fixed some English errors.

英語を少し読みやすくしました。
tsrand
Make IE8 users happy (LOGSTASH-342 and LOGSTASH-343)

Reviewed and tested  IE8 proposed quickfixes from jira
Kv filter bugfix

Humble bugfix for LOGSTASH 733 and 624 + corresponding tests.

Special attention to not let my editor trim too much spaces in the process ;)
Fixes #5: Typo in compiler.rb
Various tweaks

There are several improvements in this pull request:

* Update roundcube config template to the one in current roundcube package - it's changed a lot since the version currently in mailserv. I think I've included all the important settings that were different from defaults.
* Switch roundcube to use the new 'larry' skin which is *much* better looking than the old one.
* Install the APC PHP accelerator / bytecode cache and appropriate config (only needs a 2M cache)
* Tweak the mysql config for lower disk usage, better performance and lower memory usage
* Set PKG_PATH in .profile so it's easier to install other packages post-install

All works in my tests.
Our own implementation of a FileServlet.  (Tested locally)
Black box test

Here is the black box test for the commit cli command only and all update cli commands now hang until the update process has finished.
I need the last commits 

:-)
Viikko 4 laskarit
Bug 792269 - Update test to make use of frame/utils on loaded document only.
Issue2104 verify email reset multiple browsers

this pull request is a partial fix for issue #2104, it takes zaach's fixes to `email_for_token`, simplifies logic and documents this api better, and pulls in all the tests he wrote.
Fix for IE8 not being able to complete user verification.

in clear(), after calling localStorage.removeItem, call setDefaultValues to ensure the dialog has a set of values for each of its fields whenever the verification page loads.

issue #2206
add jshint checking for globals as a unit test

issue #1731, issue #1785

This is zaach's contribution plus a small commit to verify that jshint is installed and running.
Remove eyedee.me related wclickIfExists invocations

* When redirecting to eyedee.me, add a small delay before continuing to ensure time for the click handler to be hooked up.
* Renenable the returning-user, remove-email, and add-primary-to-secondary tests.

@6a68 - mind reviewing this?
add MATCH option to elnode--webserver-index

This patch add an optional MATCH option to elnode--webserver-index,
which is passed through to directory-files-and-attributes.
Theme updates

Lots of updates to this branch. I want to make it the new master
Much simpler, pure-python packaging

This follows: http://blog.nicolargo.com/2012/03/un-ppa-pour-glances.html/comment-page-1#comment-15288

I'm using setuptools instead of distutils, which is present on pretty much every Linux distribution. This brings more features and solves some of the issues you seemed to have.

I removed the other packaging means, because they shouldn't be required, and to show how much simpler this is!

There's still things that could be done, but it works.
If you're interested, I will add the support for installing translation files. I can rebase this on the experimental branch if you prefer.
The README could be converted to ReST so it displays better on PyPi, too.

An easy way to test package generation:
./setup.py sdist # generates a package suitable for pypi, or distribution as a download (like the current ones here) - for instance dist/Glances-1.3.7.tar.gz
./setup.py bdist # generates a final package suitable for merging in a system - for instance dist/Glances-1.3.7.linux-x86_64.tar.gz


You could change your installation instructions from:
$ ./configure
$ make
$ sudo make install

to:
$ sudo python setup.py install
Fix package build problem

Something went wrong with the latest merge 'experimental' => 'master' because
the 'glances' directory was renamed to 'src'. So, reverted 'src' => 'glances'.

Also, fixed setup.py to put data files to the right path.
merging locally
Allow to POST data without form=values
Allow command-line/environment configuration

The flask app now looks for a configuration file in the
RQ_DASHBOARD_SETTINGS environment variable and loads it if it is there.

In addition, the rq_dashboard script allows the host and IP of both the
app and the redis server to be specified on the commandline, overriding
the configuration file if necessary, and providing sensible defaults.

Fixes issue #17
ATLASINT-181 Changes to Kaltura video display 

Two changes:

  * NYUStream is now NYU Stream.  Added the space.

  * Hide the 'Download' button when showing an NYU Stream video.

Does this look OK?  My method for hiding the download button was a bit fiddly, but I'd hoped to keep all the Kaltura-related logic in the one place instead of having to add more conditionals to the 'entity' widget too.  What do you think?
Adding queue ability

We are using several queues for our workers (thinking_sphinx tasks must only run on the db server)
So I added the ability to use queues in the rake command.
You can simply do rake "delay:db:migrate[db_worker]" to make sure only the db_worker picks up the task
sdk-ios documentation update

Updated and re-organized documentation.
Guillemets français

Je ne sais pas s'il est possible de mettre des espaces insécables dans github (ou si c'est fait automatiquement à la mise en page).
Add zero padded versions of the month and day in the BaseEntry class.

By adding these properties, you can configure URLs like this:
    /:year/:zero_padded_month/:zero_padded_day/:slug/
to get:
    /2012/06/01/example
Ticket/3.x/15733 remove mongrel

Remove the built in mongrel support
Add ability to log spec test order to a file

This commit tweaks the spec_helper to give it the
ability to log the spec test order to a file.  It
will only log the order if you have set the
environment variable "LOG_SPEC_ORDER", e.g.:

LOG_SPEC_ORDER=true rspec spec

This will be useful when using Nick L.'s bisect
script to identify order-dependent spec failures.
It should probably be enabled on all of our
Jenkins jobs, and would potentially allow us to
start running them with the random order flag
enabled.
User defined search path for library loading

Extends `Library` and `DynamicLibrary` to add an options arg that allows the user
to specify a search_path from which libraries are attempted to be loaded before
the system search path is tried.

This idea came from my experience with libtool/ltdl which allows runtime configured
search paths and without having to shim the library loading path before node is run
Fix always on top, so it actually takes into account user's setting between restarts
Keep RubyGems untouched

No reasons to modify RubyGems code if the same functionality can be achieved by modifying default settings of RubyGems for Rubinius (reverts 479b268).
Fix missing declaration for getopt on Mac OS X

Several files are missing this include which prevents compilation on Mac OS X,

#include <unistd.h>

e.g.

$ make
...
gcc -c -g -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_USE_KNETFILE -D_CURSES_LIB=1 -I. bam_tview.c -o bam_tview.o
bam_tview.c: In function ‘bam_tview_main’:
bam_tview.c:462: warning: implicit declaration of function ‘getopt’
bam_tview.c:464: error: ‘optarg’ undeclared (first use in this function)
bam_tview.c:464: error: (Each undeclared identifier is reported only once
bam_tview.c:464: error: for each function it appears in.)
bam_tview.c:468: error: ‘optind’ undeclared (first use in this function)
make[1]: *** [bam_tview.o] Error 1
make: *** [all-recur] Error 1
Composite adding
Some indentation style fixes

See
http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml?showone=Code_formatting#Code_formatting
reformat README as Markdown/reStructuredText
INTERNATIONAL SPACE APPS CHALLENGE21-22 APRIL 2012

http://spaceappschallenge.org/location/university-of-tokyo
Docs: Affix plugin does not take offset x

Use `top: ...` instead in the documentation.
avoid fancy characters

I'm getting an error with my (maybe old) installation of sass : Invalid US-ASCII character &quot;\xE2&quot;
Image resizing bug in Chrome

Since about bootstrap 2.0.3 there is a bug that seemed to resize images randomly. It only occured in Chrome. After tracking it down, if found this CSS:

```
img {
  max-width: 100%;
}
```

This obiously constraints image sizes to 100% of the outer element, which is sometimes smaller than the image itself. This is mostly not a problem, except when the size of the outer element depends on the size of the image. So this effictively breaks images in tables. The following jsfiddle demonstrates the issue:

http://jsfiddle.net/SqfEC/
cleanup multi to avoid memory leak

We used typhoeus very often with jruby server, torquebox, it caused memory leak and finally crashed the server.

After I add multi.cleanup, it works fine now, but I'm not sure if Curl.multi_cleanup is useless.
Fix grep url, when click title

It is only webkit that has `location.origin`. Firefox, IE , Opera don't have it.

URL is set to `http://localhost:3000/test/undefined/test?grep=foo` when a title is clicked. 

`location.oring` is same as `location.protocol + '//' + location.host`. So it should use this.
Fix broken symbols when using node.js on Windows with default terminal fonts

This pull request fixes - imho - a major annoyance with Mocha when running with node.js on Windows.

Several reporters (`dot`, `list` and `spec`) use special unicode symbols for visualising check marks (`✓`), error marks (`✖`) and small dots (`․`).

Sadly, default terminal fonts for Windows don't support these symbols. While mocha itself works just fine, it is somewhat annoying that your console gets filled with odd placeholder characters. This problem can be worked around by installing a custom font, such as DeJavu Sans Mono (<http://stackoverflow.com/questions/9817926/how-can-i-get-mochas-unicode-output-to-display-properly-in-a-windows-console>). Given this requires extra work, I'm pretty sure many developers just live with the broken symbols.

This pull request introduces a fix to this problem as follows:

- A new, common symbol map containing symbols for check mark, error mark and small dots has been added to `reporters/base.js`
- In case Node.js/Windows are detected, the default symbol map is modified to fall back to use symbols that are readily available on default console fonts
- Reporters (`dot`, `list`, `spec`) have been modified to use special symbols from the symbol map
Only display console cursor when the textfield has focus.

The console cursor is currently always displayed, even if the textfield isn't in focus. 
The solution is simple (use the same custom effect as the original textfield).
Fixed Duplicate ID for CLF 2 anchor
creating snapshots, WIP
Correctly reuse matched params in PRG

The PRG plugin did not reuse matched params, so if an URL contained some variable params it did not work.
remove Zend\Mvc\Controller\PluginBroker from aliases in "$defaultServiceConfig"

Zend\Mvc\Controller\PluginBroker is not exist
Zend\Navigation replaced "get_class()" with "get_called_class()" because...

... it's faster

[![Build Status](https://secure.travis-ci.org/prolic/zf2.png?branch=navigation)](http://travis-ci.org/prolic/zf2)
Updates for weather app and main navigation
Update zp-core/exif/makers/sanyo.php

see fix #132 for details, dirty hack to prevent sanyo maker to read files larger than memory_limit
Coder

Adding shape-coder. Shape-coder can be useful for specifying shapes for items.
Globalmap

"explored" effect on cells will be done later, I am not sure yet how it should look like. I was considering to use the generated local map for explored cells (with fog of war as a mask for blending to the pure heightmap-based image), however it wasn't clear if generated local map is supposed to be saved with the savegame. If not, this would cause problems when transferring savegame to another computer and not having the map cache for the explored cells available.
non-const access to Store<T> from ESMStore

Yes, we'd need hacks to present mStore as const inside World.
PyLint fixes

PyLint fixes:
* nicer variable name in linebreak and yesno 
* putting spaces in comma lists in object_to_defaults
* added docstring to check_flash
Fix for Ticket #2531339

Fix bug in Cache for when uniqueKeys = true, remove the existing item from the cache rather than shift.