labofsahil/github-event-dataset-2012 huggingface dataset:
Added a Pages controller
done with this static pages part
Done with static pages
Add chili
Added .gitignore ignoring Eclipse IDE config files.
Fixing stasis server option
removed paint code from maze class and added to panel class
initial commit with rake task
Merge branch 'master' of github.com:worace/escaper-caper
fckeditor stayles fixed; node description opening added
'Add_Admin_Image_folder'
Implemented all projects
Decoding fixed once and for all?
Open/Close folder icon/glyph!
Open/Close folder icon/glyph!
horari personal -> definitiu -> he arreglat el GUP real (no tenc patis dimarts)
retweet only tweets with valid spotify url
Remove unnessary covariant signatures
added is_enabled field for option, order by update time for question list etc.
Merge branch 'master' of github.com:xiaoyong/yirisanxing
width of edit button in entry view changed to wrap_content
fixed build issues with android ndk v8
show password and lock menu item of entry view activity if there is room
Convert plugins for Shinken
workflow for creating new indexes
XWIKI-7536: Fix margin to support nested <dl>
Done.
XWIKI-7782: Allow to reset LDAP group cache from the UI
XWIKI-8489: Make the autosave widget more configurable
Done.
XWIKI-8192: Trying to search for documents only from one space might include results from other spaces with similar names
Fixed.
Merge pull request #2 from xymostech/master

Re-write sandcastle to accept phabricator reviews and only use one repository
Use ndashes instead of dashes
Fix typo with branch name
Fix bug where -new branch isn't deleted

Also, remove --quiet flags from git for easier debugging.
Move the repository to media/repo
Cleaned up event parameters a bit to drive the lightbox better
Strings, escape!
added missing access modifiers
Current vertex in Path fixed
modified enum
Add missing comma.
Adding more beers. Because there's no such thing as enough beers. Bacon strips not included.
Merge pull request #6 from majtom2grndctrl/master

