Thread: [Jamwiki-commit] SF.net SVN: jamwiki:[3419] wiki/trunk (Page 19)
Brought to you by:
wrh2
Menu
▾
▴
jamwiki-commit
|
From: <wr...@us...> - 2011-01-09 22:57:17
|
Revision: 3419
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3419&view=rev
Author: wrh2
Date: 2011-01-09 22:57:11 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
Search:
* Add an option to disable autocommit during search updates. A test
loader that I run spends an inordinate amount of time on the
IndexWriter.commit() call. Disabling autocommit and using explicit
SearchEngine.commit() calls decreases the time it takes to add/update
a topic by ~20%.
* Note that this change has no effect on core JAMWiki code since it
is late in the development cycle and I did not want to introduce any
functional changes. This will be an area to look into for JAMWiki 1.1.0.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/SearchEngine.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/TestSearchEngine.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mic...@us...> - 2011-01-12 14:05:40
|
Revision: 3425
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3425&view=rev
Author: michael-o
Date: 2011-01-12 14:05:34 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
Added static field to logback config file
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/WikiLogger.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/SetupServlet.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-01-14 19:00:27
|
Revision: 3426
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3426&view=rev
Author: wrh2
Date: 2011-01-14 19:00:21 +0000 (Fri, 14 Jan 2011)
Log Message:
-----------
Special:Diff:
* Update the UI to use a table layout, similar to Mediawiki, based on user
feedback.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/resources/pages/StyleSheet.txt
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/diff-include.jsp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mic...@us...> - 2011-01-17 09:52:30
|
Revision: 3428
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3428&view=rev
Author: michael-o
Date: 2011-01-17 09:52:24 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
[maven-release-plugin] prepare branch 1.0.x
Modified Paths:
--------------
wiki/trunk/addons/bliki-parser/pom.xml
wiki/trunk/addons/pom.xml
wiki/trunk/jamwiki-core/pom.xml
wiki/trunk/jamwiki-war/pom.xml
wiki/trunk/jamwiki-web/pom.xml
wiki/trunk/pom.xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mic...@us...> - 2011-01-17 09:53:13
|
Revision: 3430
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3430&view=rev
Author: michael-o
Date: 2011-01-17 09:53:07 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
[maven-release-plugin] prepare release 1.0.x
Modified Paths:
--------------
wiki/trunk/addons/bliki-parser/pom.xml
wiki/trunk/addons/pom.xml
wiki/trunk/jamwiki-core/pom.xml
wiki/trunk/jamwiki-war/pom.xml
wiki/trunk/jamwiki-web/pom.xml
wiki/trunk/pom.xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-01-17 19:47:11
|
Revision: 3435
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3435&view=rev
Author: wrh2
Date: 2011-01-17 19:47:04 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Bump the version number to 1.0.0.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/WikiVersion.java
wiki/trunk/jamwiki-core/src/test/resources/jamwiki.properties
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-01-17 20:05:11
|
Revision: 3436
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3436&view=rev
Author: wrh2
Date: 2011-01-17 20:05:05 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Upgrades:
* Remove ability to automatically upgrade from versions prior to 0.9.0.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
wiki/trunk/jamwiki-core/src/main/resources/sql.ansi.properties
wiki/trunk/jamwiki-core/src/main/resources/sql.cache.properties
wiki/trunk/jamwiki-core/src/main/resources/sql.mssql.properties
wiki/trunk/jamwiki-core/src/main/resources/sql.mysql.properties
wiki/trunk/jamwiki-core/src/main/resources/sql.oracle.properties
wiki/trunk/jamwiki-core/src/main/resources/sql.postgres.properties
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-01-18 19:22:11
|
Revision: 3437
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3437&view=rev
Author: wrh2
Date: 2011-01-18 19:22:05 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
Parser:
* Initial support for the Mediawiki <gallery> tag for generating image
galleries.
* There is more work required to support tag attributes and handle some
edge cases - that will come in later commits.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexLexer.java
wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-preprocessor.jflex
wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
Added Paths:
-----------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/GalleryTag.java
wiki/trunk/jamwiki-core/src/test/resources/data/results/Gallery1
wiki/trunk/jamwiki-core/src/test/resources/data/topics/Gallery1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-01-18 23:31:00
|
Revision: 3439
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3439&view=rev
Author: wrh2
Date: 2011-01-18 23:30:54 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
Upgrade:
* Automatically trigger a StyleSheet upgrade when upgrading to 1.1.0.
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-01-18 23:45:04
|
Revision: 3441
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3441&view=rev
Author: wrh2
Date: 2011-01-18 23:44:58 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.0.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/category-include.jsp
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-01-19 04:21:46
|
Revision: 3444
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3444&view=rev
Author: wrh2
Date: 2011-01-19 04:21:40 +0000 (Wed, 19 Jan 2011)
Log Message:
-----------
Parser / UI:
* Yet another CSS update for gallery display. This tweaks vertical alignment
again and moves a hard-coded width from a JSP page to the StyleSheet topic.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/resources/pages/StyleSheet.txt
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/category-include.jsp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mic...@us...> - 2011-01-22 15:58:39
|
Revision: 3451
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3451&view=rev
Author: michael-o
Date: 2011-01-22 15:58:33 +0000 (Sat, 22 Jan 2011)
Log Message:
-----------
Portback r3450
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_de.properties
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-01-25 20:00:35
|
Revision: 3455
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3455&view=rev
Author: wrh2
Date: 2011-01-25 20:00:28 +0000 (Tue, 25 Jan 2011)
Log Message:
-----------
Parser:
* Display HTML links of the form "[http://example.com]" using numbered links
to match Mediawiki behavior. The legacy behavior can be restored with a
configuration options.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/Environment.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/HtmlLinkTag.java
wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
wiki/trunk/jamwiki-core/src/test/resources/data/results/HtmlBasicLinks1
wiki/trunk/jamwiki-core/src/test/resources/data/results/HtmlBasicLinks2
wiki/trunk/jamwiki-core/src/test/resources/data/results/HtmlMailtoLinks1
wiki/trunk/jamwiki-core/src/test/resources/data/results/ImageLink1
wiki/trunk/jamwiki-core/src/test/resources/data/topics/HtmlBasicLinks1
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources.properties
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin.jsp
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-01-26 22:06:46
|
Revision: 3459
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3459&view=rev
Author: wrh2
Date: 2011-01-26 20:04:22 +0000 (Wed, 26 Jan 2011)
Log Message:
-----------
Performance:
* Enable DBCP prepared statement pooling to improve performance.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/Environment.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/LocalDataSource.java
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources.properties
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin.jsp
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-01-26 22:37:06
|
Revision: 3460
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3460&view=rev
Author: wrh2
Date: 2011-01-26 20:18:57 +0000 (Wed, 26 Jan 2011)
Log Message:
-----------
Performance:
* Change two DBCP defaults to values that should perform better.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/Environment.java
wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-01-27 06:14:47
|
Revision: 3462
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3462&view=rev
Author: wrh2
Date: 2011-01-27 06:14:41 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
Configuration:
* Move the pseudotopic list out of jamwiki-configuration.xml. While
hard-coding these values isn't ideal, the XML-based approach is clumsy
and a longer-term solution will be to share values with the
jamwiki-servlet.xml file.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/WikiConfiguration.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/PseudoTopicHandler.java
wiki/trunk/jamwiki-core/src/test/resources/jamwiki-configuration.xml
wiki/trunk/jamwiki-war/src/main/resources/jamwiki-configuration.dtd
wiki/trunk/jamwiki-war/src/main/resources/jamwiki-configuration.xml
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/package.html
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-01-27 19:38:02
|
Revision: 3463
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3463&view=rev
Author: wrh2
Date: 2011-01-27 19:37:55 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
Special:Source:
* Add a "View Source" tab to allow users who do not have permission to edit
a topic to view its wiki markup.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/PseudoTopicHandler.java
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources.properties
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jamwiki-servlet.xml
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
Added Paths:
-----------
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/view-source.jsp
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ViewSourceServlet.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-01-28 22:47:07
|
Revision: 3465
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3465&view=rev
Author: wrh2
Date: 2011-01-28 22:47:00 +0000 (Fri, 28 Jan 2011)
Log Message:
-----------
Cleanup:
* Remove unused imports identified by PMD.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/IncludeOnlyTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/OnlyIncludeTag.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ViewSourceServlet.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-02-01 15:49:43
|
Revision: 3466
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3466&view=rev
Author: wrh2
Date: 2011-02-01 15:49:37 +0000 (Tue, 01 Feb 2011)
Log Message:
-----------
Cleanup:
* The "Connection" argument of DataHandler.lookupTopic() is only needed
within the org.jamwiki.db package, so remove it from the public API and
create a private instance for use by AnsiDataHandler.
Modified Paths:
--------------
wiki/trunk/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/DataHandler.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/AnsiDataHandler.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/db/WikiDatabase.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlExporter.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/migrate/MediaWikiXmlImporter.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/ParserUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/MagicWordUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/ImageUtil.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/WikiUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/migrate/MigrationUtilTest.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/DiffServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/HistoryServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ManageServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/PrintableServlet.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/TranslationServlet.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-02-10 04:49:06
|
Revision: 3469
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3469&view=rev
Author: wrh2
Date: 2011-02-10 04:49:00 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.0.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/SearchEngine.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/WikiBase.java
wiki/trunk/jamwiki-core/src/main/resources/pages/StyleSheet.txt
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/TestSearchEngine.java
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-02-20 00:43:12
|
Revision: 3475
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3475&view=rev
Author: wrh2
Date: 2011-02-20 00:43:06 +0000 (Sun, 20 Feb 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.0.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-02-27 21:05:36
|
Revision: 3482
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3482&view=rev
Author: wrh2
Date: 2011-02-27 21:05:30 +0000 (Sun, 27 Feb 2011)
Log Message:
-----------
Merge:
* Merge changes from the rankingalgorithm branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/SearchEngine.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/WikiConfiguration.java
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/WikiConfigurationObject.java
wiki/trunk/jamwiki-core/src/test/resources/jamwiki-configuration.xml
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources.properties
wiki/trunk/jamwiki-war/src/main/resources/jamwiki-configuration.dtd
wiki/trunk/jamwiki-war/src/main/resources/jamwiki-configuration.xml
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/search-results.jsp
wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/search.jsp
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/search/LuceneSearchEngine.java
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/SearchServlet.java
Added Paths:
-----------
wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/search/RankingAlgorithmSearchEngine.java
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-02-27 21:17:59
|
Revision: 3483
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3483&view=rev
Author: wrh2
Date: 2011-02-27 21:17:53 +0000 (Sun, 27 Feb 2011)
Log Message:
-----------
RankingAlgorithm:
* Add CHANGELOG entry for RankingAlgorithm.
* Mark RankingAlgorithm as "experimental" since it is new.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/test/resources/jamwiki-configuration.xml
wiki/trunk/jamwiki-war/src/main/resources/jamwiki-configuration.xml
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-03-03 05:41:27
|
Revision: 3488
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3488&view=rev
Author: wrh2
Date: 2011-03-03 05:41:21 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.0.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/jflex/ParserTest.java
wiki/trunk/jamwiki-core/src/test/resources/data/results/Subst
wiki/trunk/jamwiki-core/src/test/resources/data/topics/Subst
wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_de.properties
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
Added Paths:
-----------
wiki/trunk/jamwiki-core/src/test/resources/data/topics/Subst2
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wr...@us...> - 2011-03-05 20:00:40
|
Revision: 3490
http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3490&view=rev
Author: wrh2
Date: 2011-03-05 20:00:33 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
Merge:
* Merge changes from the 1.0.x branch to trunk.
Modified Paths:
--------------
wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/utils/LinkUtil.java
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/utils/LinkUtilTest.java
wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
Added Paths:
-----------
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/db/
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/db/AnsiDataHandlerTest.java
Removed Paths:
-------------
wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/db/AnsiDataHandlerTest.java
Property Changed:
----------------
wiki/trunk/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X