Skip to content
This repository was archived by the owner on Apr 22, 2025. It is now read-only.

Commit eef9576

Browse files
author
Hai Nguyen
committed
* Update localization files
* Upgrade to Vaadin 7.7.6 and other libraries * Support running multiple MyCollab instances on the same server * Use relative urls instead of the absolute urls of UI link elements
1 parent 39b1c6c commit eef9576

File tree

732 files changed

+2075
-1603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

732 files changed

+2075
-1603
lines changed

‎mycollab-app-community/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>com.mycollab</groupId>
2323
<artifactId>mycollab-server-runner</artifactId>
24-
<version>5.4.5</version>
24+
<version>${project.version}</version>
2525
<exclusions>
2626
<exclusion>
2727
<groupId>com.mycollab</groupId>
@@ -160,15 +160,15 @@
160160
<artifactItem>
161161
<groupId>com.mycollab</groupId>
162162
<artifactId>mycollab-esb</artifactId>
163-
<version>5.4.5</version>
163+
<version>${project.version}</version>
164164
<type>jar</type>
165165
<includes>*.ftl</includes>
166166
<outputDirectory>${project.build.directory}/staging/i18n</outputDirectory>
167167
</artifactItem>
168168
<artifactItem>
169169
<groupId>com.mycollab</groupId>
170170
<artifactId>mycollab-localization</artifactId>
171-
<version>5.4.5</version>
171+
<version>${project.version}</version>
172172
<type>jar</type>
173173
<includes>*.properties</includes>
174174
<excludes>**/pom.properties</excludes>
@@ -177,15 +177,15 @@
177177
<artifactItem>
178178
<groupId>com.mycollab</groupId>
179179
<artifactId>mycollab-scheduler</artifactId>
180-
<version>5.4.5</version>
180+
<version>${project.version}</version>
181181
<type>jar</type>
182182
<includes>*.ftl</includes>
183183
<outputDirectory>${project.build.directory}/staging/i18n</outputDirectory>
184184
</artifactItem>
185185
<artifactItem>
186186
<groupId>com.mycollab</groupId>
187187
<artifactId>mycollab-servlet</artifactId>
188-
<version>5.4.5</version>
188+
<version>${project.version}</version>
189189
<type>jar</type>
190190
<includes>*.ftl</includes>
191191
<outputDirectory>${project.build.directory}/staging/i18n</outputDirectory>

‎mycollab-app-community/src/main/installer-resources/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Version 5.4.6
4545

4646
**Library Upgrades**
4747

48-
* Vaadin 7.7.6
48+
* Vaadin 7.7.6, Jackrabbit 2.14.0
4949
* Other libraries
5050

5151
**Improvements & New Features**
@@ -58,6 +58,8 @@ Version 5.4.6
5858

5959
**Bug Fixes**
6060

61+
* Can not install two different MyCollab instances on the same server
62+
6163

6264
Version 5.4.5
6365
-------------

‎mycollab-app-community/src/main/installer-resources/executor.jar‎

136 Bytes
Binary file not shown.

‎mycollab-app-community/src/main/webapp/VAADIN/widgetsets/com.mycollab.widgetset.MyCollabMobileWidgetSet/1C29B99B33BEE5069DDA503F6242EA00.cache.js‎

Lines changed: 41 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mycollab-app-community/src/main/webapp/VAADIN/widgetsets/com.mycollab.widgetset.MyCollabMobileWidgetSet/1C29B99B33BEE5069DDA503F6242EA00.cache.js.gz‎

378 KB
Binary file not shown.

‎mycollab-app-community/src/main/webapp/VAADIN/widgetsets/com.mycollab.widgetset.MyCollabMobileWidgetSet/34C44609060F0897A31A53810433854F.cache.js‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎mycollab-app-community/src/main/webapp/VAADIN/widgetsets/com.mycollab.widgetset.MyCollabMobileWidgetSet/34C44609060F0897A31A53810433854F.cache.js.gz‎

-378 KB
Binary file not shown.

