lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 26 Oct 2018
12:44 am

Marcin Cieslak

LDEV-4696 Rewrite Chat to Hibernate annotations

Options
    • -197
    • +0
    /lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/Chat.hbm.xml
    • -14
    • +0
    /lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatCondition.hbm.xml
    • -107
    • +0
    /lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatMessage.hbm.xml
    • -131
    • +0
    /lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml
    • -110
    • +0
    /lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatUser.hbm.xml
    • -3
    • +3
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatMessageDAO.java
    • -1
    • +0
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatUserDAO.java
    • -108
    • +40
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java
    • -0
    • +3
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatCondition.java
    • -36
    • +25
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatMessage.java
    • -81
    • +33
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatSession.java
    • -50
    • +24
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatUser.java
Thursday 25 Oct 2018
10:52 pm

Marcin Cieslak

LDEV-4696 Link persistence API source to in classpaths

Options
    • -1
    • +1
    /lams_central/.classpath
    • -1
    • +1
    /lams_common/.classpath
    • -1
    • +1
    /lams_contentrepository/.classpath
    • -1
    • +1
    /lams_gradebook/.classpath
    • -1
    • +1
    /lams_tool_assessment/.classpath
    • -1
    • +1
    /lams_tool_chat/.classpath
    • -1
    • +1
    /lams_tool_daco/.classpath
    • -1
    • +1
    /lams_tool_doku/.classpath
    • -1
    • +1
    /lams_tool_forum/.classpath
    • -1
    • +1
    /lams_tool_images/.classpath
    • -1
    • +1
    /lams_tool_imscc/.classpath
    • -1
    • +1
    /lams_tool_lamc/.classpath
    • -1
    • +1
    /lams_tool_laqa/.classpath
    • -1
    • +1
    /lams_tool_leader/.classpath
    • -1
    • +1
    /lams_tool_mindmap/.classpath
  16. … 9 more files in changeset.
10:46 pm

Marcin Cieslak

LDEV-4696 Add persistence API source code

Options
    • -0
    • +41
    /3rdParty_sources/persistence-api/javax/persistence/Access.java
    • -0
    • +34
    /3rdParty_sources/persistence-api/javax/persistence/AccessType.java
    • -0
    • +176
    /3rdParty_sources/persistence-api/javax/persistence/AssociationOverride.java
    • -0
    • +75
    /3rdParty_sources/persistence-api/javax/persistence/AssociationOverrides.java
    • -0
    • +52
    /3rdParty_sources/persistence-api/javax/persistence/AttributeConverter.java
    • -0
    • +56
    /3rdParty_sources/persistence-api/javax/persistence/AttributeNode.java
    • -0
    • +156
    /3rdParty_sources/persistence-api/javax/persistence/AttributeOverride.java
    • -0
    • +55
    /3rdParty_sources/persistence-api/javax/persistence/AttributeOverrides.java
    • -0
    • +81
    /3rdParty_sources/persistence-api/javax/persistence/Basic.java
    • -0
    • +68
    /3rdParty_sources/persistence-api/javax/persistence/Cache.java
    • -0
    • +39
    /3rdParty_sources/persistence-api/javax/persistence/CacheRetrieveMode.java
    • -0
    • +47
    /3rdParty_sources/persistence-api/javax/persistence/CacheStoreMode.java
    • -0
    • +44
    /3rdParty_sources/persistence-api/javax/persistence/Cacheable.java
    • -0
    • +50
    /3rdParty_sources/persistence-api/javax/persistence/CascadeType.java
    • -0
    • +171
    /3rdParty_sources/persistence-api/javax/persistence/CollectionTable.java
  16. … 186 more files in changeset.
10:31 pm

Marcin Cieslak

LDEV-3275 Update XStream source code

