labofsahil/github-event-dataset-2012 huggingface dataset:
remove loozah themes which fell too far behind to recover
include contact_widgets for categories_widget when doing updates
Merge branch 'pull'
this is better
re-opened bug #363
display settings hooks
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  display settings hooks
  re-opened bug #363
  this is better
  include contact_widgets for categories_widget when doing updates
  remove loozah themes which fell too far behind to recover
  smal fix
  german translation for right_aside
  make right_aside translatable and provide german translation... and some css-fixes
  suppress duplicates in search
  make contact ssl_policy change a function since it is used in a few places
  more ssl policy fixes and prevent delivery to soapbox when using  local delivery
  don't change ssl settings on local photos for remote contact

* master:
latest changes are the popup menu for notifs, fixes

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge pull request #204 from simonlnu/master

many changes, all small
better handling of reshares containing embeds
Merge branch 'pull'
bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
string update
well that was a stupid mistake...
fix config storage of booleans
log disabled requests
move alert box away from nav links
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  well that was a stupid mistake...
  string update
  bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
  better handling of reshares containing embeds

* master:
correct some filer dialog weirdness caused by introduction of categories
Merge pull request #205 from unary/filerfix

correct some filer dialog weirdness caused by introduction of categories
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update, fix autoname test "random" failure
  duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
  duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
  added BBCODE thing in comments
  add cleanzero theme

* master:
announced dipsy change. re-tie your boots, we're in for a wee ride ;)

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge pull request #268 from simonlnu/master

announced dipsy change. re-tie your boots, we're in for a wee ride ;)
Merge pull request #267 from tomtom84/master

add link "remove account" to /mod/settings.php
rev update
Merge https://github.com/friendica/friendica into pull
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: small-fix
  add link "remove account" to /mod/settings.php

* master:
fix s/color/colour/g issue

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge pull request #269 from simonlnu/master

fix s/color/colour/g issue
make comment edit icons look more like base theme
Merge https://github.com/friendica/friendica into pull
birthday contact link goes to event page instead of remote profile
put fakelink back in birthday notice
reset qcomment selector after insert.
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  reset qcomment selector after insert.
  put fakelink back in birthday notice
  birthday contact link goes to event page instead of remote profile
  make comment edit icons look more like base theme
  rev update

* master:
fix 2 issues. contacts img in finder; wall filer title

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge pull request #270 from simonlnu/master

fix 2 issues
fix view contacts
Merge https://github.com/friendica/friendica into pull
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix view contacts

* master:
added zeths rooms
Changed url field to linkURL field, and updated Safecast defaults
Fixed permissions and routing
Last changes
Merge branch 'master' of github.com:tooflya/bubble-fun
Merge branch 'master' of github.com:tooflya/bubble-fun
Last changes
switching to int
demonstration that tiles are working perfectly
added pointer to map creation
made it so that you can have data/ in an animation path
added documentation on tools
Partial revert of previous commit
Revert some legacy Equalizer API code
Merge branch 'master' of https://github.com/Eyescale/Collage
Merge branch 'master' of https://github.com/Eyescale/Collage
Win64 build fixes
Merge branch 'master' of https://github.com/Eyescale/Collage
Merge branch 'master' of https://github.com/Eyescale/Collage
Also set root var from CO_ROOT
Move co::Error and ErrorRegistry to eq::fabric
Move co::Error and ErrorRegistry to eq::fabric
Merge branch 'master' of https://github.com/Eyescale/Collage
More cleaning Equalizer
Merge branch 'master' of https://github.com/Eyescale/Collage
Impl pattern for DataOStream
Fix make test
Merge branch 'master' of https://github.com/Eyescale/Collage
Set install_name on Darwin dylibs
Merge branch 'master' of https://github.com/Eyescale/CMake
Fix install_name for Darwin dylib
Merge branch 'master' of https://github.com/Eyescale/Collage
fixed menuwarpper height glitch
ServerTemplate
THIS IS THE LITTLE CHANGE OK

Added 3 dots to LDR
ListenerExceptionTest - tests for asynchronous listener exception handling
Added find in bash-completion idiocy list
Updating makefile to add ROS_NOBUILD and symlink the ObjRecRANSAC tarball
Change detail text color on cart view
Add de-CH translation for you_have_no_orders_yet.

Merges #74
de.yml fix for capture

