labofsahil/github-event-dataset-2012 huggingface dataset:
Removed some unused lines
Added smart repainting
Decresed LAG
Added render hints on ANDROID
mouseReleaseEvent instead of mousePressedEvent
TouchEvent for ANDROID
jQuery UI 1.9.2. props ocean90. fixes #22563.


git-svn-id: https://core.svn.wordpress.org/trunk@22833 1a063a9b-81f0-0310-95a4-ce76da25c4cd
BUTTON.

Add a "Beta Media" button to the post editor. Currently, it is only capable of inserting images. Other attachment types and galleries need not apply... yet.

* Added `wp.media.string.image( attachment, props )` for generating an image as a string from an attachment and relevant attachment display properties.
* Properly localized the gallery workflow.
* Added `Workflow.update()`, which closes the modal, triggers an `update` event, and resets the selection.
* Added `wp.mce.media` to manage the various media workflows for editors.

see #21813, #21814, #21390.


git-svn-id: https://core.svn.wordpress.org/trunk@22036 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Add random and reverse sorting options to gallery settings.

Props koopersmith
fixes #22637


git-svn-id: https://core.svn.wordpress.org/trunk@22987 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Mustn't forget to hide the legacy media uploader! see #21390.



git-svn-id: https://core.svn.wordpress.org/trunk@22828 1a063a9b-81f0-0310-95a4-ce76da25c4cd
refactor: minor fix; clean MoreActivity
added blabbR
Changed the way persistence converts too and from templated Property objects.
There are now two visitor classes. One for reading and one for writing.
The Property class makes use of a traits class which provides definitions for converting to and from one of the supported primitives.

There is a bug in the sqlite3persistenceapi when building SQL strings. IT would seem that the property name is return the value of the property.hpp
now tracking environment template
First pass at Coord objects
named components & added department view
z-Index fix for append child
Merge pull request #1 from vagmits/master

z-index fix
catch dot syntax errors on stemma init
script to generate DB for web testing
fix another bug in permissions logic
fix logic bugs in stexaminer with explicit stemma specification
many small bugfixes to display and server logic
distinguish between user, admin, and public traditions; add preliminary app test
newsbeuter urls
home page move
mod vimrc for vundle
Refactored WithCustomImplementationSupport into an interface.
Moving class instantiation message into Classes.
Changing all ordinal interfaces to use the bean convention.
Changing AbstractTuple#values() to AbstractTuple#getValues().
Update some snippets
Merge branch 'master' of github.com:tokorom/dotfiles
おなかいたい
added nifty_linear_interpolator.xml for smoothness in NiftyProgressDialog
image thumbnail pipeline - unsharp mask (Photoshop/Gimp) - for GD and Imagick
Added maybeWriteFile to work with Makefile like flows.
changes to web ui
A bunch of changes
A huge bunch of change

- Got iPhone loading correctly when there's a folder or not
- Tweaked a bunch of styling issues
added to ST2
Fix id in task.Story
vim: php.snip
changed filename of README
Play frameworkプロジェクト作成
Added first use setup
Increased pause after a slow print
Updated installer file
adding main bootstrap css
fixing some classes
improved Digitize.py: More settings can be made.
changes in test2DPosition.py: Now calculates min distance only for FOUND charge clusters
Always show inherited descriptions.

This fixes bug 2195.
Only add the new description once.