Options
    • -1
    • +1
    /3rdParty_sources/versions.txt
    • -24
    • +30
    /3rdParty_sources/xstream/com/thoughtworks/xstream/XStream.java
    • -3
    • +2
    /3rdParty_sources/xstream/com/thoughtworks/xstream/XStreamer.java
    • -2
    • +2
    /3rdParty_sources/xstream/com/thoughtworks/xstream/converters/basic/BigDecimalConverter.java
    • -2
    • +2
    /3rdParty_sources/xstream/com/thoughtworks/xstream/converters/basic/BigIntegerConverter.java
    • -4
    • +2
    /3rdParty_sources/xstream/com/thoughtworks/xstream/converters/basic/BooleanConverter.java
    • -2
    • +2
    /3rdParty_sources/xstream/com/thoughtworks/xstream/converters/basic/ByteConverter.java
    • -2
    • +2
    /3rdParty_sources/xstream/com/thoughtworks/xstream/converters/basic/CharConverter.java
    • -2
    • +2
    /3rdParty_sources/xstream/com/thoughtworks/xstream/converters/basic/DateConverter.java
    • -2
    • +2
    /3rdParty_sources/xstream/com/thoughtworks/xstream/converters/basic/DoubleConverter.java
    • -2
    • +2
    /3rdParty_sources/xstream/com/thoughtworks/xstream/converters/basic/FloatConverter.java
    • -2
    • +2
    /3rdParty_sources/xstream/com/thoughtworks/xstream/converters/basic/IntConverter.java
    • -2
    • +2
    /3rdParty_sources/xstream/com/thoughtworks/xstream/converters/basic/LongConverter.java
    • -2
    • +2
    /3rdParty_sources/xstream/com/thoughtworks/xstream/converters/basic/ShortConverter.java
    • -2
    • +2
    /3rdParty_sources/xstream/com/thoughtworks/xstream/converters/basic/StringBufferConverter.java
  16. … 80 more files in changeset.
10:30 pm

Marcin Cieslak

LDEV-3275 Update XStream binaries

Options
    • binary
    /lams_build/lib/xstream/xstream-1.4.10.jar
    • binary
    /lams_build/lib/xstream/xstream-1.4.11.jar
    • -1
    • +1
    /lams_build/lib/xstream/xstream.module.xml
6:38 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Correct scan path for tool Hibernate objects

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
6:09 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Tidied up Noticeboard changes

Options
    • -2
    • +5
    /lams_tool_nb/.classpath
    • -1
    • +1
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java
    • -1
    • +1
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java
    • -1
    • +1
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java
    • -14
    • +6
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardContent.java
    • -10
    • +7
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardSession.java
    • -10
    • +8
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardUser.java
    • -3
    • +1
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml
    • -2
    • +0
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java
3:41 pm

Marcin Cieslak

LDEV-4696 Set proper JNDI name for transaction manager

Also get rid of deprecated manager_lookup_class property.

Options
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
3:32 am

Marcin Cieslak

LDEV-4696 Rewrite Criteria queries to use new API

Options
    • -20
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java
    • -77
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
3:31 am

Marcin Cieslak

LDEV-4696 Change transaction configuration for Hibernate 5.3

hibernate.transaction.factory_class is deprecated. We need to use

hibernate.transaction.coordinator_class

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
1:19 am

Marcin Cieslak

Merge remote-tracking branch 'origin/lams31' into LDEV-4696

Options
    • -11
    • +1
    /lams_build/build.xml
    • -13
    • +10
    /lams_build/build_base.xml
Wednesday 24 Oct 2018
10:35 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-4691' into lams31

Conflicts:

3rdParty_sources/httpclient/org/apache/http/auth/AUTH.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthOption.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthProtocolState.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthScheme.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthSchemeFactory.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthSchemeProvider.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthSchemeRegistry.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthScope.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthState.java

3rdParty_sources/httpclient/org/apache/http/auth/AuthenticationException.java

3rdParty_sources/httpclient/org/apache/http/auth/BasicUserPrincipal.java

3rdParty_sources/httpclient/org/apache/http/auth/ChallengeState.java

3rdParty_sources/httpclient/org/apache/http/auth/ContextAwareAuthScheme.java

3rdParty_sources/httpclient/org/apache/http/auth/Credentials.java

3rdParty_sources/httpclient/org/apache/http/auth/InvalidCredentialsException.java

