labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'develop' of github.com:plainblack/Lacuna-Server-Open into develop
Merge branch 'develop' of github.com:plainblack/Lacuna-Server-Open into develop
Some asked for changes.  Test version.
Modified version and changes.txt
Tweak.
Merge pull request #43 from lemming552/lcot

Lcot changes
Backwards match fix.
Merge pull request #44 from lemming552/lcot

Backwards match fix.
Further adjustment of cost.
Merge pull request #45 from lemming552/lcot

Further adjustment of cost.
Merge branch 'develop' of github.com:plainblack/Lacuna-Server-Open into develop
Stakes didn't check to see if their destination was an asteroid on arrival.
Merge pull request #46 from lemming552/develop

Fixed an issue with stakes and asteroids.
Update changes.txt
Merge branch 'master' into lcot

Conflicts:
	var/www/public/changes.txt
Merge branch 'develop' into lcot

Conflicts:
	var/www/public/changes.txt
Cleaned up regex.
Merge pull request #48 from lemming552/develop

LCOT changes
Merge branch 'lcot' into develop
Fixed menú title.
domain list api; ids now no longer mongodb objectid (range queries through mongodb are broken)
add wordpress demo installation
Zwiękrzenie obszaru edytora
Dodanie zamiany konca lini na br przy inicjalizowaniu edytora
Added script for isis-test
build script for debian/cmake
Started refactoring of voms request code
Added HTTPS host
Add count 780
Add count 1362
Add count 899
Add count 560
Add count 210
Add count 783
osm_router: remove the use of Hash with default proc
osm_router: fix a simple code format issue
Add Irene
add gnu-make.pdf resource
shortcode changes
restructured

for better styling and to incorporate the new cb's
styling the single books page
Added color variation in avatar and burst. Made random 'voice' generation.
recomiting last changes
readded html parser dependency
does not show past pilots
added date to list of pilots
added date to table
end date in show page is now hidden
end time -> datetime
end time -> datetime
removed bad migration file
end time -> datetime
Merge branch 'master' of heroku.com:vm-pilots
removed bad migration files
generated migration file
updated migration files
export.json
Gemfile.lock
postgres in Gemfile
Use logger instead of System out.
Created structure for sample project
Ignore Eclipse specific files
Changed homepage in admin view so that instructors are sorted by whether they have changes to be approved
MIDlet which illustrates the combined use of TransactionListener and
PushRegistry for receiving NFC transaction event notifications
Merge pull request #9 from mdwoolley/master

NFC MIDlet sample
Merge branch 'master' of https://github.com/blackberry/Samples-for-Java
Make the gcov collection work with gcc-4.7.
Support multiple test data in one file.
Change h2 font size to 24px
add scope status_update
Moved to django-discover-runner.
Improved #14 CSV import process
customize hello world - PG test
use from CM:
prebuilts_misc
ndk

I want new ccache
use local build
AOKP removed patch about new ccache, and I need it
use local sqlite
use sqlite from CM
use AOKP's sqlite
use from AOKP:
external_freetype
vendor-tmobile-apps-ThemeChooser
Use from AOKP:
frameworks_native
hardware_libhardware
track from CM, not from AOKP
use local Phone
track chromium from AOKP
track frameworks_av from AOKP
manifet rework:

