labofsahil/github-event-dataset-2012 huggingface dataset:
ajaxified adding solutions, added start voting button for creator
Merge commit 'eb9a859'

ajaxified submission of solutions, added 'start voting' button
Conflicts:
	app/assets/javascripts/discussions.js
	app/controllers/discussions_controller.rb
final night - ajaxified a bunch of stuff :)
Redirect to Gallery
Extract load_paths so they aren't locked into the binary
Merge pull request #541 from middleman/load_paths

Extract load_paths so they aren't locked into the binary
Correct path in sass-assets-path test
[PEP8] Applied PEP8 on auth/
[PEP8] Applied PEP8 on activities/
[PEP8] Applied PEP8 to contacts/
[PEP8] Applied PEP8 to core/
Initial commit
Merge branch 'master' of github.com:mikehagen/railsWork
Rename ls2 to l.
Update README.md

Amended title
reverted tweet and like buttons
Added email-suppor.php
Remove depreciated defined(@array) usage.
Merge pull request #1 from Lanzaa/master

Remove depreciated defined(@array) usage.
Fix path in debian/docs

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>
Revert "Add clean target as _build/"

This reverts commit 7dd6dc00d76b9711a2ac3711e707938a1aee1aae.
Revert "Add override_dh_auto_clean to debian/rules"

This reverts commit 8df8378a18344dc32ce2ba3b8205b3ca730f0d94.

Conflicts:

	debian/rules
Add unittest tdauth.getToken()

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>
Update unittest converter

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>
Add unittest processing

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>
Add dependency python-minimock

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>
Fix processing last dict only,  when separate processing

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>
Update test for fix bug of separate processing

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>
release 0.4.1

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>
Trying to test the org-readme tar balls
Return success key only if not zero.
Do not return a list in Dataworkflow.report. Fixes #3961
Merge pull request #3960 from mmascher/generic-fixes

Generic fixes
Fix an error in the parameter validation of get-error (fwjr)
Update User/Base handlers
Changing ByCodepoint's "save" signature

1) Because if it returns a ref, then it isn't actually saving anything...
2) Changed the "const" qualifier to inout: Using "const" means the return type is always "const ByCodepoint", which isn't a valid range (a const range can't be popped)

The change is mostly moot, since it would appear ByCodepoint's save or forwardness is never used anyways. But that doesn't mean it shouldn't be correct.
Update in chunks

reduces requirements to ForwardRange
Smarter dollar slicing in chunks

For *all* range types.
AZURE-53. Changed the default value for recycleOnExit to false
added a feature of sharing sound by SoundCloud.
added sound cloud share icon
updated to support eden GetRecentlyAddedEpisodes
move paginator into POs it's relevant to
Merge branch 'refactor_view_all_reviews' into move_paginator

Conflicts:
	pages/desktop/base.py
Remove useless locators/functions
Merge branch 'refactor_view_all_reviews' into move_paginator

Conflicts:
	pages/desktop/base.py
Move wait into Paginator
remove waits from tests.
Merge remote-tracking branch 'mozilla/master' into move_paginator

Conflicts:
	tests/desktop/test_search.py
Repair missing paginator in themes.py
Merge remote-tracking branch 'zacc/move_paginator' into pull466
Merge branches 'pull466' and 'master'
Add browserid include, to allow injection of navigator.id.get
added engines and aws
updated package
version bump
updated package versions and removed config settings
renamed settings-dist; updates to new project name
Merge pull request #5 from ednapiranha/master

renamed settings-dist; updates to new project name
add tooltips to quick login buttons
removed dev log
update gitignore
trying to fix ratings...
Add .isType() for common JS datatypes.

File-checks are missing, though.
#klar til test
Updating README for rules slightly, again
Some cosmetics and get rid of hardcoded identity.
rakefile default bundle
correct typos; reformat.
wiki: handle json parsing error
randomreddit: handle invalid json response
More descriptive documentation in BaseView
extra options are now in array() and segment_by
Fixed object name appearing for annotation value

git-svn-id: svn+ssh://rubyforge.org/var/svn/biocatalogue/trunk@2545 1acaf488-1b9d-4964-8077-0a2fdb83ef00
fixed build-type
Merge remote-tracking branch 'henare_github/patch-1'
Revert "Merge remote-tracking branch 'henare_github/patch-1'"

Mistakenly merged into master. Please note that we'll want to merge this work into master on the next release, at which point we'll want to revert this reversion in order that the changes are properly re-applied.

This reverts commit 54281fd50c3271835a54ab4bc08d40da09d643ee, reversing
changes made to 793ca358c37458e6cc4385d2366621aaee93a25e.
Latest translations from Transifex.
Revert "Revert "Merge remote-tracking branch 'henare_github/patch-1'""

This reverts commit 211fe84dc40d97df8aa8724906d9170ed4f78477.
Merge branch 'release/0.6.7'

Conflicts:
  locale/cs/app.po
  locale/ro_RO/app.po
Require rather than load to avoid already defined constant error when loading rails environment.
Latest translations from Transifex.
Merge branch 'hotfixes/translations0.6.7'
Merge remote-tracking branch 'origin/release/0.6.8'

Conflicts:
  locale/cs/app.po
  locale/sl/app.po
  locale/sq/app.po
  locale/tr/app.po
  locale/uk/app.po