3rdParty_sources/httpclient/org/apache/http/auth/KerberosCredentials.java

3rdParty_sources/httpclient/org/apache/http/auth/MalformedChallengeException.java

3rdParty_sources/httpclient/org/apache/http/auth/NTCredentials.java

3rdParty_sources/httpclient/org/apache/http/auth/NTUserPrincipal.java

3rdParty_sources/httpclient/org/apache/http/auth/UsernamePasswordCredentials.java

3rdParty_sources/httpclient/org/apache/http/auth/package-info.java

3rdParty_sources/httpclient/org/apache/http/auth/params/AuthPNames.java

3rdParty_sources/httpclient/org/apache/http/auth/params/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/AuthCache.java

3rdParty_sources/httpclient/org/apache/http/client/AuthenticationStrategy.java

3rdParty_sources/httpclient/org/apache/http/client/BackoffManager.java

3rdParty_sources/httpclient/org/apache/http/client/CircularRedirectException.java

3rdParty_sources/httpclient/org/apache/http/client/ClientProtocolException.java

3rdParty_sources/httpclient/org/apache/http/client/ConnectionBackoffStrategy.java

3rdParty_sources/httpclient/org/apache/http/client/CookieStore.java

3rdParty_sources/httpclient/org/apache/http/client/CredentialsProvider.java

3rdParty_sources/httpclient/org/apache/http/client/HttpClient.java

3rdParty_sources/httpclient/org/apache/http/client/HttpRequestRetryHandler.java

3rdParty_sources/httpclient/org/apache/http/client/HttpResponseException.java

3rdParty_sources/httpclient/org/apache/http/client/NonRepeatableRequestException.java

3rdParty_sources/httpclient/org/apache/http/client/RedirectException.java

3rdParty_sources/httpclient/org/apache/http/client/RedirectStrategy.java

3rdParty_sources/httpclient/org/apache/http/client/ResponseHandler.java

3rdParty_sources/httpclient/org/apache/http/client/ServiceUnavailableRetryStrategy.java

3rdParty_sources/httpclient/org/apache/http/client/UserTokenHandler.java

3rdParty_sources/httpclient/org/apache/http/client/config/AuthSchemes.java

3rdParty_sources/httpclient/org/apache/http/client/config/CookieSpecs.java

3rdParty_sources/httpclient/org/apache/http/client/config/RequestConfig.java

3rdParty_sources/httpclient/org/apache/http/client/config/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/entity/DecompressingEntity.java

3rdParty_sources/httpclient/org/apache/http/client/entity/DeflateDecompressingEntity.java

3rdParty_sources/httpclient/org/apache/http/client/entity/DeflateInputStream.java

3rdParty_sources/httpclient/org/apache/http/client/entity/EntityBuilder.java

3rdParty_sources/httpclient/org/apache/http/client/entity/GzipCompressingEntity.java

3rdParty_sources/httpclient/org/apache/http/client/entity/GzipDecompressingEntity.java

3rdParty_sources/httpclient/org/apache/http/client/entity/InputStreamFactory.java

3rdParty_sources/httpclient/org/apache/http/client/entity/LazyDecompressingInputStream.java

3rdParty_sources/httpclient/org/apache/http/client/entity/UrlEncodedFormEntity.java

3rdParty_sources/httpclient/org/apache/http/client/entity/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/methods/AbortableHttpRequest.java

3rdParty_sources/httpclient/org/apache/http/client/methods/AbstractExecutionAwareRequest.java

3rdParty_sources/httpclient/org/apache/http/client/methods/CloseableHttpResponse.java

3rdParty_sources/httpclient/org/apache/http/client/methods/Configurable.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpDelete.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpExecutionAware.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpGet.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpHead.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpOptions.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpPatch.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpPost.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpPut.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpRequestBase.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpRequestWrapper.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpTrace.java

3rdParty_sources/httpclient/org/apache/http/client/methods/HttpUriRequest.java

3rdParty_sources/httpclient/org/apache/http/client/methods/RequestBuilder.java

