labofsahil/github-event-dataset-2012 huggingface dataset:
Moving Setup to literal Haskell.
Revamping Category.

I've removed Choice because (|||) isn't really appropriate for Lens since one would expect uncurry (|||) :: (Lens a c, Lens b c) -> (Lens (Either a b) c) to be a bijection, notwithstanding what Control.Arrow does.
I've renamed the Control.Category.Split module into Control.Category.Product and renamed the class Split into Tensor.
I've added a class called Product for (&&&) even thought it isn't used in lens.
Hopefully, these categorical modules will be put into their own package one day.
tidying up
complete rename of Split to Product
Merge branch '2.9.0-1' into 2.9.0
railo did not like
Framework.cfc
xml = replace(xml, "<!---->", "", "all") so changed to xml = replace(xml, "#ch(60)#!----#chr(62)#", "", "all");
Ini.cfc
railo also did not like
if (variables.super != "") {  changed to if (!isinstanceOf(variables.super, "config.Ini")) {
changing variables.super to variables.parentSection

this resolves and issue with railo "Can't cast Component [Ini] to String"
Merge pull request #3 from rotts/master

wanted to get ColdMVC on railo, had a little trouble. Seems to be working after these changes.
Edited structure of UploadFile function
First version of RestSharp replacement
Corrected the StartUpload method
Disabled Async support for now
Corrected some small things
Replaced old UploadFile method with a better one (HttpFileUpload)
Complementary name change of %alloc_atoms to %alloc_arrays, as the cl_cryst does now contain the full set of arrays, see class_cryst
fix #90 center login screen
Merge pull request #97 from transparencyint/b-center-login

fix #90 center login screen
Fix broken tests from the refactor
Minor updates to request api and addition of doco.
don't mutate options hash
make cache setUp/tearDown async
-rerdme
Revert "Create gh-pages branch via GitHub"

This reverts commit 6c29f8d526ba4657d7541125ea419d040e57d2be.
zrzut naszych objektów... jsonFormatter
Remove build status image

It is stuck at "Be Wary" even though builds pass in goci.
SimpleNamespaceContextTest refactored.
DifferenceTest refactored.
NodeDescriptorTest refactored.
DoctypeTests refactored.
Replacement removed. NodeInputStreamTest refactored.
ElementNameAndTextQualifierTest refactored
Basic facility for reading tweets and storing them
Admin CSS updates

Started moving inline css to custom.css
Script to import uamuzibora database into openmrs. Issue #3
Most demographic information
Updating location ID to match our installation of OpenMRS
Updating Patient Attribute IDs for Telephone Number and Marital Status
Toggling MySQL foreign_key_checks before and after import

Otherwise we get a boatload of errors
Updating identifier_type to 3

Our UPN now has the identifier_type of 3, not 4
Importing initial patient now also imports alive/dead status

This is *really* ugly and can probably be refactored to something more
elegant.
Correcting concept IDs for Marital Status
Adjusting patient add flow
Correcting UPN import
Fixing address import
Treatment Supporters are no longer Patient Attributes
Comments on adding patient to program
We need this
Now imports Treatment Supporter
Initial encounter import complete + little refactor

I should really have split this into smaller sections but was rushing.
*Think* this now does the return visit imports correctly

Still may have some bugs
Hoping the drug import thing now works
Fixing null result for Single marital status
Fixing earlier mistake in new_person_attribute()

My earlier fix for coping with values of 0 getting erroneously
skipped introduced a new error. This fixes it.
merged r1363580 from branch-1 for HDFS-2617. (Replaced Kerberized SSL with SPNEGO-based solution.)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.1@1366317 13f79535-47bb-0310-9956-ffa450edef68
Clarify _get_dependent() documentation.
updating concept index files
get rid of eventlet
Help Image Change...
introduced correct favico
synched properties from microlist-play
submit not needed here
insert new analyses at top
widen datepicker fields
Introdução.
Updated Traces tab to auto scroll down when user is already scrolled down
Merge pull request #71 from LordQuackstar/GUImaster

Allow GUI Traces to Autoscroll when at bottom
Update CHANGELOG
Merge remote-tracking branch 'upstream/master' into LQmaster
Fix for not creating entries for empty lines in .m3u files.
Merge remote-tracking branch 'upstream/master'
Multilingual: Fix for Transifex locales to show correct name
Added missing css class.
Changed new discussion module to use button group dropdown when there is more than one type of new discussion type available. Upgraded buttons plugin with appropriate styles.
SD Homework: policeman working
Init branch my_dev
Init branch my_dev
Revert "Init branch my_dev"

This reverts commit be679db47817e0cae6edec77489297f59d9920ef.
Revert "Init branch my_dev"

This reverts commit 21f700ab16f747001e6cc64ea0b039422fa51024.
dev: basic functionality based on backbone added
Moved requirements and install instructions
Added dev and user guide
S3 WEB: Remove the PNG images and add a link to the NuGet package
Set subaccount.
Add summary to HTTP API.
Initial reports UI.
Merge branch 'master' of sixpak:c/pyfinance
Remove key (category) that sums to 0.
Sort categories by amount.
Clean up subcategories if 0.
Sort subcategories, include total.
Refactor dollar formatting to separate function.
Use Highcharts to draw up a graph on the summary page.
Make total bold.
Add subcategories to pie chart.
Return summary information (duplicated inside each record).
Allow custom searching for summary reports.
Different approach to Amazon receipts

Search for unresolved amazon transactions, then look through shipping emails (rather than order emails) to match up amounts.
Alteracao no readme para informar a pasta docs
Merge pull request #2 from basilioferraz/master

Alteração no Readme
#BodyTheatre# lib delaunay sucks, use ci::Shape2d instead
-commit for DB settings

Signed-off-by: Vitaly Mukhin <vitaly.mukhin@gmail.com>
Merge branch 'master' of github.com:vitaly-mukhin/webCMS
-del clear from some extra files

Signed-off-by: Vitaly Mukhin <vitaly.mukhin@gmail.com>
-add FirePHP lib

Signed-off-by: Vitaly Mukhin <vitaly.mukhin@gmail.com>
-add Log_Fb as a default logger for SQL-queries

Signed-off-by: Vitaly Mukhin <vitaly.mukhin@gmail.com>
* add sicp
Merge branch 'master' of https://github.com/vmlinz/my_emacs_conf

Conflicts:
	init.el
* donnot set tab-width when setting c style
Make the renderer be switchable at runtime.
set renderer-switch-keys to left-ALT + 1,2,3
animate players walking even if more than one movement key is pressed.
do not wrap explosion around line boundaries.
modify CMakeLists.txt - add gfx, ttf
rewrite of the animation system (unfinished work in progress)
add MainMenu class
add initial implementation of MainMenu.
more work on game state management.
implement mouse input for player movement and bomb planting.
replace string based resource ids with an enum class
remove Background class since it is no longer used (Arena takes now care about its background)
little cleanups
add golden flame extra
add second player action (for later features like remote bombs, picking up, etc.)
add mainmenu resources
initial commit of the scoreboard feature
merge master branches
add player standing sprites
fix merge errors
Proxy: suppress warning if browser hang up the socket

Closes #119
Chore: add NODE_PATH to sublime's build
Spring style Kafka consumer template added
Memphis fonts added
LESS added
Styles into less
Placeholder finetuning :)
initial commit
added RSpec and RSpec on rails plugins
vendored rails 1.2.3
added spec dirs +files
* added restful_authentication plugin
* added rspec_autotest plugin
* translated User Text::Unit to RSpec
* added restful_authentication plugin
* added rspec_autotest plugin
* translated User Text::Unit to RSpec
added SessionsController specs
added users controller specs
nuked test/ directory
removed sessions migration and added Project migration
* added spec_dsl file for custom matchers
* Added basic Project model
* remove public/index.html
* added spec_dsl file for custom matchers
* Added basic Project model
* remove public/index.html
Revert "* added spec_dsl file for custom matchers"

This reverts commit b153a5399928578f8b88a7840b65e02257c696ef.

Conflicts:
basic layout and other bootstrapping related things
- .gitignore for DS_Store files
- Added blueprint css framework, with grid active in dev mode
added coverage/* to git ignores
basic css added
futzing around with some more basic css and markup rules
- added show routes task
- added basic project controller
- renamed Project#name to Project#title
- Added some view specs
added missing projects/X spec
Bank class started
making some progress on the pc.
Revert "making some progress on the pc."

This reverts commit 6a1768ce01d8a50a8b28bdb7808220938614dd7c.
working on 3.
doing some more work on lab6_3.
Replace getDebugValue() with getLogs()

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>
Not more than 10 files per log line

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>
HPCC-7852 Read Roxie Control response using endpoint url

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>
SPI: FPGA - Change write/read fpga message type

Signed-off-by: Wang Xingchao <xingchao.wang@intel.com>
changed a setting for better debugging messages
[maven-release-plugin](olivier.lagache)prepare release logstash-conf-1.0.2
[maven-release-plugin] prepare release underscorejs-1.4.3
removed Standard from default print format
fix in typo in profile.py user addition
fix in error msg about unselection of system manager
fix for get_obj for custom doctypes
added comma_and function, shifted get_system_managers function to profile.py
Merge branch 'master' into form_sidebar

Conflicts:
	core/doctype/profile/profile.py
表紙に昔のブログへのリンクを設置した
removes public index
New Matrix3x3. Use of openGL fixed pipeline completely avoidedgit status! Some ajustements is needed for camera, Matrixstack and ShaderProgram for better communication.
Variant Lists
添加"放大镜模块2.0"
first swing of auto-emacs
Merge branch 'master' of https://github.com/wolfbiter/auto-emacs
removed README.md
Load PNG image with js

libpng is build with emscripten
registration initialized
11.30.12 nightly
added changelog for fhmm
Get a better error for compile(falsy)
on fourth
tinkering with the notification
updated the frameworks
switched to notification center notifications
merge
Update system/language/english/number_lang.php

more abbr add
"默认闹钟提醒"
vim.rc updates predominantly.
Working on pen color palette
Fix the open generated pdf bug of the latexmk template.
XWIKI-8015: Adding tags can cause the browser to freeze up while attempting to display the suggestions drop-down
Fixed.
(cherry picked from commit f6fc57f2d29f13da49afb7b51a21f4851467e212)
Fix/update functional tests.
ImageAttacher: a separate Executor for reading from cache.
add conditional-get.t
add disk.t
add t/content-length.t
add t/content-type.t
add  t/public.t
add t/empty-resp.t
Don't add private methods to the docs.
For running specs.
Moved private method to separate module for testing.
Removed both private methods, as one is in new module anyway, and the other was a one liner so just moved it into the code.
For docs.
Ignore bundled gems in vendor - 100% coverage!
Pending specs for the innards.
fixed bug of hidden fields
fixed hidden fields
do not repeat things
[fixes #29192029] Added support for arbitrary javascript goals to be included.
GrahamA: add eclipse specific project files to gitignore.
[CLC-83] Spaces -> Tabs
Moved phonegap
minor change to careercup 9.5
add computing total money and total dish numbers funtion
spelling is a pita
add boffile for ec5ee073c3d340d507f8735f20d4baaecf9652a1
Implement validation on xliff source and target content
add in comment for xliff test
Фоновая картинка, фиксация admin-menu
No one wants an stdClass object...
Restart AGAIN!
Added API calls for generating and printing manifest. Switched from == to eq rspec expectation syntax.
Bumped version 0.1.1.
Styling fixes on directions popup.
Fixes
Merge remote-tracking branch 'original/jellybean' into jellybean
Poshuku CW: fixed build with gcc 4.6.
LackMan: be careful removing package info stuff.

Consider cases where newer packages would use those descriptions.
LackMan: nicer code.
LMP: getters for track ID & album.
LMP: autorequest album art from collection.
LMP: fixed styling.
LMP: find album art only once.
LMP: proper include.
add list friends feature
auto deselecting row, and labels cannot be selected
Ambulances mostly work - fixed callback bomb.
Translation of preface is finished.
Added SoapServiceSimulator

First Scenario prototype
Changed my ID; looks good, although I know for a fact now that uC++ does not catch all deadlocks, or maybe they should be called livelocks instead?
;P

Signed-off-by: Jimmy Yu <jimmy.w.j.yu@gmail.com>
fix opg

git-svn-id: http://plugins.svn.wordpress.org/facebook-awd/trunk@518258 b8457f37-d9ea-0310-8a92-e5e31aec5664
Add 0.9.9.3 fix
Merge branch 'master' of github.com:AHWEBDEV/Facebook-AWD
get components action implemented
Update notes for submitted changes

* bluedroid: Add option for a device-specific bluedroid
Added bmp loader
RRemoved tga files
Added a custom url field, syntax being http://www.test.com (or https, ftp, etc)
memory footprint reduced
normal forms optimizations cont.
latex sources for bachalor thesis added
fancy input paths fixed
now toolkit use tk.dialog - inheritance from defaul jquery ui dialog
Update README.md

hello SAAD
Added isHash class method for Utils.
SQLBuilder class updates :
- Implemented buildInsert method.
- Fixed buildSelect method.
- buildDestroy renamed to buildDelete.
- An ActiveRecordException is thrown in insert method when the given hash parameter is neither a direct instance of Object nor a Dictionary.
- Implemented bindValues method.
- _joins property type changed to String.
Capistrano task to upload config file. God config file.
Adaptation du formatage des fichiers pour windows
Adaptation à windows

Les chemins par défaut ne peuvent être vrais. Utiliser le configurateur
de graphisme pour les changer
README a jour pour Windows
Refuse le .layout créé par code::blocks
Remplace les ":" par des ";" dans le fichier cible

Parce que windows utilise les ":" dans ses chemins, d'où nécessitée de
changer
dll windows nécessaire au bon fonctionnement de gravastre
Refuse les fichiers inutiles

swap de vim, les fichiers de stockages,...
Autre fichier inutile bloqué
Suppression de dossiers inutiles
Used euclids algorithm
NewFeature Atlas
- le immagini postate 1:1 vengono ora linkate e fittate nell'articolo
- al click di qualsiasi immagine essa viene aperta in una nuova scheda
Change real copyright
Enhance monit rule, zabbix and increase java max heap mem for jenkins

Change-Id: Ib2005fe0bddaad4eb17063ea4e7e090335c0e70b
sync ci jobs before push

Change-Id: I9a897e7d4df13f6fb9114d154f5ae39b5ae9f5c1
Move the description of HUBOT_HARVEST_SUBDOMAIN into the "Notes" section.
Fix for #755
Fix for #536 HazlecastBroadcaster wrong use of topic listener
Let the Hazelcast demo commented out
Fix duplicate local storage
Make sure there is only one BroadcasterFactory active
Added a name to the Lightning Box block.
now acquirer field accepts both symbol and string
clean + click button
Ficheros compilados subidos
update
Merge pull request #26 from welefen/master

将模版参数data改为__data__
Added Util test specs
Added Grid scaffolding tests
Added grid scaffolding tests to spec runner
Added Grid panel scaffold extension tests separatly
Test code cleanup
Added MIT license
Extended JSDocs and working on build system
Updated url to project
Added a generated function for easier usage in projects
Added builder folder zu repro
Ignore ftp properties
Merge branch 'master' of https://github.com/Bancha/ExtJS4Scaffold
777 autogen
Fixed the price levels in Flora's shop.
Added an option to show/hide a layer.

Also removed a bit of dead code and fixed two mising warning
message boxes.
Some tidying.
Forgot to update init.php to not require the now non-existent config file ._.
Hopefully finalized registration code.
Updated tests. 100% working.
Fix operator spacing to account for switch statements
Fix tab indention for switch/try/catch statements.
Add broken quality tests to fix tomorrow
Logout feature and password protection added
Not fucking with the version after all
fixed contact url being too long
Test2
Merge branch 'feature_presentation' of github.com:Britzpetermann/MEIKYO into feature_presentation

Conflicts:
	MEIKYO/construct/src/Main.hx
	MEIKYO/release/bin/Main.js
try and not return a hash?
change. again. yes. again.
Updated jobrunner to include user signup and signin as well as created a homepage.
RnQHistoryToDB v2.4
Cleaning up doxygen
updated doxygen build
adding doxygen updates
adding doxygen updates
Resonator~ wrapper
New gates, plus some testing scripts. HDL simulator requires all files in one folder.. =/
started Gyroscope
added device library
Added MySQL auth for users in Node.JS, allowing notifications to be sent to specific users
Add "erase" function to associative sets (maps)
basic/sortingbytranspositions done
[OPENENGSB-3386] manage ConnectorRegistrationManager with Constructur-injection
fixed AddRoute.cshtml script references
Merge pull request #19 from Demien87/master

fixed squshing of google libs on addRoute
updating .gitignore
pulling updates
updating admin dashboard to clear errors
Bugfix for jquery variable in parent window.
Add path handling. Make more formulas "readable".

- Add path handling to allow script to find word list

- Normalize variable names in gen_characters

- Make gen_groups_lownum use "readable" characters

- Make gen_groups_lower use "readable" characters
refactor to allow arbitrary bits of entropy
Merge branch 'master' of github.com:ClockworkNet/passlove
CS-14010

Add 'about' dialog to the CloudStack top header, showing current verison
information.

Patch submitted by: oyla.smola@gmail.com
Reviewed-by: brian
CS-16037: db upgrade - fixed component/category/description fields for several global configs
bug 13773

Change 'migrateToAnotherStorage' icon to use same icon as 'migrate'
CS-15560 : Improve HVM logging of hosts

When a host is not considered for deployment because it is disabled HVM,
then call that out in the logs for debugging.
Plugin support to pick test cases using marvin.

Using this plugin Nose will drive tests and this also allows using other
nose plugins. Cmd Line plugin support to be added
Support added for attrib, multiprocess and Xunit coverage plugins
bug CS-14890: Set vnc password for removed Vms as null. vnc_password is not used once the Vm is removed.
status CS-14890: resolved fixed
reviewed-by: Nitin

Conflicts:

	setup/db/db/schema-2214to30.sql
bug CS-14291: support EIP with multiple NetScalers in basic zone

This fix will enable support for multiple NetScaler devices providing EIP service in same zone.

    - Introduced global setting "eip.use.multiple.netscalers" to turn multiple netscaler support
    - Enhanced configureNetscalerLoadBalancer API to take the PBR setup between the POD's subnet
      and NetScaler device
    - logic to pick a NetScaler (based on the guest IP and corresponding pod) while configuring INAT rule
bug CS-14890: Set vnc password for removed Vms as empty. vnc_password is not null column.
status CS-14890: resolved fixed
reviewed-by: Nitin
Add additional retries to the SSH client by default
bug CS-14814: Do not allow attaching volume to a stopped vm for an uploaded volume. Make changes to accomodate volume attaching for a vm created in Stopped state.
bug CS-14249: cluster.localStorage.capacity.notificationthreshold text is incorrect
CS-14844: Api key and secret key is truncated in the user details view
CS-13123: Hide diagram parts on change password form
CS-14904

Fixed the bug where vm_instance.ha_enabled wasn't updated during service offering upgrade

Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
    CS-14751

    F5/Netscaler/Juniper config API commands are available to ROOT admin only
Added scripts for searching {bugs,wiki}.cloudstack.org.
bug CS-14833: if iso is xen/vmware tools, attach it to vm; status CS-14833: resolved fixed
CS-14609
turn on debug log, if zone is not ready to start ssvm/cpvm.
"Zone host is ready, but console proxy template" means system vm template is not in "Downloaded" state on secondary storage
"Primary storage is not ready" means the template is not been downloaded to primary storage, possible reasons: haven't add primary storage, or primary storage download is not finished/failed.
CS-14521

Remove CLVM, due to license issue
CS-14905: volume page - Attach Disk action - Instance dropdown - populate only instances whose hypervisor matches this volume's hypervisor.
cloudstack 3.0 UI - IP Address page - action filter - optimize status handling.
cloudstack 3.0 UI - IP Address page - args.id is obsolete. Use args.context.ipAddresses[0].id instead.
CS-14901: cloudstack 3.0 UI - IP Address page - SourceNAT IP - when network offering's Conserve Mode is off, hide Enable Static NAT, Enable VPN action.
bug CS-14931: Put in 'Disk' during upgrade for putting in disk offerring
Merge branch 'master' into ui-fixes
cloudstack UI - advanced search - show advanced search icon on listView only when advSearch property is specified.
Using only CSS instead of JS to display link clickability.
Merge pull request #124 from AlphaGit/allow-attachment-search-text-selection

Using only CSS instead of JS to display link clickability.
Allow search by second name or surname
Merge pull request #84 from andresmoschini/fix-search-by-second-name

Allow search by second name or surname
updated target url to the live production site
Tweaked theme settings to get Android 2.3 to work
Added ifRoom attribute to menu items
Changed Connexions themes to extend ActionbarSherlock themes
bugfix: Flattr state was wrongly displayed as "error" when it should have been "flattred"
bump version number to 0.9
Force markdown for README
Fixed timeline not switching bug
wip
Rename method
Days and months in the calendar view

Days and months now get drawed. The method to do so is not the ultimate
solution (its quite large and ghastly), it works though and if any
refactoring is needed, we always may do so. I guess for the beginning it
is sufficient.
cifs: add mount option to enable local caching

Add a mount option 'fsc' to enable local caching on CIFS.

I considered adding a separate debug bit for caching, but it appears that
debugging would be relatively easier with the normal CIFS_INFO level.

As the cifs-utils (userspace) changes are not done yet, this patch enables
'fsc' by default to enable testing.

Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Add more PMEM

Change-Id: I5a715a79be4e9fec2725913fa113a252e759efc4
Enable Novatek support on thundergboard
tinkerring with site tidying up
Added zen coding & snipmate
added html to notecard question
escape new html model field
question html changes
Changed how cake_path works
Added task to support clone cakephp at deploy server
totale integrierung von Simons Code
rev'ing buildsupport yet again
Fix: Remove dud CSS from themeroller file - 10794
Merge branch 'master' of github.com:DataTables/DataTables
Fix - documentation: Two syntax errors in the examples, one for fnStateSaveParams and the other mDataProp - 11083
Fixed a JSLint warning
updated live development launch screen to be more consistent with brackets design
Fixed indentation and quotation in launch.html
Update src/osmformat.proto
fix store.php location
nit
refs #333: drop use of deprecated ZMSettings
o.c.ams.application.deliverysystem: Added new class to handle the XMPP
connection.
o.c.ams.application.deliverysystem: Added new class that handles the
XMPP connection. Changed the time interval for the worker check.
o.c.alarm.jms2ora: Changed product configuration and removed two
deprecated classes.
o.c.alarm.jms2ora.service: Renamed some methods. Bug fixed in class
ArchiveMessage to avoid NullPointerException.
o.c.alarm.jms2ora.service.oracleimpl: Changed some method names and
added file persistence of another db table.
o.c.tine2jms: Product configuration is now based on a feature.
o.c.websuite: Added feature to the product configuration. Completion of
the changes in the new servlet.
Merge branch 'cleanup' into develop
doesn't build for some reason
some configuration for build, added name, upgraded sbt-launch to 0.11.3 and added 2 packagers: assembly plugin and proguard plugin
Merge remote-tracking branch 'origin/master'
some overhaul in file checking logic
Merge pull request #2 from eiennohito/master

Исправления
Moving stuff to the node templates
v 3.1 patch 14
Improved README file for Github
adding active field to admin display
fixed alignment of active check icon
not sure why old layerswitcher icon is still present on dev...trying to fix
creating DataNeed model and working on the data needs and the catalog templates.  will need to migrate changes to data_manager.
Merge remote-tracking branch 'origin/master'
wrapping image captions
Improve last commit, add more safeguard
Improving French translation #967
Set the X-CSRF-Token header for AJAX requests with jQuery. #950
Remove interaction with villager
A1 made
Lista de Chequeo actualizada
Added Giant Comet
added .idea folder to gitignore
Merge branch 'master' of github.com:FlatTurtle/InfoScreen
Only update traffic layer instead of whole map
overlay timeout
pincode modified
merge
Merge branches 'master' and 'pagoda' into pagoda
Dockable UI
late december
fix warnings on windows code verification
user can change position to arbitrary body (doulbe click). there's still an error somewhere, even though at first glance it may seem to work
Adding some debug features and things.
adding examples link to menu
20120802windows
widget class refactoring and fixing format issues
MOAR LDP Resource refactoring...
AvaliacaoDiscentes
FACA

branch 'master' into AvaliacaoDiscentes

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
ajustando nome da pasta application
Ajustando gitignore
Merge branch 'master' into AvaliacaoDiscentes
Adicionando master no AvaliacaoDiscentes
Merge branch 'master' of github.com:GuilhermeFM/Framework into AvaliacaoDiscentes
Commitando do windows
Merge branch 'master' into AvaliacaoDiscentes
Alterado o meio pelo qual as tabela sao identificadas nas DAO, agora todas as tabelas sao ditas explicitamente
Merge branch 'master' into AvaliacaoDiscentes
Dispatcher
Merge branch 'master' into AvaliacaoDiscentes
Ajuste Dispatcher
Implementacao parcial classeDAO
Mergin
Ajustado o novo meio de login
Adaptacao das classes que envolvem login
Terminada a implementacao do DefaultController e necessario agora criar uma manual explicando como ele funciona
Relocated MqlGraphStoreFactory to allow calling from webservice
Implemented Reset api which resets the graph db
Just changing to assign
Addes a reverse binding fucntion, based on @hivehicks idea on issue #96. Method is fetchValueUsingBindingsIntoObject:(id)
Merge branch 'master' of github.com:escoz/QuickDialog
Adds constructor with a dictionary, issue #84
Rev'd up to 0.4
Some new useful methods for QRootElement and QSection
Merge remote-tracking branch 'upstream/master'

Conflicts:
	quickdialog/QRadioSection.m
	quickdialog/QRootElement.h
	quickdialog/QSection.h
Micro-edit of QuickDialogEntryElementDelegate

QEntryShouldReturnForElement:andCell: now returns BOOL
Added QuickDialogWebController, now binding to rest services is really simple
Merge branch 'master' of github.com:escoz/QuickDialog
Changing default behaviour of the entry text to not clear field on begin editing. Fixes issue #110
Many small changes to the elements to make it easier to bind to real data
Don't crash when items are not selected
Lots of changes, including redoing the tableview edit mode, to make it more useful
Fixing more edit stuff
Moved radio element to subclass of QEntryElement, other minor changes
Cells were not being reused properly
QRadioElement doesnt bindToObject correctly, issue #119
ControllerAction not called on QWebElement, issue 114
Binding 'iterate' now also works on root element, so you can iterate to create sections. You must use the sectionTemplate to define the section elements that will be created
Modifiy install path on server deployment to use package name (i.e. esb)
regardless of application (i.e. fsb or esb).  Simplifies installs between
facilities and enterprise systems.
Merge pull request #74 from pbugni/master

minor init script change
Removed dbweb-homework Directory
Another naming bug
Started building homepage
asset link re-writing to relative
CODE STYLE Formating workflow/engine/methods/cases

Change format files in workflow/engine/methods/cases
CODE STYLE
files modified:
conditionalShowHide.php
conditionalShowHide_Ajax.php
datemask.php
dynaform_Fields.php
dynaforms_Ajax.php
dynaforms_AssignVariables.php
dynaforms_ChoseType.php
dynaforms_Delete.php
dynaforms_Edit.php
dynaforms_FlatEditor.php
dynaforms_List.php
dynaforms_NewPlugin.php
dynaforms_PagedTableAjax.php
dynaforms_Preview.php
dynaforms_Save.php
dynaforms_SaveProperties.php
dynaforms_Save_as.php
dynaforms_Saveas.php
dynaforms_ToolbarAjax.php
dynaforms_checkDependentFields.php
fieldsGetterAjax.php
fieldsHandler.php
fieldsHandlerAjax.php
fieldsHandlerViewer.php
fields_Ajax.php
fields_Delete.php
fields_Edit.php
fields_List.php
fields_Order.php
test.php
CODE STYLE Formating workflow/engine/methods/cases

Change format files in workflow/engine/methods/cases
changes: sizeof got a $, fix.
Merge pull request #812 from ralpheav/master

Code Style change workflow/engine/methods/dynaforms
Merge pull request #811 from Jennydmz/master

CODE STYLE, workflow/engine/methods/tasks/
Merge pull request #810 from norahmollo/master

CODE STYLE Formating workflow/engine/methods/cases
CODE STYLE Formating workflow/engine/methods/cases

Change format files in workflow/engine/methods/cases
Merge pull request #814 from norahmollo/master

CODE STYLE Formating workflow/engine/methods/cases
Merge remote branch 'upstream/master'
Added include and libraries for DX10.

Texture class added
Updated TextureClass
per-rule elementTypeClass/Factory attributes
right-associative assign op testdata added
AVLTree debug and test
ignore builtAssets
date, read-status, load new news;
Adding some configuration to data layer so it plays well with code first db creation.
Updating NuGet packages. Gutting FacebookController action methods in preparation for implementation of issue #43.
Add MCMC.
Merge pull request #15 from doobwa/master

Add MCMC package
Reverted previous changes to calling convention.
Spark encoding fix
use last_check to identify new entries, prevents displaying a bunch of entries popping up right after page load
which might confuse the user
display number of hidden comments
update from original repo
Merge pull request #7 from tleilax/master

Anzahl der ausgeblendeten Kommentare, Fixing des Nachladens
benchmark plot script
4/3/12 Completed a majority of part4 ex4-6
Fixed trigger issues.
more fullscreen stuff
Fixed issue #6754: column style for citronade template
Dev: reworked completely
Fixed issue: relevance SQL failing during survey import
Dev: extra apostrophe around SQL removed - apostrophe provided by the db_quote function
Fixed issue #7051: Images uploaded in HTML editor end up in wrong directory on Windows
Fixed issue: Subquestions and attributes were not properly copied when copying question
Fixed issue #6393: Multilingual attributes are lost when copying or importing survey
Dev Fixed some non-transparency on icons
Dev Removed obsolete files
Dev Fixed some old-style gfx on gringegreen
Fixed issue #6045: Firefox 12 vertical scrolling problem in admin view (and other pages)
Dev More icon changes
Handle store loading errors.

[ADDED]     Detect store loading errors and attempt to recover.
Fix migration problems non-interactively.

[FIXED]     Migration problems should be fixed non-interactively: The
            main thread may well be unavailable which means we may not
            be able to actually get a message through to the user.  This
            would dead-lock the migration problem recovery.
WebMP: Rewrite TV Shows part to use models
WebMP: Import models namespace in the views

This avoids having to fully-qualify the model names in almost all views.

It doesn't break any existing code, though skins need to update their own
Web.config file to use the short names.
WebMP: Return 404 error on request for non-existing movie
WebMP: Add a proper 404 page

Also handle exceptions in a better way
Flush logs after writing exception details
Fixed carrying boxes.
attack test, socialization (not working!), qr code
replaced hard coded entry types with customizable types via config file
changed charset to UTF-8
fix: use load method only when id is set (for saving new entries without error)
disabled debug info
start pagination only when there is more than one page
fix: added typecast possibility before saving data into MongoDB
insert new entries
added types to form
only load entry when id is set
better formatting and fixed a typo
Fix issue #139

Fix for maximizing window on secondary monitor that is higher resolution
than primary monitor.
started work to capture maximize
Working maximize on secondary monitor
Remove un-needed changes
Fix out of sync system menu
Fix out of sync move and size system menus
Small cleanup
Merge branch 'pr/n145_admsteck'
app.html

updated
added a small todo file
bridge between Factions 1.6 and 1.7 such that FP can run with any 
dynamically without requiring any changes in the code
so in other words, factions.jar can be 1.6 or 1.7 it will still work
with only one factionsplus.jar file now - but I'm not sure if this is
worth it ;) just look at the code now

1.6 now has the commands in help too, just like 1.7 except they may be
in different order/amount-per-page in help pages when compared between
the two
a little bit of reindentation
and removed some commented code
made hiding fields/params show error in Eclipse and explicitly stated
with @SuppressWarnings( "hiding" ) annotation where it is the case
/f gc is broken  but it can be fixed for 1.6
should I bother? I can fix it with bridge and it won't err on 1.7
but 1.7 has no way of doing /f gc  (as I see)
some comments
closing scanner if open
unnecessary casts
closing another scanner + reduced to boolean
avoiding boxing/unboxing + adding @Override
The expression of type Player is already an instance of type Player
closing a buffer, if it was open
avoiding resource leak
override & boolean
more of @Override, resource closing, unboxing avoiding, typos and so
todo updated
quick Eclipse instructions on how to pull project from github
removed redundant 'if' checks where it clearly only throws 
instead of ever being null

removed leftover printing to console of added subcommands to /f help 

removed some leftover commented code
console colors for info/severe messages
to easily spot [FactionsPlus] messages in console
Merge pull request #11 from basicsensei/pullreq4

fixes+additions+bridging 1.6 and 1.7 without need to modify code.
Add mysql-alive plugin to plugins dir
nitpicking myself
git diff is now colored
changed back to quantity
merged
Merge branch 'master' of git@github.com:MehrCurry/measurement.git

Conflicts:
	src/main/java/de/gzockoll/observation/Measurement.java
Release from Team_Agora is now live. All code is now available on
MichaelHoffmann repo
Merge branch 'master' of git@github.com:MichaelHoffmann/AGORA.git
Working on merge_group_ids method in members controller
Add more structure to categorize them as mixed types. Add more mappings. Begin SceneKit.
Testing change for iOS bug
Added ReDoc
Updated ReSharper 7 configuration to be solution-based

Redesigned build scripts
Added support for NuGet package creation
Now using NuGet for project dependencies
adding opinions
Cleaning up app; adding Derby usage for basic integration test
Version 0.5.3.2

- Some more minor corrections
added tests for user first_name, last_name, profilprofile_name
Add ParameterBag.
Add tests and git stuff.
Loads workbook information

Sidebar gets populated with workbook information (branches, topics, etc)

Signed-off-by: OMGCarlos <me@omgcarlos.com>
add thirdparty_settings.py
better gui.
ER #9  Allow log traces sync to disk to be disabled for performance reasons.
Some small updates to TCD parsing.
[cubox] xbmc :add specific config file for cec device
bcm2708 : remove unneeded specific package binutils
changeset: 15579:ff4908fd991e
tag: tip
user: Rabeeh Khoury <rabeeh@solid-run.com>
date: Tue Dec 04 21:29:54 2012 +0200
summary: vmeta mpeg4 (divx/xvid etc...) packed bitstream fix
Update notes for submitted changes

* Add Python bindings for Atom::type() and setType()
* Add Python bindings for the AtomTyper class
* Add Python bindings for the BondPredictor class
* Add Python bindings for the CoordinatePredictor class
* Add Python bindings for the MoleculeGeometryOptimizer class
* Add Python bindings for the PartialChargeModel class
Update notes for submitted changes

* Fix bug in which JSON strings were not sanitized
First version of ConfigImportExportTool for examples.
update jsonalltimeseries to changed HistoricalTimeSeriesInfoDocument
Added class hierarchy for CDS products. Added placeholders for multiple additional credit derivative products (e.g. index options). Re-organised logical structure of packages
Make star imports an error
Organize imports
Minor checkstyle-based refactoring
Minor checkstyle-based refactoring
fixing freemarker templates
Minor checkstyle-based refactoring
Minor checkstyle-based refactoring
Remove data type generics from Document/Master
[PLAT-2755] First draft for Portfolio hedging calculator.
[PLAT-2755] Portfolio hedging calculator first version.
Fix for Fudge Proto error "type parameters of <T>T cannot be determined; no unique maximal instance exists for type variable T with upper bounds R,java.lang.Object"
Making error messages for FX forward curve market data more explicit. No longer throwing exceptions from getRequirements()
Removing warnings
Adding an extra methid to the default properties functions for curves to allow the correct one to be picked
Testing a netting cash-flow calculator that trims series from a particular date
Previous change seems incompatible with other JDKs - reverting
Changing javadocs
Fixing a warning
Adding some more documentation
Adding more javadocs
Starting to add more flexibility in SABR functions for IR future options
PV01 now calculates for IR futures
Fixing tests that were broken because sensitivities to the discounting curve for interest rate futures were added (which are zero, as the pricing as currently written does not use the discounting curve).
Use the original document ID to query for the latest version in the case of retried operations. (cherry-picking from commit fa7022e09c30a88445c7b10ef2520019c9a87d13)
Correct encode/decode cycle to include a sub-type indicator.
Split the curve provider encoder tests into two separate test methods.
sqlserver -> sqlserver2008
Modified to start counting sequences from 1000
Added InsertCorrectDataPoint without @FETCH for SQL Server 2008
Use getCatalogToConnectTo() from DbManagement to establish the JDBC connection string for a particular catalog
Improved logging in the case of a redis failure.
IntelliJ project files
[PLAT-2271] New analytics back end connected to timeout mechanism
Lowering the priority of functions in the local repository
Adding deprecated functions
Treat empty messages the same as null ones and don't distribute.
[PLAT-2596] Added bill par spread and par spread sensitivity. Added bill in several calculators. Exemple of curve construction with bills.
In configuration allow specifying whether to write through values to
Redis. Useful for debugging.
Adding conventions for CLP
Continued development of CDS contract definition and valuation model
Checkstyle (cherry-picking from commit 926485f1d4178c3fd6e595fa5d133ee0dd0d6500)
Javadoc/Checkstyle
Clarify null handling
[PLAT-2541] Re-add EHCacheUtils.createCacheManager() in certain cases

Avoid NPE
[PLAT-2590] Better live data subscription failure handling

(cherry-picking from commit 2a709aebbc088c409e44a1de843a2fe9977a254c)
Enhance LocalDateRange

(cherry-picking from commit 57fd28417b05a8a44e4c0e7a5e4e9b1ebee0ed87)
Checkstyle

(cherry-picking from commit 5f6407505f2964d55cefddb176f467850c2270d4)
Avoid error on startup when same monitor port used for two servers

(cherry-picking from commit 7594f4a3df38a393b8f536c1bad84b3e1c910179)
[PLAT-2542] Add AbstractBloombergTool

(cherry-picking from commit 05492a98edbd65c2c3775fe9f8faf49fd85548da)
Handle missing category

(cherry-picking from commit cad86a6ceb7132f563aa396a715bee3888aeead7)
adding new loader to data gadget
GS-10565
added ability to use custom cache policy name space in pu xml

git-svn-id: svn://pc-lab14/SVN/xap/trunk/openspaces@128138 eb64e737-3616-4df0-8941-5ee2ae88103d
upload ATKMonitor, should have been available from the beginning...
Fixing facebook like button.
layout hAxis
remove invite friends and team management
Add CAM job used to produce the gerbers.
Automatic commit May 18, 2012, 12:24 pm
Automatic commit May 18, 2012, 12:26 pm
Updates to timeline
Include gitignore
Added color signs and fixed a bug with loading signs and config (again).
Tekstikayttis valmistui
Give header and footer elements an id

This lets us change the element tag if needed
Style viewer header bar fonts and colors
s/story-viewer/story-viewer-modal/
Style viewer modal window controls

Closes #370
Merge branch 'viewer_redesign' into develop
Merge branch 'layout_slug'
Merge branch 'layout_slug'
Open iframed page links in new window

Closes #354
Merge branch 'hotfix-354-tos_links' into develop
Properly unbind the callback.
Make the featured image selection view come last
Change URL on scroll
Added error templates.

The design and text for these will need to be updated before launch.
Fix logic for loading builder CSS.

The LESS stylesheets should be loaded WHEN the site is in debug mode
(settings.DEBUG == True), not the other way around.

I also had to enable the "django.core.context_processors.debug" context
processor and set settings.INTERNAL_IPS to make the debug variable
available in the template context.
Merge branch 'develop' into template_asset_types
Added a readme.md
Adding in the LESS.css framework.

Commenting out the main.css. You need to compile the LESS.css to the
main.css in production code.
Adding in scaling metadata to mobile phones.

This prevents some smartphones from trying to zoom onto the page with a
mobile browser.
Deactivated .htaccess for development

Just changed name to DEACTIVATE.htaccess
Committing fonts

Acquired from font squirrel
Committing images
Committing liquid slider js files
Main update

Forgot to do small commits
Changed distance between headings and paragraph in the grid box
Clearing up whitespace and unused liquid responsive styles
Increased size of border separation between article and team-location-space
Background of team location, same size as the main article bg image
Finish Team Panel

Made them fluid grid, each 4 will need to be encapsulated.
The popovers still need some styling though.
Increased distance between header and content in the team-location sections.
Styled popover with some rgba transparency and styled links.
Rewrote function to allow multiple row columns to be equalised in height.
Finished team location grid. Added in semantics for the footer.
Styled copyright message.
Changed some wording.
Compiled LESS into CSS with Simpless
Made changing the current system event driven
fixed aircraft model drop down list
fix NULL in ION
Revert "disable trace for interactive"

This reverts commit dcc2e40d8e6824bd7e54809bfb0663b71f2b3b32.
Revert "enable trace"

This reverts commit 9e0622d5fa87231bc7175cdea9bc0764247d3144.
Sound, button events, render code
Bar generator
Latest Android SDK
justify getBypassValue() use in triggers further

Update the following functions to use getBypassValue() instead of
hardcoding bypass argument name. Explicit bypass assertions are no more
required.

* trigger_livevlans()
* trigger_snmpportfinder()
* trigger_isloadbalancer()
* trigger_ip()
* trigger_natv4()
* trigger_autoports()
* trigger_file_editText()
* trigger_rackspace()
* trigger_ports()
* trigger_object_8021qorder()
* trigger_ipv4net_vlanconfig()
* trigger_ipv6net_vlanconfig()
* trigger_vlan_ipv4net()
* trigger_vlan_ipv6net()
add hw info and environment
click on time timing mechanisme toegevoegd
fit commit
adding ignore dirs to ackrc
Facebook header.jsp changes
Facebook header.jsp changes
Facebook header.jsp changes
updated read me, awful english
Merge branch 'dev-japortie'
Merge branch 'master' into dev-wiesendaniel
Duden/Wiktionary request working
Merge branch 'master' of https://github.com/Schille/Text-Analyzer
sketch the algorithm of group transport
Remove require "rake"

Breaks bundler
Added option captionsEnabled with default true. Added positioning parameters for thumbGallery thumbs
Trap blocks now notify console
Mans' Pull Request
Merge branch 'mans-pull' into alpha-testing
Update version to 0.2.0.0
gitignore
test swf with export name
starting support for class names
Multiple Changes

Fixed Registering user - Now Works :)
Adjusted link on new user to go to register.jsp
Changed request to be emailAddy
Adjusted Redirect to be register.jsp

Adjusted insert statement to remove extra plus and quote
Moved new ticket helpdesk to the correct controller. Cleared out dev controller
Removed ACL dump from dashboard
Herpin' And Derpin'
F != locations --> frames
토론열때팔로워한테 초대보내느거완료
Merge branch 'master' of github.com:Song-InSeok/Akropolis
edited text in Component Setup section
Fixed configuration, added commands!

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Zsh: Restore 'chpwd' which is needed to restore last cd'ed directory.

This commit also adds '-f' to 'rm' to supress any prompts.
Zsh: Less colourful PROMPT.