Emphasise the importance of adding a newrelic.yml file, fix formatting.
Don't offer or allow viewing of an HTML version of a response attachment if the request is hidden, or requester_only. Google docs viewer won't be able to access it, and our own conversion process currently can produce image files that will then be publicly viewable directly from the webserver (see config/httpd.conf). If necessary we can revisit this code to enable admins and requesters to view the HTML version created by our own conversion without adding these files to a path that is served directly by the web server.
Merge branch 'hotfix/no-html-conversion-for-hidden'
Merge branch 'master' into wdtk
Rewrite specs that were in spec/controller/application_controller as full-stack controller specs in the relevant controllers. It turns out that having spec blocks that reference the ApplicationController class directly i.e. "describe ApplicationController" can have unpredictable effects. actionpack's action_controller/test_case.rb rewrites rescue_action_without_handler on whatever it is included in, and if this is done on a controller class, and then directly on action controller, it can result in an infinite loop of recursive calls. This turns out to be the problem that was causing some tests in error_spec.rb to fail in Travis under Ruby 1.9.
novo visual
novo visual
initia push for meetup sample project
Site updated at 2012-12-17 17:42:21 UTC
added creation_date field to Project class
Changed OS target to 10.7 (was 10.8) in tests.
Backout 110075:81be299f5004 - Big regression on tabs tray
Fix for bug 799465 (Add complete support for non-nsISupports objects in new DOM bindings) - allow non-nsISupports object to be parents, take care of review comment. r=bz.

--HG--
extra : rebase_source : 0e0373a0dfb0d3a3a3846c87529bde31f072866f
Bug 792037 - Improve idle daily logic such that we shorten idle time waits if it has been a long time since the last idle-daily. Improves telemetry data collection on Win8 tablets. r=gpascutto, mak77
Check in qfin diff.
Bug 766064 - Remove overly-conservative assertion (r=jorendorff)

--HG--
extra : rebase_source : 3228f7ce771c7dda14571a16e998b4efd9b9bbd9
Bug 755186 - rm JS_NewGlobalObject (r=jorendorff)

--HG--
extra : rebase_source : d9ba442572836406e165cdff11a646e6fd498c03
Bug 755186 - s/JS_NewCompartmentAndGlobalObject/JS_NewGlobalObject/ (r=jorendorff)

--HG--
extra : rebase_source : f1ead9226915f72473a01db0a1019cdbe50c8e92
Bug 755186 - add JSCompartment::global (r=jorendorff)

--HG--
extra : rebase_source : 0a54699e01350611f1de69845cfe05b1506c40cb
Bug 726264.  r=smaug
Bug 575294, bug 760946.  part=1/5 r=enndeakin,smaug
Bug 575294.  part=2/5 r=smaug,roc
Bug 575294. part=3/5 r=roc
Bug 575294.  part=4/5 r=roc
Bug 575294 - s/mFocused/sFocused/. part=5/5  r=smaug
Bug 761927, part 0: Add casting helpers and clean house a little. r=jlebar
Bug 761927: Fix focus for <iframe mozbrowser remote>. r=jlebar,Enn
Bug 541270 - Correctly calculate the filter region for SVG filters on HTML to account for zooming. r=dholbert.
Back out 12f76b9a2d78 (bug 541270) for failing to compile
Bug 541270 - Correctly calculate the filter region for SVG filters on HTML to account for zooming. r=dholbert.
Back out cset c7f2e01bd3a3 (bug 746876) for robocop perma-orange.
Bug 727351 - Some minor refactoring of the MotionEventHelper code to make the fling part more readable. r=cpeterson
Bug 727351 - Fix the MotionEventHelper fling code to deal with the panning threshold and re-enable the fling correctness test. r=cpeterson
Bug 807623 - Reimplement obj_toString and fun_toString traps on BaseProxyHandler. r=ejpbruel

Looks like these got lost in the Direct Proxy Handler refactor.
Bug 809213 - Move PhoneNumber.js from Gaia to Gecko. r=gal
Bug 809972 - settings.js: gracefully handle missing nsIAudioManager on desktop builds. r=fabrice
Bug 810025 - Remove noisy log messages, r=ahal
Bug 565274 - Implement the accept attribute for the form and file upload controls for custom MIME types; r=sicking,mounir
Bug 760162: Remove obsolete comment about nsCRT::mem* functions in nsCRT.h; r=dougt f=sgautherie
Bug 760402 - Map debugger preference to mozSettings. r=fabrice

--HG--
extra : rebase_source : 61783ea299853396eea461b79dd5766da5e39217
Bug 757496 - Support mozKeyboard.setSelectedOption[s]. r=fabrice

--HG--
extra : rebase_source : 4f62f03c060524aa62eb388554b1c94d674505b6
Bug 758672 - Support mozKeyboard.setValue. r=fabrice

--HG--
extra : rebase_source : ab1014d247556d65dceb8c9da45a894ee5266ed4
Bug 754083 - Implement mozKeyboard.onfocuschange. r=fabrice

--HG--
extra : rebase_source : 7ea816e0c26597dde61b166e5ecf5ce2232aac2e
Bug 760100 - mozSettings throw a __exposedProps__ warning when returning a result. r=gwagner
Bug 761489 - New addon page overflows when text is wrapped; r=Unfocused
Bug 756003 - Check both overflow-x and overflow-y properties to see if an element is scrollable. r=mfinkle
Bug 759775 - Update checkerboard telemetry code to handle RTL pages. r=Cwiiis
Bug 760831 - split out per-node type stats in about:memory; r=njn, bz
Bug 761943 - crash in nsXULListitemAccessibleNativeInteractiveState, r=surkov
Backout bea5301cf21f (Bug 703484) for regressing OMTC OGL on Mac.
Backout dd81ac5bb79d (Bug 703484) for regressing OMTC OGL on Mac.
Bug 759000 Use accelKey instead of ctrlKey in peptest tests. r=ctalbert
Bug 781318 - Autofocus textboxes in prompts. r=mbrubeck
Bug 650399 - All webapps should use the same webapp database. r=mfinkle
Bug 740194 - [Skia] Implement a version of SkMemory for Mozilla that uses the infallible mozalloc allocators r=cjones

--HG--
extra : rebase_source : 6dc39ae06b4cb38cd8e85e41c01077f815b8f8c8
Backed out changeset c2475674e105
Bug 757932 - Inline calls to common property getters and setters. r=dvander,bhackett
マテリアルが切れてたので修正
Prueba push github
splash of jclazz-gui
Improved code for obtaining version numbers
Rename interrealm, remove authserver support
增加板块资金流向图片
Fixed static_maps view menu