3rdParty_sources/httpclient/org/apache/http/client/methods/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/params/AllClientPNames.java

3rdParty_sources/httpclient/org/apache/http/client/params/ClientPNames.java

3rdParty_sources/httpclient/org/apache/http/client/params/HttpClientParamConfig.java

3rdParty_sources/httpclient/org/apache/http/client/params/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/HttpClientContext.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/RequestAcceptEncoding.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/RequestAddCookies.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/RequestAuthCache.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/RequestClientConnControl.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/RequestDefaultHeaders.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/RequestExpectContinue.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/ResponseContentEncoding.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/ResponseProcessCookies.java

3rdParty_sources/httpclient/org/apache/http/client/protocol/package-info.java

3rdParty_sources/httpclient/org/apache/http/client/utils/CloneUtils.java

3rdParty_sources/httpclient/org/apache/http/client/utils/DateUtils.java

3rdParty_sources/httpclient/org/apache/http/client/utils/HttpClientUtils.java

3rdParty_sources/httpclient/org/apache/http/client/utils/URIBuilder.java

3rdParty_sources/httpclient/org/apache/http/client/utils/URIUtils.java

3rdParty_sources/httpclient/org/apache/http/client/utils/URLEncodedUtils.java

3rdParty_sources/httpclient/org/apache/http/client/utils/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/ClientConnectionManager.java

3rdParty_sources/httpclient/org/apache/http/conn/ClientConnectionRequest.java

3rdParty_sources/httpclient/org/apache/http/conn/ConnectTimeoutException.java

3rdParty_sources/httpclient/org/apache/http/conn/ConnectionKeepAliveStrategy.java

3rdParty_sources/httpclient/org/apache/http/conn/ConnectionPoolTimeoutException.java

3rdParty_sources/httpclient/org/apache/http/conn/ConnectionReleaseTrigger.java

3rdParty_sources/httpclient/org/apache/http/conn/ConnectionRequest.java

3rdParty_sources/httpclient/org/apache/http/conn/DnsResolver.java

3rdParty_sources/httpclient/org/apache/http/conn/EofSensorInputStream.java

3rdParty_sources/httpclient/org/apache/http/conn/EofSensorWatcher.java

3rdParty_sources/httpclient/org/apache/http/conn/HttpClientConnectionManager.java

3rdParty_sources/httpclient/org/apache/http/conn/HttpClientConnectionOperator.java

3rdParty_sources/httpclient/org/apache/http/conn/HttpConnectionFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/HttpHostConnectException.java

3rdParty_sources/httpclient/org/apache/http/conn/HttpInetSocketAddress.java

3rdParty_sources/httpclient/org/apache/http/conn/HttpRoutedConnection.java

3rdParty_sources/httpclient/org/apache/http/conn/ManagedClientConnection.java

3rdParty_sources/httpclient/org/apache/http/conn/ManagedHttpClientConnection.java

3rdParty_sources/httpclient/org/apache/http/conn/SchemePortResolver.java

3rdParty_sources/httpclient/org/apache/http/conn/UnsupportedSchemeException.java

3rdParty_sources/httpclient/org/apache/http/conn/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/params/ConnConnectionPNames.java

3rdParty_sources/httpclient/org/apache/http/conn/params/ConnManagerPNames.java

3rdParty_sources/httpclient/org/apache/http/conn/params/ConnRoutePNames.java

3rdParty_sources/httpclient/org/apache/http/conn/params/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/BasicRouteDirector.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/HttpRoute.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/HttpRouteDirector.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/HttpRoutePlanner.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/RouteInfo.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/RouteTracker.java

3rdParty_sources/httpclient/org/apache/http/conn/routing/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/LayeredSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/Scheme.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SchemeLayeredSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SchemeRegistry.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SchemeSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/SocketFactoryAdaptor.java

3rdParty_sources/httpclient/org/apache/http/conn/scheme/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/socket/ConnectionSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/socket/LayeredConnectionSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/socket/PlainConnectionSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/socket/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/AbstractVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/DefaultHostnameVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/NoopHostnameVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/SSLInitializationException.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/StrictHostnameVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/TrustSelfSignedStrategy.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/TrustStrategy.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/X509HostnameVerifier.java