‎mycollab-app-community/src/main/webapp/VAADIN/widgetsets/com.mycollab.widgetset.MyCollabMobileWidgetSet/aosp.manifest‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
CACHE MANIFEST
2-
# Build timeSat Dec 03 13:42:45 ICT 2016
2+
# Build timeSat Jan 07 00:41:25 ICT 2017
33

44
CACHE:
55
../../../VAADIN/themes/base/fonts/fontawesome-webfont.ttf
66
../../../VAADIN/themes/touchkit/styles.css
77
../../../VAADIN/vaadinBootstrap.js
8-
34C44609060F0897A31A53810433854F.cache.js
8+
1C29B99B33BEE5069DDA503F6242EA00.cache.js
99
51DCB1D3F3D956ACC80F89D3CF0AC5BE.cache.woff
1010
clear.cache.gif
1111
com.mycollab.widgetset.MyCollabMobileWidgetSet.devmode.js
1212
com.mycollab.widgetset.MyCollabMobileWidgetSet.nocache.js
13-
deferredjs/34C44609060F0897A31A53810433854F/1.cache.js
14-
deferredjs/34C44609060F0897A31A53810433854F/10.cache.js
15-
deferredjs/34C44609060F0897A31A53810433854F/11.cache.js
16-
deferredjs/34C44609060F0897A31A53810433854F/12.cache.js
17-
deferredjs/34C44609060F0897A31A53810433854F/13.cache.js
18-
deferredjs/34C44609060F0897A31A53810433854F/14.cache.js
19-
deferredjs/34C44609060F0897A31A53810433854F/15.cache.js
20-
deferredjs/34C44609060F0897A31A53810433854F/16.cache.js
21-
deferredjs/34C44609060F0897A31A53810433854F/17.cache.js
22-
deferredjs/34C44609060F0897A31A53810433854F/18.cache.js
23-
deferredjs/34C44609060F0897A31A53810433854F/19.cache.js
24-
deferredjs/34C44609060F0897A31A53810433854F/2.cache.js
25-
deferredjs/34C44609060F0897A31A53810433854F/20.cache.js
26-
deferredjs/34C44609060F0897A31A53810433854F/21.cache.js
27-
deferredjs/34C44609060F0897A31A53810433854F/22.cache.js
28-
deferredjs/34C44609060F0897A31A53810433854F/23.cache.js
29-
deferredjs/34C44609060F0897A31A53810433854F/24.cache.js
30-
deferredjs/34C44609060F0897A31A53810433854F/25.cache.js
31-
deferredjs/34C44609060F0897A31A53810433854F/26.cache.js
32-
deferredjs/34C44609060F0897A31A53810433854F/3.cache.js
33-
deferredjs/34C44609060F0897A31A53810433854F/4.cache.js
34-
deferredjs/34C44609060F0897A31A53810433854F/5.cache.js
35-
deferredjs/34C44609060F0897A31A53810433854F/6.cache.js
36-
deferredjs/34C44609060F0897A31A53810433854F/7.cache.js
37-
deferredjs/34C44609060F0897A31A53810433854F/8.cache.js
38-
deferredjs/34C44609060F0897A31A53810433854F/9.cache.js
13+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/1.cache.js
14+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/10.cache.js
15+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/11.cache.js
16+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/12.cache.js
17+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/13.cache.js
18+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/14.cache.js
19+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/15.cache.js
20+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/16.cache.js
21+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/17.cache.js
22+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/18.cache.js
23+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/19.cache.js
24+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/2.cache.js
25+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/20.cache.js
26+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/21.cache.js
27+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/22.cache.js
28+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/23.cache.js
29+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/24.cache.js
30+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/25.cache.js
31+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/26.cache.js
32+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/3.cache.js
33+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/4.cache.js
34+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/5.cache.js
35+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/6.cache.js
36+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/7.cache.js
37+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/8.cache.js
38+
deferredjs/1C29B99B33BEE5069DDA503F6242EA00/9.cache.js
3939
drophere.gif
4040
easyuploads.css
4141
mobilecomponent.css

0 commit comments

Comments
 (0)