When loading the page with an alternate map view specified via the map_view hash parameter, the map view menu didn't take that change into account when showing the new set of available options. The module's parseMapHash function now handles that manually.
Log flash socket policy file access
added blurring for anaglyph to help smoooth out jaggies for the displ map
Deleted CodeKit generated CSS
Merge remote-tracking branch 'origin/github-omniauth' into github-omniauth
Added default routes, github authentication works
Configuration de Travis agregada
Add pkg.sh.
A few marginpar remarks added.
Add new module - invisimail
Better data sending
New allowance system
Added file for MRC conversion
OpenTween/Connections/ に入っているソースをきれいにしました。
Fixed a regression in fuel/core/1.4.
Fix is available in 1.5 but not back-ported into 1.4 (yet?)
updated novius os
Merge branch 'dev' of github.com:novius-os/novius-os into dev
Merge dev
each block has its own histogram in global memory
bugfix -- initialize full histogram to zero
More testing code
nil is not a valid jid
added tool bar etc
sized tool bar added alt tags
Merge pull request #32 from neicull/master

added tool bar etc
Fix updates and error handling.
NXP-9432 - deprecate getUninstallDependencies(Package), add a method using P2CUDF solver
Removed the typescript modules
Removing extra column
modified footer, added some information about the lectures
Changed pom files.
Merge branch 'master' of github.com:occi4java/occi4java
Adding logStreamerHttp (work in progress)
Savurganco uploaded
Added a basic css reset
Fix #23: handle ipc support via endpoint param
find customers who returned all consoles
Merge branch 'master' of github.com:oliv9286/304Project
adds some new files, and attempts to switch RTD to use sphinx default
theme so I can use the options.
response_contexts and action_contexts documentation parts
Fixes #27. Fixes #29

Plus many other bugfixes.
strings.Contains -> strings.HasPrefix
add comment
* version number updated to 0.981
* code cleanup
* code cleanup
* move
removing pom.xml to have a gradle structure
reverting pom files so that intellij can open the project properly. (poor gradle support)
wiping out iml files from project
Remove manual reference to sentry django client.
Add back missing end date
inherit cflags from mapnik-config

git-svn-id: http://svn.openstreetmap.org/applications/utils/tirex@28904 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
[RefData][ORI] Changed the format of the ORI-maintained list of POR (points of reference).
  1. The alternate name blocks are now separated by an equal (=) sign, which allows
     to parse them more easily (e.g., in Python with the .split() method)
  2. Added two new columns, for now both empty:
  2.1. UTF8 name of the related city, when known/existing.
  2.2. ASCII name of the related city, when known/existing.
  3. Removed the 'alternatenames' field. Indeed, all the alternate names
  are already present in the dedicated section.
  4. Fixed the header, which now reflects the actual content of the data file.
V 0.1  Unfinished. Fix table layouts
Support of oxf: and file: URLs by the file serializer
Updated 2012-11-21-w1.md
removed obsolete STATUS file
add Argentinian localisation (thanks to zenarola)
fix string errors
Fixed syntax in XML and Crowdin
Merge branch 'master' into ospalh-special
Editor droppings.
Metric time.
Show times as days or years, not as hours, minutes, seconds, months.
(Exception: setting the learnig steps, still in minutes, possibly a few other.)
(Obviously not for everybody.)
Merge branch 'metric-time' into ospalh-special

Conflicts:
	.gitignore: just the same *~ files
	src/com/ichi2/anki/DeckPicker.java: Joined the metric time code
               and the fixOrientation code.
Added ids to each person
Merge branch 'master' of github.com:ot-crew/ot-crew.com
Работа над спеками для моделей
started working on the client dashboard which is a central part of this application
added model tests, updated dash
updated preview
proximity uses now the bruadcast channel and is more intelligent than before
added new threding and broadcast channel
working on mpd
working on timer
working on cron
adding back pascals edge detection functions
Code added to JobGraph::Job::Generic

Summary:
1) Generic Job object can eval() arbirtrary code
Alternative folders for JobGraph::IO development
Initial Multiple Lift Device Vehicle
First Flyable Rotorcraft-steered Fixedwing
Multi Wing
no trailing whitespaces
Ready to Fly Plane with Rotorcraft Sticks
Whitespaces again
Pitch Trim
Cherry-Picked Atmos Force Allocation Update
Fixed Pitch Overwrite Issue
New rotorcraft fixedwing attempt
Reduce overflow change in AHRS
Attempt to float dcm ahrs in rotorcraft
Pitch of VZ
Gitignoring sublime
Some formatting
Article
Use sentence-tokenizer to return token nodes.
hwsq: Two more flags found.
nvbios: Nailed down THERM_ALERT gpio tag.
Reviewed for OpenNebula 3.6
busca completa (introducao, roteiro) 0.2
Test player sliding
Enter Orcs of Golarion feats

git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/content/notfordistribution@16865 b6a209e6-650d-0410-972b-dadffa731f64
gereinigt
Merge branch 'master' of https://github.com/pcmoritz/2dayaction
BIG PUSH FORWARD on modernizing all action results and everything
Fixed the issue with the very slow basic auth specs.

(2.84 seconds -> 0.05 seconds)
refactor views spec
add call to purge view
add purge view method
add delete document to couchdb utils
clean up fbsd machines
- Added validation for port number
Convert all API output to use @json.
Account for the new meta-data in the API.
Account for the new metadata in the catchall controller.
Fix meta for proxy errors, output the status code in the meta.
Fix meta for output the status code in the meta for API results.
Merge branch 'feature/meta-data-in-api-output' into develop
Rebuild Manager app as an ASP.NET MVC 3 app, instead of 4 RC.
Fixes #929 - special case for empty arguments (double quotes)
Merge branch 'master' of https://github.com/phingofficial/phing
CRYPT_RSA_ASN1_SEQUENCE shouldn't have been used
adjusted content and style
Implemented show() with transaction on ShadowDialogFragment
fixed #6 and added onStore attribut to products
Revert "We can inherit www_view from Asset.pm"  -- No, we cannot, since there's no style template.