3rdParty_sources/httpclient/org/apache/http/conn/ssl/package-info.java

3rdParty_sources/httpclient/org/apache/http/conn/util/DomainType.java

3rdParty_sources/httpclient/org/apache/http/conn/util/InetAddressUtils.java

3rdParty_sources/httpclient/org/apache/http/conn/util/PublicSuffixList.java

3rdParty_sources/httpclient/org/apache/http/conn/util/PublicSuffixListParser.java

3rdParty_sources/httpclient/org/apache/http/conn/util/PublicSuffixMatcher.java

3rdParty_sources/httpclient/org/apache/http/conn/util/PublicSuffixMatcherLoader.java

3rdParty_sources/httpclient/org/apache/http/conn/util/package-info.java

3rdParty_sources/httpclient/org/apache/http/cookie/ClientCookie.java

3rdParty_sources/httpclient/org/apache/http/cookie/CommonCookieAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/cookie/Cookie.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieIdentityComparator.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieOrigin.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookiePathComparator.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookiePriorityComparator.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieRestrictionViolationException.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieSpec.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieSpecFactory.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieSpecProvider.java

3rdParty_sources/httpclient/org/apache/http/cookie/CookieSpecRegistry.java

3rdParty_sources/httpclient/org/apache/http/cookie/MalformedCookieException.java

3rdParty_sources/httpclient/org/apache/http/cookie/SM.java

3rdParty_sources/httpclient/org/apache/http/cookie/SetCookie.java

3rdParty_sources/httpclient/org/apache/http/cookie/SetCookie2.java

3rdParty_sources/httpclient/org/apache/http/cookie/package-info.java

3rdParty_sources/httpclient/org/apache/http/cookie/params/CookieSpecPNames.java

3rdParty_sources/httpclient/org/apache/http/cookie/params/package-info.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/AuthSchemeBase.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/BasicScheme.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/BasicSchemeFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/DigestScheme.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/DigestSchemeFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/GGSSchemeBase.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/HttpAuthenticator.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/HttpEntityDigester.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/KerberosScheme.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/KerberosSchemeFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/NTLMEngine.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/NTLMEngineException.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/NTLMEngineImpl.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/NTLMScheme.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/NTLMSchemeFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/RFC2617Scheme.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/SPNegoScheme.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/SPNegoSchemeFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java

3rdParty_sources/httpclient/org/apache/http/impl/auth/package-info.java

3rdParty_sources/httpclient/org/apache/http/impl/client/AIMDBackoffManager.java

3rdParty_sources/httpclient/org/apache/http/impl/client/AbstractResponseHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/client/AuthenticationStrategyImpl.java

3rdParty_sources/httpclient/org/apache/http/impl/client/BasicAuthCache.java

3rdParty_sources/httpclient/org/apache/http/impl/client/BasicCookieStore.java

3rdParty_sources/httpclient/org/apache/http/impl/client/BasicCredentialsProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/client/BasicResponseHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/client/Clock.java

3rdParty_sources/httpclient/org/apache/http/impl/client/CloseableHttpClient.java

3rdParty_sources/httpclient/org/apache/http/impl/client/CookieSpecRegistries.java

3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultBackoffStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultRedirectStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultUserTokenHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java

3rdParty_sources/httpclient/org/apache/http/impl/client/FutureRequestExecutionMetrics.java

3rdParty_sources/httpclient/org/apache/http/impl/client/FutureRequestExecutionService.java

3rdParty_sources/httpclient/org/apache/http/impl/client/HttpClientBuilder.java

3rdParty_sources/httpclient/org/apache/http/impl/client/HttpClients.java

3rdParty_sources/httpclient/org/apache/http/impl/client/HttpRequestFutureTask.java

3rdParty_sources/httpclient/org/apache/http/impl/client/HttpRequestTaskCallable.java

