48 Commits

Author SHA1 Message Date
Andrey Cherepanov
1bd58afc26 Merge remote-tracking branch 'school-server/sisyphus' into school-server
Conflicts:
	branding.spec
	components.mk
	components/ahttpd/styles/alterator.css.in
	components/bootloader/gfxboot.cfg.in
	components/browser-qt/design/design.ini.in
	components/indexhtml/index.css.in
	components/indexhtml/indexhtml.desktop.in
	configure.ac
	images/boot.jpg
	images/boot.png
	images/installer.png
	images/product-logo.png
	images/wallpaper.png
	notes/index-en.html.in
	notes/index-ru.html.in
	notes/license.ru.html.in
	notes/release-notes.all.html.in
	notes/release-notes.ru.html.in
2012-04-05 16:16:48 +04:00
Anton V. Boyarshinov
0248ea0da0 6.0.0-alt14
- indexhtml design and links fixed
- tooltip color in browser-qt fixed
2011-08-22 16:23:07 +04:00
Anton V. Boyarshinov
765af06cdd unified indexhtml files 2011-08-22 15:24:35 +04:00
Anton V. Boyarshinov
2b3cb4d463 s/ark/centaurus/ 2011-02-03 14:02:45 +03:00
Andrey Cherepanov
df6837363b 5.0.2-alt1
- prepare for 5.0.2 release
- proper release generation
- fix Rissian distro name in license and other places
2010-11-26 00:19:22 +03:00
Anton V. Boyarshinov
f97db0b90c Merge branch 'master' into gnome-desktop
Conflicts:
	branding.spec
	indexhtml/index-en.html.in
	indexhtml/index-ru.html.in
	indexhtml/index-uk.html.in
	indexhtml/index.css.in
2009-11-03 12:44:45 +03:00
Andrey Cherepanov
7353cde807 5.0.0-alt40
- fix CSS in alterator web interface
- remove CUPS configuration link
2009-10-26 17:19:53 +03:00
Andrey Cherepanov
0b86727561 5.0.0-alt37
- fix buildsystem after indexhtml moving (thanks inger@)
- fix release-notes.ru text
- fix size of logo in web interface
- remove slideshow of Ark Server
2009-10-23 20:51:36 +04:00
Stanislav Ievlev
bc050aa766 Revert "use unified local documentation link (from azol@)"
This reverts commit a629089f2fb3aec68bb7fe94516b4395f3737569.
2009-10-23 18:00:26 +04:00
Stanislav Ievlev
532d910744 Revert "use unified local documentation link (from azol@)"
This reverts commit f74a39840ca94dda9660870646842271273204d6.
2009-10-23 17:34:15 +04:00
Stanislav Ievlev
ef9c2e8a11 - use unified local documentation link (updated patch from azol@) 2009-10-23 16:59:34 +04:00
Andrey Cherepanov
10a506dd06 5.0.0-alt21
- fix Russian name and copyright years
- fix images
- remove beta status
2009-10-22 18:27:02 +04:00
Andrey Cherepanov
a629089f2f use unified local documentation link (from azol@) 2009-10-22 13:51:47 +04:00
Andrey Cherepanov
f74a39840c use unified local documentation link (from azol@) 2009-10-22 11:54:16 +04:00
Alexandra Panyukova
d89e8c79fa STATUS removed. It's not beta/alpha etc. anymore 2009-10-21 19:57:34 +04:00
Alexandra Panyukova
5ed0be97d3 STATUS removed. It's not beta/alpha etc. anymore 2009-10-20 17:11:08 +04:00
Alexandra Panyukova
e89e570b9e Merge branch 'P5-server' into school-server
Conflicts:
	branding.spec
	images/boot.jpg
	images/boot.png
	images/logo.png
	notes/release-notes.all.html.in
