labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #83 from sjoerdk/master

readded sites framework to fix #77
Merge pull request #86 from sjoerdk/master

split settings.py into default/local settings
FileSystemDataset now creates correct folder, cleaned code. default dataset location is now MEDIA_ROOT/<projectname>/datasets/<datsetname> fixes #78
Merge branch 'master' of https://github.com/comic/comic-django
small fix for filesystemdataset
very basic upload now working for <sitename>/files references #89
now associating upload with current site by default
Each site now has /files with upload functionality. Not pretty but useful
uploaded files now have admin interface
D:/userdata/Sjoerd/Program Files/Git/files upload page now shows site links as well. Before there were no link to any other pages
fix to viewing site without page
changed image tag to image_path tag, which renders path only, so html can be used to size and float etc the image. I currently assume people working with this know HTML
vimrc cleanup of stuff I don't use
Merge branch 'master' of github.com:sjurgemeyer/dotfiles
changes to zsh syntax highlighting.  Not sure why these are showing up
Updated README.md to include note 6
model.js
for add book working once more.
Tonight, work is done.
fixed badge labels on Lion and switched 127.0.0.1 -> 0.0.0.0, as suggested by Sumukh
Deleted some unnecessary logs
forget the source files
Create .gitignore

Trying out GitHub's default .gitignore for Python.
user can view the details of event, can delete the event, can change the status of an event
Merge branch 'master' of github.com:snasir/applicant_lab
giving up on 'smart' description due to https://github.com/sonatype/nexus-maven-plugins/issues/24
add TestInfo interface and a JUnit impl (Rule)

exposes using a rule, general information about the currently executing test class or method