3rdParty_sources/httpclient/org/apache/http/impl/client/IdleConnectionEvictor.java

3rdParty_sources/httpclient/org/apache/http/impl/client/InternalHttpClient.java

3rdParty_sources/httpclient/org/apache/http/impl/client/LaxRedirectStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/MinimalHttpClient.java

3rdParty_sources/httpclient/org/apache/http/impl/client/NoopUserTokenHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/client/NullBackoffStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/ProxyAuthenticationStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/ProxyClient.java

3rdParty_sources/httpclient/org/apache/http/impl/client/RedirectLocations.java

3rdParty_sources/httpclient/org/apache/http/impl/client/RequestWrapper.java

3rdParty_sources/httpclient/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/client/SystemClock.java

3rdParty_sources/httpclient/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/client/TargetAuthenticationStrategy.java

3rdParty_sources/httpclient/org/apache/http/impl/client/package-info.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/CPool.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/CPoolEntry.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/CPoolProxy.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/ConnectionShutdownException.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultHttpClientConnectionOperator.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultHttpResponseParser.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultHttpResponseParserFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultManagedHttpClientConnection.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultProxyRoutePlanner.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultRoutePlanner.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/DefaultSchemePortResolver.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/InMemoryDnsResolver.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/LoggingInputStream.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/LoggingManagedHttpClientConnection.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/LoggingOutputStream.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/ManagedHttpClientConnectionFactory.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/SystemDefaultDnsResolver.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/SystemDefaultRoutePlanner.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/Wire.java

3rdParty_sources/httpclient/org/apache/http/impl/conn/package-info.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/AbstractCookieSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicClientCookie.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicClientCookie2.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicCommentHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicDomainHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicExpiresHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicMaxAgeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicPathHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/BasicSecureHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/CookieSpecBase.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/DefaultCookieSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/DefaultCookieSpecProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/IgnoreSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/IgnoreSpecProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/LaxExpiresHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/LaxMaxAgeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/NetscapeDomainHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/NetscapeDraftSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/NetscapeDraftSpecProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/PublicSuffixDomainFilter.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2109DomainHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2109Spec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2109SpecProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2109VersionHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965Spec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965SpecProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC6265CookieSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC6265CookieSpecBase.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC6265CookieSpecProvider.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC6265LaxSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/RFC6265StrictSpec.java

3rdParty_sources/httpclient/org/apache/http/impl/cookie/package-info.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/BackoffStrategyExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/ClientExecChain.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/ConnectionHolder.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/HttpResponseProxy.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/MainClientExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/MinimalClientExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/ProtocolExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/RedirectExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/RequestAbortedException.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/RequestEntityProxy.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/ResponseEntityProxy.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/RetryExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/ServiceUnavailableRetryExec.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/TunnelRefusedException.java

3rdParty_sources/httpclient/org/apache/http/impl/execchain/package-info.java

3rdParty_sources/httpcore/org/apache/http/entity/BufferedHttpEntity.java

3rdParty_sources/httpcore/org/apache/http/impl/BHttpConnectionBase.java

3rdParty_sources/httpcore/org/apache/http/impl/DefaultConnectionReuseStrategy.java

3rdParty_sources/httpcore/org/apache/http/message/HeaderGroup.java

3rdParty_sources/httpcore/org/apache/http/pool/PoolStats.java

lams_build/build_base.xml

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_central/.classpath

