clckwrks 0.23.9 → 0.23.10

raw patch · 4 files changed

+14/−14 lines, 4 filesdep +uuid-orphansdep +uuid-typesdep −uuiddep ~acid-statedep ~happstack-authenticatedep ~lens

Dependencies added: uuid-orphans, uuid-types

Dependencies removed: uuid

Dependency ranges changed: acid-state, happstack-authenticate, lens

Files

• Clckwrks/Authenticate/Page/Login.hs +5/−6
• Clckwrks/Server.hs +1/−1
• Clckwrks/Types.hs +2/−2
• clckwrks.cabal +6/−5

@@ -17,18 +17,17 @@       <div ng-controller="UsernamePasswordCtrl">        <div up-authenticated=False>         <h2>Login</h2>-        <up-login-inline />+        <up-login />++        <h2>Forgotten Password?</h2>+        <p>Forgot your password? Request a reset link via email!</p>+        <up-request-reset-password />        </div>         <div up-authenticated=True>-         <h2>Logout</h2>         <p>You have successfully logged in! Click the link below to logout.</p>         <up-logout />--        <h2>Forgotten Password?</h2>-        <p>Forgot your password? Request a reset link via email!</p>-        <up-request-reset-password />        </div>         <h2>Create A New Account</h2>

@@ -23,7 +23,7 @@ import Data.String                  (fromString) import           Data.Text          (Text) import qualified Data.Text          as Text-import qualified Data.UUID          as UUID+import qualified Data.UUID.Types    as UUID import Happstack.Server.FileServe.BuildingBlocks (guessContentTypeM, isSafePath, serveFile) import Happstack.Server.SimpleHTTPS (TLSConf(..), nullTLSConf, simpleHTTPS) import System.FilePath              ((</>), makeRelative, splitDirectories)

@@ -12,13 +12,13 @@ import Data.SafeCopy (SafeCopy(..), base, deriveSafeCopy, safeGet, safePut, contain) import Data.Text     (Text) import qualified Data.Text.Encoding as T-import Data.UUID     (UUID)+import Data.UUID.Types (UUID)+import Data.UUID.Orphans () import HSP.Google.Analytics (UACCT)   -- | 'SafeCopy' instances for some 3rd party types $(deriveSafeCopy 0 'base ''UACCT)-$(deriveSafeCopy 0 'base ''UUID)  -- | at present this is only used by the menu editor newtype Prefix = Prefix { prefixText :: Text }

@@ -1,5 +1,5 @@ Name:                clckwrks-Version:             0.23.9+Version:             0.23.10 Synopsis:            A secure, reliable content management system (CMS) and blogging platform Description:         clckwrks (pronounced, clockworks) aims to compete                      directly with popular PHP-based blogging and CMS@@ -88,7 +88,7 @@      build-depends:               network < 2.6    Build-depends:-     acid-state                   >= 0.12 && < 0.13,+     acid-state                   >= 0.12 && < 0.14,      aeson                        >= 0.5  && < 0.10,      aeson-qq                     >= 0.7  && < 0.9,      attoparsec                   >= 0.10 && < 0.14,@@ -99,7 +99,7 @@      containers                   >= 0.4  && < 0.6,      directory                    >= 1.1  && < 1.3,      filepath                     >= 1.2  && < 1.5,-     happstack-authenticate       >= 2.1  && < 2.2,+     happstack-authenticate       >= 2.2  && < 2.3,      happstack-hsp                == 7.3.*,      happstack-jmacro             >= 7.0  && < 7.1,      happstack-server             >= 7.0  && < 7.5,@@ -109,7 +109,7 @@      hsx2hs                       >= 0.13 && < 0.14,      ixset                        == 1.0.*,      jmacro                       == 0.6.*,-     lens                         >= 4.3  && < 4.13,+     lens                         >= 4.3  && < 4.14,      mtl                          >= 2.0  && < 2.3,      old-locale                   ==  1.0.*,      process                      >= 1.0  && < 1.3,@@ -124,7 +124,8 @@      text                         >= 0.11 && < 1.3,      time                         >= 1.2  && < 1.6,      time-locale-compat           >= 0.1  && < 0.2,-     uuid                         >= 1.2  && < 1.4,+     uuid-types                   >= 1.0  && < 1.1,+     uuid-orphans                 >= 1.2  && < 1.4,      unordered-containers         >= 0.1  && < 0.3,      userid                       >= 0.1  && < 0.2,      utf8-string                  >= 0.3  && < 1.1,