gitit 0.12.0.1 → 0.12.1
raw patch · 14 files changed
+145/−20 lines, 14 filesdep ~HTTPdep ~aesondep ~hoauth2PVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: HTTP, aeson, hoauth2, pandoc, pandoc-types, time
API changes (from Hackage documentation)
- Network.Gitit.Authentication: instance FromData RPars
- Network.Gitit.Authentication: instance Read ValidationType
- Network.Gitit.Authentication: instance Show RPars
- Network.Gitit.Authentication: instance Show ValidationType
- Network.Gitit.Authentication.Github: instance Eq GithubUser
- Network.Gitit.Authentication.Github: instance Eq GithubUserMail
- Network.Gitit.Authentication.Github: instance FromData GithubCallbackPars
- Network.Gitit.Authentication.Github: instance FromJSON GithubUser
- Network.Gitit.Authentication.Github: instance FromJSON GithubUserMail
- Network.Gitit.Authentication.Github: instance Show GithubCallbackPars
- Network.Gitit.Authentication.Github: instance Show GithubUser
- Network.Gitit.Authentication.Github: instance Show GithubUserMail
- Network.Gitit.Compat.Except: type ExceptT = ErrorT
- Network.Gitit.Feed: fcBaseUrl :: FeedConfig -> String
- Network.Gitit.Feed: fcFeedDays :: FeedConfig -> Integer
- Network.Gitit.Feed: fcTitle :: FeedConfig -> String
- Network.Gitit.Feed: instance Read FeedConfig
- Network.Gitit.Feed: instance Show FeedConfig
- Network.Gitit.Interface: accessQuestion :: Config -> Maybe (String, [String])
- Network.Gitit.Interface: address :: Config -> String
- Network.Gitit.Interface: authHandler :: Config -> Handler
- Network.Gitit.Interface: baseUrl :: Config -> String
- Network.Gitit.Interface: cacheDir :: Config -> FilePath
- Network.Gitit.Interface: compressResponses :: Config -> Bool
- Network.Gitit.Interface: ctxBirdTracks :: Context -> Bool
- Network.Gitit.Interface: ctxCacheable :: Context -> Bool
- Network.Gitit.Interface: ctxCategories :: Context -> [String]
- Network.Gitit.Interface: ctxFile :: Context -> String
- Network.Gitit.Interface: ctxLayout :: Context -> PageLayout
- Network.Gitit.Interface: ctxMeta :: Context -> [(String, String)]
- Network.Gitit.Interface: ctxTOC :: Context -> Bool
- Network.Gitit.Interface: debugMode :: Config -> Bool
- Network.Gitit.Interface: defaultExtension :: Config -> String
- Network.Gitit.Interface: defaultLHS :: Config -> Bool
- Network.Gitit.Interface: defaultPageType :: Config -> PageType
- Network.Gitit.Interface: defaultSummary :: Config -> String
- Network.Gitit.Interface: feedDays :: Config -> Integer
- Network.Gitit.Interface: feedRefreshTime :: Config -> Integer
- Network.Gitit.Interface: frontPage :: Config -> String
- Network.Gitit.Interface: githubAuth :: Config -> GithubConfig
- Network.Gitit.Interface: logFile :: Config -> FilePath
- Network.Gitit.Interface: logLevel :: Config -> Priority
- Network.Gitit.Interface: mailCommand :: Config -> String
- Network.Gitit.Interface: markupHelp :: Config -> String
- Network.Gitit.Interface: mathMethod :: Config -> MathMethod
- Network.Gitit.Interface: maxPageSize :: Config -> Integer
- Network.Gitit.Interface: maxUploadSize :: Config -> Integer
- Network.Gitit.Interface: mimeMap :: Config -> Map String String
- Network.Gitit.Interface: noDelete :: Config -> [String]
- Network.Gitit.Interface: noEdit :: Config -> [String]
- Network.Gitit.Interface: pandocUserData :: Config -> Maybe FilePath
- Network.Gitit.Interface: pdfExport :: Config -> Bool
- Network.Gitit.Interface: pgLinkToFeed :: PageLayout -> Bool
- Network.Gitit.Interface: pgMarkupHelp :: PageLayout -> Maybe String
- Network.Gitit.Interface: pgMessages :: PageLayout -> [String]
- Network.Gitit.Interface: pgPageName :: PageLayout -> String
- Network.Gitit.Interface: pgPrintable :: PageLayout -> Bool
- Network.Gitit.Interface: pgRevision :: PageLayout -> Maybe String
- Network.Gitit.Interface: pgScripts :: PageLayout -> [String]
- Network.Gitit.Interface: pgSelectedTab :: PageLayout -> Tab
- Network.Gitit.Interface: pgShowPageTools :: PageLayout -> Bool
- Network.Gitit.Interface: pgShowSiteNav :: PageLayout -> Bool
- Network.Gitit.Interface: pgTabs :: PageLayout -> [Tab]
- Network.Gitit.Interface: pgTitle :: PageLayout -> String
- Network.Gitit.Interface: pluginModules :: Config -> [String]
- Network.Gitit.Interface: portNumber :: Config -> Int
- Network.Gitit.Interface: recaptchaPrivateKey :: Config -> String
- Network.Gitit.Interface: recaptchaPublicKey :: Config -> String
- Network.Gitit.Interface: recentActivityDays :: Config -> Int
- Network.Gitit.Interface: repositoryPath :: Config -> FilePath
- Network.Gitit.Interface: repositoryType :: Config -> FileStoreType
- Network.Gitit.Interface: requireAuthentication :: Config -> AuthenticationLevel
- Network.Gitit.Interface: resetPasswordMessage :: Config -> String
- Network.Gitit.Interface: rpxDomain :: Config -> String
- Network.Gitit.Interface: rpxKey :: Config -> String
- Network.Gitit.Interface: rqBody :: Request -> MVar RqBody
- Network.Gitit.Interface: rqCookies :: Request -> [(String, Cookie)]
- Network.Gitit.Interface: rqHeaders :: Request -> Headers
- Network.Gitit.Interface: rqInputsBody :: Request -> MVar [(String, Input)]
- Network.Gitit.Interface: rqInputsQuery :: Request -> [(String, Input)]
- Network.Gitit.Interface: rqMethod :: Request -> Method
- Network.Gitit.Interface: rqPaths :: Request -> [String]
- Network.Gitit.Interface: rqPeer :: Request -> Host
- Network.Gitit.Interface: rqQuery :: Request -> String
- Network.Gitit.Interface: rqSecure :: Request -> Bool
- Network.Gitit.Interface: rqUri :: Request -> String
- Network.Gitit.Interface: rqVersion :: Request -> HttpVersion
- Network.Gitit.Interface: sessionTimeout :: Config -> Int
- Network.Gitit.Interface: showLHSBirdTracks :: Config -> Bool
- Network.Gitit.Interface: staticDir :: Config -> FilePath
- Network.Gitit.Interface: tableOfContents :: Config -> Bool
- Network.Gitit.Interface: templatesDir :: Config -> FilePath
- Network.Gitit.Interface: uEmail :: User -> String
- Network.Gitit.Interface: uPassword :: User -> Password
- Network.Gitit.Interface: uUsername :: User -> String
- Network.Gitit.Interface: useAbsoluteUrls :: Config -> Bool
- Network.Gitit.Interface: useCache :: Config -> Bool
- Network.Gitit.Interface: useFeed :: Config -> Bool
- Network.Gitit.Interface: useRecaptcha :: Config -> Bool
- Network.Gitit.Interface: userFile :: Config -> FilePath
- Network.Gitit.Interface: wikiTitle :: Config -> String
- Network.Gitit.Interface: withUser :: Config -> Handler -> Handler
- Network.Gitit.Interface: xssSanitize :: Config -> Bool
- Network.Gitit.Rpxnow: instance Show Identifier
- Network.Gitit.Rpxnow: userData :: Identifier -> [(String, String)]
- Network.Gitit.Rpxnow: userIdentifier :: Identifier -> String
- Network.Gitit.Types: accessQuestion :: Config -> Maybe (String, [String])
- Network.Gitit.Types: address :: Config -> String
- Network.Gitit.Types: authHandler :: Config -> Handler
- Network.Gitit.Types: baseUrl :: Config -> String
- Network.Gitit.Types: cacheDir :: Config -> FilePath
- Network.Gitit.Types: compressResponses :: Config -> Bool
- Network.Gitit.Types: ctxBirdTracks :: Context -> Bool
- Network.Gitit.Types: ctxCacheable :: Context -> Bool
- Network.Gitit.Types: ctxCategories :: Context -> [String]
- Network.Gitit.Types: ctxFile :: Context -> String
- Network.Gitit.Types: ctxLayout :: Context -> PageLayout
- Network.Gitit.Types: ctxMeta :: Context -> [(String, String)]
- Network.Gitit.Types: ctxTOC :: Context -> Bool
- Network.Gitit.Types: debugMode :: Config -> Bool
- Network.Gitit.Types: defaultExtension :: Config -> String
- Network.Gitit.Types: defaultLHS :: Config -> Bool
- Network.Gitit.Types: defaultPageType :: Config -> PageType
- Network.Gitit.Types: defaultSummary :: Config -> String
- Network.Gitit.Types: feedDays :: Config -> Integer
- Network.Gitit.Types: feedRefreshTime :: Config -> Integer
- Network.Gitit.Types: frontPage :: Config -> String
- Network.Gitit.Types: githubAuth :: Config -> GithubConfig
- Network.Gitit.Types: instance Eq AuthenticationLevel
- Network.Gitit.Types: instance Eq MathMethod
- Network.Gitit.Types: instance Eq PageType
- Network.Gitit.Types: instance Eq Password
- Network.Gitit.Types: instance Eq SessionData
- Network.Gitit.Types: instance Eq Tab
- Network.Gitit.Types: instance Eq a => Eq (Sessions a)
- Network.Gitit.Types: instance FromData Command
- Network.Gitit.Types: instance FromData Params
- Network.Gitit.Types: instance FromData SessionKey
- Network.Gitit.Types: instance FromReqURI [String]
- Network.Gitit.Types: instance HasContext ContentTransformer
- Network.Gitit.Types: instance HasContext PluginM
- Network.Gitit.Types: instance Ord AuthenticationLevel
- Network.Gitit.Types: instance Read AuthenticationLevel
- Network.Gitit.Types: instance Read MathMethod
- Network.Gitit.Types: instance Read Page
- Network.Gitit.Types: instance Read PageType
- Network.Gitit.Types: instance Read Password
- Network.Gitit.Types: instance Read Recaptcha
- Network.Gitit.Types: instance Read SessionData
- Network.Gitit.Types: instance Read User
- Network.Gitit.Types: instance Read a => Read (Sessions a)
- Network.Gitit.Types: instance Show AuthenticationLevel
- Network.Gitit.Types: instance Show Command
- Network.Gitit.Types: instance Show FileStoreType
- Network.Gitit.Types: instance Show MathMethod
- Network.Gitit.Types: instance Show Page
- Network.Gitit.Types: instance Show PageType
- Network.Gitit.Types: instance Show Params
- Network.Gitit.Types: instance Show Password
- Network.Gitit.Types: instance Show Recaptcha
- Network.Gitit.Types: instance Show SessionData
- Network.Gitit.Types: instance Show Tab
- Network.Gitit.Types: instance Show User
- Network.Gitit.Types: instance Show a => Show (Sessions a)
- Network.Gitit.Types: logFile :: Config -> FilePath
- Network.Gitit.Types: logLevel :: Config -> Priority
- Network.Gitit.Types: mailCommand :: Config -> String
- Network.Gitit.Types: markupHelp :: Config -> String
- Network.Gitit.Types: mathMethod :: Config -> MathMethod
- Network.Gitit.Types: maxPageSize :: Config -> Integer
- Network.Gitit.Types: maxUploadSize :: Config -> Integer
- Network.Gitit.Types: mimeMap :: Config -> Map String String
- Network.Gitit.Types: noDelete :: Config -> [String]
- Network.Gitit.Types: noEdit :: Config -> [String]
- Network.Gitit.Types: pAccessCode :: Params -> String
- Network.Gitit.Types: pConfirm :: Params -> Bool
- Network.Gitit.Types: pDestination :: Params -> String
- Network.Gitit.Types: pEditedText :: Params -> Maybe String
- Network.Gitit.Types: pEmail :: Params -> String
- Network.Gitit.Types: pFilePath :: Params -> FilePath
- Network.Gitit.Types: pFileToDelete :: Params -> String
- Network.Gitit.Types: pFilename :: Params -> String
- Network.Gitit.Types: pForUser :: Params -> Maybe String
- Network.Gitit.Types: pFormat :: Params -> String
- Network.Gitit.Types: pFrom :: Params -> Maybe String
- Network.Gitit.Types: pFullName :: Params -> String
- Network.Gitit.Types: pGotoPage :: Params -> String
- Network.Gitit.Types: pHashed :: Password -> String
- Network.Gitit.Types: pLimit :: Params -> Int
- Network.Gitit.Types: pLogMsg :: Params -> String
- Network.Gitit.Types: pMessages :: Params -> [String]
- Network.Gitit.Types: pOverwrite :: Params -> Bool
- Network.Gitit.Types: pPassword :: Params -> String
- Network.Gitit.Types: pPassword2 :: Params -> String
- Network.Gitit.Types: pPatterns :: Params -> [String]
- Network.Gitit.Types: pPrintable :: Params -> Bool
- Network.Gitit.Types: pRaw :: Params -> String
- Network.Gitit.Types: pRecaptcha :: Params -> Recaptcha
- Network.Gitit.Types: pRedirect :: Params -> Maybe Bool
- Network.Gitit.Types: pResetCode :: Params -> String
- Network.Gitit.Types: pRevision :: Params -> Maybe String
- Network.Gitit.Types: pSHA1 :: Params -> String
- Network.Gitit.Types: pSalt :: Password -> String
- Network.Gitit.Types: pSessionKey :: Params -> Maybe SessionKey
- Network.Gitit.Types: pSince :: Params -> Maybe UTCTime
- Network.Gitit.Types: pTo :: Params -> Maybe String
- Network.Gitit.Types: pUsername :: Params -> String
- Network.Gitit.Types: pWikiname :: Params -> String
- Network.Gitit.Types: pageCategories :: Page -> [String]
- Network.Gitit.Types: pageFormat :: Page -> PageType
- Network.Gitit.Types: pageLHS :: Page -> Bool
- Network.Gitit.Types: pageMeta :: Page -> [(String, String)]
- Network.Gitit.Types: pageName :: Page -> String
- Network.Gitit.Types: pageTOC :: Page -> Bool
- Network.Gitit.Types: pageText :: Page -> String
- Network.Gitit.Types: pageTitle :: Page -> String
- Network.Gitit.Types: pandocUserData :: Config -> Maybe FilePath
- Network.Gitit.Types: pdfExport :: Config -> Bool
- Network.Gitit.Types: pgLinkToFeed :: PageLayout -> Bool
- Network.Gitit.Types: pgMarkupHelp :: PageLayout -> Maybe String
- Network.Gitit.Types: pgMessages :: PageLayout -> [String]
- Network.Gitit.Types: pgPageName :: PageLayout -> String
- Network.Gitit.Types: pgPrintable :: PageLayout -> Bool
- Network.Gitit.Types: pgRevision :: PageLayout -> Maybe String
- Network.Gitit.Types: pgScripts :: PageLayout -> [String]
- Network.Gitit.Types: pgSelectedTab :: PageLayout -> Tab
- Network.Gitit.Types: pgShowPageTools :: PageLayout -> Bool
- Network.Gitit.Types: pgShowSiteNav :: PageLayout -> Bool
- Network.Gitit.Types: pgTabs :: PageLayout -> [Tab]
- Network.Gitit.Types: pgTitle :: PageLayout -> String
- Network.Gitit.Types: pluginConfig :: PluginData -> Config
- Network.Gitit.Types: pluginFileStore :: PluginData -> FileStore
- Network.Gitit.Types: pluginModules :: Config -> [String]
- Network.Gitit.Types: pluginRequest :: PluginData -> Request
- Network.Gitit.Types: pluginUser :: PluginData -> Maybe User
- Network.Gitit.Types: plugins :: GititState -> [Plugin]
- Network.Gitit.Types: portNumber :: Config -> Int
- Network.Gitit.Types: recaptchaChallengeField :: Recaptcha -> String
- Network.Gitit.Types: recaptchaPrivateKey :: Config -> String
- Network.Gitit.Types: recaptchaPublicKey :: Config -> String
- Network.Gitit.Types: recaptchaResponseField :: Recaptcha -> String
- Network.Gitit.Types: recentActivityDays :: Config -> Int
- Network.Gitit.Types: renderPage :: GititState -> PageLayout -> Html -> Handler
- Network.Gitit.Types: repositoryPath :: Config -> FilePath
- Network.Gitit.Types: repositoryType :: Config -> FileStoreType
- Network.Gitit.Types: requireAuthentication :: Config -> AuthenticationLevel
- Network.Gitit.Types: resetPasswordMessage :: Config -> String
- Network.Gitit.Types: rpxDomain :: Config -> String
- Network.Gitit.Types: rpxKey :: Config -> String
- Network.Gitit.Types: sessionTimeout :: Config -> Int
- Network.Gitit.Types: sessions :: GititState -> Sessions SessionData
- Network.Gitit.Types: showLHSBirdTracks :: Config -> Bool
- Network.Gitit.Types: staticDir :: Config -> FilePath
- Network.Gitit.Types: tableOfContents :: Config -> Bool
- Network.Gitit.Types: templatesDir :: Config -> FilePath
- Network.Gitit.Types: templatesPath :: GititState -> FilePath
- Network.Gitit.Types: uEmail :: User -> String
- Network.Gitit.Types: uPassword :: User -> Password
- Network.Gitit.Types: uUsername :: User -> String
- Network.Gitit.Types: unsession :: Sessions a -> Map SessionKey a
- Network.Gitit.Types: useAbsoluteUrls :: Config -> Bool
- Network.Gitit.Types: useCache :: Config -> Bool
- Network.Gitit.Types: useFeed :: Config -> Bool
- Network.Gitit.Types: useRecaptcha :: Config -> Bool
- Network.Gitit.Types: userFile :: Config -> FilePath
- Network.Gitit.Types: users :: GititState -> Map String User
- Network.Gitit.Types: wikiConfig :: WikiState -> Config
- Network.Gitit.Types: wikiFileStore :: WikiState -> FileStore
- Network.Gitit.Types: wikiTitle :: Config -> String
- Network.Gitit.Types: withUser :: Config -> Handler -> Handler
- Network.Gitit.Types: xssSanitize :: Config -> Bool
+ Network.Gitit.Authentication: instance GHC.Read.Read Network.Gitit.Authentication.ValidationType
+ Network.Gitit.Authentication: instance GHC.Show.Show Network.Gitit.Authentication.RPars
+ Network.Gitit.Authentication: instance GHC.Show.Show Network.Gitit.Authentication.ValidationType
+ Network.Gitit.Authentication: instance Happstack.Server.RqData.FromData Network.Gitit.Authentication.RPars
+ Network.Gitit.Authentication.Github: instance Data.Aeson.Types.Class.FromJSON Network.Gitit.Authentication.Github.GithubUser
+ Network.Gitit.Authentication.Github: instance Data.Aeson.Types.Class.FromJSON Network.Gitit.Authentication.Github.GithubUserMail
+ Network.Gitit.Authentication.Github: instance GHC.Classes.Eq Network.Gitit.Authentication.Github.GithubUser
+ Network.Gitit.Authentication.Github: instance GHC.Classes.Eq Network.Gitit.Authentication.Github.GithubUserMail
+ Network.Gitit.Authentication.Github: instance GHC.Show.Show Network.Gitit.Authentication.Github.GithubCallbackPars
+ Network.Gitit.Authentication.Github: instance GHC.Show.Show Network.Gitit.Authentication.Github.GithubUser
+ Network.Gitit.Authentication.Github: instance GHC.Show.Show Network.Gitit.Authentication.Github.GithubUserMail
+ Network.Gitit.Authentication.Github: instance Happstack.Server.RqData.FromData Network.Gitit.Authentication.Github.GithubCallbackPars
+ Network.Gitit.Compat.Except: data ExceptT e (m :: * -> *) a :: * -> (* -> *) -> * -> *
+ Network.Gitit.Feed: [fcBaseUrl] :: FeedConfig -> String
+ Network.Gitit.Feed: [fcFeedDays] :: FeedConfig -> Integer
+ Network.Gitit.Feed: [fcTitle] :: FeedConfig -> String
+ Network.Gitit.Feed: instance GHC.Read.Read Network.Gitit.Feed.FeedConfig
+ Network.Gitit.Feed: instance GHC.Show.Show Network.Gitit.Feed.FeedConfig
+ Network.Gitit.Interface: [accessQuestion] :: Config -> Maybe (String, [String])
+ Network.Gitit.Interface: [address] :: Config -> String
+ Network.Gitit.Interface: [authHandler] :: Config -> Handler
+ Network.Gitit.Interface: [baseUrl] :: Config -> String
+ Network.Gitit.Interface: [cacheDir] :: Config -> FilePath
+ Network.Gitit.Interface: [compressResponses] :: Config -> Bool
+ Network.Gitit.Interface: [ctxBirdTracks] :: Context -> Bool
+ Network.Gitit.Interface: [ctxCacheable] :: Context -> Bool
+ Network.Gitit.Interface: [ctxCategories] :: Context -> [String]
+ Network.Gitit.Interface: [ctxFile] :: Context -> String
+ Network.Gitit.Interface: [ctxLayout] :: Context -> PageLayout
+ Network.Gitit.Interface: [ctxMeta] :: Context -> [(String, String)]
+ Network.Gitit.Interface: [ctxTOC] :: Context -> Bool
+ Network.Gitit.Interface: [debugMode] :: Config -> Bool
+ Network.Gitit.Interface: [defaultExtension] :: Config -> String
+ Network.Gitit.Interface: [defaultLHS] :: Config -> Bool
+ Network.Gitit.Interface: [defaultPageType] :: Config -> PageType
+ Network.Gitit.Interface: [defaultSummary] :: Config -> String
+ Network.Gitit.Interface: [deleteSummary] :: Config -> String
+ Network.Gitit.Interface: [feedDays] :: Config -> Integer
+ Network.Gitit.Interface: [feedRefreshTime] :: Config -> Integer
+ Network.Gitit.Interface: [frontPage] :: Config -> String
+ Network.Gitit.Interface: [githubAuth] :: Config -> GithubConfig
+ Network.Gitit.Interface: [logFile] :: Config -> FilePath
+ Network.Gitit.Interface: [logLevel] :: Config -> Priority
+ Network.Gitit.Interface: [mailCommand] :: Config -> String
+ Network.Gitit.Interface: [markupHelp] :: Config -> String
+ Network.Gitit.Interface: [mathMethod] :: Config -> MathMethod
+ Network.Gitit.Interface: [maxPageSize] :: Config -> Integer
+ Network.Gitit.Interface: [maxUploadSize] :: Config -> Integer
+ Network.Gitit.Interface: [mimeMap] :: Config -> Map String String
+ Network.Gitit.Interface: [noDelete] :: Config -> [String]
+ Network.Gitit.Interface: [noEdit] :: Config -> [String]
+ Network.Gitit.Interface: [pandocUserData] :: Config -> Maybe FilePath
+ Network.Gitit.Interface: [pdfExport] :: Config -> Bool
+ Network.Gitit.Interface: [pgLinkToFeed] :: PageLayout -> Bool
+ Network.Gitit.Interface: [pgMarkupHelp] :: PageLayout -> Maybe String
+ Network.Gitit.Interface: [pgMessages] :: PageLayout -> [String]
+ Network.Gitit.Interface: [pgPageName] :: PageLayout -> String
+ Network.Gitit.Interface: [pgPrintable] :: PageLayout -> Bool
+ Network.Gitit.Interface: [pgRevision] :: PageLayout -> Maybe String
+ Network.Gitit.Interface: [pgScripts] :: PageLayout -> [String]
+ Network.Gitit.Interface: [pgSelectedTab] :: PageLayout -> Tab
+ Network.Gitit.Interface: [pgShowPageTools] :: PageLayout -> Bool
+ Network.Gitit.Interface: [pgShowSiteNav] :: PageLayout -> Bool
+ Network.Gitit.Interface: [pgTabs] :: PageLayout -> [Tab]
+ Network.Gitit.Interface: [pgTitle] :: PageLayout -> String
+ Network.Gitit.Interface: [pluginModules] :: Config -> [String]
+ Network.Gitit.Interface: [portNumber] :: Config -> Int
+ Network.Gitit.Interface: [recaptchaPrivateKey] :: Config -> String
+ Network.Gitit.Interface: [recaptchaPublicKey] :: Config -> String
+ Network.Gitit.Interface: [recentActivityDays] :: Config -> Int
+ Network.Gitit.Interface: [repositoryPath] :: Config -> FilePath
+ Network.Gitit.Interface: [repositoryType] :: Config -> FileStoreType
+ Network.Gitit.Interface: [requireAuthentication] :: Config -> AuthenticationLevel
+ Network.Gitit.Interface: [resetPasswordMessage] :: Config -> String
+ Network.Gitit.Interface: [rpxDomain] :: Config -> String
+ Network.Gitit.Interface: [rpxKey] :: Config -> String
+ Network.Gitit.Interface: [rqBody] :: Request -> MVar RqBody
+ Network.Gitit.Interface: [rqCookies] :: Request -> [(String, Cookie)]
+ Network.Gitit.Interface: [rqHeaders] :: Request -> Headers
+ Network.Gitit.Interface: [rqInputsBody] :: Request -> MVar [(String, Input)]
+ Network.Gitit.Interface: [rqInputsQuery] :: Request -> [(String, Input)]
+ Network.Gitit.Interface: [rqMethod] :: Request -> Method
+ Network.Gitit.Interface: [rqPaths] :: Request -> [String]
+ Network.Gitit.Interface: [rqPeer] :: Request -> Host
+ Network.Gitit.Interface: [rqQuery] :: Request -> String
+ Network.Gitit.Interface: [rqSecure] :: Request -> Bool
+ Network.Gitit.Interface: [rqUri] :: Request -> String
+ Network.Gitit.Interface: [rqVersion] :: Request -> HttpVersion
+ Network.Gitit.Interface: [sessionTimeout] :: Config -> Int
+ Network.Gitit.Interface: [showLHSBirdTracks] :: Config -> Bool
+ Network.Gitit.Interface: [staticDir] :: Config -> FilePath
+ Network.Gitit.Interface: [tableOfContents] :: Config -> Bool
+ Network.Gitit.Interface: [templatesDir] :: Config -> FilePath
+ Network.Gitit.Interface: [uEmail] :: User -> String
+ Network.Gitit.Interface: [uPassword] :: User -> Password
+ Network.Gitit.Interface: [uUsername] :: User -> String
+ Network.Gitit.Interface: [useAbsoluteUrls] :: Config -> Bool
+ Network.Gitit.Interface: [useCache] :: Config -> Bool
+ Network.Gitit.Interface: [useFeed] :: Config -> Bool
+ Network.Gitit.Interface: [useRecaptcha] :: Config -> Bool
+ Network.Gitit.Interface: [userFile] :: Config -> FilePath
+ Network.Gitit.Interface: [wikiTitle] :: Config -> String
+ Network.Gitit.Interface: [withUser] :: Config -> Handler -> Handler
+ Network.Gitit.Interface: [xssSanitize] :: Config -> Bool
+ Network.Gitit.Rpxnow: [userData] :: Identifier -> [(String, String)]
+ Network.Gitit.Rpxnow: [userIdentifier] :: Identifier -> String
+ Network.Gitit.Rpxnow: instance GHC.Show.Show Network.Gitit.Rpxnow.Identifier
+ Network.Gitit.Types: [accessQuestion] :: Config -> Maybe (String, [String])
+ Network.Gitit.Types: [address] :: Config -> String
+ Network.Gitit.Types: [authHandler] :: Config -> Handler
+ Network.Gitit.Types: [baseUrl] :: Config -> String
+ Network.Gitit.Types: [cacheDir] :: Config -> FilePath
+ Network.Gitit.Types: [compressResponses] :: Config -> Bool
+ Network.Gitit.Types: [ctxBirdTracks] :: Context -> Bool
+ Network.Gitit.Types: [ctxCacheable] :: Context -> Bool
+ Network.Gitit.Types: [ctxCategories] :: Context -> [String]
+ Network.Gitit.Types: [ctxFile] :: Context -> String
+ Network.Gitit.Types: [ctxLayout] :: Context -> PageLayout
+ Network.Gitit.Types: [ctxMeta] :: Context -> [(String, String)]
+ Network.Gitit.Types: [ctxTOC] :: Context -> Bool
+ Network.Gitit.Types: [debugMode] :: Config -> Bool
+ Network.Gitit.Types: [defaultExtension] :: Config -> String
+ Network.Gitit.Types: [defaultLHS] :: Config -> Bool
+ Network.Gitit.Types: [defaultPageType] :: Config -> PageType
+ Network.Gitit.Types: [defaultSummary] :: Config -> String
+ Network.Gitit.Types: [deleteSummary] :: Config -> String
+ Network.Gitit.Types: [feedDays] :: Config -> Integer
+ Network.Gitit.Types: [feedRefreshTime] :: Config -> Integer
+ Network.Gitit.Types: [frontPage] :: Config -> String
+ Network.Gitit.Types: [githubAuth] :: Config -> GithubConfig
+ Network.Gitit.Types: [logFile] :: Config -> FilePath
+ Network.Gitit.Types: [logLevel] :: Config -> Priority
+ Network.Gitit.Types: [mailCommand] :: Config -> String
+ Network.Gitit.Types: [markupHelp] :: Config -> String
+ Network.Gitit.Types: [mathMethod] :: Config -> MathMethod
+ Network.Gitit.Types: [maxPageSize] :: Config -> Integer
+ Network.Gitit.Types: [maxUploadSize] :: Config -> Integer
+ Network.Gitit.Types: [mimeMap] :: Config -> Map String String
+ Network.Gitit.Types: [noDelete] :: Config -> [String]
+ Network.Gitit.Types: [noEdit] :: Config -> [String]
+ Network.Gitit.Types: [pAccessCode] :: Params -> String
+ Network.Gitit.Types: [pConfirm] :: Params -> Bool
+ Network.Gitit.Types: [pDestination] :: Params -> String
+ Network.Gitit.Types: [pEditedText] :: Params -> Maybe String
+ Network.Gitit.Types: [pEmail] :: Params -> String
+ Network.Gitit.Types: [pFilePath] :: Params -> FilePath
+ Network.Gitit.Types: [pFileToDelete] :: Params -> String
+ Network.Gitit.Types: [pFilename] :: Params -> String
+ Network.Gitit.Types: [pForUser] :: Params -> Maybe String
+ Network.Gitit.Types: [pFormat] :: Params -> String
+ Network.Gitit.Types: [pFrom] :: Params -> Maybe String
+ Network.Gitit.Types: [pFullName] :: Params -> String
+ Network.Gitit.Types: [pGotoPage] :: Params -> String
+ Network.Gitit.Types: [pHashed] :: Password -> String
+ Network.Gitit.Types: [pLimit] :: Params -> Int
+ Network.Gitit.Types: [pLogMsg] :: Params -> String
+ Network.Gitit.Types: [pMessages] :: Params -> [String]
+ Network.Gitit.Types: [pOverwrite] :: Params -> Bool
+ Network.Gitit.Types: [pPassword2] :: Params -> String
+ Network.Gitit.Types: [pPassword] :: Params -> String
+ Network.Gitit.Types: [pPatterns] :: Params -> [String]
+ Network.Gitit.Types: [pPrintable] :: Params -> Bool
+ Network.Gitit.Types: [pRaw] :: Params -> String
+ Network.Gitit.Types: [pRecaptcha] :: Params -> Recaptcha
+ Network.Gitit.Types: [pRedirect] :: Params -> Maybe Bool
+ Network.Gitit.Types: [pResetCode] :: Params -> String
+ Network.Gitit.Types: [pRevision] :: Params -> Maybe String
+ Network.Gitit.Types: [pSHA1] :: Params -> String
+ Network.Gitit.Types: [pSalt] :: Password -> String
+ Network.Gitit.Types: [pSessionKey] :: Params -> Maybe SessionKey
+ Network.Gitit.Types: [pSince] :: Params -> Maybe UTCTime
+ Network.Gitit.Types: [pTo] :: Params -> Maybe String
+ Network.Gitit.Types: [pUsername] :: Params -> String
+ Network.Gitit.Types: [pWikiname] :: Params -> String
+ Network.Gitit.Types: [pageCategories] :: Page -> [String]
+ Network.Gitit.Types: [pageFormat] :: Page -> PageType
+ Network.Gitit.Types: [pageLHS] :: Page -> Bool
+ Network.Gitit.Types: [pageMeta] :: Page -> [(String, String)]
+ Network.Gitit.Types: [pageName] :: Page -> String
+ Network.Gitit.Types: [pageTOC] :: Page -> Bool
+ Network.Gitit.Types: [pageText] :: Page -> String
+ Network.Gitit.Types: [pageTitle] :: Page -> String
+ Network.Gitit.Types: [pandocUserData] :: Config -> Maybe FilePath
+ Network.Gitit.Types: [pdfExport] :: Config -> Bool
+ Network.Gitit.Types: [pgLinkToFeed] :: PageLayout -> Bool
+ Network.Gitit.Types: [pgMarkupHelp] :: PageLayout -> Maybe String
+ Network.Gitit.Types: [pgMessages] :: PageLayout -> [String]
+ Network.Gitit.Types: [pgPageName] :: PageLayout -> String
+ Network.Gitit.Types: [pgPrintable] :: PageLayout -> Bool
+ Network.Gitit.Types: [pgRevision] :: PageLayout -> Maybe String
+ Network.Gitit.Types: [pgScripts] :: PageLayout -> [String]
+ Network.Gitit.Types: [pgSelectedTab] :: PageLayout -> Tab
+ Network.Gitit.Types: [pgShowPageTools] :: PageLayout -> Bool
+ Network.Gitit.Types: [pgShowSiteNav] :: PageLayout -> Bool
+ Network.Gitit.Types: [pgTabs] :: PageLayout -> [Tab]
+ Network.Gitit.Types: [pgTitle] :: PageLayout -> String
+ Network.Gitit.Types: [pluginConfig] :: PluginData -> Config
+ Network.Gitit.Types: [pluginFileStore] :: PluginData -> FileStore
+ Network.Gitit.Types: [pluginModules] :: Config -> [String]
+ Network.Gitit.Types: [pluginRequest] :: PluginData -> Request
+ Network.Gitit.Types: [pluginUser] :: PluginData -> Maybe User
+ Network.Gitit.Types: [plugins] :: GititState -> [Plugin]
+ Network.Gitit.Types: [portNumber] :: Config -> Int
+ Network.Gitit.Types: [recaptchaChallengeField] :: Recaptcha -> String
+ Network.Gitit.Types: [recaptchaPrivateKey] :: Config -> String
+ Network.Gitit.Types: [recaptchaPublicKey] :: Config -> String
+ Network.Gitit.Types: [recaptchaResponseField] :: Recaptcha -> String
+ Network.Gitit.Types: [recentActivityDays] :: Config -> Int
+ Network.Gitit.Types: [renderPage] :: GititState -> PageLayout -> Html -> Handler
+ Network.Gitit.Types: [repositoryPath] :: Config -> FilePath
+ Network.Gitit.Types: [repositoryType] :: Config -> FileStoreType
+ Network.Gitit.Types: [requireAuthentication] :: Config -> AuthenticationLevel
+ Network.Gitit.Types: [resetPasswordMessage] :: Config -> String
+ Network.Gitit.Types: [rpxDomain] :: Config -> String
+ Network.Gitit.Types: [rpxKey] :: Config -> String
+ Network.Gitit.Types: [sessionTimeout] :: Config -> Int
+ Network.Gitit.Types: [sessions] :: GititState -> Sessions SessionData
+ Network.Gitit.Types: [showLHSBirdTracks] :: Config -> Bool
+ Network.Gitit.Types: [staticDir] :: Config -> FilePath
+ Network.Gitit.Types: [tableOfContents] :: Config -> Bool
+ Network.Gitit.Types: [templatesDir] :: Config -> FilePath
+ Network.Gitit.Types: [templatesPath] :: GititState -> FilePath
+ Network.Gitit.Types: [uEmail] :: User -> String
+ Network.Gitit.Types: [uPassword] :: User -> Password
+ Network.Gitit.Types: [uUsername] :: User -> String
+ Network.Gitit.Types: [unsession] :: Sessions a -> Map SessionKey a
+ Network.Gitit.Types: [useAbsoluteUrls] :: Config -> Bool
+ Network.Gitit.Types: [useCache] :: Config -> Bool
+ Network.Gitit.Types: [useFeed] :: Config -> Bool
+ Network.Gitit.Types: [useRecaptcha] :: Config -> Bool
+ Network.Gitit.Types: [userFile] :: Config -> FilePath
+ Network.Gitit.Types: [users] :: GititState -> Map String User
+ Network.Gitit.Types: [wikiConfig] :: WikiState -> Config
+ Network.Gitit.Types: [wikiFileStore] :: WikiState -> FileStore
+ Network.Gitit.Types: [wikiTitle] :: Config -> String
+ Network.Gitit.Types: [withUser] :: Config -> Handler -> Handler
+ Network.Gitit.Types: [xssSanitize] :: Config -> Bool
+ Network.Gitit.Types: instance GHC.Classes.Eq Network.Gitit.Types.AuthenticationLevel
+ Network.Gitit.Types: instance GHC.Classes.Eq Network.Gitit.Types.MathMethod
+ Network.Gitit.Types: instance GHC.Classes.Eq Network.Gitit.Types.PageType
+ Network.Gitit.Types: instance GHC.Classes.Eq Network.Gitit.Types.Password
+ Network.Gitit.Types: instance GHC.Classes.Eq Network.Gitit.Types.SessionData
+ Network.Gitit.Types: instance GHC.Classes.Eq Network.Gitit.Types.Tab
+ Network.Gitit.Types: instance GHC.Classes.Eq a => GHC.Classes.Eq (Network.Gitit.Types.Sessions a)
+ Network.Gitit.Types: instance GHC.Classes.Ord Network.Gitit.Types.AuthenticationLevel
+ Network.Gitit.Types: instance GHC.Read.Read Network.Gitit.Types.AuthenticationLevel
+ Network.Gitit.Types: instance GHC.Read.Read Network.Gitit.Types.MathMethod
+ Network.Gitit.Types: instance GHC.Read.Read Network.Gitit.Types.Page
+ Network.Gitit.Types: instance GHC.Read.Read Network.Gitit.Types.PageType
+ Network.Gitit.Types: instance GHC.Read.Read Network.Gitit.Types.Password
+ Network.Gitit.Types: instance GHC.Read.Read Network.Gitit.Types.Recaptcha
+ Network.Gitit.Types: instance GHC.Read.Read Network.Gitit.Types.SessionData
+ Network.Gitit.Types: instance GHC.Read.Read Network.Gitit.Types.User
+ Network.Gitit.Types: instance GHC.Read.Read a => GHC.Read.Read (Network.Gitit.Types.Sessions a)
+ Network.Gitit.Types: instance GHC.Show.Show Network.Gitit.Types.AuthenticationLevel
+ Network.Gitit.Types: instance GHC.Show.Show Network.Gitit.Types.Command
+ Network.Gitit.Types: instance GHC.Show.Show Network.Gitit.Types.FileStoreType
+ Network.Gitit.Types: instance GHC.Show.Show Network.Gitit.Types.MathMethod
+ Network.Gitit.Types: instance GHC.Show.Show Network.Gitit.Types.Page
+ Network.Gitit.Types: instance GHC.Show.Show Network.Gitit.Types.PageType
+ Network.Gitit.Types: instance GHC.Show.Show Network.Gitit.Types.Params
+ Network.Gitit.Types: instance GHC.Show.Show Network.Gitit.Types.Password
+ Network.Gitit.Types: instance GHC.Show.Show Network.Gitit.Types.Recaptcha
+ Network.Gitit.Types: instance GHC.Show.Show Network.Gitit.Types.SessionData
+ Network.Gitit.Types: instance GHC.Show.Show Network.Gitit.Types.Tab
+ Network.Gitit.Types: instance GHC.Show.Show Network.Gitit.Types.User
+ Network.Gitit.Types: instance GHC.Show.Show a => GHC.Show.Show (Network.Gitit.Types.Sessions a)
+ Network.Gitit.Types: instance Happstack.Server.Internal.Types.FromReqURI [GHC.Base.String]
+ Network.Gitit.Types: instance Happstack.Server.RqData.FromData Network.Gitit.Types.Command
+ Network.Gitit.Types: instance Happstack.Server.RqData.FromData Network.Gitit.Types.Params
+ Network.Gitit.Types: instance Happstack.Server.RqData.FromData Network.Gitit.Types.SessionKey
+ Network.Gitit.Types: instance Network.Gitit.Types.HasContext Network.Gitit.Types.ContentTransformer
+ Network.Gitit.Types: instance Network.Gitit.Types.HasContext Network.Gitit.Types.PluginM
- Network.Gitit.Compat.Except: class Error a
+ Network.Gitit.Compat.Except: class Error a where noMsg = strMsg "" strMsg _ = noMsg
- Network.Gitit.Compat.Except: runExcept :: ExceptT e Identity a -> Either e a
+ Network.Gitit.Compat.Except: runExcept :: Except e a -> Either e a
- Network.Gitit.Compat.Except: type Except s a = ErrorT s Identity a
+ Network.Gitit.Compat.Except: type Except e = ExceptT e Identity
- Network.Gitit.Interface: Config :: FilePath -> FileStoreType -> PageType -> String -> MathMethod -> Bool -> Bool -> (Handler -> Handler) -> AuthenticationLevel -> Handler -> FilePath -> Int -> FilePath -> FilePath -> Priority -> FilePath -> [String] -> Bool -> Integer -> Integer -> String -> Int -> Bool -> String -> [String] -> [String] -> String -> Maybe (String, [String]) -> Bool -> String -> String -> String -> String -> Bool -> Bool -> FilePath -> Map String String -> String -> String -> String -> Bool -> String -> Bool -> String -> Integer -> Integer -> Bool -> Maybe FilePath -> Bool -> Int -> GithubConfig -> Config
+ Network.Gitit.Interface: Config :: FilePath -> FileStoreType -> PageType -> String -> MathMethod -> Bool -> Bool -> (Handler -> Handler) -> AuthenticationLevel -> Handler -> FilePath -> Int -> FilePath -> FilePath -> Priority -> FilePath -> [String] -> Bool -> Integer -> Integer -> String -> Int -> Bool -> String -> [String] -> [String] -> String -> String -> Maybe (String, [String]) -> Bool -> String -> String -> String -> String -> Bool -> Bool -> FilePath -> Map String String -> String -> String -> String -> Bool -> String -> Bool -> String -> Integer -> Integer -> Bool -> Maybe FilePath -> Bool -> Int -> GithubConfig -> Config
- Network.Gitit.Types: Config :: FilePath -> FileStoreType -> PageType -> String -> MathMethod -> Bool -> Bool -> (Handler -> Handler) -> AuthenticationLevel -> Handler -> FilePath -> Int -> FilePath -> FilePath -> Priority -> FilePath -> [String] -> Bool -> Integer -> Integer -> String -> Int -> Bool -> String -> [String] -> [String] -> String -> Maybe (String, [String]) -> Bool -> String -> String -> String -> String -> Bool -> Bool -> FilePath -> Map String String -> String -> String -> String -> Bool -> String -> Bool -> String -> Integer -> Integer -> Bool -> Maybe FilePath -> Bool -> Int -> GithubConfig -> Config
+ Network.Gitit.Types: Config :: FilePath -> FileStoreType -> PageType -> String -> MathMethod -> Bool -> Bool -> (Handler -> Handler) -> AuthenticationLevel -> Handler -> FilePath -> Int -> FilePath -> FilePath -> Priority -> FilePath -> [String] -> Bool -> Integer -> Integer -> String -> Int -> Bool -> String -> [String] -> [String] -> String -> String -> Maybe (String, [String]) -> Bool -> String -> String -> String -> String -> Bool -> Bool -> FilePath -> Map String String -> String -> String -> String -> Bool -> String -> Bool -> String -> Integer -> Integer -> Bool -> Maybe FilePath -> Bool -> Int -> GithubConfig -> Config
- Network.Gitit.Types: class Monad m => HasContext m
+ Network.Gitit.Types: class (Monad m) => HasContext m
Files
- CHANGES +28/−0
- README.markdown +7/−0
- data/default.conf +3/−0
- data/static/css/screen.css +37/−0
- data/templates/page.st +1/−0
- gitit.cabal +7/−7
- src/Network/Gitit/Authentication.hs +18/−2
- src/Network/Gitit/Authentication/Github.hs +4/−2
- src/Network/Gitit/Config.hs +2/−0
- src/Network/Gitit/ContentTransformer.hs +15/−0
- src/Network/Gitit/Export.hs +18/−6
- src/Network/Gitit/Feed.hs +2/−2
- src/Network/Gitit/Handlers.hs +1/−1
- src/Network/Gitit/Types.hs +2/−0
CHANGES view
@@ -1,3 +1,31 @@+Version 0.12.1 released 17 Feb 2016++ * Use fmap instead of <$> so ghc 7.8 won't fail.+ * Allow latest hoauth2+ * Fix typo (Chas Leichner).+ * Allow compiling with pandoc 1.16.x.+ * Add page for login failure when authorization is required for reading+ (Phil Ruffwind). When authorization is required to read the wiki, the+ error message from a failed GitHub login cannot be displayed. Instead it+ will redirect to GitHub for another OAuth authentication, which can lead to+ a redirect loop. To avoid this, the user is now redirected to a special+ landing page to display the login failure. Note: no changes are made for+ the case where authorization is not required to read the wiki.+ * Improve error message of GitHub membership check (Phil Ruffwind).+ * Add delete-summary config variable (Phil Ruffwind).+ Used to change the commit message when a page is deleted.+ * Use primary GitHub email rather than just the first (Phil Ruffwind).+ The order in which user emails are returned via the GitHub API is not+ specified, so the first may not be the one that the user prefers,+ i.e. the so-called "primary" email. To fix this problem, we eliminate+ all emails except for the one marked as "primary".+ * Make default theme responsive (Lincoln Mullen, #450).+ This commit makes the default theme responsive. For smaller browsers, it+ will move the sidebar below the main content div and make the sidebar+ three columns. On phones, it will also collapse the sidebar into a+ single column.+ * README: Tell how to enable rtsopts for disabling GC (norpol).+ Version 0.12.0.1 released 24 Aug 2015 * Revert change of curly to straight quote for starting
README.markdown view
@@ -464,6 +464,13 @@ gitit -f my.conf +RTS -I0 -RTS ++Note:++To enable RTS, cabal needs to pass the compile flag `-rtsopts` to GHC while installing.++ cabal install --reinstall gitit --ghc-options="-rtsopts"+ Using gitit with apache =======================
data/default.conf view
@@ -136,6 +136,9 @@ # (the default), the author will be required to fill in the description # field. +delete-summary: Deleted using web interface.+# specifies text to be used in the change description when a page is deleted+ table-of-contents: yes # specifies whether to print a tables of contents (with links to # sections) on each wiki page.
data/static/css/screen.css view
@@ -155,3 +155,40 @@ } /* Deal with multiple footnotes one after another; Charuru */ sup + sup { margin-left: 2px; }++/* Make theme responsive */+@media (max-width: 768px) {+ #yui-main {+ float:none!important;+ margin-left: 0!important;+ }+ #maincol {+ margin-left: 0!important;+ }+ #sidebar {+ width: 100%;+ float: none;+ }+ #logo {+ float: left;+ margin-right:5%;+ margin-top: 12px;+ width: 30%;+ }+ .sitenav {+ float: left;+ margin-right: 5%;+ width: 30%;+ }+ .pageTools {+ float: right;+ width: 30%+ }+}+@media (max-device-width: 568px) {+ #logo, .sitenav, .pageTools {+ float: none;+ width: 100%;+ }+}+
data/templates/page.st view
@@ -3,6 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />+ <meta name="viewport" content="width=device-width, initial-scale=1.0"> $if(feed)$ <link href="$base$/_feed/" type="application/atom+xml" rel="alternate" title="$wikititle$" /> <link href="$base$/_feed$pageUrl$" type="application/atom+xml" rel="alternate" title="$wikititle$ - $pagetitle$" />
gitit.cabal view
@@ -1,5 +1,5 @@ name: gitit-version: 0.12.0.1+version: 0.12.1 Cabal-version: >= 1.8 build-type: Simple synopsis: Wiki using happstack, git or darcs, and pandoc.@@ -139,18 +139,18 @@ directory, mtl, old-time,- pandoc >= 1.12.4 && < 1.16,- pandoc-types >= 1.12.3 && < 1.13,+ pandoc >= 1.12.4 && < 1.17,+ pandoc-types >= 1.12.3 && < 1.17, highlighting-kate >= 0.5.0.1 && < 0.7, bytestring, text, random, utf8-string >= 0.3 && < 1.1, SHA > 1 && < 1.7,- HTTP >= 4000.0 && < 4000.3,+ HTTP >= 4000.0 && < 4000.4, HStringTemplate >= 0.6 && < 0.9, old-locale >= 1,- time >= 1.1 && < 1.6,+ time >= 1.1 && < 1.7, recaptcha >= 0.1, filestore >= 0.6 && < 0.7, zlib >= 0.5 && < 0.7,@@ -167,10 +167,10 @@ json >= 0.4 && < 0.10, uri >= 0.1 && < 0.2, split,- hoauth2 >= 0.4.2 && < 0.5,+ hoauth2 >= 0.4.2 && < 0.6, http-conduit >= 2.1.4 && < 2.2, http-client-tls >= 0.2.2 && < 0.3,- aeson >= 0.7 && < 0.10,+ aeson >= 0.7 && < 0.11, uuid >= 1.3 && < 1.4 if impl(ghc >= 6.10) build-depends: base >= 4, syb
src/Network/Gitit/Authentication.hs view
@@ -317,7 +317,7 @@ let errors = validate $ optionalTests validationType ++ [ (not isValidAccessCode, "Incorrect response to access prompt.") , (not (isValidUsername uname),- "Username must be at least 3 charcaters, all letters or digits.")+ "Username must be at least 3 characters, all letters or digits.") , (not (isValidPassword pword), "Password must be at least 6 characters, " ++ "and must contain at least one non-letter.")@@ -464,7 +464,11 @@ seeOther (encUrl destination) $ toResponse () Left err -> do liftIO $ logM "gitit" WARNING $ "Login Failed: " ++ ghUserMessage err ++ maybe "" (". Github response" ++) (ghDetails err)- let url = destination ++ "?message=" ++ ghUserMessage err+ cfg <- getConfig+ let destination'+ | requireAuthentication cfg >= ForRead = base' ++ "/_loginFailure"+ | otherwise = destination+ let url = destination' ++ "?message=" ++ ghUserMessage err seeOther (encUrl url) $ toResponse () githubAuthHandlers :: GithubConfig@@ -472,8 +476,20 @@ githubAuthHandlers ghConfig = [ dir "_logout" $ withData logoutUser , dir "_login" $ loginGithubUser $ oAuth2 ghConfig+ , dir "_loginFailure" $ githubLoginFailure , dir "_githubCallback" $ withData $ oauthGithubCallback ghConfig , dir "_user" currentUser ]++githubLoginFailure :: Handler+githubLoginFailure = withData $ \params ->+ formattedPage (pageLayout (pMessages params)) noHtml >>= forbidden+ where+ pageLayout msgs =+ defaultPageLayout{ pgShowPageTools = False,+ pgTabs = [],+ pgTitle = "Login failure",+ pgMessages = msgs+ } -- Login using RPX (see RPX development docs at https://rpxnow.com/docs) loginRPXUser :: RPars -- ^ The parameters passed by the RPX callback call (after authentication has taken place
src/Network/Gitit/Authentication/Github.hs view
@@ -67,13 +67,13 @@ (\githubUserMail -> do let gitLogin = gLogin githubUser user <- mkUser (unpack gitLogin)- (unpack $ email $ head githubUserMail)+ (unpack $ email $ head (filter primary githubUserMail)) "none" let mbOrg = org ghConfig case mbOrg of Nothing -> return $ Right user Just githuborg -> ifSuccess- ("Membership check of user " ++ unpack gitLogin ++ " to " ++ unpack githuborg ++ " failed")+ ("Membership check failed: the user " ++ unpack gitLogin ++ " is required to be a member of the organization " ++ unpack githuborg ++ ".") (orgInfo gitLogin githuborg mgr at) (\_ -> return $ Right user)))) else@@ -117,11 +117,13 @@ parseJSON _ = mzero data GithubUserMail = GithubUserMail { email :: Text+ , primary :: Bool } deriving (Show, Eq) instance FromJSON GithubUserMail where parseJSON (Object o) = GithubUserMail <$> o .: "email"+ <*> o .: "primary" parseJSON _ = mzero sToBS :: String -> BS.ByteString
src/Network/Gitit/Config.hs view
@@ -114,6 +114,7 @@ cfNoEdit <- get cp "DEFAULT" "no-edit" cfNoDelete <- get cp "DEFAULT" "no-delete" cfDefaultSummary <- get cp "DEFAULT" "default-summary"+ cfDeleteSummary <- get cp "DEFAULT" "delete-summary" cfAccessQuestion <- get cp "DEFAULT" "access-question" cfAccessQuestionAnswers <- get cp "DEFAULT" "access-question-answers" cfUseRecaptcha <- get cp "DEFAULT" "use-recaptcha"@@ -209,6 +210,7 @@ , noEdit = splitCommaList cfNoEdit , noDelete = splitCommaList cfNoDelete , defaultSummary = cfDefaultSummary+ , deleteSummary = cfDeleteSummary , accessQuestion = if null cfAccessQuestion then Nothing else Just (cfAccessQuestion, splitCommaList cfAccessQuestionAnswers)
src/Network/Gitit/ContentTransformer.hs view
@@ -719,10 +719,17 @@ -- | Convert links with no URL to wikilinks. convertWikiLinks :: Config -> Inline -> Inline+#if MIN_VERSION_pandoc(1,16,0)+convertWikiLinks cfg (Link attr ref ("", "")) | useAbsoluteUrls cfg =+ Link attr ref ("/" </> baseUrl cfg </> inlinesToURL ref, "Go to wiki page")+convertWikiLinks _cfg (Link attr ref ("", "")) =+ Link attr ref (inlinesToURL ref, "Go to wiki page")+#else convertWikiLinks cfg (Link ref ("", "")) | useAbsoluteUrls cfg = Link ref ("/" </> baseUrl cfg </> inlinesToURL ref, "Go to wiki page") convertWikiLinks _cfg (Link ref ("", "")) = Link ref (inlinesToURL ref, "Go to wiki page")+#endif convertWikiLinks _cfg x = x -- | Derives a URL from a list of Pandoc Inline elements.@@ -745,13 +752,21 @@ Cite _ xs -> concatMap go xs Code _ s -> s Space -> " "+#if MIN_VERSION_pandoc(1,16,0)+ SoftBreak -> " "+#endif LineBreak -> " " Math DisplayMath s -> "$$" ++ s ++ "$$" Math InlineMath s -> "$" ++ s ++ "$" RawInline (Format "tex") s -> s RawInline _ _ -> ""+#if MIN_VERSION_pandoc(1,16,0)+ Link _ xs _ -> concatMap go xs+ Image _ xs _ -> concatMap go xs+#else Link xs _ -> concatMap go xs Image xs _ -> concatMap go xs+#endif Note _ -> "" Span _ xs -> concatMap go xs
src/Network/Gitit/Export.hs view
@@ -26,6 +26,7 @@ import Text.Pandoc.PDF (makePDF) import Text.Pandoc.SelfContained as SelfContained import Text.Pandoc.Shared (readDataFileUTF8)+import qualified Text.Pandoc.UTF8 as UTF8 import Network.Gitit.Server import Network.Gitit.Framework (pathForPage, getWikiBase) import Network.Gitit.State (getConfig)@@ -36,7 +37,6 @@ import Text.XHtml (noHtml) import qualified Data.ByteString as B import qualified Data.ByteString.Lazy as L-import Data.ByteString.Lazy.UTF8 (fromString, toString) import System.FilePath ((</>), takeDirectory) import Control.Exception (throwIO) import System.Directory (doesFileExist)@@ -80,7 +80,7 @@ respondS :: String -> String -> String -> (WriterOptions -> Pandoc -> String) -> WriterOptions -> String -> Pandoc -> Handler respondS templ mimetype ext fn =- respondX templ mimetype ext (\o d -> return $ fromString $ fn o d)+ respondX templ mimetype ext (\o d -> return $ UTF8.fromStringLazy $ fn o d) respondSlides :: String -> HTMLSlideVariant -> String -> Pandoc -> Handler respondSlides templ slideVariant page doc = do@@ -139,7 +139,7 @@ #endif ok . setContentType "text/html;charset=UTF-8" . -- (setFilename (page ++ ".html")) .- toResponseBS B.empty $ fromString h'+ toResponseBS B.empty $ UTF8.fromStringLazy h' respondLaTeX :: String -> Pandoc -> Handler respondLaTeX = respondS "latex" "application/x-latex" "tex"@@ -152,7 +152,7 @@ respondRTF :: String -> Pandoc -> Handler respondRTF = respondX "rtf" "application/rtf" "rtf"- (\o d -> fromString `fmap` writeRTFWithEmbeddedImages o d) defaultRespOptions+ (\o d -> UTF8.fromStringLazy `fmap` writeRTFWithEmbeddedImages o d) defaultRespOptions respondRST :: String -> Pandoc -> Handler respondRST = respondS "rst" "text/plain; charset=utf-8" ""@@ -188,9 +188,15 @@ respondOrg = respondS "org" "text/plain; charset=utf-8" "" writeOrg defaultRespOptions +#if MIN_VERSION_pandoc(1,16,0) respondICML :: String -> Pandoc -> Handler+respondICML = respondX "icml" "application/xml; charset=utf-8" ""+ (\o d -> fmap UTF8.fromStringLazy $ writeICML o d)+ defaultRespOptions+#else respondICML = respondS "icml" "application/xml; charset=utf-8" ""- writeICML defaultRespOptions+ writeICML defaultRespOptions+#endif respondTextile :: String -> Pandoc -> Handler respondTextile = respondS "textile" "text/plain; charset=utf-8" ""@@ -240,7 +246,7 @@ return res case pdf' of Left logOutput -> simpleErrorHandler ("PDF creation failed:\n"- ++ toString logOutput)+ ++ UTF8.toStringLazy logOutput) Right pdfBS -> do case cached of Nothing ->@@ -264,9 +270,15 @@ let static = staticDir cfg let repoPath = repositoryPath cfg +#if MIN_VERSION_pandoc(1,16,0)+ let go (Image attr ils (url, title)) = do+ fixedURL <- fixURL url+ return $ Image attr ils (fixedURL, title)+#else let go (Image ils (url, title)) = do fixedURL <- fixURL url return $ Image ils (fixedURL, title)+#endif go x = return x fixURL ('/':url) = resolve url
src/Network/Gitit/Feed.hs view
@@ -140,8 +140,8 @@ enTag :: String -> [Content] -> Content enTag tag content = Elem blank_element{ elName=blank_name{qName=tag}- , elContent=content- }+ , elContent=content+ } enTag1 :: String -> Content -> Content enTag1 tag content = enTag tag [content] enText :: String -> Content
src/Network/Gitit/Handlers.hs view
@@ -608,7 +608,7 @@ Nothing -> return ("Anonymous", "") Just u -> return (uUsername u, uEmail u) let author = Author user email- let descrip = "Deleted using web interface."+ let descrip = deleteSummary cfg base' <- getWikiBase if pConfirm params && (file == page || file == page <.> (defaultExtension cfg)) then do
src/Network/Gitit/Types.hs view
@@ -159,6 +159,8 @@ noDelete :: [String], -- | Default summary if description left blank defaultSummary :: String,+ -- | Delete summary+ deleteSummary :: String, -- | @Nothing@ = anyone can register. -- @Just (prompt, answers)@ = a user will -- be given the prompt and must give