deprecates TestMethod.getName for now ( eventually I'd like to see all of TestMethod refactored )
make formatting consistent for new classes
Merge pull request #6 from sonatype/testinfo-rule

add TestInfo interface and a JUnit impl (Rule)
dmwr Ch2
Minor refactoring.  Added pushMultiple() for pushing to multiple streams in one call.
CC-1665: Scheduled stream rebroadcasting and recording

-initial prototype
CC-1665: Scheduled stream rebroadcasting and recording

-started working on UI
CC-3507: Live Stream status: naming

- fixed
CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on

-fixed
CC-4626: Airtime installation on Wheezy
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
CC-4677: Improve Smart block repeat description

-fixed
cleanup redundant code, remove whitespace
CC-4700: Return mime type of streams instead of null

-fixed
CC-4633: Use David's new method of Liquidsoap webstream switching

-fixed
CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule

-fixed
CC-4694: Apache/Zend error only specific to some users
CC-4715: Better management of tracks that are shorter than they claim to be.
CC-4658: Smart Block: Unable to drag songs into block directly

- fixed
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
CC-4697: airtime-import script fails silently on FLAC files

- fixed
CC-4662: Media Monitor: Unable to add watched folder because it's read only, by airtime-import command

- fixed
CC-4615: Now Playing page: Fail to get soundcloud file id in Schedule

- fixed
CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.

-fixed
CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.

-fixed
CC-4716: Cannot hear fade in & fade out

- fixed
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
upgrade script for 2.1.1
Fixed typos in changelog
add a few try catch blocks
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
CC-4091: More comprehensive error message for installs on systems with incorrect locale

-done
Merge branch 'master' of dev.sourcefabric.org:airtime
CC-4589: Small inconsistency in config files after upgrade
Deep optimization
Removed trailing whitespace
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
CC-4595: Fade in/out setting doesn't work

-fixed
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
Removed space
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
CC-4215: Smart Playlist: Exception happens when generate with criteria Length is 2012-08-10 14:00:00

- fixed
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
CC-4564: Webstream Book same webstream twice in Scheduler, the 2nd one doesn't get played

-fixed
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
CC-4564: Webstream Book same webstream twice in Scheduler, the 2nd one doesn't get played

-small syntax error in last commit
CC-4564: Webstream: Book same webstream twice in Scheduler, the 2nd one doesn't get played

-fixed
CC-4581: Confirmation dialog for removing an item from a show refers to deletion
CC-3672: Source switch stays connected if current show is cancelled

- fixed
NR-57 : Basic REST server components for handling gateway

Refactored the authorization URL modifications in order
to have consistent URLs.
NR-540 : soundcloud, youtube and instagram provider icons are not shown in the livedesk admin interface

Fixed
add tint2 confs
updated recipes to make the upload_cookbooks task a bit more straight
forward (no more bullshit of tar'ing, etc)
some algo stuff
polishing
changed SpockTimeoutError constructors
improvements to PollingConditions

- throw SpockTimeoutError
- added within() overload for consistency
- Javadoc improvements
- enhanced spec
enhanced mocking docs
Merge branch 'groovy-1.8' into groovy-1.9
getCategoryTitle: return translated Uncategorized (closes #506)
Merge pull request #25 from sq5gvm/master

Polish translation for tt-rss 1.5.11
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
add hotkeys to select marked/published articles
login form: focus login field
allow filters to work on child categories
API: support comments count/url
API: support comments count/url (2)
fix infinite scrolling for search results
viewfeed: better checking for reopening current feed
api: add always_display_attachments to getHeadlines
unify child category counter display; remove include_children control
fix types on RPC counter replies
updated documentation for v1.1.0
added changelog
Version 1.1.0
Prepare for Version 1.1.1
Prepare for v1.2.0
use player inventory as account storage
fix getting player from offline player
readme links tu bukkitdev
add support for inventory and enderchest "vaults", and appropriate permissions and configuration options
Make fractional value optional
Disable saving of config on disable.

This would overwrite changes to the config file made during runtime
add /gringotts reload command for reloading configuration
rename license.txt
Add default config mechanism
remove unused permission
edited license
updated changelog
Update documentation for 1.2.0
Version 1.2.0
Fix userWareHouse grid to have edit and delete functionality
Merge branch 'master' of github.com:ssommerfeldt/TAC_EAB
added demos page
TWIG include without namespace
WIP: piglit-dispatch: Code generation script

This is the first in a series of patches that replaces GLEW with a new
mechanism called "piglit-dispatch".  This patch adds the script that
will be used by piglit-dispatch to build its generated code.

The input to the code generation script is a set of XML files
describing the GL API, in the same form as used by Mesa.  For the time
being, these files can be found at
git://github.com/stereotype441/glapi.git.

v2: Ensure that a copyright notice appears in the generated file.

Whoops, wasn't actually uniquifying the functions

Sort enums by value and eliminate duplicates.

Declare types in a uniform way

Experiment: generate code from json

Remove unused gen_dispatch stuff

Add parse_glspec.py

parse_glspec fixup

WIP: piglit-dispatch: CMake code to build generated files

This patch adds the necessary build infrastructure to build
piglit-dispatch's two generated files, generated_dispatch.c and
generated_dispatch.h.

These files can be built by invoking "make piglit_dispatch_gen" from
the toplevel source directory.

Rework code generation CMake

Cmake fixup

Generated code

WIP: piglit-dispatch: Remaining infrastructure

Previous patches introduced code generation for the auto-generated
portions of the piglit-dispatch mechanism.  This patch supplies the
remaining hand-written code, which includes:

- Code to initialize piglit-dispatch.

- The actions to be taken when looking up a function, when function
  lookup fails, or when a function is unsupported.

- Code to determine whether piglit-dispatch has been initialized,
  which GL version is supported, and whether a given extension is
  supported.

- Definitions of basic GL types.

Mac workaround

Mac workaround

Mac GetProcAddress

Mac GetProcAddress fix

Mac GetProcAddress fix

Mac workaround for APIENTRY/GLAPIENTRY

Oops, GLhalfNV needed

Change to piglit_dispatch_function_ptr

Use other function pointers in the conventional way too

Use APIENTRY everywhere

Split out resolve functions and make tables

Add piglit_dispatch_resolve_function

Regenerate

Regenerate
Switch to using piglit-dispatch instead of GLEW.

Previous patches set up the piglit-dispatch infrastructure but did not
use it.  This patch enables piglit-dispatch and uses it instead of
GLEW.

No piglit regressions on Intel SandyBridge (Linux).

Make piglit_get_proc_address point to piglit_dispatch_resolve_function()
Remove GLEW.

This patch removes the files glew.c and glew.h, which are no longer
used.  The "piglit-dispatch" mechanism is used instead.
WIP: glean: use piglit_get_proc_address()

Previously glean got the address of GL functions by directly calling
an OS-specific function (e.g. glXGetProcAddressARB(), dlsym(), or
wglGetProcAddress()).  This patch changes it to use
piglit_get_proc_address(), which is OS-independent.  This paves the
way for switching to the piglit-dispatch mechanism of accessing GL
functions.

TODO: split out stuff?
Check initialized when resolving a function by name
Fixed issue with uncaught database exceptions
packet smackit
Merge branch 'master' of https://github.com/steveman/teamsquishy
Added a Graph Manager to handle redirects (added Boost)
bugfix
* Intrudusing templates
* Advanced vhost setup
Fix the handling of nullable integers under hosted mode
Support for updating charge disputes
Bump version to 1.7.6
verify existence of mimetype instead
GUI update 03.11 14:32
Add warning about git-get from master
Added a Pages Controller
added pages controller
completed static pages
made some file structure changes
Scaffold of Users
Added Users
Generated Micropost
Added Micropost scafold
Finish demo app
* modif evwr
 * suppression des tests
 * modif gestion du moteur
[MISC] added new information
updated vagrantfile
login works now with shiro
changing top template for login/logout
Only pass primitives to fireRequestSuccess
refs #1361 Currently installed apps tab should now obtain and display app descriptions from available app stores. App descriptions are not stored in the jar or locally at the moment, so they are obtained from the app store.

git-svn-id: http://chianti.ucsd.edu/svn@30238 0ecc0d97-ab19-0410-9704-bfe1a75892f5
Fixes #1304 (Add Edge/Connect selected nodes menu does not apply Visual Style)
Also fixes applying visual style after adding edge/nodes through the SIF Interpreter panel.

git-svn-id: http://chianti.ucsd.edu/svn@29988 0ecc0d97-ab19-0410-9704-bfe1a75892f5
refs #1122 Tag folder icons change to the open folder icon when selected

git-svn-id: http://chianti.ucsd.edu/svn@29598 0ecc0d97-ab19-0410-9704-bfe1a75892f5
Initial changes to work api

git-svn-id: http://chianti.ucsd.edu/svn@30320 0ecc0d97-ab19-0410-9704-bfe1a75892f5
Updated XML parsing
Created man file for package trioClasses

Just a skeleton right now, needs to be updated as we go.
Splited cmd line code and basic code
New user insert to the db
Add YellowTail sound
aaa
Marge tao-0001
RISOLTO il problema dello struzzo

Il ritardatore maledetto ritarda anche i pacchetti
oltre che scartarli (altrimenti non si sarebbe chiamato ritardatore no?)
Quindi succede che -> il primo ACK viene ritardato, il proxysender rimanda il paccketto, il secondo ACK arriva subito, poi arriva il primo ACK ritardato ma la lista non contiene il pacchetto.
Quindi non è un errore, bisogna semplicemente ignorare il pacchetto.
Casomai dimensionare bene il timeout in modo da sfruttare anche questi pacchetti ritardati per ridurre l'overhead? boh da valutare.
Piccoli commenti nel proxyreceiver
Mostrar fechas con resultados en show de Grupo
Upgraded Webbit version and updated WSServer and handler because of that. Added WSConnection object to deal with connection-specific data and behaviour. Added an exception handler for connection issues.
Committing all changes that haven't been committed last time for some reason
Load balancer and scaling groups
fitVids fix
Refactoring: renaming + using generics where possible
Removed some now-unneeded console messages from chrome extension. Updated .gitignore.
updated def mine to include limit option
Update src/DoctrineModule/Form/Element/Proxy.php

restoring current()
Big big changes, basically actually started the game... Still missing some chuncks
updated for new and improved BUGS
removed a call to execute a process with firefox
better command line handling
Make sure y axis of plots always starts at 0
Don't include legend in single data file plots
Implemented, how long one physic frame is. 10 seems to be a good value for the gp2x.
Bug Fix: Template string substitution missing character
Update: OBDeque public interface
Update: OBDeque internal data
Add: OBDeque method implementations
Basic startup script for phpd. Only supports start/stop commands for now.
COOK-1374 sv-unicorn-run.erb should use runit attributes
Merge pull request #13 from jschneiderhan/COOK-1374

COOK-1374 sv-unicorn-run.erb should use runit attributes
[CHEF-1312] correctly include a mixin.

While here, also require the file the mixin comes from, for correctness sake.
Merge branch 'COOK-1312'
Changed config from to use the ~/.cjdnsadmin file
Add a StaticPages controller
Finish static pages
Fix merge issues
fikset dobbel menu class
Testing av bakgrunn
hgg
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChilledTreat/ChilledTreat/ChilledTreat/ChilledTreat.csproj
	ChilledTreat/ChilledTreat/ChilledTreat/Menu.cs
	ChilledTreat/ChilledTreat/ChilledTreatContent/ChilledTreatContent.contentproj
index
moving folder. update peeps
~Changes~
Documentation - subsection 1.1 and minor corrections
Resolve compile error because of comment
fix indentation of var declarations
* Edited generated `README` to include real information.
* Markdown-ified some of the code in the `SPEC.md` file.
* Refactored some Node/Edge attribute methods into a new Member superclass.
* Fixed up the version.
* Added an example memory storage backend.
* Added a new `Graph` class for managing graphs individually, each with
  their own backend.
* Added test for the new `Graph` class.
* Added pry to the `minitest_helper` for helping with debugging.
* Fixed a bug where adding an `Edge` to a `Graph` did not persist.
* Rewrote a good portion of the tests. Goal is 100% code coverage.
* Old tests are in `old_test`. This will be removed as soon as the new
  test suite is deemed complete.
* Cleaned up the `minitest_helper`.
* Completed the tests for the `Member` class.
Move client and server code into separate files.
Fix whitespace
10-11-2012 05:12 PM
Fix tabs and spacing
updated CHANGELOG for 2.1.0-SNAPSHOT.
bumped to support OrientDB 1.0rc9
Changed property and index names to avoid collision with Rexster
added geolocation support for cordova 1.6, fixed small lint error in resizer
Saturday Evening
Final I
A few tweaks.

Mostly fixing minor bugs discovered in assembling the gimbal.
typeset text ok
active form of URLs
.top files .gitignored
started c-display; new file for LaTeX->ConTeXt Vim mappings
mmc: nios_mmc: remove unused spinlock_t from NIOS_MMC_HOST

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Added VFW Week 4 project files to MIU Week 1 project.
adding media link for lvg
comments added
Merge branch 'master' of https://github.com/tksrules/DBMSProject
Building java app
* Implement resource groups
  * Implement more tests
  * Fix race condition in connection with using mimification and bundeling
  * Fix typo in how test suite cleaned cache directory
Remove "workspace" query param from project issue list API call.

This param is now rejected by the Asana API with the message
"Must specify exactly one of project, tag, or workspace".
Merge pull request #5 from kennknowles/master

Remove "workspace" param from project task list API call
Now working with JavaFX 2.2 (new scene constructor)
Merge branch 'master' of https://toedter@github.com/toedter/e4-rendering.git
Moved old and test files out of /
Moved utils, cached, and staged into utils/
Updated paths to load files from utils/
Tidied up dag.jl
Tidied up tangle.jl a bit.
Footer customization workaround for ReadTheDocs
add binary extension compiled for windows
Began work on Peejeshare
somehow the full rails stack got pulled out of these

Signed-off-by: t.pickett66 <t.pickett66@gmail.com>
make the method proxy work in 1.8.7 and 1.9.3

Since #methods returns strings in 1.8.7 and
symbols in 1.9+ we have to handle the gathering
of these slightly differently.

Signed-off-by: t.pickett66 <t.pickett66@gmail.com>
bump gem version

Signed-off-by: t.pickett66 <t.pickett66@gmail.com>
usage warning added
field seperator added
first crude working version done
some more comments added
MongoDB defaults to off
Add MongoDB to dependencies
Merge pull request #82 from transparencyint/f-interface

fix moneylist scrolling
Fix jobs table when jobs have different config keys

If we have 2 jobs within 1 build, with such config values:

    { rvm: 'jruby-head', jdk: 'oraclejdk7' }
    { rvm: '1.9.3', jdk: null }

We should return jdk in configValues for second build, even if it's not
present. Otherwise table rows may be missing.

(closes #28)
changes for pro
Slugs are case insensitive now (closes #51)
Revert "Slugs are case insensitive now (closes #51)"

This reverts commit 8fb481cdd07b7f5fc6f8c033ec6f33066ac24736.
Update Ember.js from drogus/ember.js and fix routes

Default regexp used in ember does not work well for us. With repos
starting with 'stats', ember will match such url for /stats/ page, even
though the rest of the url is different, I added ability to overwrite
default regexp.
issue events on user:signed_in and user:synced
Merge branch 'master' of github.com:travis-ci/travis-web
Remove console.log
Add google analytics
Debug info on auth
Update Ember with history location fix from my fork
Add history.state hacks for browsers not supporting it
increase timeout, api is now taking care of this
Fix build link when updating builds through pusher
Don't add repository on worker events if it already exists

It's best to do that, because worker payload is usually outdated. If
there is no info on repo yet, it's worth to add it, but if it already
exists, we will most likely end up with inconsistent situation.
payload.job.id is not always present in worker:updated event
Handle case where key on data needs Ember.set

I'm not really sure what cauese a field to be defined as such setter,
but it sometimes happens.
Check also associations for incomplete records
use method signature over unified method. closes #12
weave/unweave on start/stop, not initialize/finalize
use when.js. relates to troopjs-core#49
fixes on bellevue site
Fixed issue #1436
dev checklist and new header
Made tests more universal by using libvirt test driver
Usuwanie wielu wierzchołków. CTRL + klik, zaznaczenie
Merge remote-tracking branch 'origin/master'
update logs for: 2012-06-14
more work
added footer to artist.html
added css and js files for dropdown
began integration
further integration, left justified now
more integration
fixed header and footer
changed top 2 rows/6 divs to 1 row/3 divs
finished integration
Better words from Marius.

Explicit-ify some collect+select behavior: the API designer is not trying to
mess with you, unlike some other APIs you might be used to. Or at least I guess
thats why these questions came up in Finagle class.
combine connectivity index with tax rate from cities.txt
Solve Problem 86.

Refactor some code in 85.
비바돈까스 입점
HDFS-3667.  Add retry support to WebHdfsFileSystem.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1368350 13f79535-47bb-0310-9956-ffa450edef68
HDFS-528. Backport: Add ability for safemode to wait for a minimum number of live datanodes. 


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1368353 13f79535-47bb-0310-9956-ffa450edef68
HDFS-1957. Documentation for HFTP. Contributed by Ari Rabkin


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1360349 13f79535-47bb-0310-9956-ffa450edef68
Add missing file from previous commit.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1360350 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-8355. SPNEGO filter throws/logs exception when authentication fails (tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1360458 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-8587. HarFileSystem access of harMetaCache isn't threadsafe. Contributed by Eli Collins


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1360464 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3639. JspHelper#getUGI should always verify the token if security is enabled. Contributed by Eli Collins


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1360487 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'origin/master' into Physics-Football
Merge remote-tracking branch 'origin/Physics-Football' into Angry-Monsters-StarterKit
Merge remote-tracking branch 'origin/master' into Physics-Football
Merge remote-tracking branch 'origin/master' into Physics-Football
Merge remote-tracking branch 'origin/Physics-Football' into Angry-Monsters-StarterKit

Conflicts:
	AngryMonsters-StarterKit/assets/app.osc
	AngryMonsters-StarterKit/assets/constants.osc
	AngryMonsters-StarterKit/assets/core.osc
	AngryMonsters-StarterKit/assets/director.osc
	AngryMonsters-StarterKit/assets/image.osc
	AngryMonsters-StarterKit/assets/main.osc
	AngryMonsters-StarterKit/assets/node.osc
	AngryMonsters-StarterKit/assets/opengl.osc
	AngryMonsters-StarterKit/assets/text.osc
	AngryMonsters-StarterKit/assets/utils.osc
Merge remote-tracking branch 'origin/Physics-Football' into Angry-Monsters-StarterKit

Conflicts:
	AngryMonsters-StarterKit/assets/app.osc
	AngryMonsters-StarterKit/assets/constants.osc
	AngryMonsters-StarterKit/assets/core.osc
	AngryMonsters-StarterKit/assets/director.osc
	AngryMonsters-StarterKit/assets/image.osc
	AngryMonsters-StarterKit/assets/main.osc
	AngryMonsters-StarterKit/assets/node.osc
	AngryMonsters-StarterKit/assets/opengl.osc
	AngryMonsters-StarterKit/assets/text.osc
	AngryMonsters-StarterKit/assets/utils.osc
Merge remote-tracking branch 'origin/Physics-Football' into Angry-Monsters-StarterKit

Conflicts:
	AngryMonsters-StarterKit/assets/app.osc
	AngryMonsters-StarterKit/assets/constants.osc
	AngryMonsters-StarterKit/assets/core.osc
	AngryMonsters-StarterKit/assets/director.osc
	AngryMonsters-StarterKit/assets/image.osc
	AngryMonsters-StarterKit/assets/main.osc
	AngryMonsters-StarterKit/assets/node.osc
	AngryMonsters-StarterKit/assets/opengl.osc
	AngryMonsters-StarterKit/assets/text.osc
	AngryMonsters-StarterKit/assets/utils.osc
Merge remote-tracking branch 'origin/Angry-Monsters-StarterKit'
Merge remote-tracking branch 'origin/Angry-Monsters-StarterKit'
another embarassing log
remove Animal_ prefix from animal names
Removing wrong header includes.
Added Fire at skill. Added function to remove dead actors from the game.
Reworked GameObject to remove its Shape from GameTiles on death.
cramtools.jar and updated README
Added BAM stdout stream to SliceView
Fix for BAM streaming out in SliceView
Update when the change of tab look was accepted
Ability to define hover and focus classes for UploadButton
Merge pull request #485 from obiwanus/3.1-IP

Ability to define hover and focus classes for UploadButton
Add some exception handling into the timezones.
Added the Category() function to get the current category at a certain level.
Made some simple layout & text changes to error & maintenance screens.
Switch to latest jQuery.
Merge branch 'develop' of github.com:vanillaforums/Garden into develop
Added some wrapper classes to the photo links to allow plugins to add classes to the user.
Tweak the image thumbnail to better support people's camera phones.
Merge branch 'develop' of github.com:vanillaforums/Garden into develop
BookmarkedModule fix.
optimized planet generator
How embarassing: a bug in 'prime?'.
0.6.1 tag
16 sep avond
hgf
Merge branch 'master' of https://github.com/vfernandez/gordivery
Increase the size of Biography Prefix text box on the admin Content tab.
Add support for 'target' and 'rel="nofollow"' attributes on contact links.
bug fixes, new tests
Merge branch 'master' of github.com:victorjonsson/Arlima
Index pronto
remove debug print
now indexing 11000 tweet/sec with single thread
fix bug in engine loop
tweaking
Fix test for empty/missing category/subcat in main listing.
появился баланс у админов
в bill.sql изменение таблицы admin
Added the glob supprt.
Стилизация под сайт потока
Add chroot

Signed-off-by: Vlad <vgit@vladgh.com>
Filtering by sex removed
Merge branch 'master' of github.com:vmalyi/find_discount
Initial code. It's not compiled and has lots of error
#1 remove sqlite db from repository
little patch for fixing sunday
Merge branch 'master' of github.com:vonkow/bcb_attendees
Nothin
Merge branch 'master' of github.com:vwirantana/eNotebook
Installing blog templates plugin
adding asynctask
asynctask working prototype
asynctask finished
Got static optimality to work.
implement left and right rotation
Rework model for tripwire hook (patch renderer)
removed hyphens in import data template, as it causes error in excel 2003
report_builder & confirm: minor fixes
replaced - in -- in Notes section of import template
added getRemainingRequest helper
add faq cache
some tweakings to the cluster viewer
default number of motifs for MEME now set to 1 to be more in line with reference R version
update config stuff to rails 3
new syntax for routes
possibly small changes to pluralization and routes for species
TODO: start using mysql2 driver
strstr function
prelim setup for main menu
Fixing scribe_apache help message
Buildling separate packages for python-scribe, python-scribe-ctrl and python-scribe-cat
Site updated at 2012-08-27 07:23:03 UTC
Patch: use server_url in sitemap generation
add class NFOView, support load nfo file, change font face, increase and decrease font size in NFOView
fixed ultim push
actualització de qfer i posat versio='no-definida' quan no existeix el fitxer VERSIO.txt
seekbar: show label "paused" instead of "now playing..." if player is
paused
channel osd re-design
removed scrollbar in channel osd
Merge branch 'master' of https://github.com/xhaggi/Xperience1080.git
More expressions to be fixed
De vuelta validaciones en tweetPostModal
XWIKI-8287: Sometimes an exception is displayed when canceling an edit operation
Fixed.
XWIKI-5676: Implement new search engine using Apache Solr
- Fixed escaping issue
XWIKI-7943: Impossible to save very large pages in jetty
XWIKI-7946 Right issue with REST API on subwiki in path-based multiwiki
XWIKI-7957: Unsorted columns of the TableFilterNSort script should have a double arrow as the alternative text
Done.
XWIKI-7955: Small UI issue on table head of Wiki Manager
Fixed.
XWIKI-7959: The "More Actions" column on the list of applications shouldn't be filterable or sortable
Fixed.
XWIKI-7961: Give access to PersistentTestContext in page object suite initialization
XWIKI-7963: Possible java.lang.NullPointerException when validating extension
Various bugfixes
Improve test setup
[Misc] Added link to maven jira issue
XE-1197: Allow velocity script in the space copyright field
Note: There were 2 solutions: change in XWiki#getSpaceCopyright or change in xwikivars.vm. I've decided to change in xwikivars.vm to be more similar to what we do for the version display in the footer and to not break backward compatibility in getSpaceCopyright() (even though the likelihood that someone was voluntraily using Velocity content in there is close to zero IMO...).
XWIKI-7945: Diff of wiki content is not showing up
* Add page objects for functional tests.
Protect against missing (null) version.
[misc] Use logical or rather than bitwise or which provides tiny performance improvement.
XWIKI-7889: wysiwyg: Cannot list attachments for pages with a period "." in their name - TRANSPORT_ERROR
* Small clean up + reduce the usage of XWiki.resource in xwikiexplorer.js
XWIKI-7889: wysiwyg: Cannot list attachments for pages with a period "." in their name - TRANSPORT_ERROR
* Replace two more usages of XWiki.resource.get(string)
XWIKI-7968: Upgrade to Infinispan 5.1.5
XWIKI-7969: Possible NullPointerException with unset DBList property
XWIKI-7971: HTML markup visible in the document title when copying, renaming, editing objects, browsing history and other actions
Fixed.
XWIKI-7972: Allow to add custom properties in PersistentTestContext
XWIKI-8086: Author coming from the XAR should be used when none is provided when installing it
- Actually send the message for CEREALZ
Fixed nested JSON (de-)serialization.
Funny separator.
A chance to process fetched image.
[maven-release-plugin] prepare release hw0-yucongy-0.0.1
UP
修复前端，预订按钮无法显示BUG
fixed messed up admin
js->enum
Merge branch 'master' of ssh://github.com/you21979/codesnippet
TomA: fixing some bugs concerning nested directories
Palautettu Analytics
add rrest
Renamed to avoid very generic names
dependencies review + ysd_mw_site refactoring
Migrate to pure sql alchemy
Missing table name
Table name typo
And restore tweeting
Missing break on tweet complete
Add non-functional items
Convert XCConfigurationList tests to rspec
Convert PBXBuildPhase tests to rspec
Convert PBXContainerItemProxy testing to RSpec
Use fake xcodebuild for running tests
Updated Libvirt libruary to support the 0.9.12.
Skeletonized
more skeletonizing
few type changes
wrapping up them skeletons
panic changing the menu
Added more comments
Workshop Done!
Merge branch 'workshop-done'

Conflicts:
	index.html
	js/states/menu.js
Merge fix
ready to reset
Remove unnecessary ignores
Chp 8.3
Adding a debugger
Added comments in POT file
captcha refresh
Site updated at 2012-09-04 15:21:14 UTC
Site updated at 2012-09-05 11:51:19 UTC
add comment for down image method
Moved mathlib to lib/ and updated project file.
Update Ktulhu_App/Ktulhu_App/Form1.cs
v0.0.7  added gems.
v0.0.8  prepping for deployment.
Fix docu.
Add Plone 4.2 to classifiers
Add Products.CMFPlone as dependency.

Not strictly required, but according to our new OneGov rules it has
to be added if the package is a Plone addon.
Merge pull request #15 from treinhard/master

- Update documentation
- Update classifiers
- Declare Plone as dependency
Merge in start
thesis: uml
content (html, css, js) samples
ticket:3 Created middleware & tests for it
ticket:3 middleware Finishing ticket.
Fixing static files path
hej
color change
Merge branch 'dev' of https://github.com/ApplETS/ETSMobile-iOS into rc4-calendrier
Start of WS request
webservice v2
monday night first commit
first commit monday
dates
late monday night
Merge branch 'rc4-calendrier' of https://github.com/ApplETS/ETSMobile-iOS into rc4-calendrier
Dates with advance time adjustment
late late monday night
take it bitch
sorting events and detailled description
Detail in the description
monday night final commit
Merge branch 'rc4-calendrier' of https://github.com/ApplETS/ETSMobile-iOS into rc4-calendrier
save events to iphone
late tuesday night commit
small UI tweaks
wednesday night commit
Session ends/starts in calendar, bit slow, need to upgrade
If the Broadcaster share a thread pool, make sure we shutItdown when we force it
Expose the path for configuring the annotation processor
Fix scala binding issue with Jackson
add more styling to some of the basic pages, like genres and index pages
Event Hook
add transformations to network's description & folder
Added a small transition on the forest entrance.

And fixed also a small missing wood corner in the shop map.
Linked the south west map with the noth west one.
Linked the maps up the cave entrance.
Added flowers and the grass in the corresponding forest maps.
Hopefully optimize the GL enable/disable states calls.

glEnable/Disable[ClientState]() calls are costy operations.

Thus, disabling a client state after doing a draw operation
should be avoided when necessary. Also, client state should
be enabled only once, not on every draw calls.

To permit all that easily, I added wrappers of those enable/disable
states calls and used them through all the code.

This should also save a few cycles and make the game smoother.

I also think this should get Nemesis out of problem with some slowness
he encountered on old hardware.

A special thanks to Andrei Karas <4144> (https://github.com/4144)
for the advice there.
Made the boot presentation completely scripted.

You shouldn't notice any differences, apart the new sound for
new games.

This will permit me to create easily a custom boot menu. ;)
Added new exceptions, and included them inside of enumerator
Create a new user instead of using the current user.
Add a few more permissions to the user.
Fix typo.
Merge pull request #7 from nthomson/patch-1

Fix typo.
Removed unused import. Added missing docstrings. Fixed undefined reference to builder. Fixed various PEP-8 errors.
bugfix: avoid DVD chapters informations merge when only one chapter
Be more compatible with older gcc versions
Added functions for site developement
Added ppr function
Added $url_post_form function defining
fork of @mxcl's MBSliderButton
revamped 'General' preferences UI
added toggle/slider button resources to project
added Max (@mxcl) to credits
viewer mode slider button properties
code to be invoked when toggle slider change notes drop in
デバッグログの追記
Add new foundation.css with default foundation navbar styles
Remove default atlas layout structure styles
Add textured bg and sidebar bg images
Add some chipola specific styles
Add link to the logo h1
Adjust width of user details in the header
Wrap nav ul in a row with twelve columns
Remove default content header

Replaced with $content_for_layout
Add id of sidebar to the four column sidebar
Add some jQuery to match the sidebar height to the content height
Added background to the header element
Restyled navbar
Nested nav and section#announcements into the header element
Add search bar bg
Change section#content to #content-container

Add #content to eight column div
Change the user welcome/details to by dynamic

Changed span.login-or-register to a block level element
Add logo as background image to the header h1
Add classes to eoe-copyright and powered-by p tags
Style search bar
Add sidebar background
Cleaned up code, final commit.
Fixed corrupted italian file
Merge branch 'CMSname' into 1.1.develop
phpdoc comments for parseProprties changed
Warning to be displayed on welcome page if parser errors set to be displayed on screen
Installer changed to use the default password hash method
Merge branch 'sha1' into 1.1.develop
Fix for https://github.com/ClipperCMS/ClipperCMS/issues/15
To be improved later if DBAPI::replace is written.
INSERT variants abstracted into DBAPI
Includes INSERT IGNORE and REPLACE.
Better error messages added for fix for https://github.com/ClipperCMS/ClipperCMS/issues/15
Bug fix for __insert calls
SQL injection fix via IP in weblogin.inc.php
Update assets/snippets/ditto/classes/ditto.class.inc.php

Removing start=0 in the URL in the pagination
Merge pull request #17 from AgelxNash/patch-2

Eliminate "?start=0" in Ditto's paginated URLs
Merge branch 'Extras' into 1.1.develop
Merge branch '1.1.develop' of ssh://github.com/ClipperCMS/ClipperCMS into 1.1.develop
Merge branch 'DBAPI' into 1.1.develop
Merge branch 'Security' into 1.1.develop
Issue 22 fix
Changes to List (Ditto) language files
Bulk of the work on conversion of the manager language files from 'MODx' to using constants for the CMS Name.
Upgrade ManagerManager to 0.3.11
Fixed corrupted italian file
bug 9756: fix ssvm-check.sh, always get parameter from /var/run/cloud/cmdline
status 9756: resolved fixed
bug 11024: fix a typo
status 11024: resovled fixed
bug 10561: intermediate checkin- basic creatFirewallrule works
Revert "bug 10561: intermediate checkin- basic creatFirewallrule works"

This reverts commit 1e544363a99f04ee30bdfae29f558c160479c8ed.
bug 10561: backend added for CreateFirewallRule and deleteFirewallRule
bug 10561: code cleanup
Fixing the remoteSSHClient imports, migrate VM, SSVM and router tests
Adding Netscaler test suites
CS-14937: System VMs and Router VMs does not come up after upgrading from 3.0 to Bonita

Description:

	Reverting my earlier fix for bug 14937. The fix is
	not needed.
CS-14461: Add more infrastructure page shortcuts

-Add additional shortcuts for:
  -Primary storage
  -Secondary storgage
  -Virtual routers
  -System VMs

-Replace host stats with the new shortcuts

-Add 'zone' dropdown to create form for the newly added-shortcuts'
 sections, to support creating these items without a zone context
fix copying template
Don't call configSSL() in SecStorageSetupCommand
just for test
don't call _secMgr.generateSetupCommand each time copying template
it will reboot httpd making in processing copy fail
Fixed search bar styling.
Moved location dot to top of layer stack
rebuild the image viewer to include a gallery at the bottom for easy image switching
added method addChild instead of methods: AddSprChild, AddSndChild, etc.
changed method InitParent
changed method InitChild
small changes in method InitChild() and addChild()
Merge pull request #15 from Applemann/master

Refactoring some mothods
Readme Added
README
Merge branch 'master' of github.com:CruGlobal/mpdx-mobile
Update GCC patches for latest snapshot.
edited popup profile
Merge branch 'develop' of github.com:DBCDK/bibdk_favourite into develop
login system working/ refactoring/ cleanup
journals and project plan updated
Detailkonzept: added calendar mockup
fixed span10 --> span11 to fill out the screen better
debug_fs enabled
Update atinylib.h
minor styling changes
fixed password field
refreshing members
Merge branch 'master' of https://github.com/DanB91/USU-BUGCATCHER.git
refreshing members and team name
Merge branch 'master' of https://github.com/DanB91/USU-BUGCATCHER.git
Rev'ing the nugets to fix the Spark compilation issue
Update to 1.0.8.dev
Dev: Minor changes to typos and JSHint fixes.
Dev: FixedColumns integration eable now also fixed the right column in
place
First: somebody killed the settings.cs...

Second: Settings-dialog now provides WriteTime.
Third: refreshing logging after settings changed does not work correct.
Restore tube state.
Sharpshooter, infected edition
Don't allow spaces in tags by filtering input from keyboard
Substitute a dash when user types space in a new tag
Do something to indicate input replacement is intentional
Add a new activity for bookmark details, evoke on longclick

Make bookmark passable
Formatting changes,
Some random things that the new activity bookmark did,
 that I'm pretending not to notice.
issue #5

Using the wizard precipitated some random changes to the xml files
Display both description and URL in detail activity
Display the tags in the detail activity
Display username, created on, and total clicks in detail activity
Add some labels and minimal style to the details activity
Display both my count and total count in detail activity
Merge branch 'add-bookmark-detail-activity'

Closes #5
Fix redirect for other user's bookmarks

Related #8
Don't bother displaying My Clicks for other user's bookmarks
Merge branch 'setup-an-inputfilter-for-tags'

Conflicts:
	androidBookie/res/values/strings.xml

Closes #7
Added language support.
Intergrated languages and added default config.yml
Merge branch 'master' of https://github.com/DicaxDorcas/SimpleHat
telas adubacao, especie, passarela e sistema de producao implementadas; faltando apenas cadastro de Hapa para o fim do primeiro Sprint
Whitelist fix
Done DataTables with CoffeeScript
added more descriptions and removed return values from private methods cause they should not be used externally
Merge branch 'develop' of github.com:divio/django-cms into feature/qunit
Added protection from GitHub update lag
base url

revert back to herokuapp.com
gsmopen: windows config file update
fix regression in commit 19f441c6f4516f035828aa112bcf92f47f4e0f28
FS-3902 --resolve
Add ability to upload android app to a CouchDb server, for debugging purposes.
Chap18
14章　為替レートについて、reduce()メソッドを実装し、Bankにレートを回答するrate()メソッドを実装した
CanCan added to Gemfile
Defining ability
Protecting backoffice
load_and_authorize resource in controllers
Defining new routes
Document controller and views
Adding links to menubar
Change license file extension to refelect Citrix standard
+- Big letters at beginning of enumerations
- F of NF
hello
hello
Merge branch 'master' of github.com:HKMachine/GameStalker
Committing documentation
Merge branch 'master' of github.com:HKMachine/GameStalker

Conflicts:
	views/header.php
Added clean implementation of product guide page in native ios
Twitter: Cleaned up how arguments are handles.
Date now respects custom tick formatter.  Added scaling options for date (ie. for using seconds instead of ms).
Added ResultPage text
Added current points, average points and a comment dummy
Migrated Image and Default stop views to TapAPI namespace
Handling null description case for Stop Groups
Sort Commit
Signed-off-by: IamMike4Life <Paradox_Slayer517@hotmail.com>
Uploaded Project Files
Signed-off-by: IamMike4Life <Paradox_Slayer517@hotmail.com>
Style updates to edit-panel
Update to 0.31-DEV
Updated with new Extension version
Another attempt to create a site for the Rapture plugin
VERSION ALFA 2
VERSION ALFA 2
Enabled inheritance for tiles
gettext-full: use shipped libxml for the host build, fixes lzma references from creeping in on certain distributions

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34400 3c298f89-4303-0410-b956-a3cf2f4a3e73
[boot] uboot-kirkwood: build in $(BUILD_DIR)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34401 3c298f89-4303-0410-b956-a3cf2f4a3e73
kernel: update linux 3.6 to 3.6.8

Also refresh the affected patches.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34402 3c298f89-4303-0410-b956-a3cf2f4a3e73
remove common symbols from 3.3 configs

The removed symbols are present in the generic configuration.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34403 3c298f89-4303-0410-b956-a3cf2f4a3e73
remove common symbols from 3.6 configs

The removed symbols are present in the generic configuration.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34404 3c298f89-4303-0410-b956-a3cf2f4a3e73
Merge remote-tracking branch 'upstream/master'
added hashfragment for photos
mail, styles, portfolios navigation
Fixed registration

Fixed registration by just creating a new guid for a UserId on user
creation.
make-over of myhill_nerode.v
Initial Push
Merge branch 'master' of https://github.com/JarredOlson/UrlToText
WPP-55 Allowing for session scoping of link list in gateway portlet
Corrected missing export of RawNode
quit compilation window and goto eshell buffer if there is no error.
Mise a jour des fichiers configuration
Revert "Debugging sockets"

This reverts commit d783974decddfdc67fdccd5257a87f72de513a8e.
Revert "Revert "Revert "I don't know why"""

This reverts commit d088e836b39ed89dc8ab22585953cca3966ccd55.
Seems I cant do anyhing without committing this
removed finalize because of recursion problem
turned on transparency, hopefully made urls clickable
Commit:由报名阶段转入申请阶段的时候，不在使用slep，而是加入taskid的值。原因是applicant里面不再有关于slep和合同相关的信息
提交：在申请阶段的学生的列表做了调整，删除了project data字段，因为没有用
提交：修正了转为安置阶段的方法，app中更新phase id，然后在app job中插入纪录。如果纪录存在，就直接使用存在的纪录即可
bug fixed:判断app job是否存在的时候错了，条件应该是is_null($bean['app_job']['id'])
安置阶段的申请人信息列表修改，显示出雇主信息
COMMIT
commit:bug fix 给modify方法传入正确的phase id值
commit:老师可以上传offer，学生也可以下载offer并上传
Adding the catchCoins game
ARC
.. and extracted protected methods
new scrollable view with partials. ugly, but it works.
a project
Start imp implementation + renaming some class
Added .gitignore for .idea folder
Added .gitignore for .idea folder
Changes function definitions to operate on the prototype rather than on the object instance itself
Merge branch 'master' of https://github.com/Kashnaladak/cormen-js
renamed: WordCrammer -> LinguoMentor
Removing possible IE handle duplication
Fixed issue #05948: Mandatory directive for question is ignored for array (numbers) using checkbox layout
Merge branch 'master' of github.com:LimeSurvey/LimeSurvey.git
Fixed issue: SQL statement shown when invalid SID is given
Add a x/z offset to the blend.
Personalizada vista a esquema de colores obscuro. El siguiente commit tendrá un esquema de colores claro.
Provide HANDLE definition for non-Windows.
Merge branch 'vmap_extractor' of github.com:LordJZ/mangos3-server into vmap_extractor
Changes to be committed:
	modified:   app/assets/stylesheets/application.css
	modified:   app/controllers/movies_controller.rb
	modified:   app/helpers/movies_helper.rb
	modified:   app/models/movie.rb
	modified:   app/views/movies/index.html.haml
	modified:   config/routes.rb
	.project
	modified:   app/controllers/movies_controller.rb
se ha añadido un campo más en el sql para guardar nuevas imagenes
Update the demo html again.
Anpassungen an den Properties
WebMP: Add preview image and description to TV recording page
Merge commit '8c963ed9' from 'git://github.com/Ollienator/MPExtended.git'
- provisorische Tests für Bankservice sind erstellt.
Merge branch 'master' of https://github.com/MacMuffin/Geldverleih
changed collection attribute to visibility protected
Merge branch 'master' of github.com:MadCatme/Kickipedia-2
renamed dir cache to tmp and Views to Templates
renamed index template
completed MVC
renamed Package App to MongoAppKit
renamed Model Entry to EntryModel
NetStoreManager GoogleDrive:  replace QString with tr