More beers for the menu.  Because I love alcohol, but have never drank or been to a bar.
Now using Maruku to try and get JRuby to build with it.
first commit from pc
Merge branch 'master' of github.com:ycheng06/Imagine-Cup into USFinals
Fixed bad bounds
修改SQLite动态库设置。
Add  hello world script by php
Include missing stylesheet
Updated project my-internets
Added jQuery FullCalendar plugin (http://arshaw.com/fullcalendar/)
Load FullCalendar CSS/JS
Use FullCalendar on #event-calendar elements
Added event calendar page
Added pagination!! (fixes #6)
package.json: updated to 0.11.1
wikiminute/: removed trailing spaces
edited .gitignore to track jquery.tmpl.min.js
added jquery.tmpl.min.js
added the Spine library (spine.js and local.js)
added entry.js
rewrote mover.js, which now depends on the Spine library
added entries.js, which replaces footstep.js
added a class to the span of the overlap number in unq.js
core_main.css: added new styles of Footsteps
main.css: added the styles of the check mark in the list
main.ejs: edited it to load new files and added a template
index.ejs: edited it to load new files and added a template
LICENSE: added more copyright notes
added batik jar
Update layout to link "participate"

- Link "Participate" in header, and add link "Overview" under
  "Participate" header in footer
- Add space before "class" in nav links
- Mark active navigation element in participate page
Added pole_zero file
Fixed wrong order author
Merge branch 'develop' of github.com:zherebjatjew/autodor into develop
Typo in New truck dialog label
#16 Added Charge view and required fields
首页
首页继续修改
Rename Lexer->Tokenizer
Bump to Release v0.4.2 vc10
Forgot the VersionControl post XD
fix example background
LastFMScrobble: language stubs.
LastFMScrobble: actually use the language setting.
changed copy, added new font
Added Flask requirement
toggle_fcharge
добавлен нормальный ввод даты . реализованы кликабельные теги в блоге
twitter and rows fixes
added credits, help and develop info
Working version of kernel indepanded
p2fl passes 1-3
Rename to bukkit settings and clean up pom.xml
Inittab configuration support
Add alternatives to the README
TEST COMMIT
Should fix the custom item problem with Roaper's ID. I can't tell for sure though, because I have no way to test it.
Merge pull request #1713 from ThatOneGuy42/master

Roaper's custom Item fix
Merge pull request #1712 from zoou/master

test commit
fixed faux's custom item
REALLY fixes Roaper's custom item (I forgot to code the spawning thing-y for his ID) and adds mah cane.
Merge pull request #1714 from OriginMUD/master

Custom items
Port fix for #485
Allow other filter to skip the TrackMessageSizeInterceptor
Fix for #757
Split cols into parts.
use hlink for default view of author
update TODO
client check moved up
Add DELETE /student/:id/class/:id/ endpoint. Document new endpoint.
Revert "Ramhack, OC, UV"

This reverts commit 18ab13dedf8281e73bc092914f14efe54b8156ba.
Revert "enhanced-FakeShmoo-OC-UV-for-2.6.32 by wkpark"

This reverts commit 941a2b414ea55aeb3a27937cab7a85623f03175a.
Revert "Update defconfig"

This reverts commit 5275e40066e9c18060f21fe7bbe33e0b53dda3a8.
updated defconfig
removed the comment so that it should use @logo
updated the way logo is been accessed
added ignore file
checkinstall scripts
checkinstall
support ',' as needed by a few plugins
Drive funtional and fully tested
Fixed aspect and removed bordertexture for channel logos
db file is imported
DBUtil file unuseful import is removed
Create employee reg form page
RendezvousMesh tests updated
draws crosshair
fixed

menu, header, footer, div. margins og justeringer inkl page bredde, der
nu er 990 (960 + padding: 30)
Describe use(handle)
Fixed general config constructor. Fixed issue with getting specific config from ID.
Updated README with version info
initial commit
Merge github.com:CharlesAHunt/BrianApp
Pass projectId to listTags, when viewing a project resource
Always make tags editable
CS-16206: code cleanup
CS-15287

Support validation on edit detail view

Original patch by: olga.smola
reviewed-by: brian
CS-16046: cloudstack 3.0 UI - Edit zone - Local Storage Enabled field is a true/false field. Make it a checkbox in Edit mode.
Implemented wild card Search feature!
set up mail, not quite working correctly but getting there. Cannot make
connection to the server.
successfully sent email!
With Loads of Error in searchResults.ftl....
Implemented Wildcard Search for Logged-Out Search for
Organizations....which displays in a seperate FTL....

Added loggedOutSearchResults.ftl freemarker to display results....

So need to merge the two resultsets of Organizations and Users
search....
Integrated the ResultSet of Organizations and Users for LoggedIn Search
and LoggedOut Search.. And also added DisplayBean as the Bean and
deleted the loggedOutSearchResults.Ftl Freemarker page....

\m/ \m/
added a genericPageTemplate for headers and footers. need to put roles
once a user signs up.
adds authorities for a new user.
Merge remote branch 'origin/UserFriends' into masterPrep

Conflicts:
	web/home.ftl
	web/login.ftl

got the user friends and the registration part done. Need some cleanup,
but we'll get to that later.
Low: Tools: ptest - Fix for being able to be built with latest code
Merge pull request #177 from gao-yan/ptest-fix-build

Low: Tools: ptest - Fix for being able to be built with latest code
we should watch for split line endings everywhere, not just the last chunk
fixed when opening non-project
Bitcoin-Qt: use statustips in addition to tooltips

- add setStatusTip() in addition to setTooltip() where it makes sense
- add only setStatusTip() if GUI element is only used in main- or tray menu

- add an event filter on our BitcoinGUI object to prevent garbelled text
  on the status bar, which happens when we use it for e.g. displaying
  block-sync state and then a QEvent::StatusTip wants to write own text to it

- remove a double translation of "Bitcoin client"
Merge pull request #1923 from Diapolo/Qt_tooltips

Bitcoin-Qt: use statustips in addition to tooltips
Add virtual destructor to CCoinsView
Merge pull request #1972 from sipa/virtcoinsview

Add virtual destructor to CCoinsView
style and checkboxes working
finish refactoring person phones
Remove special build rule for gcc.o
updated mockup's
mockup's updated
snp link on snp-disease view
Removed competition id dependencies 
Merge branch 'master' of https://github.com/DanB91/USU-BUGCATCHER
Début de travaux sur ouverture dynamique d'écran client existant
Merge branch 'ClientExistantConnect' of github.com:Djiko/Immobilier into ClientExistant
Ajout d'une listeClient, modification du slot dialogClient(client) pour prendre en compte l'index dans la liste et non le client lui-même
Création et Implémentation de l'accès à DialogListeBien depuis un widget client
Merge branch 'master' of https://github.com/Djiko/Immobilier
One library list.
Updated .vimrc to use a basic status line.
Added logfilename option.
JSVita Beta 4.4 Released
adjusting search result on data catalog page to ensure the located layer is actually on the page.
Merge remote-tracking branch 'origin/master'
solution for fullscreen borking in ie
new bed template
new shorter mounting bracket for x axis idler/motor mounts
modified lower z mount to fit a prusa mendel
ZIP-Ordner für die Abgabe wurde hinzugefügt, der im dist-Ordner eine Jar-Datei, den src-Ordner, das Bild und eine Write-Datei beinhaltet.
Create folders for nodes strategy
Import docs from blogofile.com & mark them as 0.7.1 specific.
Fix link to plugins branch docs on readthedocs.org.
SessionsManager and services testing
Output performance data even if WARNING or CRITICAL job count threshold is crossed.
Minor trace enhancement
Hello

Hello again
Added try-it URLs to config
Add BukkitUtils dependency and update version
Nblines
Revert "Check"

This reverts commit da0aa49d738a57a042420c5b77ac48eeded96fbc.
Revert "Revert "Check""

This reverts commit 8733a1ccbc68c1f3fa863e367fe1755870c4fc4b.
Remove unused imports.
Added a new way to set aliases.
This way, the aliases are set on Bukkit level and the CommandListener,
which checks for every single command every single time, gets obsolete.
Removed CommandListener, as it serves no purpose anymore.
Implamented a simple config. Re wrote Duration[] as SetDuration to avoid confusion with the DurationSec variable.
customise appid
[maven-release-plugin] prepare release quark-1.0.3
[maven-release-plugin] prepare for next development iteration
Fixed a bug causeing SQL error when both order by and limit are in the
query
Fix a function name typo.
Update wpe.txt
+ 8 dynamic whatever
MacAddr removed from method LogPlayerJoins
Agr for method IsIpWhitelisted changed to String
My fail xD
Many things from JoinEvent moved to LoginEvent
MotherF***r
Added orientation.
Added collision and scene creater classes.
bugfix in Pages news_index
Add `combine` and other split-apply-combine operations.
Traduction des erreurs
Trend forecasting. Records management improved. Optimizing chart for some extremal states. Debugging.
gitignore list: ignore OS X system files
radar chart experiments in separate branch

Das ist ein ganz langer Text....
.
.
.

zu Testzwecken.
FIRST TESTS: new html page with test charts and new js files creating charts and data
new branch

Merge branch 'testRadarChart' of github.com:HsKaChartMap/chartmap into testradarchart
Added a dummy service class to make git commit the folders
wwww-1: add joda time
Updating typhoon checks
Populated gldefs/ folder with pk3/GLDEFS contents
The D.Wyvern no longer vigorously humps the Ettin.
A lot of stuff in this update:
- Added 5 extra classes (Soldier, Trader, Scientist, Citizen and Bandit)
- Added two new stats (Charisma and Speech)
- Moved the stat editing box up (To fit the player name box in)
- Made the stat box background red (Looks cool :D)
- Added a player name box (For obvious reasons)
- ADDED (>>NOT CHANGED<<) a new button method to create buttons of a set
size. Examples of it can be found in the character creation menu (I
thought it would look neater if all the class buttons were the same
size)
- The total points adds up to 21 for each class. Each has two strengths
(Which start with 4 points on each), three regular (Which start with 3
points on each) and two weaknesses (Which start off with 2 points on
each)
- Added a check to see whether dexterity is less than/equal to 2. If it
is, speed defaults to 1. Otherwise, speed defaults to Dexterity / 2.
- Made the Main Menu background fit the screen.

I know you were working on it Zex but I just thought I'd add the classes
to the page and finish the design for you. The two new stats will allow
more complex NPC interractions, and I just they were a MUST =)
Merge branch 'master' into gh-pages
Footer adjusted
changed construction message
style updates for sass - still going...
abstract draft 2
Added Brighton and Hove specific CSS for the admin
even better fake rule usage
Visitor generation improved
Fixed the Property Window Second set Bug.
Noting change
add InputTextBox.cs
Init Solutions

Signed-off-by: AB <www.wpj@163.com>
Déplacement de l'affichage de printf valueUsername.c_str()); dans PushConnexion
from - to
Notifcation and camera fixes
#werwer-3 Fixed Minor
Moved piece of bonus room ceiling into ceiling group.
Remove rails.png
Add mustache.js
When adding a new book, lookup ISBN number and show book preview
Split out specific books styles into books.scss
Expose in the ISBN lookup whether a book can be created
Restructure template markup to contain create button
Switch to use keyup, but only perform lookup on input change.
Direct user to add copy to existing book if book already exists
Style input with 'btn' the same as links with 'btn'
Fix selector for button link styles
Handle cases where no book can be found
Expose the entire existing_book in ISBN lookup
Merge pull request #3 from JordanHatch/isbn-search

Overhaul the new book form
Changes made to __init__ to register the blueprints. Addition of the view class.
提交：学生的短消息，可以收到文件被reject和通过的消息
运营部ajax更新客户基本信息完成
完成ajax的修改applicant家庭信息的功能
运营部修改申请人费用和进程的ajax方法，完成
commit： modify contract and fee
adding version and OS check
Automatic commit of package [foreman] minor release [1.0.1-7.a5bc286].
desain interface
Decimal#to_s takes parameters which SimpleDelegation wasn't passing on
Implements flat hash class.

Makes hash traversing function such as #each work with a single argument
instead of 2.
Merge branch 'master' into rbtree
Fix jRuby Decimal#to_s.

Decimal#to_s has a different output in jRuby. It ends with a trailing 0.
German Open Goals
moved projects into source dir
basket bean cleanup job fix
Removed portions of database configuration that are ignored by SQLite.
added home page at /pages/home
Add slacker teleport.
Fixed issue #06261 : unable to preview non-active survey, group, or question
Description
Dev : put test in replacements, maybe best is to rework Survey_dynamic::model
Fixed issue #6969: Statistics graphs in Arabic not shown properly
Adicionado a classe de teste o metodo testEnviarLembreteUmDiaAntes()
0.0.2beta update
Updated Web Services api to proper version for elgg 1.8 and api key
Hashie version update
moving 2

forgot to save 1 more file...
Refactor
Fix sky appearing on certain tiles by always using max distance (doesnt seem to affect fps)
account at a glance and terrifyingJS
Herp
wha
Blogique: add core object
Double quotes replaced with single quotes

...around string literals that contain neither PHP variables to
interpolate nor special characters like \n. Strings wrapped in single
quotes are processed slightly faster in PHP since, unlike strings
wrapped in double quotes, PHP variables are not interpolated at all in
strings wrapped in single quotes and only two characters that must be
escaped in single-quoted strings are single quote character itself and
`\` character.
Fix ReferenceEllipsoid class to handle spheres as well as ellipsoids
Use of EPSG data listings for Reference Ellipsoids and Datums
Unit tests for spheres
1. Deleted app name in action bar.
Change Ib7331616: Always show menu key in navigation bar

Change-Id: I95915b07db806a6ee19b0600addf5e8e68bd4f6b
Change I346eb652: Don't popup confirmation when backup/restore

Change-Id: Id7aeae1b555265fd723a36c893fdf7dc7d20d5a7
merge framework changes of antispam

N/A

Change-Id: Ic8b4226aa2c383246e301d52782a560439967c1b
Signed-off-by: wangwei_b <wangwei_b@xiaomi.com>
Change I5f81ac8a: Change access permission of translateStatus

Change-Id: I940c8e72302d0014a5aa6f75946138160385ce1a
fix parameter position error

Change-Id: I9cdb5421ab259c5b345544f7ad16a9405edaac50
fix bug that volume key can't wake phone

Change-Id: I0dea14e69580243a61e7d1ac5d60a03d63e2c195
Change I39339c0e: Try to avoid keeping ringing after answer a call

Change-Id: If9f294ab98d930a5c8e674533c582de28862dfc6
Change Icf4efffe: use ExtraLocalePicker to adjust locale order

Change-Id: I8b205e8c1a82fcd675d9eb372f24c88bfb92153e
Change I43a90d89: support read MO sms on sim card

Change-Id: I656aefb63364d78a19bcfe8c618e80c1dc7b86dd
modify resource id to right value

Change-Id: Ie24ca79eff202f897c6847d04885bf9b001df039
Added softgis logo
solution concept document
Merge branch 'master' of https://github.com/MinskLab2012/Module-6
NPE fix for Accept command.
Converted project to maven.
Included WorldGuard library for maven.
Temp fix for images problem
Add dates to images and stories
continued work on the skill system
Update src/MvcExtensions.Ninject/MvcExtensions.Ninject.nuspec
qTranslate check in parser.
Fixed to request filter.
Much work on cleaning stuff up
import skeleton
Version 5.2.5.41
Version 5.2.5.11
Version 5.2.5.13
luarocks zipball link
Merge branch 'ui/dev'
Rename property files.
Merge branch 'master' of github.com:/OpenGamma/OG-Platform
Commit analytics package change
Merge remote branch 'origin/master'
Rename property files.
Adjust and test extraction of server name
[PLAT-2051] Linking to position information from Analytics web client
Merge remote-tracking branch 'origin/master'
Added a tool to create a new CSV or XLS file with the columns required for a portfolio load of the specified security type
Merge branch 'master' of github.com:/OpenGamma/OG-Platform
Script in OG-BloombergExample(s) for portfolio CSV/XLS template creator tool
Merge remote branch 'origin/master'
Script for portfolio template creator tool in OG-Integration
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
Couple of fixes to message text in portfolio template creation tool
Merge branch 'master' of github.com:/OpenGamma/OG-Platform
Example Multi Currency Swaps
Remove old vertica scripts
Cope with null listener user
Docs
Converted DbConfigMaster.elsql to use new @PAGING macro
GS-10613

* created view and remote service to display recipes.
* created abstraction for topology bottom tab split panel.

code reviewer: Evgeny Fisher

git-svn-id: svn://pc-lab14/SVN/xap/trunk/openspaces@128892 eb64e737-3616-4df0-8941-5ee2ae88103d
first commit
initial Skin commit
taken out all dependance's on vix skin
Merge remote-tracking branch 'assembla/master'
- fix addMessage button
Added Screenshot, Link to GPLv3
Readme
Read me
First commot
Merge https://github.com/vbelinic/SEW_12-13
Second commit
bearbeitet von Vennesa
bearbeitet von Vennesa
Merge https://github.com/vbelinic/SEW_12-13

Conflicts:
	README.txt
Arif Balkan
Arif Balkan/TGM
Merge https://github.com/Astrid364/SEW_12-13
Merge https://github.com/Astrid364/SEW_12-13
Depot scaffold
Validation!
Validations changed!
Chapter 8
Chapter 9
chapter 9
gemfile
gemfile.lock
Latest
Latest20120702
latest
Whoops.  Fixing template to get the order of the text the correct way around
структура проекта
структура проекта
after upload/download it will update the files version and save it
Version 1.0.0 final
Translate tools menu labels
Add "Start Over" item to tools menu.

Closes #232
Merge branch 'hotfix-issue_232' into develop
Added a "continue" button to the help modal.
New assets: bones, picture frames, level numbers, spider webs, new doors, candles and urns
Merge branch 'master' of github.com:Plaev/skeleton-jigsaw

Conflicts:
	lib/game/levels/04.js
unset id matter
This enables configuration of the deform static path in the Pyramid
configuration file.  If the Pyramid configuration includes a value
for ``pyramid_deform.static_path`` that will be used to configure the
static path, else the default value of static-deform will be used.
	modified:   CONTRIBUTORS.txt
	modified:   pyramid_deform/__init__.py
	modified:   pyramid_deform/tests.py
Merge pull request #14 from lanestevens/master

Enable management of deform static path through Pyramid configuration file.
Keep the cursor 8 lines from the top when scrolling
I'm using vim now
Turn off Resume
Revert "revert temporal arena disabled"

This reverts commit 00d9448966fe2b66ae30ae0b1bf882817633b562.
Updated to v0.5.9b
changed kv to kvs
version bump to 1.0.3 #2
Agregué el contenido que nos puede servir del sitio antiguo en old_page_content y modifiqué un poco Trisfera.txt, añadiendo links
taalbestand aangepast voor tekst in menu-aanwijzing. Daarom dus *.sys.* file
first CI test
Correct Timing
Tweaks and preliminary FoV implementation
Add some vampiric monster boss people
Add item to gond shop
Dragonhide item
WP for xpcraft
Fix FAI lights
Fix water trigger
Change location of guards
Remove cruft
Fix initFilters + Add initOrder method
Cleanup of fragment generation algorithms.
refactor ressource loading
Merge branch 'master' of github.com:Sambuca/AndroidGameBA
removed warning in dbhandler
Clean object files 2
star wars greetings
star wars greetings, says the username
Added alias foor scour and selenium
Changed delivery directory paths to flow cell IDs to avoid collisions for runs with the same date.
Carrying over lagging changes to generate_sbatch.py
Merge branch 'master' of github.com:SciLifeLab/scilifelab
Merge remote-tracking branch 'scilifelab/master'
Merge branch 'hotfix/add_bc_count' into develop
Merge remote-tracking branch 'origin/master'
Merge branch 'hotfix/sample-status-bugfix' into develop
Merge branch 'hotfix/check-status-and-Status' into develop
Merge remote branch 'origin/master' into develop
Merge remote-tracking branch 'origin/master'
Merge branch 'hotfix/rounded_read_count' into develop
Add code for generating reST reports
Add bp_seqcap
Change project to project_name
Merge remote-tracking branch 'origin/master'
Update key-values for templates
Reformat bibliography
Fix merge conflicts
Change sphinx to rst. Use rst2pdf to generate reports
Fix rst document output, and add concatenated document
Delete Info header
Move logo to upper right corner
Rename status document classes
added error handling in chidb_step
make sure the game name popup disappears
before the regex monster eats all the working code
refactored to recursive regex
interpreterGenerator changed
Merge branch 'master' of https://github.com/SimonKaltenbacher/CIC
Fichero configuracion AMI
xbox360 Controller patch
Fixed bad console logging code.
Removed unused files and methods.
Cleaned up code.
Twitter Bootstrip!
Simplify code using Vector copy constructor
Right-click shoots
Limit range at which AI shoots
Move Emitter class into own file
change the groupid
minor changes
show errors to the user
radna verzija 001
armv6 is obsolete.
I comment my Question on the very top of "Viewcontroller.m"
pulling data off takktile via bulk endpoint
merge in jb-mr0-release history after reset to jb-dev
Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/bionic into aosp-merge
Merge remote-tracking branch 'cm/jellybean' into jellybean
PastCourse details
Update o365.ps1
Ja sama englanniksi :)
Forms

Added basic support for forms elements.
documentations

changed rest options
update readme
added rest docs
added procfile
c3 is updated
Memory leak tickled by CRZ bug.
DarkmoonFaireIsland => Darkmoon Faire
CRITERIA_UPDATE update events MUST be bucketed.
Coord Corrections.
Merge branch 'master' of github.com:Jiyambi/WoW-Pro-Guides
For Lucky Dragon: add protection in OnClick CheckFunction dispatch.
Merge branch 'master' of github.com:Jiyambi/WoW-Pro-Guides
Quick guess to fix Emmaleah\'s recorder problem.
AutoSync to WoW-Pro.COM on Mon Nov 12 16:44:01 EST 2012
Add General directory scanning to UpdateGuides.py
Merge branch 'master' of github.com:Jiyambi/WoW-Pro-Guides
AutoSync to WoW-Pro.COM on Mon Nov 12 18:05:43 EST 2012
Move EmmLostAndFound to the right place.
Merge branch 'master' of github.com:Jiyambi/WoW-Pro-Guides
V 2.3.6
Merge pull request #1 from Jiyambi/master

11/13/2012
Updated dummy data.
Updated models, stores, views and application.
Implemented Snippet and Tag controllers.
Vendors updated to latest versions.
delete all
delete alll
remove length option for Binary properties
Merge pull request #1113 from galthaus/pull-req-release-rails3anddb-master-db18324703

More updates to the sass fix.  First one wasn't complete enough. [3/6]
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Add updated submodule references for release/rails3anddb/master
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Merge pull request #1126 from cloudedge/pull-req-release-rails3anddb-master-afed661706

Routes v3 added into Doc work Change [2/5]
Merge pull request #1128 from cloudedge/pull-req-release-rails3anddb-openstack-os-build-f0df57f9a2

Routes v3 added into Doc work Change [4/5]
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Turn of auth for now - until the update auth system comes in
Fix unit test to pass with new routes for Rails3
Pull in Rob's logging update and network changes for the doc system.
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Dynamic doc changes
Merge pull request #1130 from galthaus/pull-req-release-rails3anddb-master-064380ba1e

Get the admin nodes installed without auth for now [3/6]
Merge pull request #1132 from galthaus/pull-req-release-rails3anddb-openstack-os-build-25940da480

Get the admin nodes installed without auth for now [5/6]
Merge remote-tracking branch 'origin/release/rails3anddb/openstack-os-build' into release/rails3anddb/openstack-os-build
remove nav and i18n imports because they have moved to saner locations
Merge remote-tracking branch 'origin/release/rails3anddb/master' into release/rails3anddb/master
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Add updated submodule references for release/rails3anddb/master
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Merge remote-tracking branch 'origin/release/rails3anddb/openstack-os-build' into release/rails3anddb/openstack-os-build
j1.5 fix

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@5856 87cc427b-4a1e-0410-b729-b2260ec0f063
fixed report view
fixed storing of ST address (please check)
fixed login form, should now work also directly called (not using shopFunctionsF

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@5950 87cc427b-4a1e-0410-b729-b2260ec0f063
CheckConditions : checks for billTotal

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@6723 87cc427b-4a1e-0410-b729-b2260ec0f063
Small update of de-DE language files

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@5759 87cc427b-4a1e-0410-b729-b2260ec0f063
PayZen, SystemPay missing sys language files

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@5760 87cc427b-4a1e-0410-b729-b2260ec0f063
excersice 3
Added short description, description is optional, prepared addon import.
bionic: Add NASTY_PTHREAD_CREATE_HACK

This is a workaround for bad linkage of proprietary libs on certain
devices. Thanks to Zinx for tracking it down.

Change-Id: Ice2da9c02c3c84b9ed417e623b248a87b8f9678e
add box template
watch_for_card saves captured cards
add easy gradient calculator
add helper function to show an image, clamped so whole range is visible
add card set loader
example of how to score cards using gradient
save card images in directory, keystroke deletes card
helper functions from_buffer, and setup_windows
whitespace cleanup
create a click-based workflow for deleting bad scans, with multiple cards visible at once
create utils to save images to folder, and load raw scans to db
implement card matching
header comment
fix img_from_buffer
implement card matching database process
add re-implementation of correlation coefficient calc, and implement 'return to base' checking on watch for card
load_known calculates histogram & angle. match_card makes use of these
ignore local data
add gimp command to add numbers to image
add ruby script to split up image, and generate printable sheets
Updated documentation features (hover activation)
tested via remote machine
Improved javascript style, anxed some issueues.
edits to Drink! Deep dive doc
Modified p3.R
another attempt at fixing orders
Readme File

For Sudoko.java
Repositioned header on home page
Can now dislike a song, added dummy visual % bar
Resource Management (part 1)
Merge branch 'master' of git@github.com:abcfantasy/Green-Time.git

Conflicts:
	GreenTime/GreenTime/Managers/ScreenManager.cs
Lots of stuff
- organized content
- new sounds + music
- esc. to quit intro/logo
- lots of fixes with sound and resources

to do: final screen & computer screen with resource manager
moving to 2.3
Added Startup Genome Mode!

Now you can optionally show map data from Startup Genome (http://www.startupgenome.com). The service makes it easy to collaboratively curate map data and enables everyone in your community to maintain their own marker information. So when people change their address, they won't need to ask you to update the map for them. Startup Genome may also have existing map data for your community, so it could help you pre-populate your map. Integration is 100% optional.

Big thanks to Chris Taulborg and the Startup Genome team for contributing to this update.

Also fixed a few small bugs including past events displaying on the map.
Version 1 archived. Prep for new code base.
removing duplicate ssh include in go server recipe
Add a pub section.
Correcao de envio de interacao ao usuario
add id generator for kevent timers
Fixed the stack size for the test program
changed Manager to MercuryManager in ConnectToHomeNetwork
changed layer source types
support certificate authorities
commit changes...
debug ok and remove test for no selections
Merge pull request #14 from kerautret/addOldExtractionMethod

Add old extraction method
Modelo completo con relaciones en cascada
moving the triiifecto bootstrap test to the triiifecto static project
Data is successfully being piped to the workers from the content supplier
devel version 1.2.4.13.
v2.8

added new side bar nav to link to new web page, added new workshop as
well to BETA
update to tell folks how to run the CLI and Unit Tests
Changing status messages
Fix hopefully fix any wmic command not found errors. Add override support, create a file called .screenfetchOR in you /home/mokou folder and set variable used in the script from there.
add url history support
add tab settings for rails
Removed useless code
Added (empty) translation files for spanish and german
Removed unused logo. Updated old ones
Updated README
Fixes SQLite3 bug in Heroku
WIP account registration
修改了signup.jsp以及添加了gitignore
改动error.jsp使其能够显示exception内容。
Update Border Manager for latest XPDF
add reoute controller collection + tests for upload & quarantine
add missing bind
rename route
fix alignment
add doc consistency
fix error doc
fix error doc
remove unecessary assert
Merge pull request #92 from nlegoff/html5_upload

Html5 upload
lazybox confirmations
Modificada estructura base de archivos
add settings bar;
Added getItems() method in BloctopMenuItem class
Added instructions in README
Rebased on master add recommitted changes... Still learning Git :-)
Merge branch 'dev' of github.com:alexsegura/prestashop into dev

Conflicts:
	classes/Link.php
write directly to a tmp file, remove writefile
remove current_file as it is not used
parse stdout first, if empty try stderr
updated actions to new generator
Cleaned up a little
ALLJOYN-1529: Call StopAllJoynProcessing in BusAttachment Dispose method

Closing programs would hand in the StartAllJoynCallbackProcessing loop waiting for
call backs.  Programs should no longer look for callbacks if the BusAttachment is
being closed.
removed dupe lograge entry in Gemfile
Improve the datapack
* Hide internals of ForeachCall data structure

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@23143 3ad0048d-3df7-0310-abae-a5850022a9f2
* Expose ForeachCall functionality in new Iterate call, but keep backwards compatibiliy

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@23144 3ad0048d-3df7-0310-abae-a5850022a9f2
typechecker in progress. Checks assignment statements currently. Still needs to drill down through while/if/etc to find the embedded statements.
More functions added to SocketAPI to support audio streaming
Merge branch 'master' of https://github.com/amoljain/Localization
Fix Appirater to include necessary resources. Add Appirater 0.0.6
First commit of DCPU16 attempt.

Current problem I'm stuck on: match vs matchAll, 'asdf' vs
['a','s','d','f'] duality. It's both confusing to follow, and
probably impossible to switch between the two modes.

Since I intended to parse general text tables into array-trees full
of strings, then traverse the trees and further parse the trees in
latter stages... This is annoying. I'm going to have to do all the
parsing in one pass, it looks like.

This significantly restructures my class structure. Not world-ending,
just annoying.
Reduced analysis size, attempted to run more code
Added new paramaters to devicelister output
Committing building MonoTouch projects/solutions

This commit contains a building Graffiti.Core.iOS.MonoGame and a
Samples solution - but due to lack of project templates I have been
unable to get the sample(s) to work.
Added a sawtooth function with dutycycle parameter because I thought we could use it for procedural spritesheet animation, but I think a set of keyframes is better for the MonkeySpace demo. Also added DiscreteTranslateTransform
cyanogenmod_ak_defconfig: Enable USB_MUSB_PERIPHERAL, Disable USB_MUSB_HDRC and USB_MUSB_OTG
cpuidle: Add last_residency trace event for residency profiling
omap44xx: cpuidle: Update target residencies to saner values

The current values are insane.

There is no possible way power saving
can be attained by heading into C4 for not much more than 1ms. The average
values are in the 20ms range, so why do we need to even entertain entering
at much lower values when we will use more power than we save in doing so.

The actual recommended values are shown in 79e796f7b993bd82ad108fa488c35ddd1b9387eb
but for some obscure reason, in 16385c726d55f9e84bbc60ff9e329a84d56a13a3 and
22e2193661b6bffcfdc1a4d17f6af0d1782ba860 they were updated to match the exit_latency.

This seems horribly wrong to me as there comes a point when the target residency is
so low that you use more power actually entering the state than you gain from the
insignificant amount of time you spend there.

With the values in this commit, C4 state is used for >95% of the time when the screen
is off, with C3 picking up the remainder.
During audio playback, C4 is used ~50% of the time, C3 is used ~25% of the time and C2
picks up whatever is left.

Conflicts:
	arch/arm/mach-omap2/cpuidle44xx.c
Kernel Version: ak.078.jb.unit666
cyanogenmod_ak_defconfig: Enable ZRAM support
[glassfish-test] Test merge in container-setup - issue #2
Signed-off-by:Ancoron Luciferis <ancoron.luciferis@gmail.com>
[eclipselink] Test merge + many-to-one/one-to-many - issue #2
Signed-off-by:Ancoron Luciferis <ancoron.luciferis@gmail.com>
Disable tests during release run
[maven-release-plugin] prepare release release/9.1.901.jdbc4.1-rc7
Change font for code blocks
Einbinden von der Öffi-API
Hinzufügen des Importers
Criar bloqueio de Modificação 278
consulta e bloqueio de Modificação patrimonio 278
consulta e bloqueio de Modificação patrimonio 278
Merge branch 'feature/bloqueio_nota_278' into dese
Correção bloqueio de modificacao 278
Added the recognition colors to identify clocks too
Use requests.session to allow urllib3 to reuse connections
Fixed duplicate twitter links
progress on snapping for scaled nodes. right now, it only works on nodes whose parents have a scale of 1
updated node version in travis to 0.8
design fixes (use textboxes instead of inlineeditbox)
Adding first cut at the DSL.
Moved title back above, made it multi-line, updated JS bookmarklet code in admin side
Adding support for track location

Track#location with return the raw location (a file:// URI)
Track#location_path will convert the location to a standard file path
Fixing whitespace
Merge pull request #3 from andyw8/track-location

Track location
Added bit rate, sample rate, artwork count
Merge pull request #4 from adamlazz/master

Bit rate, sample rate, artwork count
Fork
Explain fork
Packaging
#89: added tests for remove directive.  fixed a bug in the remove directive where it would not find the sibling nodes because it was detached from the tree.  also fixed a bug where the child variable had no index() function.
#89: removed unused var
Merge pull request #98 from boneskull/89

#89: added tests for remove directive.  fixed a bug in the remove direct...
db settings to heroku deploy
calculando consumo solar
add new files to the repository
implementation de la fonction native de php "mysql_insert_id" afin de recupèrer les ids pour remplir les tables de relations
calculating resources gain
added cross-corpus results
Koppel + word n-grams result finally updated.
ind view front end
Fixes #65: We shouldn't interpret users data, it's just a blob from Amazon:Glacier:GetJobOutput
A few setting changes
updated breadcrumb nav to all admin pages
updated password setting page's nav
增加 一键管理脚本
Merge branch '1.0.1' of git://github.com/mindpin-shcmusic/pin-2012-edu into 1.0.1
修改为自定义错误页面
Merge branch '1.0.1' of git://github.com/mindpin-shcmusic/pin-2012-edu into 1.0.1
Merge branch '1.0.1' of git://github.com/arlyxiao/pin-2012-edu into 1.0.1
rails 路由错误等也跳转到自定义错误页面
Merge branch '1.0.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.0.1
fixed a url bug
some fixes
Merge branch '1.0.1' of git://github.com/mindpin-shcmusic/pin-2012-edu into 1.0.1
/courses 全部课程页签不包括 学期筛选
fixed a bug
Merge branch '1.0.1' of git://github.com/mindpin-shcmusic/pin-2012-edu into 1.0.1
学生和老师查看课程详情页 可以看到资源列表
Merge branch '1.0.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.0.1
added course location to dashboard
Merge branch '1.0.1' of git://github.com/mindpin-shcmusic/pin-2012-edu into 1.0.1
fixed avatar alt info
TEMP: REALLY TEMP
Merge pull request #90 from kalleya/ui-quick-fix

Closing as there was a duplicate pull request which has been closed already by @naleksi.
Fixed so that only published comments are shown
Merge pull request #102 from naleksi/comment-hiding-fix

Fixed so that only published comments are shown
Tad more beautiful
Merge pull request #103 from naleksi/comment-hiding-fix

Tad more beautiful
Paginates admin idea list

crude, looks ugly, but works. TODO: Fix layout.
Paginates admin citizen list but keeps CSV export full
Adds names to admin idea list, and also email for admin/idea#show.
Paginates admin idea list

crude, looks ugly, but works. TODO: Fix layout.
Paginates admin citizen list but keeps CSV export full
Adds names to admin idea list, and also email for admin/idea#show.
Merge branch 'admin-idea-editing' of github.com:naleksi/avoinministerio into admin-idea-editing
Merge pull request #104 from naleksi/admin-idea-editing

Admin idea and citizen pagination, and idea author information and content markdowning
Paginating admin comments
Paginating admin comments
Merge branch 'admin-idea-editing' of github.com:naleksi/avoinministerio into admin-idea-editing
Merge pull request #105 from naleksi/admin-idea-editing

Paginating admin comments
Added counts on citizen's idea comments and votes, and also dates for last ideas
Merge pull request #106 from naleksi/citizens-groupings

Added counts on citizen's idea comments and votes, and also dates for last ideas
Cleaning up extra logging messages
Shuffle around locations of Compass deps
Completely rebuilt this theme using LESS
turned these into sprites
Send backend config
More debug
Find communi in QT_LIBRARY_DIR
Do not treat transport contact as buddy
Fixed out-of-source build again
More edits to resume
Merge branch 'r/0.1.0' into develop
add daemonizer

- add commands(start/stop, run)
change column width for server name
fix fail api check on connection fail
apply backbone

- enable auto refresh
Version bump to 0.1.1
Merge branch 'r/0.1.1'
exercise, Added Help page
adding util.js include file and multiTest.js file

multiTest is the basic extended example which runs many test operations.
Fix nil error in code block method when language is nil.
New workflow for managing users in courses. With more privacy.
Resolved css issue in breadcrumbs.
ignore --disable-gems mode
Better prompt / gr for easygrep
Some vim additions
Merge
Updated version for eea.eggmonkeytesttarget to 3.2-dev
Version 2.2 -> 2.3
used wrong gapi request command
dodanie cout'a
this is the final ssl_server file for the project
actually ask the galil for thread execution info
Update notes for submitted changes

* fix typo in CSV import
Add command for displaying services and events
Merge remote-tracking branch 'origin/master'
Add notification, Add all public request in assets, fields, messages, tracks, channels
Resolve issue with multi_json - gem
Resolve issue with multi_json - gem
Resolve issue with multi_json - gem
Resolve issue with gemspec
Resolve issue with multi_json - gem
Resolve issue with multi_json - gem
Resolve issue with gemfile.lock
Resolve issue with multi_json - gem
Notification is now independant from th Client.\nUpdate Notification to support last version of the cloud (message_fields named before payload became now b64_payload)
resolve issues of the gem
remove notification from client directory
new version of the gem 3.0.2
Remove .idea
Merge branch 'v3-dev' of https://github.com/benamib/cloud_connect into v3-dev
Remove test.rb and json.json
Made email recipients BCC
Included "Send theMessage" as comment
README Highlighting and Repo Change
Add option sp_before_pp_stringify and default sp_pp_stringify to ignore.
Add in readermobilekeys.

This used to live in a silo'ed repo before the creation of this
userscripts repo. It's a small script that lets you use Google
Reader's mobile interface (which is much more minimal than the
desktop one), and gives you hotkeys for it
Some lint fixes for bluegmail.user.js
Initial commit of a GAE logs munger

This is a script to make GAE logs in the web UI easier to scan,
and possibly add additional features on top of it.

It's likely to evolve to be Khan Academy centric.
Right now, it just does some status highlighting, log suppressing,
and user agent simplifications
Can now read file and set params from CLI
check in gemspec
Copy the bundle template and rename it for the Adium plugin template

This commit provides a reference for later commits that will modify the template to generate an Adium Plugin project
Added a file template for an empty Ruby script
added styles
Finish layout and routes
moved latex template to folder and changed website reference type to technical report
start slides for talk
Merge branch 'master' of github.com:bherrmann7/simple-geb
Removed unused preference parameter.
Removed the unused pinned callouts check.
Add preventDefault() to system events.
Added protected method to select term attributes to be copied into vertices.
Made a couple of bug fixes.
Made the GR descriptors both trait and scale.
Added UN stat regions: need to attach them to countries, as well as make valid and legacy connections between countries.
cache progress and fetch across tx from utxo
Update README with run and build instructions
vmod: remove useless keymap initialization

keymap->vmods is not touched until UpdateModifiersFromCompat,
where it initialized and used.

Signed-off-by: Ran Benita <ran234@gmail.com>
vmod: ClearVModInfo doesn't need the keymap

Signed-off-by: Ran Benita <ran234@gmail.com>
symbols: remove comparison of unsigned >= 0

clang warning.

Signed-off-by: Ran Benita <ran234@gmail.com>
state: fix led_update_all group mask calculation

The one above uses which_mods, this one should use which_groups.

Signed-off-by: Ran Benita <ran234@gmail.com>
state: lit indicator when either condition is satisfied

For the indicator to be set, it is sufficient for at least one of the
group, modifier, or control state to match; this is in line with the
xkblib spec, section 8.2 and ComputeAutoState() in xserver/xkb/xkbLEDs.c
(though the xserver implementation differs from the spec on some
points...).

This also adds a tiny optimization to skip the entire check if the mask
is empty.

Signed-off-by: Ran Benita <ran234@gmail.com>
state: lit indicators also when mods/group is zero

The xkblib spec says, e.g.:
    If groups is zero, the indicator is lit whenever the base keyboard
    group is zero.
    If groups is zero, the indicator is lit whenever the latched
    keyboard group is zero.
And likewise for the modifiers. This fix is just what
xserver/xkb/xkbLEDs.c:ComputeAutoState() does.

Signed-off-by: Ran Benita <ran234@gmail.com>
keymap-dump: write directly instead of using static buffer

Signed-off-by: Ran Benita <ran234@gmail.com>
xkbcomp: clean up compile_keymap function

We make the xkb_file_type enum sequential instead of masks, and then
we don't have to repeat the file types several times in the function.
Makes the code cleaner.

Signed-off-by: Ran Benita <ran234@gmail.com>
Move enum xkb_file_type to xkbcomp/ast.h

This is a more suitable place for this enum, since it's internal to
xkbcomp.

Signed-off-by: Ran Benita <ran234@gmail.com>
types: remove outdated comments

The code is pretty straightforward now...

Signed-off-by: Ran Benita <ran234@gmail.com>
keycodes: remove outdated comments

Signed-off-by: Ran Benita <ran234@gmail.com>
log: replace "priority" by "level" everywhere

Now that we don't use syslog, "level" does sound more commonplace. We
should change it while there is still nobody using it.
Also leave some space between the integers of the xkb_log_level enum
values, if we ever need to shove more in between.

Signed-off-by: Ran Benita <ran234@gmail.com>
insert gushbutton into storyVC
insert gushbutton into storyVC
fixed my profile page errros to make them NA
Removing submodule for facebook-ios-sdk in preparation for replacement with a forked submodule so changes can be made
1
2
3
Merge branch 'SuhasBranch'

Conflicts:
	First App/FAAppDelegate.m
added "ask"
cleanup move resources
finito la prima esercitazione di laboratorio
Adding Plugins and tweaking theme

Added
- NERDTree
- CtrlP
- tComment
- Switched Surround to pathogen loaded
nitrogen53_ao: Don't display tux during boot
Updating createacct function to not check reponse body
Industry Sector Id
Debug search controller error
updated documentation to reflect API changes
Added K and S parsing logic; redesigned to pull files from DEV or QA, or die if can't find.
Added addons support
Added event handlers and triggers
Added demo addon.
Added html element in the spashscreen to be used by addons when required;
Added onpresentationtoolloaded event access to addons
Cleaned up multiselect remove and made it more efficient.
Merge remote-tracking branch 'origin/master'
Removed aliases not used
Handle error when executor throws an exception.
Fixed broken style links
Moved styles and images
Resolved own ip problem, among other improvements
small is_own_ip improvement
Merge remote-tracking branch 'beisheng/master'
Merge remote-tracking branch 'renxi/master'
Merge branch 'master' of github.com:jizecn/srs_public
cmake download file with md5sum checked
Merge pull request #63 from jizecn/master

external lib download link updated
Merge remote-tracking branch 'origin-ipa320/master' into automerge
Add date to .tell output
only print each clause of the proof once
fixing scrollArea; sanatize *.apply() calls
build-common (from cdbs sources) will be refetched every time so...
query_all
Fix for OBANYC-1455
Merge branch 'master' of https://github.com/camsys/onebusaway-nyc
Fix for OBANYC-1486
Merge branch 'master' of https://github.com/camsys/onebusaway-nyc
Changed UTS file directory in TDM profiles to match the directory where files are uploaded
More tidying up in README.org
added default value for reputation and added associations to user model
Merge branch 'master' into users_model
Merge pull request #3 from car-meetup/users_model

Users model