This reverts commit 7764b9f15172b8a22b7d1c33e3e7e0a9bd299cfe.
~ switched back to normal css
Shorten UsageExample
Removing duplicate plugin entry in POM.
Updated eventcloud artifact id
Merge branch 'master' of github.com:play-project/WebApp
Perl caps
Another test, this time for the main branch of the project.
another change test
another change test
Re-compile source.
merged bibs
Merge pull request #133 from fifthroom/2.0

Widget / Shortcode restructuring and fixes
Merge pull request #135 from fifthroom/2.0

Renamed widget classes
Renamed form includes to fit new widget naming convention
Building a shortcode in list and single widgets, displaying it in the widget view
Added column widget output
Added backend interface for the Pods form widget
Calling shortcode from form widget
Prefixed shortcode form CSS classes and IDs with 'pods'
Added dummy links to admin bar for custom table pods
Replaced dummy hrefs with real ones
Changed admin bar label to pod['options']['label'] if present
Merge branch '2.0' of https://github.com/pods-framework/pods into 2.0
Commented out the admin bar's edit link for now, until I can test it. Requires PodsAPI->save_pod_item to work
Added todo note for admin bar edit links
Merge branch '2.0' of github.com:fifthroom/pods into 2.0
Removed redundant function declaration for admin_bar_links from PodsAdmin class
removed redundant add_action call for admin bar links from PodsAdmin class
Merge pull request #137 from fifthroom/2.0

Admin bar links and "form" widget type
Merge pull request #138 from pods-framework/2.0