This avoids ending with more than one duplicated version of
the newly added description.
Octopress init
Site updated at 2012-08-02 03:06:02 UTC
Initial checkin of the new way I'm going to do my base site. This will be a starter package which needs to be downloaded and edited when creating a new website.
issue#134 , issue #151 done
added gdx-buillet/Target to ignore
added gdx-mavenizer from team gemserk
removed gdx-mavenizer submodule, what a pain in the ass...
Merge remote-tracking branch 'upstream/master'
update
This sucker is compiling... still failing like a mofo, but compiling with thrift and all.
collision with objects
Don't include metadata in portfolio listings.
Simplify styles based on margin-collapsing.
Allow optional dates in recent post lists.
Add sqlalchemy to requires.txt
Move server to a different module and start of work on ERROR messages
urlencode params
Ignore rubinius files
Not sure how to fix, so I'm commenting...
lisäsin algoritmien pseudot kirjasta
Päivitin FileHandlingiin virheenkäsittelyä
Päivitin FileHandlingiin rivin luvun ekan version
Päivitin FileHandlingiin closen
Merge branch 'master' of https://github.com/kekkeri/RioHarkka.git
most of the rest of my project
junk commit
Merge branch 'master' of github.com:uberamd/srclockr
working on comments
added poi-category for different transportation options - adjustments need to be made
Update config/locales/diaspora/sq.yml
Add distribution management
Correct developer SCM connection
Add release plugin configuration for tagname and release profile for github site
Change logging of handle acquisition to debug
Add version to compiler plugin
Add tracing aspect during testing to allow tracing of stack
[maven-release-plugin] prepare release v1.0
finally found a working way to hide node_modules from ctrlp... that
works...
removed rvm from the prompt
Merge branch 'master' of github.com:ullmark/dotfiles
removed the custom ctrlp ignore...  didn't work for some reason
Basic `New Task` form
- {{{->{{{2
- その他いろいろ修正
README and beatifying
rstudio-server-git: add conf.d file
Committing small changes so I can merge
Merge branch 'gui' of github.com:ursulawolz/tanCS into gui
signup logs in the user. remove unneccessary links
merge with origin conflicts
cleanup of xcms fix
removed memoize decorators, may produce mem problems
removed ref to QApplciation in monitor thread
added call to parent class __init__ in several classes
commented proper uses of deepcopy
GitHub: Added remote address security check
Star links: improved UI
Pridėta skaidrių numeracija.
Pridėtos mintys ką pasakosiu.
Smulkus pakeitimas.
ready to test new main
Merge branch 'master' of https://github.com/varantz/PennApps
Added commands to create data directories under /var/db
Added patches to Gentoofy data directory
disable tcl
sync
Parametrize zip code data file name.
 use the federal government zip codes file to load the zip_codes table

zip_code.rb
 - use upcase to normalize city and state names

zip_code/index.html.slim
 - use two letter state code for states

db/seeds.rb
 - use the federal government zip codes file to load the zip_codes table
add the federal government zip codes data file
fix devise authentication
Remove unneed gem.
Add comment list to tune page for iphone.
attr_accessible added to model
removed published text and darkened links
Log testing cleanup
Rename map to mapToObject
change the shortcut ,something like cscope
Implements hoo_node_view to display the ranking table. add api file and define hook_tbtrack_platform_info. modified the tbtrack_product fields
add new platform tbtrack_tmall
Fill in README, add circuit diagrams
wsapi cleanup: factor out checkCSRF()
wsapi cleanup: flatten control flow a little bit
add isCookieFresh check, db methods. Still incomplete:

* set session.passwordChangeTime, probably in wsapi.authenticateSession
* fill in STRING(now) in db setter code
* needs test
tests: use Math.floor, not Math.round, else test sometimes fail

The failing tests were modifying a random byte and then confirming that
authenticators were invalid. But with Math.round() they were sometimes
modifying a byte off the end of the Buffer, hence not modifying the
buffer at all, so the authenticator was still valid.
test/box: use fewer iterations (100, not 1000) to avoid timeouts
Add opal to available rubies
`rvm install opal` is clean now
Fix opal config file path
Add opal requirements
Set a target CPU

This serves more as a test to check opal/config functioning.
Opal is a known ruby now
Cleanup Opal installation output
Use real (node) binary architecture for Opal
Simplify Opal binaries
Use curly braces to preserve environment during Opal installation

Reference: 
- http://www.gnu.org/software/bash/manual/bashref.html#Command-Grouping
- http://stackoverflow.com/a/11933990/601782
Merge pull request #1217 from elia/opal

Add Opal Ruby
Cripes. Really Deryl? You need THIS many commits to get it right?? Forgot to enclose the builtin in  which collects the return and THEN passes it back to the 'if'
1.16.3
fix osx binary rubies, fix #1145
Merge branch 'hotfix/1.16.3' into stable
Wide variety of changes necessary for emactest to work correctly.
Easier paging.
fixing tag and adding if then for category buttons as a array prototype function was being added as a button on the live site
show company name in lead list
item query changes in stock entry
added newsletter listing
show message after sending test email
prepare to ajax upload integration
Renamed 'miniracket' to 'boot-eval'
New copy of 2012-05-16

git-svn-id: https://svn.generic-nic.net/NIC-generique/iana/whois@12062 e62f009e-d044-43ae-9900-873abb462db7
commit before switching branches
added google mapv3 to UI, pushed reports to own controller. CSS work.
SNAPSHOT version
[maven-release-plugin] prepare release param-model-0.0.1-utillities-thread-safe
cruft blast
Got some non working basic code
Separate LEAVE and RET
Update the code generators
Update the peephole optimizer for the new operators
Finish use of LEAVE/RET
Cleanup
Enhance printer
Review ALLOC and FREE stack
Implement new optimizations to replace the one for allocations and
desallocations of stack memory
New optimizations
Remove the operators
Generate preamble of functions in the LTAC Compiler
Do not remove sp and bp by dead code
Review preamble and prologue
Do not create stack frames when not necessary
Merge branch 'feature/stack_frames' into develop
Can't seem to get this right..
check for login error
Changed NetPIPE to support constant separation in packet size
modified:   pom.xml
	modified:   src/main/java/br/com/wjaa/dao/impl/EstoqueDaoImpl.java
	modified:   src/main/webapp/index.jsp
update default config
delete need removed element
inicio do sistema
Updating naming conventions
- expansion warnings removed by introducing lookaheads
- extract syntax integrated into jj file
- ExtractExpression integrated
- Tests ExtractExpression started
- Function problem found
- difference problem between deparser and tostring for function without parameters resolved
- difference problem between deparser and tostring for function without parameters resolved
- corrected changelog
Adds the Tower.js console
Merge pull request #67 from edubkendo/adds-tower

Adds the Tower.js console
i can't take no commiting any longer, so here's this mess
Test for Grid
Replace Backbone.Paginator with backbone-pageable
fix Warning
gitDemo init
Merge branch 'master' of https://github.com/xdream86/NewRepo
saveLoad world static objects
Dmenu configuration for dmenu_mpd and others
Block all access to users not logged in
minor cleanup
add one more test
Create min.isNull.php
Update examples/pyGDP_featureWeighted_script_OKNTYD.py
fixed indexPage
added "./" as a cache resource
Arrow padding in item list is now done via css. Moved border definition to 'HTML style' to css
Added Imager class, haven't tested it.
Admin link redirect to proper controller.

If we're editing a user Users links to edit controller instead
of index.
Fixed #302. Fixed redirection.
Capitalize directory name to render view.
Explicit form url. #303
Update user role through ajax. #303
fix bug nullpointexception in finalHttp
improved text field behaviour
revert some changes
refactored method for fontmetrics and creation into font manager
1354007019
Highlight extra whitespace at end of lines in Vim
Tweaks to bufexplorer
Start wrapping lines at 120 characters when typing
Improvements to buffer handling in Vim
Fix text wrapping in multiple open buffers
Use recognized filetypes in Vim instead of file extensions
Parse out iframe src
Work with new clojure-mode and leiningen
change searched joints
forward 'synced' events from scuttlebutt streams
use the 'synced' event in the CLI
document the 'synced' event in the readme
スペース画像変更しました
packaging for debian, run release.sh
fix release.sh script
fix release.sh
fix release.sh, remove executable bit from so, add install scripts
move DEBIAN to deb dir
move init.d to horentq
Merge branch 'debian-support' of github.com:ysarbaev/hornetq into debian-support
fix permissions
fix deb dir
fix jars
remove a bunch of deb errors
fix init script
packaging for debian, run release.sh
fix release.sh script
fix release.sh
fix release.sh, remove executable bit from so, add install scripts
move DEBIAN to deb dir
move init.d to horentq
fix permissions
fix deb dir
gallery-2012.08.29-20-10 clarle gallery-model-sync-local
gallery-2012.08.29-20-10 zordius gallery-zui-scrollsnapper
gallery-2012.08.29-20-10 stlsmiths gallery-datatable-paginator
gallery-2012.08.29-20-10 zordius gallery-zui-attribute
gallery-2012.08.29-20-10 zordius gallery-zui-rascroll
gallery-2012.08.29-20-10 stlsmiths gallery-paginator-view
gallery-2012.08.29-20-10 haizaar gallery-yui3treeview-ng
gallery-2012.08.29-20-10 Satyam gallery-md-model
Gallery Build Tag: gallery-2012.08.29-20-10
uploaded 23.09.12
all kindes of bug fixing
config and signal
all properties
prop->get
zwicky commands
VimFiler make Default Explorer and Not use NerdTree
first draft of the rename bed script
removed old build file for jenkins
update gitginore file
commit

added random pulling from wordpool
testing multiple floating words
adding flags for said schedulers
Added NPM bin director to PATH
Update help message
Allow tag suffix as flexible word
Updated the changelog.

Probably should've done this *before* pushing the Gem to Rubygems.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
2012-11-20
2012-11-2113:54:49
修改可对同一好友打开多个聊天窗口bug
Make some default settings in configuration
random small changes, model changes coming soon along with plots
invoking2.2
Final resume version for now. Is anyone ever completely happy with their resume?
Repository slackware:
        lua
        setuptools
        exif
        SDL_gfx
        gavl
        libquicktime
        libsexy
        numpy
        protobuf
        sexy-python
        dvdauthor
        ffmpeg2theora
        ffmpegthumbnailer
        gst-ffmpeg
        mjpegtools
        mplayer-codecs
        vlc
Implement growth function.
added widget classnames to every widget in sidebar
removed a goto statement
added README
Added unit-tests for PackageKit 0.6 API
PackageKit: GetTid() was renamed in PK 0.8.1
Updates for API breakage in PackageKit 0.8.1
Build header at login page
created some pages for link each page together.
fixed some css for header.
Set header each page.
add every page JSP
add every page
create jsp page
update some jsp and css
create style when search
change a little bit after larp
merge with Larp
catalog
faq and home done
when clicked logo >> home
change logo again
merge with larp
edit Catalog page and add catalog_style
これから制作開始
UI: changed distance to observations for futur
fix dummy errors in settings
add refinery inquiries
Javadoc re-generee (java v1.7)
rreconn
ujhfkhfj
altered index file
added a proper readme, cleaned up C code,...
some final edits to c code, check the readme....
improve javadoc script
improve javadoc script & fix errors
Minor changes to home screen, gallery, serverQueue

- Copy URL to clipboard on long click in gallery
- Alpha change on button clicks on main screen
- Fixed a bug in server queue which throws exception on splitting ";1"
John new PID processor, NOT TESTED!
PID processor in flight status fix
Some memory improvement but revert John PID for now
Put back the old PID processor, add Integral error + error processing only when in flight. memory improvement for PID and compilation fix
Merge pull request #260 from Kenny9999/KennyAQDevelopment

Kenny aq development
Small changes in the models
400+ main successfully compiled
added big new feature to network module, and more to come - now allows http download to string
hibernate 归回测试
Merge pull request #209 from yinheli/master

hibernate 回归测试
Merge pull request #4 from AllDayFantasy/contents

added player photo to team show
setup schedule file for auto raking
Merge branch 'cronjob'
added background
Merge branch 'master' into contents
Getting setup.php cleanup done.
initial version of configuration files
Fixing macos major compilation problems and linking
Fixing a transparency bug
Towards this sketch working in JavaScript mode.
More JavaScript fixes.  Yay, works now.
Spring cleaning - moved some less interesting and less complete stuff out of the way.
This was my first sketch, let's bring it into the fold (tweaked to work with Processing 2.0b7).
Improved SessionControl
change model images
[i3lock-git]cairo image support
Merge branch 'master' of github.com:Atsutane/packages
modified:   .gitignore
	deleted:    bin/Spuzzle-debug-unaligned.apk
	deleted:    bin/Spuzzle-debug-unaligned.apk.d
	deleted:    bin/Spuzzle-debug.apk
	deleted:    bin/Spuzzle.ap_
	deleted:    bin/Spuzzle.ap_.d
	deleted:    bin/jarlist.cache
	deleted:    bin/proguard.txt
	deleted:    bin/res/drawable-hdpi/ic_launcher.png
	deleted:    bin/res/drawable-ldpi/ic_launcher.png
	deleted:    bin/res/drawable-mdpi/ic_launcher.png
	modified:   .gitignore
MatrixStack fails. Epically. Ortho works now though.
1.0.0.3

- Added username colors and timestamps
- If client gets disconected after it's been connected, it shows a
message and closes.
- Probably some more things I forgot.
asdf
Merge branch 'master' of github.com:BenWendtner/kTong
finished cart
changing name for percona recipe
Java interop basics
Added examples for exceptions
Changed module loading to attribute based loading
Efficiency maximized, duplicates removed in full rectangles, 58fps big castle
Update bloc/chapters/arguments.md
BOOM MODE
Zeroes crossed
Small bug on useless
Styling 'more' link
Put docs for parameters in the same order as parameters
geolocator now optionally normalizes the query string
characterizer also caches the already known geolocations
public table column filter
removed debug code
removal of filter option on public table view
new utility funtions to feed tables
fixed & added tests
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
Performance optimization on TablesController#index
sql option removed from export window
Updated CPU gradient color
Bug fix
Bug fix
Merge remote-tracking branch 'origin/master'
Now gitmodules are working. Hi vim-pathogen.
ServiceFusion: Add a placeholder for Oulu event live
created all images
add docs todo for 0.4
more files to ignore by Jekyll
minor tweaks
update docs snippets
Update reference.html

Fixing typos ("preciously" should be "previously"), the default values of offset for L.Popup are (0,6), not (0,0).
Merge pull request #876 from erictheise/gh-pages

Two typos
0.4.5 release and new post
Fix border logic on fullscreen toggle
BUG: Fixes so that dtype casts respect the NPY_NEEDS_PYAPI flag
BUG: Make ufuncs respect the dtype NPY_NEEDS_PYAPI flag
Updated The ReadMe

Added alot of information in the README.md file.
So now we have credits etc
Set the data to the resource after completion
[bug 681108] Fixed indents
Merge branch 'release/7.x-2.2' into develop.
open from file
schemas for openagency and openorder
Tagging version 7.x-2.2.1
Merge branch 'release/7.x-2.2.1'
adding fields for bibdkWorkEntity and -manifestations
add support for work cover images
finishing touches
Merge branch 'feature/bibdk_covers' into develop
a newline so source is less cramped
actually, the inherent padding is enough
justify~
Merge branch 'master' of github.com:shish/shimmie2
change_X -> edit_X for consistency
note of perms
Merge branch 'master' of github.com:shish/shimmie2
delete with images / with comments, and check auth token
user signup form
allow logout from link
malformed sidebar cookie was breaking JS
modification dates on CSS/JS links
handle test error
user needs perm /and/ the image needs to be unlocked
better log for owner change
mass edit as its own test
Merge branch 'master' of github.com:shish/shimmie2
tag history reverter updates
Merge branch 'master' of github.com:shish/shimmie2
html5 validation
Added an auto-catching method to exceptions thrown by HaTeX, so 'runLaTeXT' is safe.
Update MVC.md

views
Use socket.io to send queue and now playing updates
Remove Gzippo Requirment
Merge pull request #1 from DarthGandalf/master

It's NAK, not NACK in CAP protocol.
Fix atheme.logout XMLRPC call (closes #2).
Add SSL support for IRC
Merge branch 'ssl' into znc
SSL setting should depend on SSL in ZNC
bug fixes to parsing pretty automata
Tidied up the generated output from wyone.
Revert "Added summarize"

This reverts commit d56f64aedb212c67d38b893a55818a59a2b9fc3b.
Added pdfcrowd
Added a promt, if there are plugins installed. This gives the user the choice to use the plugins, or not.
fixed dutch language changes
Added UML diagrams
(cherry picked from commit a3378e8d49a895a9506cbb09e697f7338bba68ea)
Reorganized MixView Class
(cherry picked from commit ffdefadfea2f607ad265ef2575b4d79ac3fbb158)

Conflicts:

	src/org/mixare/MixView.java
Removed duplicate access to R, memory enhancement
(cherry picked from commit 360d7094b665fae5df44fc731ac0519b93903e13)

Conflicts:

	src/org/mixare/DataView.java
	src/org/mixare/MixContext.java
	src/org/mixare/MixMap.java
Add Arabic Language support. (supported on 2.3.3 and later)
(cherry picked from commit aee3b63f0a840e9d09ba9728baa23c023def359e)
Corrected Arabic Language support. (supported on 2.3.3 and later)
(cherry picked from commit 5b99c42c59d42d3837967086ae5206ecc703cab0)
Merge branch 'feature/issue-118' into development
Merge pull request #26 from abduegal/feature/issue114

Feature/issue114
Merging with Mixare development
added link to devboost.de
fix minor bugs in order creation from another object
fix minor bug in invoice creation from another object
Merge pull request #462 from cbattarel/develop

fix minor bugs in invoice and order creation from another object
Added basic player jumping
512x512 image
django-mode path fix
create page edit name_sup
Merge branch 'chang_name_sup' into dev
FixGroupId looking for samples too
Added build.xml with deps
Added  ResolveScope getTargetResolveScope() to object attributes
Fixed long op session timeout
Auto MMode
Added some diag messages to SerSwapStorage
Fixed getMasterObject method
Offset/skip in index 
MT indexing
Moved some tests to debug folder
Merge remote-tracking branch 'BioSD/alpha' into alpha
correction editor: change compilation via ajax dropdown
ADDED exceptions to cflags
Merge branch 'master' of github.com:EhevuTov/tcp2snmp
FIXED to exit clean
skip_before_filter inlog fix bij channels en episodes
Added "victory lap" autonomous programs

MUA-HAHAHA
Allow both thread starter and last poster to be displayed on Mobile

Removed the "By: " and "Last: " labels as this information is
obvious based on the order of the names. Text overflows into
ellipsis allowing the number and timespan to be viewed while 'ago'
gets cut off in cases where there is not enough space for longer
names. E.g. '1 h...' or '1 y...'
PMs on Mobile

This commit restyles the messages views such that they are usable
on Mobile devies. This is not perfect, but it's functional enough
to use.

Future re-developments should see tables being used for messages
markup instead of divs.
Fix for NSFW threads for new Mobile styles
Merge pull request #82 from EvanFBC/mobile

Mobile thread starter + poster, Messages
Click-to-spoil is now Click-to-unspoil

Also changed the warning message so it does not change.
Git alias: commit typo
gits = alias for git status
Canvis en l'area d'administració
Absolutelly full screen support
button active color tweak
two typos

changed $file to $templateFile to correct a typo

using 4 spaces in line 27 instead of tabs
premier commit
s
z
PG syntax test for Heroku
Added a test for the unexistant AndPromotor case
more additions to final report and spelling check
final report commit before pull, check if merging will work :(
Merge branch 'master' of https://github.com/FelixAkk/synthbio
! Only highlight self posts as game chats
Using from now on GradientTable for holding b-values and other
scanner gradient related parameters.
INTE JULIEN qui arrive pas a upload....
fixes in the test framework code following first couple of test runs in Linux.
Update recieving artist and title name as input, hopefully making search far more reliable.
Verbessertes Readme
Way smarter parenthesis driver
set input and output directories on the ASDoc task so it executes only when needed
added an 'additionalASDocOptions' property which can be used to specify additional ASDoc compiler options
only add the ASDoc task when the project is of type 'swc'
Changed Bukkit version to 1.2.5-R1.2-SNAPSHOT
Changed some commands outputs, changed config.
renamed translation values of compartment titles
added GroupBidQueue to prevent starvation
created Event Classes
v0.0.1

v0.0.1 commit! Big stuff here, working multiplayer
Fehler bei Intersection zweier disjunkter Einzelintervalle
Fehler bei Intersection zweier disjunkter Einzelintervalle; merged weil bereits gefixed
save hwnd
Tidied code. Removed unneeded code, and debugging print statements.
Basic Modding draft 2

How to Begin Modding renamed to Basic Modding.

Added .gitignore file to make it easy to make commits.
uprava zidelania notebooku 3
fix icon for selected folder on my items page
add my items search
add django_js_utils to .gitignore
fix update query by search filter if current queryset's query is not empty
fix sentry build_static and gitignore it
Merge pull request #24 from ISKME/master-sentry-gitignore

fix sentry build_static and gitignore it
Merge pull request #25 from ISKME/master-search-filter-fix

fix update query by search filter if current queryset's query is not emp...
Merge branch 'refs/heads/master' into authoring

Conflicts:
	.gitignore
use cached function to get content types
Merge branch 'authoring' of github.com:ISKME/OER-Commons into authoring-myitems

Conflicts:
	apps/materials/views/index.py
	apps/materials/views/view_item.py
	project/settings.py
	project/templates/include/header.html
fix narrow
use fixed search filter
Merge branch 'refs/heads/authoring-myitems' into staging

Conflicts:
	apps/materials/views/view_item.py
Bugfix
Merge branch 'refs/heads/460-image-alignment'
Add collection field to authored materials
Wrap words in authored content
adding correct link to first week example
1)Added the include/exclude buttons 2)Added the filter text box
Merge pull request #22 from pradeepin2/master

Include /Exclude filter for js files added
aligned calendar to center
Erreur lors du passage du suivant au nouvel ordinateur corrigé
Fixed dim effect for 32bpp.
Add purging of client result cache to parallel.Client

The new methods clear the cached values and free some memory.

The whole thing is split into different methods to both clear the
client and the hub side.

Additionally fix some bugs in other parts of the code.
Add Testcases for new purging methods in parallel.Client

Signed-off-by: Jan Schulz <jasc@gmx.net>
update performance test template to use test method
Don't crash exception translation w/ nil result attribute.

Exception.result is nil when attempting a query after PostgreSQL
disconnect, resulting in new exception:
NoMethodError: undefined method `error_field' for nil:NilClass
Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.
Stop being silly with formatting of method aliasing.
Add documentation for create_with
Add documentation for arel and build_arel
Add nodoc to create_with_value

Reason: all *_value methods are defined dynamically and so don't appear
in the documentation.
Add documentation for query_methods bang methods
Typo
Don't link to edgeguides in docs
Add docs for Relation initialize, create and create!
Fixes "Cannot visit ..." with validates_uniqueness_of

Fixes issue with overrding ActiveRecord reader methods with a
composed object and using that attribute as the scope of a
validates_uniqueness_of validation.
Fix class_eval without __FILE__ and __LINE__.
Merge pull request #7072 from beerlington/fix_validations_with_scope

Use database value for uniqueness validation scope
Merge pull request #7076 from kennyj/fix_class_eval

Fix class_eval without __FILE__ and __LINE__.
Log query plan when we use count_by_sql method.
Add support for optional root segments containing slashes

Optional segments with a root scope need to have the leading slash
outside of the parentheses, otherwise the generated url will be empty.
However if the route has non-optional elements then the leading slash
needs to remain inside the parentheses otherwise the generated url
will have two leading slashes, e.g:

Blog::Application.routes.draw do
  get '/(:category)', :to => 'posts#index', :as => :root
  get '/(:category)/author/:name', :to => 'posts#author', :as => :author
end

$ rake routes
  root GET /(:category)(.:format)              posts#index
author GET (/:category)/author/:name(.:format) posts#author

This change adds support for optional segments that contain a slash,
allowing support for urls like /page/2 for the root path, e.g:

Blog::Application.routes.draw do
  get '/(page/:page)', :to => 'posts#index', :as => :root
end

$ rake routes
root GET /(page/:page)(.:format) posts#index

Fixes #7073
Add join table migration generator

For instance, running

    rails g migration CreateMediaJoinTable artists musics:uniq

will create a migration with

    create_join_table :artists, :musics do |t|
      # t.index [:artist_id, :music_id]
      t.index [:music_id, :artist_id], unique: true
    end
AR::Integration must be included after AM::Conversion

Integration's definition of #to_param must override
Conversion's. Otherwise, there is a regression from
3.1 in the behavior of a non-persisted AR::Base instance
which nevertheless has an id.
Merge pull request #7081 from jfirebaugh/to_param_regression_master

AR::Integration must be included after AM::Conversion
将中文的命名改成英文

中文的在命令行里面操作会出问题。
Updated to stop errors when saving .png
Merge branch 'master' of github.com:JohnReid/dotfiles
Adding return button to examples and updating docs to fix blitwiz.os section link and to describe better isImageLoaded behaviour
Implementing better blitwiz.graphics.isImageLoaded behaviour
Implemented blitwiz.graphics.unloadImage() which also allows cancelling images being currently loaded, and made the sample browser use it to avoid some odd situations with conflicting image texture names of various examples
ensure that dada classes are at the front of the classpath so that dada-clojure may override clojure
Merge branch 'master' of github.com:JulesGosnell/dada
Correct error is syntastic compile flags
fixed unit-tests and some metatags
ignored-dirname is no longer ignored in the test
made changes to the animation, now flips
Dodany tryb debug do sensora oraz monitora. Dodane parametry
uruchomieniowe.
Imporved the content and format.
Fix image size computation
optimized customscripts file
+ Message router (initial)
Fix user not able to delete his attachments if he doesn't own the topic
Fix #865: Installation fails on error if transliteration returns empty
Merge remote branch 'upstream/master'
Fix some bugs in frontend attachment manager

* Allow user to always remove his attachments
* Allow only category moderators to do the same
* Display users own attachments, not moderators
* Topic: display attachment not found if it doesn't exist
Merge pull request #866 from mahagr/master

Fix 3 bugs (see contents)
Update master
Merge pull request #28 from OctopodaChong/patch-4

Update master
removed my from all var names
Trying different spoutplugin version
add one edition
15
Update README
Merge pull request #2 from MDFowler/branch3

Branch3
Update js/main.js

events sounds added and screening problems resolved
testing wgs84 raster buffer query
Removed tabs and 3 unused vars.
Merge branch 'bug-11126-ToFUtilTabs'
Added progress bar to all related filters of 3D interpolation
Merge branch 'bug-11125-progressbar-for-3d-interpolation'
added documentation for the new property "Backface Culling"
Merge branch 'bug-10835-BackfaceCullingForMITKSurfaces'
Fixed a small issue concering the progress bar when switching between no interpolation, 2d or 3d interpolation
Fixed wrong logic for switching between none, 2d and 3d interpolation.

Additional clean the QLayout setup for QmitkSlicesInterpolator. Now no more layout warning appears
Merge branch 'bug-11146-disable-interpolation-does-not-work'
Removed unused code
Merge branch 'bug-11146-disable-interpolation-does-not-work'
Merge branch 'bug-10792-IGTTrackingClosingBug'
setting size of vtkRenderWindow if it's SMALLER than 11
Merge branch 'bug-11164-vtkRenderWindow-init' into personal/engelm/mitk
added getter for calibration dir
adapted TrackingDeviceConfigurationWidget: calibration file which is given by cmake is used as default now.
Merge branch 'bug-10821-CalibrationFileMicrontracker'
Changed the number of scanned ports to 40.
added docu from tbss that was previously only in the diffusion release
Merge branch 'bug-11004-tbssDoc'
Replace &times; and \u00d7 by ×.
Close #567
Correction critique des requêtes en ajax.
HW9 Draw Xes
changed the mex function so it's more efficient
database was changed
ルール設定をstd::mapで管理するようにする、使っていなかったmjcore.cppを削除
fixed auth.
Use hash maps instead of tree maps

Signed-off-by: Meldanor <Bhaals@gmx.de>
Use a string builder instead concating strings

Signed-off-by: Meldanor <Bhaals@gmx.de>
Use for loop instead of while for running the queue

Signed-off-by: Meldanor <Bhaals@gmx.de>
Use long instead int

Signed-off-by: Meldanor <Bhaals@gmx.de>
- fixed removing subprotections
initial import
format and fix
merge with origin master
small fixes to redirect_tool
Xnet/Inet seems to be working just fine.
Things added:
-Xnet_login switch
-checkAllSubPages switch
-one common _browser instance instead of separate inet/xnet instances
-simple error handling 
-IMPORTANT: when checkAllSubPages=True -> open_novisit(url) is used!

Signed-off-by: Morphik83 <Morphikx@poczta.onet.pl>
test

Change-Id: I8010460d7f31ffbf8fed3b444ff6056991e5561c
Fixed bugs in Allocation-Domain object
Install/Integrate RestKit
added title case lib
Changed prompt to work better with solarized
Filled in blank record on star methods columns.
HTML5 data attributes for edit/delete
No longer clean Newznab URLs when saving
TVRageMapping updates

Fixed: Issue matching TVDB series to TVRage series in some situations
rename the folder and change the user agent
fixed error with non-existing folder "cgi-bin"
added missing cmake module
Merge pull request #17 from c-geek/master

cmake compilation
Fixed bug on distributed alignment of servers

git-svn-id: http://orient.googlecode.com/svn/trunk@5926 3625ad7b-9c83-922f-a72b-73d79161f2ea
changing way to lock memory in JNA library. Now platform is ignored but c library is significant.
Merge pull request #2 from JavaWarlord/develop

Develop
Update README.md

adding project descriptions
Update README.md
Update README.md
Implemented quasi layer over our zombies to handle an increase in their
health and affect other things (such as immunities to certain damage
types and the ability to do "special" things). Re-organized the package
structure.
Added config to specify zombie health
Corrected warnings
Merge remote-tracking branch 'origin/develop'

Conflicts:
	TheWalkingDead/src/com/orqwith/mc/SpawnHordeListener.java
Merge remote-tracking branch 'origin/master'
need to ignore these classes. Will do on next update
Added vim-markdown-jekyll module
MODIFIED: command scheme changed
MODIFIED: from wait syscall to waitpid syscall
ADDED: support for background processes
Final javascript code complete, will add html doc later today to complete project.
Commit inicial - Iniciando layout
Revert "Test Cases added"

This reverts commit 6c75f9608fa7fbdb6c42f8ae64cbb4a3cbdefbdc.
adding backbone, underscore, jquery via asset gems
The bundle is OK !
Copy update. 

Signed-off-by: Matt Barba <matt@placester.com>
using gem 'better_errors' to see if it has any value
Important change in the name of the model Multimedia to Multimedium (singular form); added the crud of multimedia to variants as a section of a product (nested routes); changed everything related to the upload of multimedia in the product and variant
applying 'fat models, skin controllers'
prototypes removed from attr_accessible on product model as requested by Bruno Azevedo
small changes to fix models spec
added link to snapping example
session half
dependecia de .hpp no makefile e alguns ajustes
k, ajeitei problemas anteriores.. deletei TODOS OS .HPP e criei um chamado defines.hpp que define todas as classes necessarias.. é um .hpp global...... suddenly, no errors, plan was good.
added a test for multiple select (introduced in #92 of deform)
Merge pull request #7 from sontek/test-multiple-select

added a test for multiple select (introduced in #92 of deform)
is_null -> empty in api
Implémentation ListBox avec CheckBox
Added Response to event handler
Move to a github clone of ECB from emacsmirror.  Update to emacs 24.x fixes.
 - Switch to use https: for FW stupidity on git submodules.
Change key equivalent of "Commit" button from Cmd+Shift+Return to Cmd+Return.
Sum of diagonal
Added the JSR op.
circle generation method added
circle generation method added
merged conflict
Fix for broken routeGenerator
add siteindex to application-all requires
Fixed last commit

Signed-off-by: Ravn T-M <ravn.tm@gmail.com>
Dodanie algorytmu AES.
fixed header size, made carousel and links and mimages work and correct
editor <-> preview margin
Initial design for portal after sign in
Footer amendments
Merge branch 'feature/portal-design' into develop
Randomizing Players's Index

Randomizing player's Index
Some minor big fixes
Slightly increased size of pet panel duration.
Deleted StaticPopupDialogs.TOO_MANY_LUA_ERRORS.button1
Fixed raid debuffs count level.
Cleanup ruRU locale.
Updated AltPowerBar color.
Replaced some php string function with the correct StringUtil methods
Cleanup and use createContentInContainer.
SONAR-3825 add sidebar "filters"
SONAR-3218 Update message of "migration running" page
Add Stratum 0 (Braunschweig, Germany)
Merge pull request #21 from stratum0/master

Add endpoint URL for Stratum 0 (Braunschweig, Germany)
refactoring the API for cataloging APIs and format adapters
Update .gitignore to ignore Netbeans files

This is my first commit, but I'm trying to cut down on project files by
updating .gitignore to ignore Netbeans project files.
Clean logging setup. Keep logs for each day, delete logs older than a month.
Allow mixing & matching of annotated command styles in nested commands

Signed-off-by: zml2008 <zach@zachsthings.com>
Added Placeholder getter for ChatArguments

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Removed gui folder

Signed-off-by: Dalton Pelc <daltonjpelc@gmail.com>
Add EventableObject system for attaching event listeners to objects.

Signed-off-by: zml2008 <zach@zachsthings.com>
Expand completion futures to have oncomplete listeners, split up RootCommand and syncedrootcommand so that we don't have stringmaps with commands not children of a RootCommand

Signed-off-by: zml2008 <zach@zachsthings.com>
Beginning of cursor navigation within text fields

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
ajout compte bean
accès au solde depuis la page user.jsp
raise if an empty Marketplace endpoint is provided to metadata URL builder
don't fiddle with endpoint is an empty one is provided
set Marketplace endpoint on configHolder only if it's defined
Cleaned up find.
TESB-7117 - Talend CXF jaxrs-jms-http example fails with certain
deployments
Move examples build config to examples parent pom
Merge branch 'refs/heads/master' of git@github.com:Talend/tesb-rt-se.git
Now clocks the execution of the quicksort. cleaned up the assembly a bit. Not much else
Trying to add keypress event to the carousel buttons
Making carousel work with left and right arrow keys
Remove debug printf

git-svn-id: https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk@5007 4407c894-4637-0410-b4f5-ada5f102cad1
Preserve file position throughout call

git-svn-id: https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk@5009 4407c894-4637-0410-b4f5-ada5f102cad1
_mingw_mac.h: Added __C89_NAMELESSSTRUCTNAME* and __C89_NAMELESSUNIONNAME* macros

git-svn-id: https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk@5010 4407c894-4637-0410-b4f5-ada5f102cad1
Updated widl to current Wine version (includes nameless union/struct support)

git-svn-id: https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk@5011 4407c894-4637-0410-b4f5-ada5f102cad1
Regenerated headers with new widl

git-svn-id: https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk@5012 4407c894-4637-0410-b4f5-ada5f102cad1
Updated imported headers to current Wine version

git-svn-id: https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk@5013 4407c894-4637-0410-b4f5-ada5f102cad1
Fixed path to root directory for upload
librairie jdbc
-Fix: rename README to README.md (github special)
Changed class names to public-use conventions.
I'm going to kill a bitch
[mr2149] long ago not initialized set...
Merge remote-tracking branch 'remotes/mangosR2.mangos/master'
[TESTING] Make default ByteBuffer size 64 bytes instead of 4 KB.
[TESTING] ByteBuffer: make read, read_skip, and append methods return reference to the ByteBuffer instance.
Helps with complicated Cata/MoP packet structures, make it possible to skip loading ByteBuffer instance every time you want to write a bit.

Conflicts:
	src/shared/ByteBuffer.h
[TESTING] Rework UnitStateMgr::DropAction after LockedMap use v0.8.1 testing, related to #1078
 - add incoming actions queue. must greater speedup subsystem.
[TESTING] Rewrite Evade system on event-based structure, including StateMgr features. v0.5. related to #1086 and some other.
[mr2172] Implement SPELL_EFFECT_144 as SPELL_EFFECT_KNOCKBACK_FROM_POSITION

At the moment only test with Spell 70851
Unify changing movement style for Units

Conflicts:
	src/game/Creature.cpp
	src/game/Player.cpp
	src/game/Unit.h
[mr2173] add some initializations and additional checks in creature events.
Update src/game/SpellEffects.cpp

We doesn't need this calculation, because sin and cos is 2*Pi periodic
[mr2174] Fix build of sd2 (at least in VC90 project).
Merge remote-tracking branch 'remotes/mangosR2.mangos/master'
[TESTING] Rework HostileRefManager creating/deleting v0.2. related to #1068

Also some corrects to unit deleting from map.
[TESTING] Use damageInfo on next two methods. cleanup and small improve structure.
[TESTING] Use DamageInfo in Unit::SpellDamageBonusDone/Unit::SpellDamageBonusTaken
[TESTING] Use DamageInfo in Unit::MeleeDamageBonusDone/Unit::MeleeDamageBonusTaken
[TESTING] Implement GetTotalAuraScriptedMultiplierForDamageTaken/GetTotalAuraScriptedMultiplierForDamageDone (NU now). also fix damage reduce for 63944 (#1127).
[TESTING] WorldStateMgr implement - some rework for fit to new OutdoorPvP system (unfinished). more correct work with expire states, add some flags fo future use. more verbose SQL.
[TESTING] WorldStateMgr: fix most problems after last OPVP changes.
[TESTING] WorldStateMgr implement (cleanups) related to #1129
- some cleanups and fixes to fit current mainstreem
- remove temp methods for dig/collect worldstates
- make creating worldstates at bg/opvp creating permanent.
Some parts of BG/OPvP seems not good functioning, required remove hack on Capture point work (BG EY), WS locking (OPvP GH) and some other things. Still need bugreports.
Up to date + [LAST 2]
Started working on magic bitboards
Update 28/12/2012

* Add Reading Key
* Add Fibonacci Key
* Add Serie 3n+1
* Add Random Key
MaJ du 05/15
added bootable flag toggle and more extlinux sanity checks
cloneSprite command introduced
using parseCharacterString
Merge pull request #139 from threonin/contrib

cloneSprite command introduced
make basic User model (including passwords)
Added HTML helper function and refactored the interface

Changed the verifyToken function to isTokenValid, which better
represents its purpose.
Debian has no python2, its either python or python2.6,python.2.7
typo fix
add command corrected
Merge pull request #1 from Zouuup/master

Very minor fixes
until 1.3
pylinted mince.py a little little bit
minor changes to experience section content
marker as png
Visual reorg.
Update 2/index.php
Merge pull request #7 from fxn/patch-2

Update 2/index.php
print a link to lyrics wikia for the currently playing song
#18 Icons improvement, code refactoring
Update view beer.js
configured routing for /tixbay and /
get_keystone_token.sh added to test directory to get tokens from essexkeystone
index.php added in the public folder
index.php added in the public folder
VESPERS: Added the rest of the images for the endstation configuration view.
VESPERS: Did some widget reorganization in VESPERSAppController.  I also switched VESPERSEndstationConfigurationView to use QPixmapCache rather than generate the pixmap every time.  Should help with performance.
Merge branch 'master' of github.com:acquaman/acquaman
Merge branch 'master' of github.com:acquaman/acquaman
Merge branch 'master' of https://github.com/serby/control
added redis to package
Downgrade jade blocks. Add fb login.
Only accept sockets from auth'd clients.
Merge branch 'master' into dev-frontend

Conflicts:
	views/index.jade
	views/layout.jade
Added Options checkbox in the config window
add glitch effect to library.
OrderService initial
Merge branch 'master' of https://github.com/ahaeff/ibsys2_p02.git
Merge branch 'master' of https://github.com/ahaeff/ibsys2_p02.git
Merge branch 'master' of https://github.com/ahaeff/ibsys2_p02.git
Anpassungen Order import
Merge branch 'master' of https://github.com/ahaeff/ibsys2_p02.git
Initial Dispositionsservice
Merge branch 'master' of https://github.com/ahaeff/ibsys2_p02.git
Precompiling assets
Config mailer
Config mailer
Config mailer
Delete user profile issue defeted
mailer
add textile support, sending mail work now
delete not useful files
Added match results pane
dependency should be greater than or equal to 0.1.0
Merge pull request #9 from 9minutesnooze/master

Dependency version
Modified about
Fixed autocomplete search with spaces
Initial Commit
Merge branch 'master' of https://github.com/akiwarheit/BroHub
Aggiornati server/client
actualitzacio github
changes in css and html to show login form correct
Agregado el documento en ODT y PDF
added .gitignore, should stop tracking logs
Add StaticPage controller
Finished Static Pages
Added errors to foi form

@author Seema
Move homepage assets from static into frontend
Pull homepage css into homepage view
Reduce height of main campaign image at middle breakpoint
Put in some space between category list and main campaign on small screens
Big prime
Rename heroku app in Procfile
Fixed for PDFs larger than 500 pages

Also added rudimentary overflow checks so it does not just die with a
segfault.
- Poursuitre de la mise en place du module de recherche
add testing index
Adicionei dojo de hoje
Sidereal Half-Castes use Sidereal magic. Fixes #211
Improved graph initialization and vertex addition, and added extra helper methods
Refactored Prim's MST code to use external graph library
Fixed heap deletion of last element
Added heap deletion by element
Refactored Prim's algorithm to use a heap to find the cheapest edge
Added an example in Python for grid factor graphs with diversity-based budgets.
revert & register
revert & register
Don't append a slash to part of our PATH
Catalog, Category classes, xml parsed
Revert "Merge pull request #1 from andxrs/patch-1"

This reverts commit 9823079a027cd19e158755902449f54479d16fdc, reversing
changes made to 7da6060d22585a6a753afd4773776c0bab8e3bbf.
Working calculation demo
embark and friendship working.
tools updated (not fully), added editor( edit everything in df)
small debug un-optimatization removed
updated readme.txt
few small bugs (embark caste selection) and moved runsaved to non-auto.
Merge https://github.com/angavrilov/dfhack
Make the server suspend the core around calls unless disabled.

I expect the majority of methods will have to suspend the core
first thing anyway, so this will reduce typing and bugs.

Also get rid of the "me->" ugliness by splitting threadFn.
Add RPC calls to query some global state.
Export unit curse, squad, death and burrow info.
parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content.