Commit Graph

100 Commits

Author SHA1 Message Date
Mikhail Efremov
4ac2300f30 notes: Replace license.all.html.in with English page 2019-07-10 14:59:42 +03:00
Andrey Cherepanov
28db402aeb Move all install instructions from notes/Makefile and spec file to Makefile.in 2019-04-30 13:47:58 +03:00
Andrey Cherepanov
f84f05b066 Apply new license and release notes 2016-07-15 13:48:00 +03:00
Andrey Cherepanov
10268fc4db 7.0.5-alt0.M70P.2
- Update copyright years, fix VK group URL and update company address
- Fix button gluing in web interface
- Fix package name with Droid fonts
- Generate image for selection bar in GRUB menu from specified color
2015-04-14 12:44:01 +03:00
Andrey Cherepanov
24fd0f09eb Update copyright years, fix VK group URL and update company address 2015-04-10 12:43:56 +03:00
Anton V. Boyarshinov
2dc613c440 7.0.3-alt1
- Fix license
2014-02-06 10:59:19 +04:00
Anton V. Boyarshinov
4e7b4290ed 7.0.3-alt1
- Fix license
2014-02-06 10:57:05 +04:00
Andrey Cherepanov
7b692b001b Remove missing non-free software from School Server license 2013-12-17 11:07:39 +04:00
Andrey Cherepanov
a831f37408 Actualize package list with non-free licenses 2013-12-17 11:05:10 +04:00
Andrey Cherepanov
6fc3eb617f Actualize package list with non-free licenses 2013-12-17 10:31:41 +04:00
Andrey Cherepanov
07a7bceee3 Merge branch 'school-master' into school-junior
Conflicts:
	Makefile.in
	branding.spec
	components.mk
	components/ahttpd/images/groups/datetime.png
	components/ahttpd/images/groups/mail.png
	components/ahttpd/images/groups/network.png
	components/ahttpd/images/groups/pkg.png
	components/ahttpd/images/groups/servers.png
	components/ahttpd/images/groups/system.png
	components/ahttpd/images/groups/users.png
	components/ahttpd/images/groups/xorg.png
	components/ahttpd/images/steps/install2-preinstall.png
	components/ahttpd/images/steps/packages.png
	components/ahttpd/images/steps/timezone.png
	components/bootloader/config.in
	components/bootloader/gfxboot.cfg.in
	components/browser-qt/design/design.qss.in
	configure.ac
	graphics/icons/altlinux_16x16.png
	images/boot.png
	images/console.jpg
	images/installer.png
	images/wallpaper.png
	kde3-settings/apps/kicker/default-apps
	kde3-settings/config/kcmdisplayrc
	kde3-settings/config/kdeglobals.in
	kde3-settings/config/konquerorrc
	kde3-settings/config/kwinrc
	kde4-settings/kde4/share/config/default-apps
	notes/license.ru.html.in
2013-11-20 19:16:58 +04:00
Andrey Cherepanov
000989f5d0 Merge branch 'school-server' into school-master
Conflicts:
	Makefile.in
	branding.spec
	components/ahttpd/images/groups/datetime.png
	components/ahttpd/images/groups/firewall.png
	components/ahttpd/images/groups/mail.png
	components/ahttpd/images/groups/network.png
	components/ahttpd/images/groups/pkg.png
	components/ahttpd/images/groups/servers.png
	components/ahttpd/images/groups/system.png
	components/ahttpd/images/groups/users.png
	components/ahttpd/images/groups/xorg.png
	components/ahttpd/images/steps/install2-preinstall.png
	components/ahttpd/images/steps/timezone.png
	components/ahttpd/styles/alterator.css.in
	components/bootloader/config.in
	components/bootloader/gfxboot.cfg.in
	components/browser-qt/design/design.qss.in
	components/indexhtml/index-en.html.in
	components/indexhtml/index-ru.html.in
	components/indexhtml/index.css
	components/systemd/os-release.in
	configure.ac
	gnome-settings/index.theme.in
	gnome-settings/metacity-theme-1.xml.in
	images/background16x9.png
	images/background4x3.png
	images/boot.png
	images/grub.png
	images/product-logo.png
	notes/index-ru.html.in
	slideshow/README