2.0 refresh
Add / Edit roles now working
Attachment handling on admin for issue #345
testing create and delete alli #bug
Ajoute debut pres
calling updatemodel too early can cause session to be undefined
release 0.4.11
Adds theming
Dont ignore our theme
html4 mode for hash testing
More pre-hamlification tests for views.
HAMLify some pages.
client senza errori
removing .end()
Version bump to 0.0.6
permissive version for rcov
beginWithKeyword
Fixed comment typo
[Issue #72] Enclose regexp starter keywords in \b...\b
Dropped unneeded parens around terminators regexp
Replaced 'if' and two 'returns' with a ternary 'if' under 'return'.
Drop {begin: '\\n'} hack from SQL, we now have another hack to detect EOF
Named constant for EOF regexp
Revised readme
Fixed typo in README.ru
Counting a sub-language relevance in a host language.
[Issue #74] Testing beginRe against lexems in `subMode()` should succeed only at the beginning.
Thanks to Joe Cheng for the report and the initial patch.
[Issue #75] Using named recursive function inside `nodeStream()` instead of relying on `argument.callee`.
optimize images
Merge https://github.com/isagalaev/highlight.js
add string.Format support to CsvWriter
mod: better dependency list
mod: readme
mod: republish package
mod: less todos
rm: .gitmodules
mod: re-organize files
add: doc and makefile
mod: add libs
fix: footer style
mod: implement async grid generation and auto start end positioning
mod: minor tweeks
add: stats for generating grid
fix: set node position
mod: push logic off view
add: impement colorize effects
add: state description
mod: instructions panel dom id
fix: panel styles
add: implement dragging and drawing
add: implement button transitions
Adding credentials.py to the ignore list
data.economie-solidaire.fr changed to thess.economie_solidaire.fr
Merge branch 'master' into multisite
Save screenshot and controls of display done.
novastats and other site templates
missed urls
Merge pull request #4 from SandyWalsh/better_tenant

Better tenant
hope I got it all
Merge branch 'master' of https://github.com/rackspace/stacktach into better_tenant
temp
reactivate daemon
Merge pull request #5 from SandyWalsh/attempt

Capture latest staging changes
add allow_all_file_extensions module
Merge branch 'hotfix-allow_all_file_extensions'
fix flash from invalid password
doc web svc
Loosening restrictions on FFI module dependence.
Updating for 0.6.3 release.
added method for getting person photos
Merge remote-tracking branch 'upstream/master'
Merge pull request #16 from mdeng/master

MORE STUFF YAY
tweaked init.lua
Changed app name to org.tribler.mobile v1.0
Aesthetic fixes
More aesthetic changes
overlay4u.get working and tested
tidied up search for recipes
Merge branch 'master' of https://github.com/rawrjustin/foodprep
Merge pull request #29 from aronr/cspace-5175-rework

CSPACE-5175: Rework vocabulary instance changes to match those described by Carly on this JIRA issue; remove new 'Local' vocabularies and instead simply change the display names of existing 'default' vocabularies. Remove person and organization 'test' vocabularies, per CSPACE-5181.
CSPACE-5207: Making Patrick's suggested config change to filter soft deleted records (in 'deleted' workflow state) from 'All record types' search results. This prevents a user from seeing and attempting to edit deleted records, which would result in their seeing blank records, without an error message being displayed.
Merge pull request #32 from aronr/cspace-5207

CSPACE-5207: Making Patrick's suggested config change to filter soft deleted records (in 'deleted' workflow state) from 'All record types' search results.
Merge branch 'v2.4' into ucb-deploy_2.4
Adding dependency tclhttpd3.5.1, server startup script, and basic directory structure
Removed commented out extras from search_results.py
Add a title helper
chapter 5
finish layout and routes
Project Add working!!
Improve the disassembler output. Args are correctly formatted based on addressing mode.
Removido teste de app/index.php
Stability enhancement — 3 bugs fixed
Move key binding definitions.
Put trigger key in variable.
Keep point when inserting rectangle values.
Move variable definition.
Make scenarios the way that is expected.
Unused steps.
Add TODO file.
Update of Dutch translation.
Start Assessment POSTs
* Added hidden assessment_id
php-phpunit-PHP-Timer: update to 1.0.3
Misplaced OS_NAME_MAX_LENGTH initialization fixed
上的发生大幅上的
Revert "thousands separator on score"

This reverts commit 14ebacfb350cdb1d339096bab11495a8734489b0.
Revert "Revert "thousands separator on score""

This reverts commit e65b3923ed3ce0152a5f1b6508b72c744848ecf7.
minor change to fake Mr. Nice settings
Fixed some backtraces.
Fixed more backtraces and the nonatomic variants.
Fixed a terrible, terrible bug.
Fix bug in case of too many replicas across the cluster with a primary datacenter that has one replica
Fix pinning master
Add listener for pin on/off
Add destroy
Improve comment for the span used to preload fonts
Added solution skeleton.
re-added pytmdb3 submodule, this time pointing to fork so it can be edited
Merge pull request #17 from rit-pepband/dev

Dev
Merge pull request #19 from rit-pepband/dev

Made the banner hide after code was re-input(ted?) (#16)
Updated gitignore for some basic tmp files
Added the twitter feed
Kelly's Major Changed
Twitter feed styling and setup
Added info about the location of the band room
Updated the font size of the user (also: this is issue #18)
Merge pull request #20 from rit-pepband/twitter

Twitter
Made the appropriate changes to allow for a history section, with urls of:

/history -> index
/history/:year -> specific year
Defined the default history (/history) page
Some sample history pages
Added history to the nav bar
Differentiated the index from the 2012 page
Added JQuery to site
Started to sepreate rendering a history page
Added the HAML layout for history
Added functionality for rendering history pages
Added the history navigation bar
Updated styling of the history nav bar
Don't import launchpadSim unless we actually need to use it.
adds min, max, limit, range, variance filters to Stats
Fix Valgrind warnings about use of initialized memory. Caused by member variables
not initialized in the constructor.
Add CORE_EXPORT to QgsAtlasRendering
Fix QgsComposerLabel unit test
Add/Fix SIP for QgsComposition, QgsComposerMap and QgsAtlasRendering
Add Python unit tests for atlas rendering
Add synchronization between canvas layers addition / removal and atlas GUI
Revert "Revert "Merge pull request #245 from Oslandia/atlas_integration""

This reverts commit 8a1953b9e710ea25dac502b32eab9e0e8d652b10.
Revert "Resolved merge conflicts when reverting 686f632"

This reverts commit a654e274a352ef29354de0bcb13e96444868c806.
Merge branch 'atlas' into atlas2

Conflicts:
	python/core/composer/qgscomposition.sip
	tests/src/python/CMakeLists.txt
Update atlas unit tests (fix the overview map frame style)
Add function helps for $page, $numpages, $feature and $numfeatures
minor mapserverexport plugin fix

making it work on ms6 work out of the box again
Update atlas.
* Store every parameters and expose operations in a new QgsAtlasComposition class
* Restructure the GUI part. The atlas configuration panel is now independant
Update of QgsAtlasComposition SIP (with Python unit tests as well)
Fix atlas segfaults
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into atlas
Merge branch 'master' of https://github.com/rouault/Quantum-GIS
indentation update
Merge branch 'mapserverexport' of https://github.com/rduivenvoorde/Quantum-GIS
fix #5269
updated some of the package versions, minor fix.
Tweaked the jds cli a bit
padding top features
fixed link footer view
add heroku/development Procfiles.
Move first config stuff to the script
Initial work on authentication.
Allow the user to check that tools/build-all.sh completed succesfully
Update to 824
Update to 588
Update to 24
Add the use of minFilter and maxFilter options in
TextureCompositorTexArray
Fixed variables names extraction from numeric expression in case the
variable name use operand characters
Ocean: added mask layer. Added surface animation of texture.
Merge pull request #251 from aurelien35/Feature_TextArrayFilter

Add the use of minFilter and maxFilter options in TextureCompositorTexArray
Merge pull request #258 from aurelien35/BugFix_NumericExpressionVariable

Fixed variables names extraction from numeric expression in case the variable name use operand characters
removed extraneous files in quadtree driver
TextureCompositorMulti: fix createSampler function
Added the boundary generator tool.
CMAKE: rearranged IDE folders to separate samples from tools; added RC versioning to osgEarth::Version
Cache: quieted a debug message
Added some copyrights
BoundaryUtil: gcc compile fix, and a couple earth file fixes
2.3 Version bump.
gcc compiler warning
Merge branch 'master' into topic-ocean-masking
Registry: force "quadtree" driver as the default on Android
Changed to default terrain engine driver to "quadtree".
OceanSurface: added docs for the masking layer
[openstack|identity] use tenant_id parameter in users model

Bump version to v1.3.9 for internal use

Initial update for DWC-1174.

[openstack] Make use of the unscoped token for reauthentication

[openstack|identity] Add `attr_accessor :unscoped_token` to Mock

Signed-off-by: Nelvin Driz <nelvindriz@live.com>

Additional Updates for DWC-1174 Add reset server state.

Additional Updates for DWC-1174 Add reset server state.

Final updates for Add Reset Server State

[openstack] Make use of the unscoped token for reauthentication

[openstack|identity] Add `attr_accessor :unscoped_token` to Mock

Signed-off-by: Nelvin Driz <nelvindriz@live.com>

Additional Updates for DWC-1174 Add reset server state.

Final updates for Add Reset Server State

Removed extra spaces and added comments.
Merge branch 'reset-vm' of github.com:rolandoalvarado/fog into reset-vm
More Slowness
Add rake to gem deps to make Travis happy
..
Merge branch 'master' of github.com:roquesouza/HosFlowE
..
Merge branch 'master' of github.com:roquesouza/HosFlowE
Rebase from 'release/ros' @ version '1.9.36'
Generated debian files for quantal
Rebase from 'release/rqt_service_caller' @ version '0.2.5'
Generated debian files for precise
define-common-generic auto-exports from CM-METHODS; def :type :generic added
Export status :keep
F: definition order C: ->

* Changed order of definitions such that an error during the first
  compilation of a def would not cause subsequent defs to have symbol
  collisions.

* -> now takes a symbol parameter as an alternate syntax for
  single-parameter lambdas, e.g., (-> x ...) which is equivalent
  to (-> (x) ...).
MINOR FIX selectlnks query
Add new source code: main.cpp.
catch invalid bytes in source quickly and raise. This has some performance implications though.
Revert "Removing octopress"

This reverts commit d857674619a63a702104eaac1cb9e1729c00db71.
Renamed exercises to w1ex? format
Updated Readme file. Please Test!!
MetaData Capture makes more sense in the context of a workflow
removing TNT run files
removing normalized MRP matrices
removing TNT runall script
removing nchar file
removing MRP matrices
removing TNT files
adding new URL files
downloaded new sitemap.xml file, with new studies
added new tb2download target, which only fetches new studies from sitemap.xml
adding new TreeBASE studies
removing failed downloads
adding .gitignore file
removing old-style komodo project file
Show personal info to users viewing own profiles
Add per-project Featured Item model
Add notes API & allow filtering on project in API
Extend base autocomplete JS functionality

1. Enables autocomplete fields for notes and documents (not just topics)
2. Truncates results over 100 characters
3. Allows for selection of a result without redirection. If the
autocomplete field has the class "autocomplete-no-redirect", once an
item is selected, the field will be disabled, and two hidden inputs with
the model type & object id will be appended following the field.
Add method to get log entries by project
New view for editing featured items
Update menu bar with correct links
Merge branch 'master' into featured-items
Merge pull request #108 from rybesh/featured-items

Featured items
remove public/temp cached
DB backup 2012-12-28
add hibernate utility
Updated with Dana's revisions on near final copy.
SIGNUP-173 add category filter to main signups page

git-svn-id: https://source.sakaiproject.org/contrib/signup/trunk@82235 fdecad78-55fc-0310-b1b2-d7d25cf747c9
Added hiredis (Native redis C lib) as a dependency.
Merge branch 'master' of github.com:sakaiproject/Hilary

* 'master' of github.com:sakaiproject/Hilary:
  Capitalizing CQL keywords
  reCaptcha fix.
  Content libraries should be sorted on their last modified date.
(Issue 302) Tuning search index to favour the document title and boost better on more exact matches.
Reverting the switch to edgengram and instead tokenizing by 'letters' instead of white-space. This means that text such as 'white-space' will get tokenized into white and space.
Removed non-existing documented parameter
Fixed documentation + changed to stable version of grunt-simple-mocha
Adding fontawesome, a scripts.js file and an images folder
Added procedurally generated music
Added procedurally generated music again
Show note names. Highlight notes that can't be played on trombone in red.
Still showing publisher greens if story has no feed_id and therefore wont have any feed greens.
Trying to fix dupe detection.
Adding auto_active flag to reader import, for the iPad.
Merge branch 'master' into bookmarklet

* master:
  Adding auto_active flag to reader import, for the iPad.
Formatting article.
updated unit_test README.txt
Implement accuracy/evasion pseudo-stats.
Improvements on mammoth getters
added datatables, white-space:nowrap;
Refactored pages & tests
Finish layout and routes
update ruby patch level to p327
fix ganglia metrics for ubuntu 12.04 and MySQL 5.5
Merge branch 'master' into stable
Merge branch 'stable' of github.com:scalarium/cookbooks into stable
Merge pull request #12 from rockamorales/master

Modificaciones a la seguridad
Merge pull request #24 from mackk/master

merge
Merge pull request #25 from schumy21/master

merge
Merge branch 'master' of github.com:rockamorales/ClinicaWeb.git
Merge pull request #13 from rockamorales/master

Acceso a los recursos solo para usuarios autenticados
Merge pull request #26 from mackk/master

Acceso a los recursos solo para usuarios autenticados
Merge pull request #9 from rockamorales/master

Acceso a los recursos solo para usuarios autenticados
bind method, changes to Native API to be super methods.
need to work some on the jQuery api bits
fixed model test
added watermark icons for datasets and views
add sitemap gen configuration file
add post oop post idea
Merge pull request #4 from sdywcd/master

jshop
Merge pull request #5 from sdywcd/master

jshop
订单详细情况
jshop
Merge remote branch 'origin/master'
Merge pull request #35 from alextao/master

JSHOP
Changed code to return diffs of X and Y rather than values
Rut ahora guarda sin digito verificador
Merge branch 'master' of https://github.com/sebasalazar/laboral
JJ/TS: spacewhite
Making sure intervals greater than 1 will start from the start date of the schedule.
Merge pull request #92 from cawinkelmann/master

Schedule find_occurrence when interval is greater than 1 won't use the start date causing invalid results
* config loader with os.environ
* add ini path to base.cfg
* config inherence example
* test runner with different options, i.e, run test with pdb
Adding backfill call for parameter change
first commit
Merge remote-tracking branch 'matthew/master'
Merge remote-tracking branch 'matthew/master'
another change
Merge pull request #1 from semmerson/master

pull request
Merge pull request #1 from mryilauer/master

pull request #1 from mryilauer/master
do not format swap partition by default.
Merge branch 'master' into debian-pulse
2.13.3
minor fix
added pry-debugger dep
delegate post reqs to config/providers
passing config to providers initialize instead of sending it w/
each request
added PUT, DELETE request methods
Variable type autoconversion for preferences module
Added common app bootstrap module
добавлен dbg-wizard.php
Minor change in Retrieval Part
Craig
Quick fix: Fix area labels in configuration dropdown
Fixed sign.update()
Use color with euses.
partners appear in order.
login/logout redirects actually work now.
elfinder
efinder2开发开始
Merge branch 'master' of github.com:sheshuguang/archive
upload ok
upload ok
文档管理建表
合并版本
合并版本
encounters for screener module
test changed
merged code
stored the attributes needed in an array and called them
final code
final code
code to get person uuid of provider put in util
full representation of provider
meerging from main repo
commit after checking code
commit after checking code
Merge pull request #117 from vishnu-krisiz/secondary

RAXAJSS-160:Screener: Create Screener Encounter with "Assign to Doctor";RAXAJSS-231:Screener - Add registration encounter
conflicts resolved
hapus silabus
rename silabusname
Removed unused validation tests. Refactored tests and fix event
registry.
Added an annotated tag instead.
Don't require yajl-ruby to parse JSON, but use it if it's installed
Rather than changing error_reporting, just suppress

Hopefully this should fix tests on 5.4
only parameters changed so that the are comparable to the dog bone
tensile tests
parameters changed - comparable to the dog bone tests
module works, minor plot changes
formula simplified
non working version
Merge branch 'master' of
https://rostar@github.com/simvisage/simvisage.git

Conflicts:
	quaducom/quaducom/micro/resp_func/cb_emtrx_clamped_fiber.py
	quaducom/quaducom/micro/resp_func/cb_emtrx_clamped_fiber_stress.py
DNA extractions cannot be published by default
Sequenced genes published on Strain record
Added best culture medium column
Added best culture medium to Strain
Añadido el campo supervisor id a la tabla maintenance
Añadido el campo supervisor id a patent_deposit y a isolation
Added the module Petitioners and changed references from identification to address this table
Form for configuring Strain labels
Merge branch 'master' into 1.2
Merge remote-tracking branch 'origin/1.2' into 1.2
Added isolation date to the isolation services
Create labels for Strain
Removed old Labels module
Migrations fixed
Added a zero in front of the latitude and longitude when these numbers have just one digit
Merge branch '1.2' into marcos
Labels for Strain-related models
Merge branch '1.2' into labels
Moved the app.yml to app.template.yml and added to the .gitignore
Moved the app.yml to app.template.yml and added to the .gitignore
修改fieldEditor为widget
1934
Merge remote-tracking branch 'origin' into third-branch
Lots more HTML and styling.
Refactor _button code to be less redundant
Remove if clause from reset; remove partial.
Update Readme
Can now handle history by pushing up/down
Added a bunch of cool settings
Remove dependency to libpthread by adding weak aliases
Added forelse, and foreachelse, which allow for "default" code branches, in the event that the loop would run 0 times.

forelse(assign, condition, counter, loopCode, elseCode)
foreachelse(array, assignment, loopCode, elseCode)
Fixed a bug where a missing persistance file caused EOF exceptions when loading the file.

Also, updated the documentation some, and moved the DocGen files to their own package.
Added main class, map class, and pan class. Everything seems to be working
Merge branch 'master' of https://github.com/skegel13/course-map.git
Add 2ndlesson.php and 2ndhomework.php
Fixing loading order
other sounds
Attempt at Raspberry-pi support in the Makefile
Platform wasn't set correctly
Renamed darnitMusicPlayMod -> darnitMusicPlayTracked
General Cleanup

Combined some source files and fixed a couple small errors.
Created SQLite database schema file.
merged with branch master
optimization code for union tool (fix #5617)
merged with branch master
Merge branch 'master' of github.com:slarosa/Quantum-GIS

Conflicts:
	python/plugins/fTools/tools/doGeoprocessing.py
Build requires libewf20120304, later versions that depend on zlib-1.2.7 are not supported at this time.
Update to latest version of RegRipperModule.
Merge remote-tracking branch 'upstream/master'
Added new blackboard artifact for exif metadata
updated solution file to include exifmodule
adding updating framework solution to include exif module
adding submodule for exif module
updated exif module to be up-to-date
Merged Blackboard modifications.
Fixed resource leak
Move to 1.7 and cleanup imports
Moved archive folder out of .minecraft
Initial work on instancing
Added new class: InstanceManager
New: exams are now instanciated based on a directory rather than a unique dcm file. Bug [Resolved]: A slice was added twice (call to addSlice in the constructor has been removed).
added some debug text for butterfly
Merge branch 'master' of https://github.com/smeighan/nutcracker
Merge branch 'master' of https://github.com/smeighan/nutcracker
fixed for HORIZ_MATRIX model type.
new effect class, twinkle
nov 26 export
cha nges
Add Windows 2008 as OS for SauceLabs tests
Fix gem build -- files were missing.
mensaj
haber
Merge branch 'master' of https://github.com/sonico999/sisjungla
Fixed the stderr format
removed full image
weird hack to support v6
change dataset implementation
Adding coffee script require tests
Moving javascript test files to their own folders for test isolation
Adding check for duplicates of different types within the same file. Adding unit tests to support change
here be the page.
revrev not revrevrev!
updated color abilities.
fiiiine.
ok, better.
fiiiine ie! thanks jquery!
oops jquery
Merge remote-tracking branch 'origin/gh-pages'
removed console.log
template -> templates fixes
=エディタ修正
Fixed Mcrypt deprecated functions and related tests
add image to sample text in samples/replacebyclass.html
Make m2crypto support Oneiric
[scripts] fix 2.4 2.6 options and version info
add new file to branch 1
add 1 line to file
Checking Python version is more explicit.
Add contentencode and contentdecode utility functions.
Update CHANGES.
add matrix
Merge branch 'master' of https://github.com/stephenLee/codebase
adding location to tweets
find-out
changes now
update changes
Fix mesh, cpu usage.
Return of the Strings

Put the strings back in, except for 2 that are stored in a separate,
untracked file.
* fix: win32 libevent.lib file error
add hacks that could works fine on GNOME 3.6 with Emacs
sonata req changed
slug overrides
Add backbone views for landing page
Mise à jour des css
Make proof address configurable.
asset pre-compile issue with tokeninput fixed
reSWIGged

git-svn-id: http://svn.wxwidgets.org/svn/wx/wxPython@72764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
removed api key because it looked a bit redundant, not sure if it is a good thing
[modified] readme
Facebook timeline.
BroFrank

Update Metro UI in show dialogs.
Update Command Line Feature.
Command:
-SkillEditor to run QSanguosha General Skill Editor
-Option to show Option Window
-About to show About Window
-Help to show Help Window
-Mainpage to show Mainpage
-Homepage to show Homepage
-CloseDevelop to disable developing status
-IntoDevelop to enable developing status
-FullScreen to show window with fullscreen
Dodanie krzyzowania arytmetycznego
Dodanie metody selekcji i mutacji
more instructions, patterns
css changes
div removed
Mobile
Submit button at the end of the page
Form submission working
Thank you page after reporting
Added splashcreen picture
Thank you screen with mobile payment
forgot some files
association information
Complete hackday code
task #45099 - general reports and transaction view now take a date type parameter for what to search on

can be ordered_at, fulfilled_at, or journal_date
Merge branch 'master' into report_date_field_45099
Calendar working kinda
Merge branch 'master' of github.com:tageorgiou/baguette
Fahrrad Diagramm.
PartsList weitergemacht
nfa_mit_ausgabe umbenannt
Testfälle NFA
Merge remote-tracking branch 'origin/masterFTJ' into totobaa

Conflicts:
	nfa_mit_ausgabe/src/model/Automaton.java
	nfa_mit_ausgabe/src/model/RelationManager.java
	nfa_mit_ausgabe/src/model/State.java
	nfa_mit_ausgabe/src/test/TestManager.java
Exercise 35, functions and branches
项目名称和应用名称统一为 apposs_agent
调整配置文件的装载策略
添加设计图
Merge branch 'simple'
fix config file
Change the Scorer to:
  * Remove unnecessary inner class (Entry)
  * Store score in HashMap
  * Use PriorityQueue to sort using the comparator
add a :parent option to Timeline#post
Merge branch 'master' into madrox-entry
Fix build error: ext/java/nokogiri/internals/PushInputStream.java is no more (0e0f8eee230a471b529c512bf8d4dad0f8ffcfd9)
Merge pull request #654 from wolfgangw/patch-1

Fix build error: ext/java/nokogiri/internals/PushInputStream.java is no ...
Version bump to 1.5.4.rc2
Change class name.

Test::Unit::Data::ClassMethods::CSVDataLoader ->
Test::Unit::Data::ClassMethods::Loader
Rename method.

Test::Unit::Data::ClassMethods::Loader#load ->
Test::Unit::Data::ClassMethods::Loader#load_csv
Move code to check filename extension.

Test::Unit::Data::ClassMethods#load_data just calls
Test::Unit::Data::ClassMethods::Loader#load.
Move document
Fix @see
Add document about  Test::Unit::Data::ClassMethods::Loader#load
Bring include's to common style

 * Include local headers within module

 * Don't use "headers only" meta-modules in depend.pri
2012.09.26-17:56
back out readline addition (#376)
docs: clarify single-quote comment is for Unix
typo in inline plugin docs
sanitize output of %unique
Merge remote-tracking branch 'upstream/master'
Removed stupid-browser test case
Removed stray coma causing a sytax error
Remove lusty plugin
Renamed TreePacksPanelConsoleHelper to TreePacksPanelConsole
Added date/build now that the latest binary has been released.
Update rascunho
subs-tupane - added 'derived' as search term
update copyright years

for every file we touched in year 2012
Automatic commit of package [katello] release [0.2.56-1].
Automatic commit of package [katello-configure] release [0.2.38-1].
Merge pull request #397 from xsuchy/pull-req-copyright

update copyright years
Automatic commit of package [katello-agent] release [1.0.6-1].
Automatic commit of package [katello-configure] release [0.2.39-1].
bump up version to 1.0

as preparation to 1.0 release
Automatic commit of package [katello] release [1.0.1-1].
Automatic commit of package [katello-selinux] release [1.0.1-1].
Automatic commit of package [katello-repos] release [1.0.1-1].
Automatic commit of package [katello-configure] release [1.0.1-1].
Automatic commit of package [katello-cli-tests] release [1.0.1-1].
Automatic commit of package [katello-cli-headpin] release [1.0.1-1].
Automatic commit of package [katello-cli] release [1.0.1-1].
Automatic commit of package [katello-certs-tools] release [1.1.7-1].
puppet - moving lib/util into common subpackage
Bumping package versions for 1.1.
Merge pull request #404 from lzap/installer

puppet - moving lib/util into common subpackage
puppet - better wait code for mongod
Merge pull request #400 from thomasmckay/crosslink

crosslink - links from system and activation key subscriptions
Sample node.js server added.
Changed the style id for the standard unfolding map to 67954
Moar CSS changes
Renamed LocationService to Location
username is a string
Added dependencies to JUnit and Mockito for 'core-service' module
Implemented unit test for TimeTagService
Added dependencies to JUnit and Mockito for 'data-access' module
Implemented unit test for GenericDao
Used 'spring-context' instead of 'spring-core' in 'data-access' module
Used Spring-based annotation for dependency injection in GenericDaoImpl
Initial version of TimeTagService was implemented
write the docs
Added context, framebuffer, buffer, format and pipeline stubs
Previous commit corrupted XCode project, this seems to have fixed it.
Added module
Added module
Solved problem 3
decreased tab size
removed i3 config - couldn't get soft link to work
YUI script src enabled
preliminary mailer functionality - sends confirm email to terminal
Comment out lines using test data.
added some validation logic to receipt
fix typo
abstract XML generation
add initial CSW fields (first pass)
add pycsw_local catalogue backend
s/keywords/keywords_csv/
added the LOP example from hxmpp.lop
support for multiple celebs
Rough "Add new dive" infrastructure in the divelist

Do a right-click to get a menu with the "Add dive" entry.  Should do
delete too, but that's for later.

What's also apparently for later is to make this *useful*.  It's the
butt-ugliest time entry field ever, and there's no way to set depth for
the dive either.  So this is more of a RFC than anything truly useful.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Make the interval between notifications a setting.

Read the notification interval from the settings and make it one month
by default.
replace size module with multiple version modules
renamed versions file
added versions
use version one
reverted addition of SysLogHandler
add first user seed
enable responsive css
added submodule private
Skeleton axis docs
Try new way
now that we can check queueing without a queue name, stop passing in queue name
Merge pull request #10 from tstmedia/hurr-no-queue

now that we can check queueing without a queue name, stop passing in queue name
add a load testing tool
added 500 page, debugging 500 error