Options
    • -29
    • +17
    /lams_build/build.xml
    • -3
    • +2
    /lams_build/build_base.xml
    • -129
    • +238
    /lams_build/conf/domain.xml
    • -1
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • -69
    • +195
    /lams_build/conf/standalone.xml
    • -18
    • +14
    /lams_central/.classpath
    • -22
    • +0
    /3rdParty_sources/httpclient/org/apache/http/client/version.properties
    • -66
    • +0
    /3rdParty_sources/httpclient/org/apache/http/conn/ssl/PrivateKeyDetails.java
    • -47
    • +0
    /3rdParty_sources/httpclient/org/apache/http/conn/ssl/PrivateKeyStrategy.java
    • -271
    • +0
    /3rdParty_sources/httpclient/org/apache/http/conn/ssl/SSLContextBuilder.java
    • -93
    • +0
    /3rdParty_sources/httpclient/org/apache/http/conn/ssl/SSLContexts.java
    • -106
    • +0
    /3rdParty_sources/httpclient/org/apache/http/impl/client/CloseableHttpResponseProxy.java
    • -65
    • +0
    /3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultClientConnectionReuseStrategy.java
    • -33
    • +0
    /3rdParty_sources/httpclient/org/apache/http/impl/conn/tsccm/package-info.java
    • -77
    • +0
    /3rdParty_sources/httpclient/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java
10:25 pm

Marcin Cieslak

Merge branch 'LDEV-4440' into lams31

Options
3:02 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Runs Hibernate 5.3 with errors, Noticeboard hbm xml gone.

Options
    • -0
    • +0
    /3rdParty_sources/hibernate-core/org/hibernate/AnnotationException.java
    • -4
    • +2
    /3rdParty_sources/hibernate-core/org/hibernate/AssertionFailure.java
    • -0
    • +0
    /3rdParty_sources/hibernate-core/org/hibernate/BaseSessionEventListener.java
    • -24
    • +50
    /3rdParty_sources/hibernate-core/org/hibernate/BasicQueryContract.java
    • -35
    • +256
    /3rdParty_sources/hibernate-core/org/hibernate/Cache.java
    • -0
    • +0
    /3rdParty_sources/hibernate-core/org/hibernate/CacheMode.java
    • -0
    • +0
    /3rdParty_sources/hibernate-core/org/hibernate/CallbackException.java
    • -9
    • +30
    /3rdParty_sources/hibernate-core/org/hibernate/ConnectionAcquisitionMode.java
    • -2
    • +26
    /3rdParty_sources/hibernate-core/org/hibernate/ConnectionReleaseMode.java
    • -14
    • +14
    /3rdParty_sources/hibernate-core/org/hibernate/Criteria.java
    • -0
    • +0
    /3rdParty_sources/hibernate-core/org/hibernate/CustomEntityDirtinessStrategy.java
    • -0
    • +0
    /3rdParty_sources/hibernate-core/org/hibernate/DuplicateMappingException.java
    • -0
    • +0
    /3rdParty_sources/hibernate-core/org/hibernate/EmptyInterceptor.java
    • -0
    • +0
    /3rdParty_sources/hibernate-core/org/hibernate/EntityMode.java
    • -0
    • +0
    /3rdParty_sources/hibernate-core/org/hibernate/EntityNameResolver.java
  16. … 3444 more files in changeset.
4:18 am

Andrey Balan

LDEV-4440 Prevent form resubmission

Also it fixes problems with making subsequence calls (as forward leaves

/servermaintain/ in the browser's URL which causes problems with

relative paths)

Options
    • -3
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java
3:54 am

Andrey Balan

LDEV-4440 Tweaks for "Edit integrated server" page

* As per LDEV-4654 userinfoUrl field is no longer required

* Removed duplicate lessonFinishUrl field

* Added link to "Maintain integrated servers"

Options
    • -8
    • +11
    /lams_admin/web/servermaintain.jsp
3:50 am

Andrey Balan

LDEV-4440 Fix author and monitor links requested from integrations

Options
    • -12
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
3:48 am

Andrey Balan

LDEV-4440 Fix learner and monitor links after creating LTI lesson

Options
    • -4
    • +4
    /lams_central/web/lti/learnerMonitor.jsp
Tuesday 23 Oct 2018
2:36 am

Andrey Balan

Merge branch 'LDEV-4698' into LDEV-4440

Options
2:36 am

Andrey Balan

LDEV-4698 Remove Apache httpcomponents source code