Fix #1475
Prepare testing with RSpec
Update default/*.yml based on current spree(03eb54a1)
Fix japanese translations for Spree 1.1

Split ja.yml into five YAML files and placed them a seprate directory.
Provide RSpec examples to confirm the completeness of YAML files.
Add ja/spree_core.rb to translate correctly affirmative and negative
sentences.
Make railtie to see the value of app.config.i18n.available_locales
Changed, a_copy_of_all_mail_will_be_sent_to_the_following_addresses:
sounds nicer
Update spree_i18n.gemspec to depend on a ~> 1.1 version of spree
Fix typo
date formats default for es.yml translation

Closes #82
Relax dependency to any version of Spree >= 1.1
loading all locale files, not only those in the subdirectories

Merges #83
Load extension rake files in Rakefile
Require active_support core extension in i18n utils
Fix a bug in the new getStops method.
fix markdown indentation in NEWS
[FEATURE] Migrate EXT: beuser to Extbase

This patchset includes a new backend user administration.

Based on extbase a model for BackendUsers is included.
All users can be listed and the listing can be filtered by
* username
* usergroup
* admin/non-admin
* active/inactive
* ever logged in.

The user listing includes the last login column also the
limit of 1.000 users was removed and pagination integrated.

Selected users can be compared in a table view.
All active backend user sessions are listed - can be terminated.

Of course the SU/change user feature was migrated.
Clickmenu was widely integrated to allow editing right away.

Change-Id: I32569c848581a49b3948e093d717dad50e973c5d
Resolves: #39141
Resolves: #5288
Resolves: #37949
Resolves: #33427
Resolves: #18602
Resolves: #15494
Releases: 6.0
Reviewed-on: http://review.typo3.org/12935
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
[CLEANUP] Typo in INSTALL.txt

Change-Id: I2597cbec82e2dc61ab247cdff8b4ce9d19b2c231
Reviewed-on: http://review.typo3.org/12942
Reviewed-by: Wouter Wolters
Reviewed-by: Oliver Klee
Reviewed-by: Steffen Gebert
Tested-by: Steffen Gebert
[BUGFIX] Incomplete mocking in AbstractMenuContentObjectTest

AbstractMenuContentObjectTest of frontend extension mocks TSFE
(TypoScriptFrontendController) but does not provide all needed
constructor parameters, which raises warnings.
The patch now gives add sane parameters.

Change-Id: I80bc3baa701c5994af9299ba0ba3d79aef12c917
Resolves: #40541
Releases: 6.0
Reviewed-on: http://review.typo3.org/14296
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
[BUGFIX] Fix typos in stdWrap_crop description

Fixes: #43919
Releases: 6.1, 6.0, 4.7, 4.6, 4.5

Change-Id: Ib4b447f825122ea069802a7c9139602362430bdc
Reviewed-on: https://review.typo3.org/17139
Reviewed-by: Wouter Wolters
Reviewed-by: Oliver Klee
Reviewed-by: Sebastian Michaelsen
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
Update notes for submitted changes

* [BUGFIX] Remove isLoaded('fluid') call from FLUIDTEMPLATE
Update notes for submitted changes

* [TASK] Improve error message of "broken rootline"
Update notes for submitted changes

* [TASK] Improve error message of "broken rootline"
Update notes for submitted changes

* [TASK] Introduce "TYPO3 CMS" in EXT: about
[BUGFIX] Hide relations to deleted records

When displaying a column containing MM-relations in Web > List
view, deleted records will show up, because the MM relations still
exist and the foreign table is not checked for deleted records.

Additionally an empty result in this case should display "N/A"
just like for the other situations.

Change-Id: I78969ca83b464889c646fd6de4784886cdbeaaf2
Fixes: #21713
Releases: 6.0, 4.7, 4.6, 4.5
Reviewed-on: http://review.typo3.org/10813
Reviewed-by: Francois Suter
Tested-by: Francois Suter
Update notes for submitted changes

* [BUGFIX] Wrong icon in db_new tree
missing bin.includes for schema folder
Audio Recording, Emoticon model
Added jQuery UI to products admin page
Added default/blank schema
Removed Web.Config transforms
removed bams
go live
Major updates. Proxied stats service.
fix
fix ignore files
Added BPSbank support
ComapnyInfo refined
UI-Update-1
using print0 with find-cmd
running rspec extracted to named function
set compilation-window-height
Started outlining some headings.
structure and cleanup
Modified client to use XmlHttpRequest when in browser
Modified to have success, error callback properties in options params for query and trans_query
Corrected issue with fat arrow syntax in dynamically-generated modelObject object derived classes
Update 01_gen_to_mgf.py

Flipped alleles. Minor allele is first for bimbam mean genotype format.
don't draw pie chart if options.data[0] is undefined
thêm các tài nguyên cần thiết
Hey,
     I have made slight changes in package_data in this file, this resolves both the #88 ( https://github.com/ingenuitas/SimpleCV/issues/88 ) and #90 ( https://github.com/ingenuitas/SimpleCV/issues/90 ).
Problema: TROCCARD resolvido
bug fix
bug fix 2
bug fix 3
merge and fix conflict
Added Logos
Added image info while uploads
Added Persistance and Save
Added conact picking feature
fun times
Merge branch 'master' of github.com:vishnubob/mythonic
commit #1, casa #2
Use own ThreadPoolExecuter instead fo chached. Core thread pull size set to 3.
Fixed error after merge in Makefile
Mahlzeiten-Formular gefixt
adding viewers and edit functions
reset viewers 0 on toggle
Expresions (3)

Puto operadorAsignacion
Merge remote-tracking branch 'origin/master'
New counter text
Day counter removed
Improve form-elements-matches.html.
Minor updates to NEWS file
Added event manager test
Got a non segfaulting version going
Works are all done. XML updated. Puzzle filters working properly. Tween into puzzle location. Frame is a groove now.
Add character set information to README
Refinement of tests, get winter evaluation working, break tick.
Moved viewport plugin, started src_loader plugin
Viewport used on dataset of image thumbs
Update mutt keybindings
very simple IF branching (without the check; just the basic-block creation), and emitting quads only after a function definition
added CMP and condition checking for IF branches (not including short-circuit)
Tweak install button css
added 'tweet_link' template tag
Q48 how to print pretty binary trees
browserid, profile, etc
Use MenuItem in context menu selection
added some static text values to stats
Implement Deck list view
adding new preloader
- fixed a typo in a log message

git-svn-id: http://svn.berlios.de/svnroot/repos/z-push/trunk/src@1366 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
ZP-138
- changed: return a HTTP 503 returncode if ZCP is not available during login

git-svn-id: http://svn.berlios.de/svnroot/repos/z-push/trunk/src@1367 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
ZP-149
- added: semantic checks can be globally disabled setting DO_SEMANTIC_CHECKS to false

git-svn-id: http://svn.berlios.de/svnroot/repos/z-push/trunk/src@1368 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
ZP-158
- added: -h and --help to display help from cli
- added: show options default, active-only, unknown-only and custom timeout for terminated connections
- changed: number of rows available is now better used on busy systems
- changed: show more columns of username and less of device id


git-svn-id: http://svn.berlios.de/svnroot/repos/z-push/trunk/src@1369 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
ZP-158
- changed: use shorter "terminated" string to use available space.. shows "OK" now


git-svn-id: http://svn.berlios.de/svnroot/repos/z-push/trunk/src@1370 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
ZP-166
- added: performed actions announced to top collector

git-svn-id: http://svn.berlios.de/svnroot/repos/z-push/trunk/src@1371 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
ZP-150 #comment Inline images can not be downloaded with Windows Phone 7.5 or Samsung Galaxy S2 #time 10h

git-svn-id: http://svn.berlios.de/svnroot/repos/z-push/trunk/src@1372 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
ZP-148
- added: a method to DeviceManager to remove previously ignored objects from the device data 
- changed: StreamImporter->ImportMessageDeletion() excludes a previously ignored object from the device data
- changed: the DeviceManager should always be present when using the StreamImporter. If not, it should be loaded anyway

git-svn-id: http://svn.berlios.de/svnroot/repos/z-push/trunk/src@1373 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
Wed Dec 19 23:01:02 CST 2012
Sat Nov  3 08:01:02 CST 2012
Sat Dec  1 16:01:01 CST 2012
Fri Dec 21 19:01:01 CST 2012
Sun Nov  4 23:01:02 CST 2012
Sat Nov 17 07:01:01 CST 2012
Fri Nov  2 16:01:02 CST 2012
First version of the lite theme and message to the user.
First version of the lite theme and message to the user.
First version of the lite theme and message to the user.
Half of chapter 11 from TDD was studied
Site updated at 2012-04-12 09:21:25 UTC
BUG修正

core/request中的BUG修正，后台界面显示中的小修改
chdir just print
test sublime git with random comment
trying rvm install script as defined on website...
稍微做了点完善，可以用于演示
MISC: start 1.2.x maintenance series
MISC: start next development series 1.3.x
DOC: add pypirc note for uploading release

pypirc file needed for uploading to pypi.
ENH: use Python's logging (nibabel.dft level) instead of print statements
ENH: use logging in dicomfs + optparse to provide control over logging etc
TEST: make travis test with latest pydicom

Thanks to Nathaniel Smith for working out how to do shell conditionals
in the travis.yml file (See charlton/charlton repository)
Merge pull request #119 from yarikoptic/_enh/dft_use_logging

dicomfs: control its verbosity from cmdline (silent by default) + use python's logging

otherwise it bombards user with lots of information he doesn't need (ideally it also should fall into background unless -f (not yet present) or any -v provided)
RF: move dicomfs script to nib- naming convention
RF: refactor installation checks to check scripts

Rewrite of testers module for clarity, in part.  Add a routine that
allows us to check if any scripts have been missed in the installation.
Add this to the Makefile as a target and to the release checklist.
DOC: add/expand docstrings, move code for testers
RF: add informative message when check-files is OK

Also return something that could be used as an error code.
BF: make compatible with pydicom 0.9.7

Pydicom 0.9.7 returns some fields as Python Decimals, when previously
they were floats.  This causes a mess when using values in an array,
because the array becomes objects rather than floats, and, well, it
doesn't go well.  Tests pass for me with pydicom 0.9.5 through 0.9.7
with these changes.
DOC: point to nipy organization's nibabel instead of the original Michael's for issues and changes
Merge pull request #126 from yarikoptic/master

point to nipy organization's nibabel instead of the original Michael's for issues and changes
RF: use map instead of list comprehensions

map looks a little nices here; from suggestion by Alexandre Gramfort
RF: refactor, rename nifti diagnostic script

Script didn't have any usage, help, etc.  Stolen from nib-ls.  Renamed
to nib-nifti-dx to fit with our new naming scheme.
BF: add missing scripts to setup.py

We were missing the dicomfs and nifti diagnostic scripts.
BF: fix nasty bug for orientations and 0 columns

Getting orientations for columns of all zeros in an affine resulted in
numpy svd hanging.  I realized in the mean time that the io_orientation
function was not returning the correct number of rows.  Extend tests,
fix, improve docstrings.
RF+DOC: remove unused _ornt_affine function

Remove unused function and expand docstrings for the orientation_affine
function, because it sure is confusing.
RF: rename orientation_affine to inv_ornt_aff

The original name was very confusing. Add deprecation warning attached
to old name.
Jinclude ready method and ReadyCore Object added
ajout aide epidemiologie
Changes to BootStrap.groovy
Site updated at 2012-12-25 19:28:16 UTC
Add new menu item type: Text with sprite.
SqlTimeSeriesService.java: disable error tracing
py agent: _command.py: unused urllib import
mistake
patterns update
refabrication new classes
Signed-off-by: yuduozhou <yuduozhou@gmail.com>
Signed-off-by: yuduozhou <yuduozhou@gmail.com>
Logs for build 167 of yui3-3.x on branch dev-3.x
add alias n' func
new gui interface
add countyusuke in menubar
add zabbix-1.8.11 tarball
Update bidpom
Merge pull request #51 from zacc/update_bidpom

Update bidpom
Merge remote-tracking branch 'upstream/webdriver' into migrate_homepage_locators
Fixed project header dirs
downloader support delay update files
Fix page scroll position on material popup closed

- Fix Page is not restored to original scroll position
  after popup is closed by cancel button
Strip whitespace from search key term

- Strip whitespace from search key term
Remove unnecessary margin in site notice text

- Remove unnecessary margin in site notice text
Merge branch SearchInstructionalMaterials

- Merge branch SearchInstructionalMaterials into AutomatedTests
Merge branch SiteNotices into AutomatedTests

- Merge branch SiteNotices into AutomatedTests
Fix "Register and Add new student" alignment issue

- Fix "Register and Add new student" alignment issue
  in Student roaster
Merge branch StudentRoster into AutomatedTests

- Merge branch StudentRoster into AutomatedTests
Add links in top menu

- Add investigations and resource pages links in top menu
  for appropriate users
Modify tooltip text

- Modify tooltip text to make it more explanatory.
Merge branch StudentRoster into AutomatedTests

- Merge branch StudentRoster into AutomatedTests
Refine feature tests for search materials

- Refine feature tests for search instructional materials
  for the scenario of pagination.
Fix fast click on showhide filters button

- Fix fast click on showhide filters button
Merge branch SearchInstructionalMaterials

- Merge branch SearchInstructionalMaterials into AutomatedTests
Refine feature tests for search materials

- Refine feature tests for search instructional materials.
Add tooltips to standalone activity name headers

- Add tooltips to standalone activity name headers on the full
  status page.
Refine feature tests for assign materials

- Refine feature tests for assign materials.
Merge branch FullStatus into AutomatedTests

- Merge branch FullStatus into AutomatedTests
Modify welcome page layout

- Add Search bar

- Add links to browse materials using domain names

- Add carousel
Added the new larger teleporters to the sprite sheet and updated the two teleporter screenshots.
Added new sprites for the subway nodes.
Added a new game node for subways and a new level showing how to ride them.
Added a comment to the ride method and tweaked the position of the coin label in the iPhone view.
Added error messages when you try to cross a bridge, visit a house, or ride a subway and can't.
Fix #navlinks positioning
Youtube Embed > Embedding
Fix colorID
BECAUSE I BREAK EVARYTHANG
disques test
add io inferior mode
Pass object, not array, to Z.selectItems
Initial translator commit for the redesigned Springer Link website.
Rename translators
Update tests after rename
Merge pull request #487 from aurimasv/sl-new

Translator for new Springer Link website
testing lab01
Mit Circlesearch und auto Add
Update Automater.py

Cosmetic changes.
fix bugs in SFSUploadHandler and SFShandler

1. work for UTF-8
2. return StringEntity
sprucin'
J'avais oublié de add le template
Reworked dumping/loading

* Add ability to "smartly" dump/load data. Instead of constantly
  overwriting and deleting data files, with the "-e" flag, mysql_truck
	will check if files exist before processing.

* Split schema files into two different files:
  1) Table schema with no indices
	2) An alter table sql that adds indices to a table

* Import now creates the table without indices, imports data, and
  finally applies the indices. This should speed up imports.

* Extracted Dumper/Loader/Helper classes into their own files.
Merge branch 'master' of github.com:8tracks/mysql_truck

Conflicts:
	lib/mysql_truck.rb
Starting to play around with views(controllers) and templates(views).
Update notes for submitted changes

* i9100g: camerawrapper
FascinateTAB test 1
fixed yaw bug
refactoring; added replay feature (tbt)
current state
Merge branch 'NG' of github.com:ARCADE-UAV/airborne into NG

Conflicts:
	ARCADE/airborne/components/core/main.c
working
fixed a bug where page for a no longer used badge causes an internal server error
Fix get_badge_summary
Merge pull request #89 from atiberghien/patch-1

Fix get_badge_summary
made high reputation users be able to reopen questions
Aded Levenshtein and list of "Bad Emails"

Added a simple check against whether the user has inserted "spam@" or
"info@" as an email address in addition to changing the distance
calculation to Levenshtein
tx: added a module to register an after commit hook.
refactor: rename `events` to `handle` and added orm event notifications.

Moved the existing functions that handle tweet data into a module called `handle`.
Then added a new `events` module with crud events for Stories and a notify
module with ORM event subscribers.

Currently the story event subscribers tell the stream manager to reload the
track predicates.
refactor: updated the stream manager to use live predicates.

Updated the Twitter Streaming API consumer manager to actually query the db for
track predicates, specifically all the story hashtags and all the user twitter
ids. At the same time, moved the query functions into the stream module.
refactor: added Story model and implemented traversal.

Major refactor of the data model, partly to introduce a Story class and
partly to allow URL traversal with ACL security policies.

There are now a number of traversal roots in the `model` module and model
classes like `Story`, `Assignment`, `CoverOffer` and `PromoteOffer` now
have ACL policies that allow editing by the user that created them.

The JSON dict representations of the model classes have been updated
accordingly and the old `tree` module has been deleted.
Refactor: removed get_hashtag hook and fixed doctest.

Now we're using the Story root and traversal machinery, we no longer
need `request.hashtag`.  Plus lost the NotImplementedError in the
assetgen manifest hook.
refactor: tidy up the app configuration and traversal routes.

Removed the unnecessary hook / request property configuration and rejigged
the exposed routes to use the new traversal machinery.
refactor: fixed import names in queue module.

Plus added a debug . log everytime data comes in.
refactor: simplified schemas in line with traversal machinery.

Plus renamed to use `Create...` consistently.
refactor: rejig views into a stories view module.

Removed the dashboard and assignment views and replaced by a set of views in the
stories view module, hung off context classes and interfaces as necessary.

This leads to urls like, e.g.:

    /stories/:hashtag/assignments/:public_id/cover_offers/:public_id/@@action
Refactor: updated the client to use the new traversal urls.

Rejigged the coffeescript a little to pick up the new data and to construct AJAX
request urls properly.
made several components that into loopable components
updated XmlComplexParserTest
We don't need the setModelData override.
Initialising the extension
Internal variable name fixed.
Made attachment search also work on filenames.
Minor typo fix.
[code] Align some variables and properties
Moving functions out of the base functions.py into a /defs module with the decorator syntax
Adding a tiny bit of styling.  Included zurb foundation 3 & jquery masonry
Screen resize to fit on mac and windows
commit!

PUSH
Merge branch 'master' of https://github.com/Andrusza/PiratesArr

Conflicts:
	PiratesArr/PiratesArr/PiratesArr.csproj.Debug.cachefile
Update Relay to tweak styling for timers.
活動管理修正
Version bump to 0.0.0
Version bump to 0.0.1
[FIX] Readme - add taxonomy specification
[ADD] Gemspec description + generate gemspec
scrolling temporarily working
better scrolling
better assets
Merge pull request #4 from tks2103/updateassets

Updateassets
Fixed min file name
Remove debug print statements.
Enable UI and scene clicking.
Merge remote-tracking branch 'origin/unstable' into unstable
Hopefully finally finished renaming Golem weights
Note that idleTime is set in the CRuby bindings of Chipmunk.
working on getting gallery uploads working
galleries now working I believe
Add galaxys2 support
Fix
Merge remote-tracking branch 'upstream/ics' into ics

Conflicts:
	configs/common.mk

Change-Id: Idbb2452398cea4356aee25246fd88c9130a13a39
added date to ro.aokp.version

Change-Id: I4a69ec3a2ed74f1fc15e106841778007def13e87
fix ro.aokp.version

Change-Id: Iba1512c91457d307cd0db016f7b46ddbd7efc206
fix ro.aokp.version again

Change-Id: I7bc0f9ecac37c6dfb85c26b2d4b002847c8ab410
Merge remote-tracking branch 'upstream/ics' into ics

Conflicts:
	configs/common_versions.mk

Change-Id: I9ac8042153ad79d0992df4921beae94ce3dad417
Fix bootanimation

Change-Id: I2fda1709775593af9b1dccd44b90cbe1228207de
Merge remote branch 'upstream/ics' into ics

Conflicts:
	configs/common_versions.mk
	overlay/galaxys2/frameworks/base/core/res/res/values/config.xml
	overlay/galaxys2/packages/apps/ROMControl/res/values/arrays.xml
	overlay/galaxys2/packages/apps/ROMControl/res/values/config.xml
	products/galaxys2.mk
	tools/squisher
	vendorsetup.sh
Attempt to autodetect palette conversion, fix a few bugs, clean up the code a bit, improve the presentation sort of.
Make a few public members into private things with accessors.
factorisation includes
started doing everything in 1d coords
leaky version
no memory leaks for both see and ibd
added output filename
fixed bug in ft
fixed bug in ft
Merge branch 'master' of https://github.com/BenjaminPeter/SSSim
Passíusalmur52
Merge branch 'master' of github.com:Bergurth/haust12org
server-side fb auth and basic requests
changing to heroku
/test in url
Attempted more file creation fixes.
Filter out all characters but '+'sign and digits from imported numbers

Some firmware versions of SPA phone do not dial numbers containing signs such as  '-' or brackets
Merge pull request #2 from Bounder/master

Filter out all characters that are not digits or '+'sign from imported numbers
Added outlook as a provider
Added an option to provide which provider you would like to use.
group variable now check for its present in the 'Categories' variable of an outlook contact.
Refactored code according to PEP8 and Bouke code-style
Refactored range to start from 1 instead of adding 1 in the function call.
Prepared for windows builds
Merge branch 'master' of https://github.com/Bounder/spa-phone-api
Cascade errors from provider into main

Errors raised in the provider are now catched in main and the error is
printed from the main.
Merge branch 'master' of https://github.com/Bouke/spa-phone-api
Setting gencache to readonly fixes errors when running exe
Version bump
Command line usage, specifying provider
Resolved XXL-engine and Improved JJs issue.
finished register and login.
Move realm status checker debug output to #diablobot.
links display as blocks
Initial commit of para :3
Updated .info file to make for new happy default settings
Updated version number
First tests.

File is imported, read and exported to desktop.
Map/Refresh-Button vertuscht
Normal/Satellit/Hybrid mapType selektion
FlickerFetcher Keys verwenden
Merge branch 'Map' of github.com:Chrichton/TopPlaces into Map
new stuff in mission.
removed mission time limit.
Fixing what is stored on github.  Also, some small (not totally working) code snippits added.  Trying to figure out why QTimer is not emitting a signal at the designated time interval.  This is probably really simple.  Need coffee.
Fix RubyGems version too old error message to show current version instead of hardcoded value.
Merge pull request #678 from brentnycum/master

Fix RubyGems too old error message
[Core Extraction] More fixes for the resolver.
rename org_type to organization_type
Sprint 5 : lance le thread pour le chargement des ressources - bug SFML lié à l'ATI rend nécessaire le passage en SFML 2
Making the README more accessible
tried to figure out the date in php
Merge branch 'master' of https://github.com/DanielDe/Simbiotica
pushing list v2
update readme in dev folder
Fixed editing ROI position to work correctly with improved sector.
Added in a custom Actor for convoluted fermi edge fitting
Properly tracking references for GdkPixbuf objects
allow multiple instances of build step by providing different IDs for targets
test
remogve /bin
add bin to gitgnore
pupil dilatation with AU 6pd
update to latest chlas
merge
added sound detection
added monitoring of sound events
renamed after the sense, not the modality
initial readme
add dependency: bottle.py
add first working version
ignore .pyc, .pyo and .db files in git
Monstupar\tests: Test for parser (data Type)
Clean up and adding some documentation
Added declareTemps helper
Use new declareTemps helper
Various code changes. Should be even better on performance now (not that it was bad before..)
Navigation fix
Navigation start fix in examsapp.cpp
Building fix in App.pro
"internal" prefixes removed in tests
Control class tests - removed obsolete "view.clear" function call
Really stumped as to why I can't get past login (0xCD not being received)
Réorganisation des packages.
Ajout de tests pour Route.
Fixe Timeago
Add route for serving the display js with the HOST dynamically subbed in
Update the display lib to work properly with api keys posted
Grab the username off the body, not the query
Version 1.2.8 lanzada
headUrl problem fixed. Going to work on another problem: contacts may still be duplicated
simplify the plugin
Add support for integer ranges in switchover
adfadsfasdfsdf
Implementando Generador de Codigos QR
Added packages.

- FlorianWolters\Component\Core\Debug Method
- FlorianWolters\Component\Core\Equality
- FlorianWolters\Component\Core\HashCode
- FlorianWolters\Component\Core\StringUtils
Estrutura inicial do CakePHP 2.2.1 com o Bootstrap
Finished Dynamic Language Mods To Dynamic Forms
Added new field options table to installation file
Rearranged for proper language flow
Dynamic Languages For Settings
integrated languages into hostnames
Changed table name format
updated install queries and language queries to match new table format
Installer Bug Fixes, User Login Issues With Cookie Expiration Fixed
MinenessShop Update
adding details to asset allocation
Update README.md

Changed hEntry to h-entry. As per the style of Microformats 2.
Ofertas/Demandas: Si la fecha de caducidad está mal, se autocorrige
* Added "long Random(long)" in PhysicalEtoys.h for compatibility with Nxt
Base class CarrotRequest to allow GET and POST requests.
GET friend scores and achievements
added sexec
Improved README with MarkDown
Tail & head methods
Make app an owner of file formats.

Since Cura works with file formats designed for exporting
it makes sense to be an Owner of such files, since Cura
prints them.
Fix resulted archive was wrong in Mac OS X.
fix esercizi
weitere sachen
documentation linking
minor update

extended id usage
Change: amazon s3 upload via collectstatic
New: management command which generates media to be uploaded to amazon s3

Change: added generated media to gitignore
Updated calendar icons. Updated bundle id.
create startup screen for qt gui
Updated implementations and added copy method.

- Added fast return on quatNormalize for already normalized quaternions
- Added argument copying in quatMultiply to avoid in-place errors.
- Added method quatCopy for copying quaternions.
Merge remote-tracking branch 'origin/quat-update' into attitude-update

Conflicts:
	quat.c
spit out markov chains based on the channel log.
bug fixes
Correct the logging
Gestion fichiers utilisateurs avec CKFinder
update database
add table view for censor
update UI
add tab indicater to both ICS and pre-ICS
update UI of people detail

Signed-off-by: Elonix Thonarel <spider0quoll@gmail.com>
removed ballz.tmproj
Add more suitable messages for constructor errors.
working on physics simulation
forgot modelloader.d
Allow local overides of vimrc
fix a fat finger mistake
Merge pull request #8 from wmernagh/iora

Allow local overides of vimrc
updated caption for datastreams table
Remove the google pie
Update the templates
Merge branch 'master' of github.com:JacksonTian/doxmate
[Responsive] Part 1
Fixed bug where Phantom could crash when minifying files over https
Moved --inspect reporting to server
exit with appropriate success/failure code. if --inspect is set, a document whose layout is not intact is considered a failure.
Removed old docs
Commented CLI file
Documentation into version 0.0.9
report on # characters removed
if the layout is not intact afterwards, exit with failure code
Show output for debugging if invalid
Show output for debugging if invalid
Run asterisk against Alexa top 10
error handling and logging
Added timeout
README
Merge branch 'develop'

* develop:
  README
  Added timeout
  error handling and logging
  Run asterisk against Alexa top 10
  Show output for debugging if invalid
  Show output for debugging if invalid
  if the layout is not intact afterwards, exit with failure code
  report on # characters removed
  Documentation into version 0.0.9
  Commented CLI file
  Removed old docs
  exit with appropriate success/failure code. if --inspect is set, a document whose layout is not intact is considered a failure.
  Moved --inspect reporting to server
  Fixed bug where Phantom could crash when minifying files over https
Implemented and fixed many things:
+ Correct connection pooling
+ Load and display search results correctly
+ Connection bug fixed
Some modifications
Removed the query execution methods from the datastore
added postgres support for ubuntu
remove zoom plugin
Now reading mass centers from vphysics_valve instead of trying to calculate them
Merge branch 'master' of https://github.com/Jcw87/Gmod-vphysics
Disabled cache of pages when using an admin account
Removes Library Structure
Adds Log Class, Replaces Libraries With Submodules
Implements The Log, Updates Newtonsoft Submodule
Updates settings.json And README.md
Fixes Tab Indention
Merge git://github.com/Jessecar96/SteamBot into log

Conflicts:
	SteamBot/SteamBot.userprefs
	SteamBot/SteamWeb.cs
	lib/protobuf-net
Fixes #36 and #11
Adds Color To Console Logs
Merge pull request #32 from redjazz96/log

Adds Log, Moves Libraries to Submodules
UP-3466 Work on cleaning up pref storage
UP-3466 Work on custom PortletPreferencesImpl
Fixing password reset string template functionality
UP-3471 Creating factory for preference input objects to simplify XML configuration
Merge branch 'UP-3471'

* UP-3471:
  UP-3471 Creating factory for preference input objects to simplify XML configuration
UP-3466 Add custom PortletPreferences IMPLS
UP-3466 Add tests to validate new preferences impl
Merge branch 'UP-3466'
UP-3473 Fix classloader tracking
UP-3474 Setup admin requests correctly
UP-3472 Fix hibernateUpdate call to use right args
UP-3466 Cleanup from preferences rewrite
Switch to using m2e apt plugin

https://community.jboss.org/en/tools/blog/2012/05/20/annotation-processing-support-in-m2e-or-m2e-apt-100-is-out
UP-3384 Move entityVersion to concrete classes to avoid runtime warning
UP-3384 Move entityVersion to concrete classes to avoid runtime warning
UP-3476 Fix toggling of error stack trace
UP-3479 Updating user account helper to use displayName person attribute when wending password reset emails
UP-3480 Adding mobile icons for links, photos, and presentations portlets
UP-3481 debug upgradeChannel_32.xsl : hasedit->editable hasabout->hasAbout hashelp->hasHelp
UP-3481 Import/Export Unit Test portlet 32-40 : hasedit->editable hasabout->hasAbout hashelp->hasHelp
All is working - We are ready to upgrade Thunder
Pass in module dir from CLI
Make it easier to pull out an entire chapter of text at once
Configuration entry for language facet translations
fixing numbering of images and table according to section - appendix as normal section after bibliography
s/</&lt;/
new parties region
COMPLETE ! (Moveset)
Merge pull request #1 from Wolfy76700/patch-1

COMPLETE ! (Moveset)
Prepares the repository for heroku
Formatting
Merge branch 'master' of github.com:LeandroLovisolo/TPF
Merge branch 'master' of github.com:LeandroLovisolo/TPF
Tests para liuSongJ
added; direct array index assignment support

Instead of `doc.array[i] = whatever`, which requires n setters
created on every MongooseArray, we implement `doc.array.set(i, whatever)` which
gives us a single entry point for casting.

This change introduces the possibility of adding nulls into
DocumentArrays as a side affect of assigning a value to an
index larger than the arrays current length + 1:

    doc.array.set(doc.array.length + 1, something)

Previously, DocumentArrays did not support nulls.
tests; add debug switch
todo
Merge branch 'arrayset'
add bugs to package
fix mobile
move css
Merge branch 'master' into gh-pages
docs; regen
remove doc#commit

use doc#markModified instead
remove num.valueOf()

no longer have MongooseNumber
(Plugins/lcdcontrol)Give the visualization more life. Add 'corona' in the background. Should remove old ~/.lcdcontrol_config.js before running this plugin.
(Plugins/actor_lcdcontrol) Bug fixes to get morphing working.
Core: Factor out audio sample conversion functions
Add Changelog10

Change-Id: I2bc2643000a3ae146e03adccaef4a5f85ea8774a
Converted to TrayIcon application. [touch: 194]
Changed format of error message.
Temp disable debug for train trip
Pagination done right
Moar pagination
MOAR PAGINATION!
Don't hardcode user id's
typo in development domain
Jazz up the private message postform
Debug map mode.
Début class Calculatrice
what i have so far
Merge pull request #27 from theCompanyDream/master

what i have thus far
Added a README tweaked makefile
Old methods now do something :3
[IMPROVEMENT] french texts + mobile style
Some of the PSX plug-ins don't implement every feature. Just use stubs if that's the case.
Avoid conflicts with headers named the same.
Implement more missing functions.
output.svg: Implemented Draw.get() and completed Draw._text()
Diagramas de casos de usos
Finished unit-managment, cleanup.
Fix PHPROJEKT-363: Error parsing configuration.php

Ini doesnot support ' to declare strings. On some systems the Zend_Ini parser
complains about it, leading to a status 500 after the installation.
Merge pull request #235 from dsp/PHPROJEKT-363

Fix PHPROJEKT-363
CHILD3
ok
config update
config
CT
Removed filter files from gitignore (added by mistake).

Signed-off-by: Ken "Minalien" Murray <minalien@gmail.com>
Adjusting FBAFormulation to fix SCIP functionality
Added bonus and the API for them
UI can now connect and send standard input from the console back to the running program. Need to make sure we read any remaining stdout/stderr data after the program exits though.
Final submission. Worked perfect on wamp but it didnt show thank you message on imm server
Fixed account.php (this ain't python bro); fixed permissions because I'm picky.
Finished About Content

Created About Content
Still need to workout CSS styling because font is too small and
unreadable for content.
some wrong comments fixed
Restyle user views and add haml
adjust vimrc
change VimL python and ruby code EOF string in neosnippet.
remove neocomplcache comments, plugin default help includes it already
make vim function neosnippet s: prefix  optional
add plugin neco-ruby and adjust vimrc
enable two neocomplcache sources: neco-ruby, neco-rubymf
add plugin taglist-plus for JavaScript.
adjust vimrc
update fcitx configs
update stardict dictionaries
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of github.com:NagatoPain/dotfiles
delete old Emacs configs
change mapleader into comma , and put it first before using mappings
re-enable window navigation mappings
add function to toggle list settings
disable vimwiki folding to speedup vimwiki
update syntastic options
remove files in opt/
add plugin rsense, and use its omnifunc RsenseCompleteFunction
add xmodmap to change C- key for Emacs
add Emacs configs
add youdao.py script
update vimrc
more advanced tags option with recursively
migrate my vertical indent lines to plugin file
remove unite series plugins list
Merge branch 'develop'
Merge branch 'master' of github.com:NagatoPain/dotfiles into arch
add plugin querycommandcomplete.vim
Added haml files for author views
Make Gerrit plugin work with all SSH providers

Removed the warning if Plink() returned false and added functionality to
get
the correct SSH command to use from settings. Also made sure that it
used the
right flag for the "port" setting for both Plink and SSH
add gen class
PL-125 Heartbeat included with heartbeat.get

Added the code to include heartbeat support using service (deepfiler in
case of gateway and monit incase of Appstack)
whoops, deadlock
Adding BS Less
Added Processing.js & co ver. 1.4.1 (http://processingjs.org/)
Added Three.js & co ver. r53 (http://mrdoob.github.com/three.js/)
Added Enyo & co ver. 2.1.1 (http://enyojs.com/)

See http://enyojs.com/get-enyo/
And specifically Enyo's Bootplate starter project.
Added Enyo's Bootplate starter project, symlinked into www/
Added Shipyard & co v0.2.0 (http://seanmonstar.github.com/Shipyard/)
Added « The X Toolkit » (co. ver `xtk-v9.0') : WebGL for Scientific Visualization.

See http://www.goxtk.com/
Added Angular.js (http://angularjs.org/), co ver. 1.1.1
Added BonsaiJS (http://bonsaijs.org/), co v0.4.1
Added Fabric.js (http://fabricjs.com/), v0.9.35

NOTE: Repository has no tags!
Added qooxdoo (http://qooxdoo.org/), co release 2.1
README.md : Warning on recursive cloning vs disk usage.
README.md : Some notes and todos...
ooptimized player moving
cleaner qs parsing
docs
added logical pwd support
implemented arch
changed echo to use getopt()
Merge remote-tracking branch 'upstream/master'
fixed problem in arch pointed out by allanference, made my files comply with the style guidelines, and made readme prettier
imma retard that forgot to add the readme to the last commit
Merge pull request #29 from TacticalGenius/master

Fixed Pull Request
delete unused modules + associated files

deleted modules:
01. cash
02. computers
03. events
04. explorer
05. fightus
06. gbook
07. history
08. joinus
09. links
10. linksus
11. quotes
12. ranks
13. replays
14. servers
15. shoutbox
16. usergallery
simplified the breaking condition for the VM brute forcing
Folder Restructure for master
low level fixes
meta/index: Update biography (2nd).
meta/index: Improve description of build system.
Allow the set of all trackers registered to a TrackerManager to be fetched.
Add a clear(World) method to Tracker and make onEnable and onDisable optional.
Clear tracked data when a world is unloaded.
Add an entry point for DamageResolvers
Add the DamageAPI for easy-to-use methods targeted at other plugins.
fix todo link in readme
plop
merge
added strength unit selection
redoing the Language System

Signed-off-by: Perdemot <perdemot@live.de>
Merge branch 'master' of github.com:RageModDevs/RageMod

Conflicts:
	src/main/java/net/rageland/ragemod/npcentities/RageEntity.java
added settings.h, gamelogic changes
Merge branch 'master' of github.com:Raydiation/bif4-cge
invite and kick icons added
icons to images folder added
Merge remote-tracking branch 'origin/master'
Deletada a aplicacao antiga e movida a pasta da modelagem
Arrumei a classe Vehicles....
Writing pdfs of the whole timeline - also fixed some hide/show stuff that I broke earlier
Change the syntax to [<command> #cardnum].

Command can be start(s)/finish(es)/fix(es)/close(s).
No command just adds a comment.
use latest Vagrant
mensaje que va
added readme, parameters, preliminary files
-BuildingMenu working and correctly updated
-Reset the stream after each sent colony as the stream otherwise uses and
older instance making upgrades not show
-Correctly show if you are maxed at a building.
-Does not show cost if you are out of money (bugged)
-Fixed Paths
Update src/org/runedream/api/methods/Inventory.java
Merge pull request #2 from iBotRD/patch-1

Fixed inventory slot bounds.
Update for iterator
add addin trigger logic
Changed the Windows bit bucket to NUL.
Added logic to detect new columns in $from
Issue 623 fixed
Merge branch 'master' of github.com:Sankore/Sankore-3.1
HHH-7159 Database keywords causes failure of some tests in org.hibernate.test.collection.custom
HHH-7162 - Use concise artifact syntax in build scripts
upgrade to junit 4.10
exclude xml-api which is part of JDK 6/7
change jboss-logging to make it JDK7 compatibile
HHH-7156 Make Hibernate ORM compile and run tests using JDK 7 (and JDK 6)
HHH-7156 Make Hibernate ORM compile and run tests using JDK 7 (and JDK 6)
HHH-7165 - count() query on classes using EmbeddedId should not use id column tuple on Dialects which dont support non-distinct tuple counts
HHH-7165 - count() query on classes using EmbeddedId should not use id column tuple on Dialects which dont support non-distinct tuple counts
HHH-7169 - Use ClassLoaderService to load JDBC driver classes
HHH-7169 - fix failling tests
change org.jboss.pressgang:pressgang-jdocbook-style version to 3.0.1-SNAPSHOT, since there is no 3.0.0-SNAPSHOT available
HHH-7165 - count() query on classes using EmbeddedId should not use id column tuple on Dialects which dont support non-distinct tuple counts
HHH-7158 - Regression: null values on NaturalId's at persist-time are causing subsequent NPE's and wrong behaviour
HHH-7167 - The new natural id code introduced in 4.1.1 depends on the order the entity persisters are loaded which leads to fatal errors
HHH-7133 - NaturalIdLoadAccess not correctly working on mutable NaturalId's
HHH-7133 - NaturalIdLoadAccess not correctly working on mutable NaturalId's
HHH-7174 org.hibernate.test.tm.CMTTest.testConcurrentCachedQueries fails due to test cases interdependent
uid is a oracle keyword
HHH-7166 Support multiple custom command factories
HHH-7176 Upgrade to Infinispan 5.1.2.FINAL
rollback org.jboss.pressgang: to 3.0.0
Fix nested comments for Haskell
Merge pull request #94 from vthriller/master

Nested comments for Haskell
Build package.json for node
Merge pull request #95 from Sannis/package-json

Build package.json for node
Replace site URL with email for Alexander Makarov
Preliminary changes to package name, license, version and homepage in package.json
Refactoring authors parsing from AUTHORS.en.txt
Python 3 version of build.py
Simpler flattening of cat_languages
"..." after "Adding package.json"
Removed useless argument to substr
Concatenate variable definitions in nginx.js
Keyword-less redefinition of nginx
Dropped debug className 'directive' from nginx.
Illegalize => in nginx
Extracting glue_files from build_browser to call from hljs_download
lang_name helper
Fixed number definitions in nginx. IP addresses now include port numbers.
Don't treat URLs as strings in nginx. Seems weird…
Drop ':' from nginx default illegals. It did help heuristics very much but there's a very real chance that it does appear legally in real-world configurations. Needs more test/research.
added voting stuff... mayube fixed it?
lol
Merge branch 'master' of github.com:Schonhoffer/Flannel
Fixed bug int the controller template
generate scaffold Book
error found: line 39