2009-10-20 16:58:46 +04:00
Alexandra Panyukova
bd47689162 removed link to indexhtml-uk 2009-10-02 14:20:26 +04:00
Alexandra Panyukova
270e2ac9e8 pink background and padding for warnings added 2009-10-01 16:51:11 +04:00
Alexandra Panyukova
44665dc586 english translation of notes added 2009-09-29 18:13:01 +04:00
Alexandra Panyukova
f4871cb4bf english translation of indexhtml 2009-09-29 17:50:52 +04:00
Alexandra Panyukova
33b08a90fa new indexhtml 2009-09-28 20:03:34 +04:00
Alexandra Panyukova
618cf24c4e unnecessary hr removed from notes 2009-09-28 16:38:43 +04:00
Alexandra Panyukova
803c019d38 Merge remote branch 'inger/office-server' into P5
Conflicts:
	branding.spec
2009-09-25 16:16:40 +04:00
Alexandra Panyukova
41762117d6 new slideshow 2009-09-24 11:59:32 +04:00
Alexandra Panyukova
61ec3f36b3 new variant of notes 2009-09-21 19:51:34 +04:00
Alexandra Panyukova
db22c16d8b new variant of notes 2009-09-21 19:48:36 +04:00
Stanislav Ievlev
b96d41c740 Merge branch 'master' into office-server 2009-09-18 16:42:12 +04:00
Stanislav Ievlev
bdefc3d690 - simplify design of indexhtml page 2009-09-18 16:38:58 +04:00
Stanislav Ievlev
3effbee764 Merge branch 'master' into office-server
Conflicts:
	components.mk
	components/ahttpd/styles/alterator.css.in
	images/logo.png
2009-09-18 15:24:30 +04:00
Stanislav Ievlev
0fb2eae596 - made indexhtml as a component
- partial sync between CSS for indexhtml and for alterator
2009-09-18 14:09:46 +04:00
Vitaly Kuznetsov
6bc394f455 branding-altlinux-school-server-5.0-alt2: fix graphics 2009-08-27 16:13:33 +04:00
Andrey Cherepanov
ce76b6a499 Added release notes in English and Russian for Ark
Conflicts:

	notes/release-notes.all.html.in
	notes/release-notes.ru.html.in
2009-08-25 19:05:25 +04:00
Andrey Cherepanov
2255c66210 Remove SUN Java and Adobe Flash from license (closes: #21000) 2009-08-25 15:01:40 +04:00
Anton V. Boyarshinov
43d9a7a384 5.0.0-alt22
- \%status set to beta
- merge with master
2009-08-13 15:19:08 +04:00
Anton V. Boyarshinov
6c07439808 Merge branch 'master' into gnome-desktop
Conflicts:
	branding.spec
2009-08-13 13:17:42 +04:00
Anton V. Boyarshinov
4f1de091a4 Merge branch 'master' into alt-desktop
Conflicts:
	branding.spec
2009-08-13 13:15:25 +04:00
Andrey Cherepanov
bbb6273b25 Fix URLs and address in licence text 2009-08-13 13:13:38 +04:00
Alexey Rusakov
0fa0ec06b5 Added release notes in English and Russian for Ark 2009-08-11 18:45:09 +04:00
Alexey Rusakov
a2b078a6ca Added release notes in English and Russian for Ark 2009-08-11 18:35:11 +04:00
Alexey Rusakov
c858dc9c0d Added release notes in English and Russian for Ark 2009-08-11 18:32:50 +04:00
Anton V. Boyarshinov
73985d7a0f notes/release-notes.ru.html.in 2009-07-03 14:12:39 +04:00
Alexandra Panyukova
77719c02aa notes merge fixed 2009-04-24 18:22:15 +04:00
Alexandra Panyukova
7dc1a9ebd6 label about plazma 2009-04-24 18:05:43 +04:00
Anton V. Boyarshinov
b3c4f92aba Merge branch 'alt-desktop' into altlinux-office-server
Conflicts:

	branding.spec
2009-02-24 17:23:27 +03:00
Anton V. Boyarshinov
866ae1ca48 release notes rewritten 2009-02-17 21:06:36 +03:00
Anton V. Boyarshinov
19b7f37069 5.0-alt9
- rebuild with new translations
- more templates in notes
2009-02-06 14:10:56 +03:00
Anton V. Boyarshinov
212694b202 5.0-alt5
- added 'notes' subpackage
2009-01-23 15:57:22 +03:00