2013-10-16 20:47:53 +04:00
Andrey Cherepanov
0c91ca4a48 Merge branch 'school-teacher' into school-server
Conflicts:
	Makefile.in
	branding.spec
	components.mk
	components/ahttpd/images/first-page-button.svg
	components/ahttpd/images/groups/firewall.png
	components/ahttpd/images/groups/network.png
	components/ahttpd/images/groups/pkg.png
	components/ahttpd/images/groups/system.png
	components/ahttpd/images/groups/users.png
	components/ahttpd/images/groups/xorg.png
	components/ahttpd/images/last-page-button.svg
	components/ahttpd/images/next-page-button.svg
	components/ahttpd/images/prev-page-button.svg
	components/ahttpd/images/steps/datetime.png
	components/ahttpd/images/steps/finish.png
	components/ahttpd/images/steps/greeting.png
	components/ahttpd/images/steps/install.png
	components/ahttpd/images/steps/install2-basesystem.png
	components/ahttpd/images/steps/lilo.png
	components/ahttpd/images/steps/net-eth.png
	components/ahttpd/images/steps/notes-license.png
	components/ahttpd/images/steps/notes-release-notes.png
	components/ahttpd/images/steps/pkg-groups.png
	components/ahttpd/images/steps/preinstall.png
	components/ahttpd/images/steps/root.png
	components/ahttpd/images/steps/sysconfig-base.png
	components/ahttpd/images/steps/sysconfig-kbd.png
	components/ahttpd/images/steps/sysconfig-language.png
	components/ahttpd/images/steps/user.png
	components/ahttpd/images/steps/users.png
	components/ahttpd/images/steps/vm.png
	components/ahttpd/images/steps/x11.png
	components/bootloader/config.in
	components/bootloader/gfxboot.cfg.in
	components/browser-qt/design/design.ini.in
	components/browser-qt/design/design.qss.in
	components/browser-qt/theme.qrc
	components/grub2/theme.txt
	components/indexhtml/images/altlinux-logo.png
	components/indexhtml/images/bullet.png
	components/indexhtml/images/community.png
	components/indexhtml/images/documentation.png
	components/indexhtml/images/facebook.png
	components/indexhtml/images/lines.png
	components/indexhtml/images/twitter.png
	components/indexhtml/images/vkontakte.png
	components/indexhtml/index-en.html.in
	components/indexhtml/index-ru.html.in
	components/indexhtml/index.css
	components/indexhtml/indexhtml.desktop.in
	components/systemd/os-release.in
	configure.ac
	graphics/kde/kdm-logo.png
	images/product-logo.png
	notes/Makefile
	notes/license.all.html.in
	notes/license.ru.html.in
	notes/release-notes.all.html.in
	xfce-settings/etcskel/.config/xfce4/desktop/icons.screen0.rc
	xfce-settings/etcskel/.config/xfce4/helpers.rc
	xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
	xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
	xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
	xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
	xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
2013-10-14 18:43:20 +04:00
Andrey Cherepanov
edf764aa57 6.9.9-alt1
- Update branding for Seven platform
2013-09-10 00:16:55 +04:00
Andrey Cherepanov
afafe26426 6.9.9-alt1
- Update branding for Seven platform
2013-09-09 23:33:38 +04:00
Andrey Cherepanov
02b9f5b37e Merge remote-tracking branch 'zerg-school-master/sisyphus' into school-master
Conflicts:
	Makefile.in
	branding.spec
	components.mk
	components/ahttpd/images/groups/firewall.png
	components/indexhtml/index-ru.html.in
	components/indexhtml/indexhtml.desktop.in
	images/installer.png
	notes/index-ru.html.in
	notes/license.ru.html.in
	notes/release-notes.all.html.in
	notes/release-notes.ru.html.in