update AOSP repos to 4.4.1_r4
add from cm: libncurses and bash
use from aokp: guava, Gallery2, Nfc
use Calculator from CM
use local development
use local Calculator
use different frameworks until AOKP sorts the issue on github
going back to old frameworks
use 4.1.1_r6 branches
use proper branch declaration
use external_bluetooth_bluez from AOKP
half-done walkthrough of the new appengine python tutorial
show all stack objects when the debugger pauses
ignore Cheffile.lock, it is causing problems
Apply a fix from bug 740551 that was lost in the transition from DebuggerUI to DebuggerPanel
Port remote debugging to the toolbox API
remove ip and password
Fixed neighborhoods and categories.
Applied patch for ticket #789 (Feature catalogue schema in GeoNetwork is outdated)
PHP: Fix '--without-pear' arg for './configure' (Fixes #249)
report
Merge branch 'master' of https://github.com/joshuanapoli/carcarecheck

Conflicts:
	app/views/engine_code_reports/newindex.html
moved browser stuff to gh-pages
Before filtre oprava
Merge branch 'master' of github.com:jozef-mokry/EventPlanning
Add new contrib script

The prune_obsolete.sh script will accept a "build" argument and
proceed to remove all obsolete ports from that build (port where
the directory no longer exists).
bug fix: strips out new line spaces etc. between records
Merge pull request #482 from julceslauhub/master

BUG 9594 Have no cache for JavaScript SOLVED
BUG 9607 "Need a way to disable/enable eMail notifications..." SOLVED

- New feature, Need a way to disable/enable eMaill notifications when
  a case note is created
- Solved, added checkbox for send eMail notifications or not
Merge pull request #483 from victorsl/BUG-9607

BUG 9607 "Need a way to disable/enable eMail notifications..." SOLVED
BUG 9594 Have no cache for JavaScript IMPROVEMENT

- Add additiona varification for the path sep in the real Path
improved connection handling and user messages
Test added for group query
Test added for MoreLikeThis query
Test added for facet-query
fixed git checkout commands
no bg switcher on the 404 page
ParsingTree for LL1Parser fixed.

toString for the tree has been removed.
It's quite difficult to print or toString a parse tree...
fix site-width problems

adjust container width, remove or change some random width values on
other containers, hide overflow on all child elements in Facebook like
box
added up/down arrow nav for beginning/end of presentation
removed indentation in pre block for scope diagram
removed duplicate code to use library instead
removed unused previous and stack variables; refactored code block regex; keeping lists on one line to alleviate paragraph matches
make waitWhile' a little more efficient by only applying the exception handler to a single attempt rather than the entire recursive computation
final touchups before release
For POST data: read CONTENT_LENGTH - already received.
updated kartograph.js
use one dj process per monitrc
add the app name to the worker name
Merge pull request #36 from crigor/dj

One DJ process per monitrc file
Fixed dead link in delayed_job readme
ignore .DS_Store files
removed ElasticSearch recipe for refactoring
Revert "removed ElasticSearch recipe for refactoring"

This reverts commit b59816e72b313b139cb648cc4f47d7970a516ac0.
Added recipe to install Mongo Monitoring Service (MMS)
Updated README to include mms support. 
added auto-generation of mongoid.yml file
Merge remote-tracking branch 'upstream/master'
json settings file
update to scala 2.9.1
user-showのデザイン変更
added rest client to clear down doubles
Adding some styling & scrolling
completed major restructuring
completed major restructuring
working stack, instructions, getInstructionById fix
fixed tests for home controller and added project class.
suggest use of gridy
added: TODO List
fix bug and add bar.less
remove bar.css
remove fudge
pre-implementation switch commit
Added generation of kernel parameters at kernel generation, and extraction of parameter values at run time
added requirejs demo - mac
added in response validation and parsing
renaming commands and other clean up
Gui Beginning
gogo
Merge branch 'master' of github.com:konglingkai/ajinga_survey
allowing else statement
moving syntax CStyle
removing kNode_GetBlock
enbuged orz 31% tests passed, 616 tests failed out of 890
Update tools/data/viable-moves.txt

Fix errors
Merge pull request #2 from TheImmortal/patch-1

Update tools/data/viable-moves.txt
Regenerate formats-data.js
Reflect Type can copy types multiple times.
Reduce the login server timeout to 10 seconds
(this is on the off chance that a login server stall is causing our lag spikes)
Proper fix to modifier rounding
(LC battles should actually have their damage calculated correctly now
Remove old Foul Play code
obsoleted by better Foul Play code,
which was written without awareness of the existence of old Foul Play code
Clarify Echoed Voice and Round's descriptions.
Implement Ring Target.
Bad Dreams affecting Pokemon after losing all HP
Implement Echoed Voice
Fix Autotomize.
Proper, working implementation of Echoed Voice.
Make sure to recalculate the target after both ModifyMove events.
/birkal tracking
Better move validator
(uses set theory)
(documented in comments)
!learnset command, for checking learnsets
Simplest fix for the Giratina ability issue
Include shininess in event data
Take event data into account by the set validator
Use a compressed version of kota's learnsets/pokedex
This solves the problem of the old pokedex not having every prevo, and adds some useful features for future learnset checking
Consolidate formats data in formats-data.js
Update formats-data format
- viablemoves => viableMoves
- add requiredItem
- simplify eventPokemon list
Fix Poliwhirl Hypnosis misspelling in random battle
Make sure correct item is used for Arceus formes in randbat
Remove tiers.js completely.

Rest in peace.
Make JSLint shut up about learnsets.js by quoting all instances of "return" as a property name.
Change "Unreleased" to "Limbo" for level scaling.
Fix a few more typos in viable movelists.
Add Limbo to the Standard banlist.

Fixes people being able to use unreleased Pokémon like Genesect and Meloetta in random battles.
Another viable moves typo.
Guard against generating random Pokemon with multiple Hidden Powers.
Remove Life Orb and Sheer Force debug messages.
Illegal is no longer used as a "tier", so we can eliminate it from the Standard banlist.

Pokemon without defined tiers will be placed in Limbo instead. (Seems fitting.)
Added viable movelists for all CAPs
Remove Limbo from the source, and revert back to using Unreleased/Illegal.
Update viable moves for CAP and remove the viable member from formats-data
Compressed pokedex.js a bit for values that can be defaulted to
CamelCase some members in pokedex.js
Merge remote-tracking branch 'upstream/master'

Conflicts:
	formats-data.js
	learnsets.js
	pokedex.js
	scripts.js
	tools.js
Web_ProjectCompare VERSION_UPGRADE 0.0.2.2
Little Bugfixes with paths
falsch commited
Add timeago plugin and update tempaltes
Experiment with custom fonts to increase identification
Implement content type schema and views
make the job view display edit actions
Add toogle switch and make the views nicer
Add de translations and make the job opening view usable
Pretty print jobtype
Updated internal logging configuration to have more options. Fixed bug where data handler did not get database connection object.
o Removed forkMode from forkconfiguration
viewport設定追加
fix google-analytics
Update MVC_WebRole_v4/Views/Shared/ODP_MasterOriginal.Master
Add Demo Project | Readme updated
README updated
This system is VERY ugly but now the debug mode can go up to level 28 !!! (+17 lvls)
only publish when tracking
Very silly mistake ;_;
vanalles... en nog wat
Merge branch 'master' of https://github.com/lannoysamuel/penoteamgeel.git
replace element ends with spaces
Imporved download capability - still not working but now has enough info to process
#1 adding a scalatest to the build.
iniciada a parte do motor de agregação
Solved path deletion bug
Fixed WS-25 Web Store not properly flagging PHP 5.4 and halting install
adding periods support, defaults to yesterday
Only auto-inserting points of *active* projects
replaced gets() with fgets() and added exit call
use codeblocks
fixed bad line breaks
remove comment form
Display only uniq name when executing 'list'
Merge branch 'master' of git://github.com/robertcosta/symfony-condomino
Adicionado global partials para mensagens de sucesso e erro
Adicionado form basico para usuario
Implementado layout basico sem css e js
Adicionado crud basico de usuario
Decided that built docs need graphics xD
Changed and rebuilt docs
Renamed run_tests.py to run-tests.py
Database error handling, Batched XMPP commands
- Database checks for exceptions, handles appropriately, releases resources automatically
- Removed XMPP In Band Registration class, might re-add if we want later, currently incompatible with batched commands
- Refactored XMPPJAXL to be self contained, no need to extend
- XMPP implementations like ServiceAdministration now have static calls that act on an XMPPJAXL object passed
- XMPPServiceAdministration still needs additional functions refactored to new interface
Adding the find method using the object
Luke: unit tests patches
added bower component.json file and documented installation
table created for items
fix setValue for booleans
make the value id 64 it
Fix datatype of valueid
Added jenkins_group parameter.
Use the correct working copy for ant.xml and use standard name for Hello Ivy composition
Add support for cracking PuTTY private keys
Merge branch 'magnum-jumbo' into bleeding-jumbo
RACF binary() alignment fix
Merge branch 'magnum-jumbo' into bleeding-jumbo
css wrks on my tribes
resolve conflict
fidex formatting of readme some more
QmlInspector: Don't show root element twice (4.x)

Change-Id: I1871f4c0d4ccb7339f4cea64e6119e0a74459630
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
QmlDebug: Rename signal

Rename signal connectedStatusChanged() to newStatus(). We're using
newStatus also for the EngineDebugClients.

Change-Id: Ic793b4b74e629b602b9467f3abc8127c9c0174d5
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Debugger: Add documentation to QmlAdapter

Change-Id: I6a8a4e0e220cde51fa16c33b9fa468b41521d88f
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Renamed TaskHub::popup to requestPopup and removed boolean flag.

* TaskHub does not pop up itself because it is not a widget.
* popup(true) is never used and may lead to bad user experience.
* use boolean flag goes agains Qt API design guidelines.

Change-Id: Idf28a8d4af66022961d94f1d1cdeeaf155b67c52
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Debugger: Fix refactoring artifact in name demangler.

Change-Id: I5fcb60fc7e46b558e1627e91f6272f963bacf491
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Don't build current file when build of subproject is requested.

Change-Id: I0432c5d90fa6eb762745f458693747383cf5b0d2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
TaskHub: emit taskAdded before adding the task to a document

As the adding to the document calls updateTaskLineNumber(), which will
emit a signal. The TaskModel needs to know the task before getting that
signal.

Task-number: QTCREATORBUG-7401

Change-Id: I35deba8696adc14199c6c56e45c414016e094088
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Debugger: Move std:: Qt namespace actions to options

Rename 'Debugging Helper' options pane to 'Locals & Expressions',
and move the two actions for showing/hiding std:: and Qt namespaces
in type name to the page.

Change-Id: If7ec66016b330a4c579597bcc81f1fa5a3eff815
Reviewed-by: hjk <qthjk@ovi.com>
Debugger: Rename actions dealing with watched expressions

Unify naming: Expressions are added/removed inside an "Expression Evaluator".

Task-number: QTCREATORBUG-7308
Change-Id: I47c8f7bee3673fe8378fab7977d8b57e5e4ad1c1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Debugger: Show locals when loading core dumps

Make sure locals are shown (instead of inspector) in Locals and
Expressions when a core dump is loaded.

Change-Id: I434acac59a2c575a2425e2ba06a13020c17547e4
Reviewed-by: hjk <qthjk@ovi.com>
zeroconf: ensure that a broken pipe does not crash creator

Change-Id: Ib8e408d3d7323728333ac8615240684e7f86867f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
Debugger: Remove actions from object pool

The actions were added to the object pool so that QmlJsInspector
plugin can access them. This is obsolete now.

Change-Id: I7c33428b834c372fab354b39ffeb6c8d181c162a
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Debugger: Fix capitalization of 'When' in actions

Prepositions are usually not capitalized, even in book style.

Change-Id: Ibdca3843b349bf7aaac57e4e3ce635960f46ee0f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Merge branch 'qtcreator'
removed some "yum"'s with "apt-get"#s
Now SOURCE has user_guide as default (for ReadTheDocs confort)
further updates
further updates
created / edited softlinks
tab added
files further converted
Added the requirements file.
Better to name master document as index for apache benefit.
Added a build script to use in crontab.
Forgot that the bash script must activate the virtualenv.
Removed the linphiniti-sphinx-theme as a submodule.
Added the linfiniti-sphinx-theme
migrate georeferencer section
merged upstream changes
Changed blacklist of diffraction files to regexp.
adaptando a la nueva version del bootstrap

fueron solo pequeños detalles en los label
que se les agregó una clase
ajustando las vistas a diseño adaptable
mas adaptaciones
correción en palabra
Ajax problem corrected
unused resources removed.
more symmetric pixel avatar, favicon URL, footer edit
nejake TODO k tomu
# Typo error
cleanup docs, CVS and test
Misadded files
More improvements for vasp_analyzer.
Allow default operation without -e for vasp_analyzer.
Added font rendering and pausing.
Added ball tracking to mouse click locations.
Save scale by area/diameter setting
General Piss About
You can now order resources however you like - isn't that great?

Might need to work on the interface for it a bit though.
fixed a bug where not having a creator causes the rdf and rss feeds to fail fail FAIL
JS and CSS are now statically loaded using a custom page so they can be cached, yo!
Cleaner solution, same speed
added eye data
hopefully merging?
LPS-30588 Automatic generation of test for Models
LPS-30588 Autogenerated
LPS-30588 Autogenerated
add more state handler
game logic of phase1-changeGood
add PlayerInputProtocol for observers (GameLayer or AI)
move stateStack to GameBoard
readme
Merge branch 'master' of github.com:megallo/singing-tarantula
uuuuggh, it's not a sequence file. pay more attention
Record when the upgrade check has been performed

And while we're at it, add a method that allows the caller to know
whether or not the upgrade check has been performed in the JVM session.
This is helpful for making sure that the upgrade check is not called
many times.
Add upgrade check to bfopen.m

Auto-upgrading can be enabled by setting the 'autoDownload' flag; it is
turned off by default.
Add API for disabling the upgrade check

As with the "have we already done the upgrade check?" method, this just
boils down to getting/setting a system property.  By default, the
upgrade check is still enabled.
Pass the calling class' name to OMERO.registry
Add upgrade checks to the command line tools
Add support for cross compiling

Generate a native version of make-c-interface, then use this when cross
compiling
Add cross compilation instructions
Reset the site title to it's original title when an alert is cleared.
Fixed random warnings.
Merge branch 'master' of github.com:mgyenik/ECE309-Calculator
Stuff. Great commit log message right?
Styling change, made to merge.
Merge branch 'master' of github.com:mgyenik/ECE309-Calculator
NO MORE ASPLODE
制造merge冲突
合并和解决冲突测试

Merge branch 'backup'

Conflicts:
	git-test.py
Update log level
Escape html
Create Multi-pane layout
Added README file
Faster checking for node properties
Added minified version
Updated swedish localization for 2.0.0-beta1.
CTV - remove empty testURLs from plist
CTV - fix TestURLs()
Freakonomics - disable "originally_available_at" until TrackObjects support it in the released Framework
Freakonomics - fix thumb loading
re-wrote due to site change
updated test urls
updated after site moved to theplatform
added missing resources for fxuk
fixed following site change, and replaced webkit with mp4
resolved issue with invalid XML being returned by server
updated test url after expiration
made date optional
resolved issue where MetadataObjectForURL was expecting SMIL to be in XML, but JSON was being returned
add fallback for obtaining the title
South Park - new service
fixed issue with TestURLs method
implemented proper TestURLs method
Speed - new service
resolved thumbnail issue and TestURLs function
Speed - new service
Fix for content filter usage.
Fixes
Collisions with getcontent function in components.
String replacements shortcodes etc.
Incorrect insertion of html during a filter hook.
added legacy support for blog_display_posts() incase anything else uses it.
Merge pull request #5 from tablatronix/master

pull request for issue #4
git config
new login form and couple bug fixes

new login form and couple bug fixes
@Miles rough draft of doGet
add different status values for different failures
adding arguments so this can be called in an outside loop
adding different status reports
return codes should be positive
test lin commit TIN
fixing errors in ERD
images and edits to fix #589
Merge pull request #615 from mollybostic/weekly_1018

fixing #614 merge conflict.
tech review comments on the first push tutorial
Added switcher hookups to the new iOS tutorial #1
Merge pull request #616 from Blackmist/update-cloudservice

images and edits to fix #589
Final version of iOS push #2--final review pending
fix #617 merge conflict
MOLLY-291 / removed deprecated stats app
Merge remote-tracking branch 'origin/experimental' into batch-to-celery
made website folder
Added "Clear" Button for saved trails
Moved card creation to background task
Debaking parses endpoint.
Whitespace
Keep errors together.
Handle parse errors more gracefully.
Generic errors work pretty good.
Fixed some compilation issues. Fixed .gitignore
Better dropbox syncing UI feedback.
Resized spinners.
Made changes to wrong branch
[sys-cluster/mechanic] simplify ebuild, add metadata
Merge pull request #3 from Xarthisius/master

poprawki do sys-cluster/mechanic
Added incryption of information and it works now
Set TLS disabling only for app masters
Added HeadJS as a submodule, now we don't have to include the latest version of it every time we release.
Updated HeadJS minified version to 0.97a, and minified HeadcatchJS using Google Closure Compiler. Updated copyright and name to reflect the original author, rather than some company that just happened to use it in their projects.
Add static file handing in debug mode.
correct typo getInstace to getInstance
add null check on AbstractGUI
Merge pull request #1 from nagaseyasuhito/bugfix/20120814

fix some problems
設定情報更新
adding supported for related param in slice

gives us the ability to slice on related object id - e.g., ASN id for
standards alignment
Remove the somewhat misleading logging of the string length of some unknown requests, as this appeared to be some kind of numbered error code.

This brings these messages into line with similar messages that did not do this.
BulletSim: protect prim property setting to remove crash from taints setting properties after the destroy object taint has happened.
BulletSim: protect character property setting to remove crash from taints setting properties after the destroy character taint.
BulletSim: fix crash caused by the creation of a linkset child that is under the terrain. Users can sure find some interesting corner conditions.
Null reference in llGetObjectMass on a seated avatar.
Updated to use API Key as per the SDK changes
V2.2#Alpha
filter output to remove some clicking
added relationships between section_edits, sections, and editors aka adminusers
Change name to 'SocialReddit'. That's important, right?
Changed in presenters. Group reports almost done.
ICalHandler - ImportFromFile
Updated README with the software story
SAKIII-5293 Replace the old path in the tmp widget data with the new path upon save
SAKIII-5644 update pom version to 1.4.0-SNAPSHOT
Merge pull request #2123 from arwhyte/SAKIII-5644

SAKIII-5644 update pom version to 1.4.0-SNAPSHOT

* arwhyte/SAKIII-5644:
  SAKIII-5644 update pom version to 1.4.0-SNAPSHOT
KERN-2805 Remove unnecessary wildcards
Merge 1.3.0 into master & fix the merge conflicts in the .xml files
Merge branch '1.3.0'
Merge pull request #2126 from raydavis/KERN-2805

KERN-2805 Remove unnecessary wildcards

* raydavis/KERN-2805:
  KERN-2805 Remove unnecessary wildcards
Sakiii 5623 - Remove jquery.json from our codebase

Squashed commit of the following:

commit 0e620b7d4193e815b33d3f8a9657b7df3d95fdc6
Merge: 5b9bb9b a87448e
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Thu May 24 13:52:13 2012 -0700

    Merge remote-tracking branch 'apex13/SAKIII-5623' into apex13-SAKIII-5623

commit a87448ed84c1bd5c15168f2b06704935bfb20a75
Author: Dean Angerer <DeanAngerer@Gmail.com>
Date:   Wed May 23 10:46:07 2012 -0400

    SAKIII-5623 Removing acknowledgements and strings pertaining to jQuery JSON plugin. Also removing test console.log
    https://jira.sakaiproject.org/browse/SAKIII-5623

commit db48792a391b120b6721d0d3b5b6b493e0b8acd1
Author: Dean Angerer <DeanAngerer@Gmail.com>
Date:   Wed May 23 10:29:42 2012 -0400

    SAKIII-5623 Deleted jquery.json.js and removed references to jquery.json in dependency lists (in comments as well)
    https://jira.sakaiproject.org/browse/SAKIII-5623

commit 3b7b3da76c863684a41f9bccb0afce5604981c20
Author: Dean Angerer <DeanAngerer@Gmail.com>
Date:   Wed May 23 10:18:49 2012 -0400

    SAKIII-5623 Changed all $.toJSON calls to JSON.stringify
    https://jira.sakaiproject.org/browse/SAKIII-5623
Merge pull request #2130 from apex13/SAKIII-5623

Sakiii 5623 - Remove jquery.json from our codebase
SAKIII-5620 Removing request for unread message count on /me page

Squashed commit of the following:

commit c46c2616c53a64893df222daded5b23408bc3351
Merge: 1c5d98e 2a2f56d
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Thu May 24 18:10:09 2012 -0700

    Merge remote-tracking branch 'apex13/SAKIII-5620' into apex13-SAKIII-5620

commit 2a2f56d1c58b4020177dab1ffba40ce48599b2bb
Author: Dean Angerer <DeanAngerer@Gmail.com>
Date:   Wed May 23 12:59:09 2012 -0400

    SAKIII-5620 Slight refactor.
    https://jira.sakaiproject.org/browse/SAKIII-5620

commit 4ed20d9c66cddc7c2734d3433f544632b9630478
Author: Dean Angerer <DeanAngerer@Gmail.com>
Date:   Wed May 23 12:50:38 2012 -0400

    SAKIII-5620 Using unread count from me feed instead of issuing additional request.
    https://jira.sakaiproject.org/browse/SAKIII-5620

commit c2f5f224dc6c2ae9a480911bc90fccb89f762672
Author: Dean Angerer <DeanAngerer@Gmail.com>
Date:   Wed May 23 12:15:15 2012 -0400

    SAKIII-5620 Removing request for unread message count on /me page
    https://jira.sakaiproject.org/browse/SAKIII-5620
Merge pull request #2131 from apex13/SAKIII-5620

SAKIII-5620 Removing request for unread message count on /me page
Simplified code for reading, still cannot receive JSON response
template for meta info
Les tortues ont maché leur salade je répète les tortues ont vomit leur salade.
for le franklin
[doc minor] Fixed incorrect file header.
Merge pull request #4 from ritch/patch-1

[doc minor] Fixed incorrect file header.
small modifications
Merge branch 'master' of https://github.com/noelle/VirtualSpeedDating

Conflicts:
	vSpeedDating/public/js/chatroom.js
	vSpeedDating/public/js/opentok.js
Merge branch 'master' of https://github.com/noelle/VirtualSpeedDating
Update counting_bits_set/README.md

reformatting
added as sellonline
Added Utility folder, renamed RenderPipeline
main form funcionando con todos los permisos
login usando u_login
PatternValidator para el Ticket Externo
How about no shadow on the header as well...
added is_tree function for determining the root of subpages

I'll need this for widget logic and the Scoda handbook
add line margins
An attempt at fixing the settings.
pulled instrument agent client startup back into a module so it
can be used outside of tests
completed the pubsub and event listeners
Merge branch 'master' of github.com:ooici/marine-integrations
[OE-2411] bugfix: added missing fields to safe clause
Merge branch 'release/1.1-moorfields' into jira/2411

Conflicts:
	models/Element_OphCiExamination_PosteriorSegment.php
move initial waiting time into PatternBoard. #781.
remove incorrect comment (Eclipse workspace corruption was cause)
initialize list to avoid NPE
fix single-feed multi-agency fares: compare fare agency with stop agency

not route agency, because while routes really have agencies, both stops
and fares receive the feed default agency ID
warn on missing RAPTOR data
remove cruft
fix #839
Add simple help info to the framework
Improve the spec tests so that they pass when an openshift config file already exists
Get 100% coverage of helpers in helpers_spec.rb
Add a way to create global options cleanly from the helper
Ruby 1.8.7 doesn't support to_time
DateTime on Ruby 1.8.7 can't be converted because of timezones
Merge pull request #77 from smarterclayton/add_help_information_to_framework

Add help information to framework
Help has moved to its own repo now: 

https://github.com/openspending/docs
Update docs and remove openspendingjs submodule.
Build a fcgi and non-fcgi version of the library

The simple FastCGI protocol, fcgi_stdio, redefines a lot of the libc
stdio functions, which trips up libctemplate. Hence we included the
fcgi_stio.h header file in ctemplate.c so that libctemplate used the
fcgi versions.

However there may be times when you want to use the libc versions
instead, e.g when not using FastCGI.

The simple thing to do is just build two versions of the library, a
normal non-fcgi version and one that uses the fcgi functions.

Hence we now have the following

    libctemplate
    libctemplate-fcgi

and applications can choose to link against which version they want.

Signed-off-by: Andrew Clayton <andrew@opentechlabs.co.uk>
Add a RPM specfile

Signed-off-by: Andrew Clayton <andrew@opentechlabs.co.uk>
its best to be correct when setting Copyrights
move fastcgi to its own test

* EL platforms are not supported for the recipe (no package for
fastcgi), so make its test separate to allow 'skip'
add xmpp README file
add stress testing code
added a username string to strings.xml
set the textView to show username
changed the app to work with xml
Update link to Lion Finder

I'm having a weird bug that I need to fix. I don't know how though.

The full-page view of CodePen breaks half of the Finder in WebKit and there's no background on my server.

Meanwhile, everything looks ok in Firefox and in CodePen's editor view (even in WebKit...).

┐('～`；)┌

Signed-off-by: Patrick Kontschak <patrick.kontschak@gmail.com>
Take advantage of Pax Exam 2.4.0
Areglo en Index
Updating master
switched Vince's twitter and github links. fixes #41
Fixed tumblr {} not displaying at the right font weight.
Add media query to fix slideshow text going out of slide. fixes #36
Add custom pin to find us map. #40
Update location of pebblecode.
Only load google maps api js and execute onload for find us page.
Pulling from master
Merge branch 'version-2'
CrudCasos Listo Sugerir SubGrupo, Corregido Bug Comportamiento
GL: Move drawing into Renderer.
Get barycentric coordinates right. Rastering finally works!
Remove QuadMatrixf.invert().
db conf update
random whitespace and critic cleanups
aiming for the perfect after-action behavior3
realtime.jsp; refactoring of dummy methods.
get rid of code smells in paintContent
exchange

testing
device awareness
Replaced default README content.
Implemented alternative win detector
Bug fixed in the is_win? function
Added logging
Adjust Makefile to use C++11 and include dir ./ ( so allows including
boost libraries places in the /engine folder )
Remove MSVC build files
Use QT 4.8.0 libraries
Update simcqt.pro ( include build.conf, use c++11 )
Use updated double fast mersenne twister rng
Use updated double fast mersenne twister rng
Delete local implementations of find(), fill(), fill_n(): we can use the
std/boost versions with nullptr in C++11.

Conflicts:
	engine/sc_action.cpp
	engine/sc_mrrobot.cpp
	engine/sc_player.cpp
	engine/sc_torhead.cpp
	engine/simulationcraft.h
	qt/sc_window.cpp
Replace all of the range-based algorithm stuff with the Boost::Range
implementation. That means range::name should generally be replaced with
boost::name, except for the cases we implement locally - fill, find,
dispose, sliding_window_average - which now simply reside in the global
namespace.

Conflicts:
	engine/sc_action.cpp
	engine/sc_mrrobot.cpp
	engine/sc_player.cpp
	engine/sc_sage_sorcerer.cpp
	engine/sc_shadow_assassin.cpp
	engine/sc_torhead.cpp
	engine/simulationcraft.h
	qt/sc_window.cpp
Fix problem in sc_spell_data.cpp and initialize
players attribute_multipliers.
Add boost libraries.
Change a bunch of std::maps to std::unordered_maps. Get rid of
OPTION_CHARP and util_t::dup(). [Use std::string, fool!]

Conflicts:
	engine/simulationcraft.h
Use c++11 "enum class" for stim_type, shorten name to stim_t. Actually
use an enum type strictly for once instead of just using int for it
everywhere.

Conflicts:
	engine/sc_consumable.cpp
	engine/sc_player.cpp
	engine/sc_util.cpp
	engine/simulationcraft.hpp
Use c++11 enumerations and add bitmask template code.
Taken from:
http://code.google.com/p/simulationcraft-swtor/source/detail?r=1ee1de4b002b9d2494f22184765935a7ec289131
http://code.google.com/p/simulationcraft-swtor/source/detail?r=94882dcfb2277f0dd88a638e4faa590e83d0ed7f
http://code.google.com/p/simulationcraft-swtor/source/detail?r=d4c8052ef17c0bab708622ed00d1d3e5f61b4774
http://code.google.com/p/simulationcraft-swtor/source/detail?r=d751f7ee1c80366407115fbf86b7e7517c2b940b
Commit previously ignored boost files.
pushing up all our changes. still in a HIGH ALPHA state. NOT FOR USE UNLESS DEVELOPING
Update src/com/op/kclock/utils/Utils.java

save Prefs to SD
Added setup method.
Added better support for Choice widget... fixed Array to String warning.
Added address partial used by the new site admin form.
use config file for connections settings
fixed config reade, added fetch email script
2012-11-4 :: 10:15 PM
remove blog.php duh
added local image cache
started moving to responsive style
started adding comment system
bad big commit
finished adding comment
finished adding responsiveness
TODO refactor Photo and Activity to get one class
TODO clean code, remove useless parts
TODO better, smaller commits
mudando busca de texto para suportar frases
Update Jenkins.php
correzione di bozze (71.51% completato)
文字コード変換を追加。
Updating to tycho 0.15.0 and adding multiple archs
Minor addition of import.
Adding admin hooks for new models.
A handful of new views.
Removing dummy tests.
Adding new template tags.
New urls to match new views for editing.
A first stab at a frontend editing system.
test_suite string correction
Converting css to less.
- animation stop behavior should be consistent everywhere
- also window.location.origin is not defined for firefox and IE
Added employee activities
Compile the GET_LOCAL instruction.
Scaffolding for scheduling gearman jobs.
/ ‘Pictures/attic-light_test.png’
single lang working only, added file + lang input
modul 2 dan 5
modul 2 dan 5
Modul 3
Merge branch 'master' of github.com:takmid/QGIS-Training-Manual
Modul 2
Modul 5
update vectorclass and foreword
Modul 14 dan 15
Modul 14 dan 15
Modul 9
Modul 9
modul 13 update
Modul 16
Modul 2
Modul 5
Merge branch 'master' of github.com:qgis/QGIS-Training-Manual
Merge branch 'master' of github.com:takmid/QGIS-Training-Manual
added appengine scripts
rescue "HTTP request path is empty" error
Code comments and cleanups.
Updated module info.
Expand virtual album code to cover the rest of Latest Updates.
added 3.1 Files
added 3.1 Files
Merge branch 'modeling-users'
Syntax highlighting
RSS body correction
Fixed extension logging and stty configuration on startup.
make JVM heap min of 1G to avoid out of memory errors in controller during analysis
updated file names (osx isn't case sensitive)
empty lines next to man page sections; makes markdown compatible
some clarifications about changes in diverted files
local * add BUGS and HOMEPAGE section in man page
Merge remote-tracking branch 'config-package/upstream' into rebranding-branch

Conflicts:
	debian/custom-gitweb-setup.txt
Adding support for api v4
centering button on second activity
adding support lib
improving information on location/source
added rebuy coding standard for php codesniffer
fixed race condition. possible loop if team 1 ko'd
updated monster input
law section updated
Updated version number. As of now, it is local and won't be published to pypi
CQB

CQB 2012-09-20. First commit
Alot of changes in this commit
synchronous execs seem not to work on windows, making them async
Since the Rightscale metadata.rb uses a "File.read" for the README.rdoc
we need to have that file in our modified cookbook as well in order to
run properly.
passage sqlite (suite)
osc add $package.spec unless versioned already
commit gordo
one page column page toegevoegd (schets, html & domtree)
initial commit of a quick and dirty md5 user-defined function for use in hive.
Merge branch 'master' of github.com:rqbanerjee/hive-udf-utils

Conflicts:
	README.md
Improved word packing in cloud by modifying placement range in d3
Dynamic allocation of font range in cloud to try to prevent words from being dropped
Merge branch 'master' of github.com:rstuart85/textisbeautiful
Merge pull request #20 from krisrogers/master

Files missed on last merge
delete the dump xsd
Modified pants to use noddity-underwear, added example content.
Reorganise _bin/generate
Update project to recommended settings.
Merge branch 'master' of github.com:samvermette/SVProgressHUD
UI: Clean up HTML a little.
UI: Generalized flow display code - matches and actions display correctly.
Merge into master from pull request #250:
UI: Display flows better (https://github.com/floodlight/floodlight/pull/250)
Restructure code. Put all the constructors together! No other changes.
Fix inifite loop in cleanupEntities due to concurrent modification.

BSC-2131
Remove IStorageListener from DeviceManagerImpl. I didn't use it.
Merge remote-tracking branch 'floodlight/master' into addrspace
Merge into master from pull request #265:
Fix infite loop in DeviceManager (plus some code cleanup) (https://github.com/floodlight/floodlight/pull/265)
Merge into master from pull request #266:
pull request for deleteDevice method (https://github.com/floodlight/floodlight/pull/266)
Update the ILinkDiscovery service method to include link and linkinfo to get the link type.
Merge pull request #267 from sriniram/master

Update the ILinkDiscovery service method to include link and linkinfo to get the link type.
Add port state as part of Link REST API.
Merge pull request #268 from sriniram/master

Add port state as part of Link REST API.
Show openflow clusters by default in REST API, but add a parameter to choose L2 or Openflow
Merge pull request #269 from readams/master

Show openflow clusters by default in REST API, but add a parameter to… 
enable/disable flowReconcile from property setting
Merge into master from pull request #270:
support property setting to enable/disable flowRecoconcile (https://github.com/floodlight/floodlight/pull/270)
removed docs -- not needed, also cause compressor errors
add percussion scholarship fields closes #3
making headway on subscribe
Remove dependance on sbadia login
Fix tempo function blowup

time left can't be used, it approaches inf as t -> t_c
Also if there has been no previous changes, use a default change time at
tempo changes
Make BeatClassifier virtual, so I can work on a different implementation
Add bounded vector class
Add BeatPattern class and tests
Make the beat classifier interface asychronous (WIP)

lose beat visualization, have to add it back later...
Use current time for tempo changes
Fix tests
A pattern matching classifier that works at some level...
Add beat visualization
fix offset to nearest in beat pattern
We need a section on writing validations.
fix utf-8 encode problem, fix UDModel thread bug
DOC Fixed a return in predict_proba in SGDClassifier
DOC add support for sparse arrays to SGDCLassifer
DOC forgot dot in SGDCLassifier documentation
Images are now centered in the image view
Fixed error when contact was selected but the list was empty.

Signed-off-by: Kong Yang <kongyang80@gmail.com>
Added menu options.

Signed-off-by: Kong Yang <kongyang80@gmail.com>
Added the Help and About Activity class.

Signed-off-by: Kong Yang <kongyang80@gmail.com>
Modified the Accounts Activity layout.

Signed-off-by: Kong Yang <kongyang80@gmail.com>
Fixed error in unit tests to pass.

Signed-off-by: Kong Yang <kongyang80@gmail.com>
Added basic unit tests for Activities.

Signed-off-by: Kong Yang <kongyang80@gmail.com>
Proper object selection added.
Closes #508: Merge remote branch 'lloydwatkin/master'

Conflicts:
	Tests/Util/TestTest.php
Errorhandling, Changelog and BC impact minimization for #508
Fixes #581: Windows diffs where polluted with extra newlines
delete unnecessary js files
Real man 'use strict';'
From Munich, Living in London
cname
Fix out of bounds error.
Merge pull request #51 from sellmerfud/strings

Enhance string and character highlighting.
Add dynamic configuration testing for earlier issue detection.

Detect availability of a c++ compiler, c++11 features, python-dev and
boost::python.
Auctions now finish when timer reaches zero and close.
When auction finished show a "Finished" messages.
added all necessary tables
link x slides
delets owner_id in create project
Compile/minify routine updates.
Added the awesome Gemnasium dependency tracker.
optimize reloader
Backfill changes to the CHANGELOG for 0.10.7
Bumped version to 0.10.7
Corrected french translation
Merge pull request #866 from Fiaxhs/master

French translation corrections
`render [:some, "array"]` renders JSON
Add clarifying comments to padrino-admin/access_control.rb
Merge pull request #868 from danieltahara/master

Add some comments to padrino-admin/access control
Merge pull request #867 from misfo/render-arrays-as-json

`render [:some, "array"]` renders JSON
Get the first key passed to expire helper. Fixes #873
Missing = on admin page erb templates

The erb templates in the admin generator were missing = from <%%=
mt(:<%= @orm.name_plural %>) %> so the @orm.name_plural value wasn't
being added to the page output.
Merge pull request #876 from sleepingstu/master

Missing = in the admin generator erb page templates
Merge pull request #874 from gugat/expire_helper

Get the first key passed to expire helper. Fixes #873
Refactor ObjectSpace patch to DRY it up.

Also, Added unit tests for ObjectSpace patch.
And added some debugging statements using logger.devel
Merge pull request #864 from dcu/reloader

optimize reloader
Merge branch 'master' of git://github.com/padrino/padrino-framework
isolated jquery
Update optimization/blackhole_README
implement 4x4 crafting with model preview for main vehicles.  Add new
cooldown implementation--airlock type.  Fix gate health packet to add
animation ticks to gate when it receives an update.  Update blocks
textures.  Update all models to support a renderAll command.
Updateed version. Uses table name instead of SQL staement.

Signed-off-by: Shane Smith <shanes@vandals.uidaho.edu>
Add binmode => :utf8 flag to read_file [RT#78423]
dealing with removing classes
gitignore
beginning the refactor project, new project name, src and bin folders
~ Testing r/w access.
Update content to make it teaching-friendly
Add task to optimize jpegs
Initial source import generated by STS Template Project.
Add test code for controller class.
add test case for POJO.
add simple manager class and test.
added blackout_once and fixed serious typo (pun intended)
pushing working binary
Endret syntax på JList og DeafultListModel
Laget Testklasse og en fix i database
Merge branch 'master' of github.com:sky-is-the-limit/Calender
- run the google command inside the run wrapper
Added turn gem

Added the turn gem to prettify the test output.
add bootstrap profile; tweak .gitignore
revert change to root pom GAV
simplify bootstrap profiles to only point at single upstream project; this will ensure no duplicate GAVs when building the whole stack
https://issues.jboss.org/browse/JBIDE-12920 - Java EE Project -> Java EE EAR Project

Signed-off-by: Fred Bricon <fbricon@gmail.com>
Removed src folder from .classpath

Signed-off-by: Fred Bricon <fbricon@gmail.com>
JBIDE-12943 Remove all swtbot tests that now live in jbosstools-integration-tests repo

Signed-off-by: Fred Bricon <fbricon@gmail.com>
JBIDE-12943 removed remaining references to the removed bot test in test feature

I removed the remaining reference to org.jboss.tools.maven.ui.bot.test in org.jboss.tools.maven.test.feature/feature.xml . In addition to that I added the remaining test plugins to the test feature as suggested by Fred.

Signed-off-by: Fred Bricon <fbricon@gmail.com>
Add missing lib folder to fix failing JSF test

Signed-off-by: Fred Bricon <fbricon@gmail.com>
Added snowcap_core_video_type
Preventing errors when using @file annotation on inherited entities
Adapted collection javascript to Symfony2.1
Added collection extension to manage add labels
testimonial on footer
Move client to own module

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Removede gralde folder
Set version of guice-plexus-bridge to 0.1.0-alpha-3
Set version of common-utils to 0.1.0-alpha-3
added naive speculation of audience, d3 pie chart, probably not going to be a popular idea...we'll see
Fixing a bug with a like statement's escape clause.
Merge branch 'refs/heads/hotfix-escape' into 3.2/develop
Renaming folder.
Merge branch 'refs/heads/hotfix-schema' into 3.2/master
Seperated options to seperate variable to help with selection and zooming.
Added selection and zooming to both graphs.
Test SVN on assembla.


git-svn-id: http://subversion.assembla.com/svn/portaudio/portaudio/trunk@1863 0f58301d-fd10-0410-b4af-bbb618454e57
Apply patch to configure to fix build on Mac Lion.
See ticket #216.


git-svn-id: http://subversion.assembla.com/svn/portaudio/portaudio/trunk@1864 0f58301d-fd10-0410-b4af-bbb618454e57
Fix fprintf format for long int.


git-svn-id: http://subversion.assembla.com/svn/portaudio/portaudio/trunk@1865 0f58301d-fd10-0410-b4af-bbb618454e57
First pass at inheriting font attributes from the label.
Changed adjust font size to fit scale factor into a rendered attributed string attribute.
Forgot to remove unused attributes after normalization.
We now have a plainText flag to disambiguate text that behavies like regular text.
Merge branch 'font-from-label'
Added Generic EndFileNoNewlineSniff to ensure there is no newline at the end of a file
Ensure "rules" is tab-completable for "queue show"

Previously, tabbing at the end of "queue show" produced a list of
available queues about which information could be shown, but did not
include an alternative command, "rules", to access information about
queue rules. The "rules" item should now be shown in the list of
tab-completable items.

(closes issue AST-958)
Reported-by: John Bigelow
........

Merged revisions 372444 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 372445 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 372446 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@372447 f38db490-d61c-443f-a65b-d21fe96a405b
Make chan_local module references tied to local_pvt lifetime.

The chan_local module references were manually tied to the existence of
the ;1 and ;2 channel links.

* Made chan_local module references tied to the existence of the local_pvt
structure as well as automatically take care of the module references.

* Tweaked the wording of the local_fixup() failure warning message to make
sense.

Review: https://reviewboard.asterisk.org/r/2181/
........

Merged revisions 378088 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 378089 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 378090 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@378091 f38db490-d61c-443f-a65b-d21fe96a405b
ok let's try to hook B-01050 references again
Добавил OpenLayers
Login changes
Some Changes
Add markdown extension to README and CHANGELOG.
Remove dead code from example. Remove old documentation (0.1) from README. Improve README.
Just some style fixes and widescreen >1200px layout
Add TODO for installing Fantastical
adjusted for my local test server
updated sub module references
Add RAM.max_request() and RAM.total_request()
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bug
Add RAM.max_request() and RAM.total_request()
Merge pull request #1035 from setowns1/bug

Add RAM.max_request() and RAM.total_request()
Merge branch 'dev' into pib
add delay to editor layout
modif pop-up