Options
    • -64
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AUTH.java
    • -63
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthOption.java
    • -33
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthProtocolState.java
    • -130
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthScheme.java
    • -51
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthSchemeFactory.java
    • -46
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthSchemeProvider.java
    • -157
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthSchemeRegistry.java
    • -328
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthScope.java
    • -235
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthState.java
    • -70
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/AuthenticationException.java
    • -90
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/BasicUserPrincipal.java
    • -38
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/ChallengeState.java
    • -62
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/ContextAwareAuthScheme.java
    • -44
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/Credentials.java
    • -69
    • +0
    /3rdParty_sources/httpclient/org/apache/http/auth/InvalidCredentialsException.java
  16. … 561 more files in changeset.
2:34 am

Andrey Balan

LDEV-4698 Stop using Apache httpcomponents library in LAMS

Options
    • -2
    • +0
    /lams_build/build_base.xml
    • -1
    • +0
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • -2
    • +0
    /lams_central/.classpath
    • -31
    • +25
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -36
    • +30
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
Monday 22 Oct 2018
3:33 pm

Marcin Cieslak

LDEV-4691 Fix file uploads

MultipartFilter was introduced for LAMS servlets to work with Spring

MVC. It appears that for WildFly 14 it is not required anymore.

Furthermore, without it will not work without extra configuration. It

was removed.

Also a controller method was rewritten to Spring MVC style.

Options
    • -25
    • +9
    /lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -17
    • +1
    /lams_central/web/WEB-INF/web.xml
Friday 19 Oct 2018
7:53 pm

Marcin Cieslak

Merge branch 'LDEV-4694' into LDEV-4440

Options
7:48 pm

Marcin Cieslak

LDEV-4694 Remove obsolete embedded MySQL configuration

Options
    • -11
    • +0
    /lams_build/build.xml
    • -18
    • +0
    /lams_build/common.properties
    • -13
    • +0
    /lams_build/conf/domain.xml
    • -13
    • +0
    /lams_build/conf/slim/standalone.xml
    • -13
    • +0
    /lams_build/conf/standalone.xml
    • -1
    • +1
    /lams_common/build.xml
6:52 pm

Marcin Cieslak

LDEV-4691 Use a memory, non-transactional cache for HTTP sessions

Options
    • -11
    • +22
    /lams_build/conf/standalone.xml
5:38 pm

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_admin/web/sessionmaintain.jsp

lams_build/build.xml

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

Options
    • -2
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
    • -1
    • +3
    /lams_admin/web/sessionmaintain.jsp
    • -0
    • +1
    /lams_build/build.xml
    • -11
    • +10
    /lams_build/build_base.xml
    • -6
    • +0
    /lams_build/build_tools_base.xml
    • -2
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -9
    • +9
    /lams_central/web/outcome/outcomeEdit.jsp
    • -9
    • +8
    /lams_central/web/outcome/outcomeManage.jsp
    • -9
    • +9
    /lams_central/web/outcome/scaleEdit.jsp
    • -9
    • +8
    /lams_central/web/outcome/scaleManage.jsp
    • -0
    • +2
    /lams_common/build.xml
    • -3
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
    • -0
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
  16. … 3 more files in changeset.
4:21 pm

Marcin Cieslak

Merge branch 'LDEV-4693' into lams31

Options
4:20 pm

Marcin Cieslak

LDEV-4693 Add name in logged in user list in sysadmin

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    /lams_admin/web/sessionmaintain.jsp
    • -3
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
3:30 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_build/build_base.xml

# lams_build/lib/lams/lams.jar

# lams_central/web/WEB-INF/struts-config.xml

# lams_common/build.xml

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

Options
    • -13
    • +0
    /lams_build/build.xml
    • -11
    • +10
    /lams_build/build_base.xml
    • -6
    • +0
    /lams_build/build_tools_base.xml
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -8
    • +10
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java
    • -1
    • +3
    /lams_common/build.xml
    • -1
    • +4
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +3
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
    • -5
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -9
    • +62
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -2
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
2:49 pm

Marcin Cieslak

LDEV-4609 Adjust columns for previous attempts in monitor activity view

Options
    • -9
    • +20
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityArchiveGridRowDTO.java
    • -5
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -12
    • +18
    /lams_gradebook/web/gradebookMonitor.jsp