2013-09-06 09:22:04 +04:00
Andrey Cherepanov
0a4136befc 6.9.9-alt1
- Update branding for Seven platform
2013-09-03 14:47:38 +04:00
Andrey Cherepanov
afcd00d9ad Use product name for English version of license and release notes too 2013-08-06 12:29:48 +04:00
Andrey Cherepanov
0b775e68b0 6.9.9-alt1
- Update branding for Seven platform
2013-08-05 14:03:43 +04:00
Mikhail Efremov
1e9d1a0a38 documentation: Drop space between VERSION and STATUS.
So it will be better looking if STATUS is %nil.
2013-07-11 17:53:42 +04:00
Mikhail Efremov
bf5f31b52c Fix license.ru.html. 2013-06-24 19:53:15 +04:00
Mikhail Efremov
fa9adea6ad license.ru.html: Add SL version. 2013-06-11 17:10:57 +04:00
Mikhail Efremov
5453de0de5 Add Ukrainian start/release-notes pages.
Translation by Michael Shigorin.
2013-05-29 17:19:46 +04:00
Mikhail Efremov
dc96696110 Really use russian license text for Ukrainian. 2013-05-24 15:50:28 +04:00
Mikhail Efremov
b0cc3d0352 livecd-start.ru.html: Fix align. 2013-02-26 15:24:02 +04:00
Mikhail Efremov
20325539ca release-notes: Fix align (thx cas@). 2013-02-11 17:38:46 +04:00
Andrey Cherepanov
45e19f8875 Set correct URL to indexhtml 2012-12-28 18:21:03 +04:00
Andrey Cherepanov
0ae5c78062 Add links to useful resources 2012-11-30 16:34:59 +04:00
Andrey Cherepanov
c8dadb9505 Set correct Russian product name from spec 2012-11-30 16:06:05 +04:00
Andrey Cherepanov
1f92710f62 Remove obsoleted files 2012-11-30 15:57:06 +04:00
Andrey Cherepanov
a302b6eeaf Fix attribute name for meta http-equiv 2012-11-15 12:09:24 +04:00
Andrey Cherepanov
7e0f6c512d Adapt for School Teacher 2012-08-29 18:25:11 +04:00
1e707e06cf - translate license titles 2012-08-29 17:28:39 +04:00
Andrey Cherepanov
d1d5c06d6b 6.0.0-alt5
- Set correct distribution name
2012-08-29 15:49:35 +04:00
Andrey Cherepanov
0f0efa8d18 6.0.0-alt5
- Set correct distribution name
2012-08-29 15:45:15 +04:00
Andrey Cherepanov
233deca808 Fix attribute name for meta http-equiv 2012-08-20 14:51:17 +04:00
Andrey Cherepanov
6cbcb586fd Fix attribute name for meta http-equiv 2012-08-20 14:15:58 +04:00
Andrey Cherepanov
7c978368d5 Fix attribute name for meta http-equiv 2012-08-17 16:41:54 +04:00
Andrey Cherepanov
b1b05e0ae6 Fix distro name 2012-08-17 16:30:03 +04:00
517b9ffe07 - gix license content-type 2012-08-10 17:34:46 +04:00
Andrey Cherepanov
cafed54b2b Adapt texts for School Master, remove old files from notes 2012-05-05 17:31:46 +04:00
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
a8ab443cb8 Merge remote-tracking branch 'boyarsh/centaurus' into kdesktop
Conflicts:
	branding.spec
	components/browser-qt/design/design.ini.in
	components/browser-qt/design/design.qss.in
	components/indexhtml/index-en.html.in
	components/indexhtml/index-uk.html.in
	components/indexhtml/index.css.in
2011-10-18 14:20:11 +04:00
1d5f7945ac - add Ё to notes 2011-09-19 15:42:14 +04:00
Andrey Cherepanov
b862116592 6.0.0-alt25
- Use russian license text for Ukrainian
- Fix English text in indexhtml
2011-09-15 15:19:35 +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
Alexandra Panyukova
e8f28e239a text for first installer step on livecd added 2011-08-02 18:24:20 +04:00
Alexandra Panyukova
3c96212789 s/slinux/simplylinux/ 2011-07-28 17:42:44 +04:00
Alexandra Panyukova
7e59d5673a adding symlink for final step in installer 2011-06-28 20:36:08 +04:00