Andrey Cherepanov
6ebedb3462
Remove informika-schoolmaster provides
2013-11-20 20:58:26 +04:00
Andrey Cherepanov
0328fc754f
Fix disto name in merge
2013-11-20 19:30:16 +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
d2fcb48156
Add graphics abi placeholders
2013-10-25 17:15:40 +04:00
Andrey Cherepanov
e95f4918e6
Put product logo to indexhtml
2013-10-25 16:36:11 +04:00
Andrey Cherepanov
508e6a9afd
Do not install icons
2013-10-25 16:28:09 +04:00
Andrey Cherepanov
6d17505826
Fix missing wallpapers
2013-10-25 16:21:42 +04:00
Andrey Cherepanov
14b72a8e70
Put indexhtml icon on KDE4 desktop
2013-10-25 16:05:20 +04:00
Andrey Cherepanov
323dca01b9
Fix empty Plasma desktop
2013-10-25 16:02:49 +04:00
Andrey Cherepanov
b01d5586df
Add KDE3 settings
2013-10-25 16:02:20 +04:00
Andrey Cherepanov
6b90f1e73a
Fix typo in file name
2013-10-25 13:15:43 +04:00
Andrey Cherepanov
a6e80ccb84
Fix placeholder for bootloader
2013-10-18 11:03:16 +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
96f4010d49
Fix size of product logo
2013-10-16 14:57:42 +04:00
Andrey Cherepanov
cfb3b1ccb7
Fix case of placeholders
2013-10-16 14:01:03 +04:00
Andrey Cherepanov
e4f60164ae
Fix indent
2013-10-16 13:37:26 +04:00
Andrey Cherepanov
e3403492fd
Change issuer name
2013-10-16 13:31:14 +04:00
Andrey Cherepanov
817bf4681c
Fix distro name for @Name@ placeholder
2013-10-16 13:11:16 +04:00
Andrey Cherepanov
5df1fffd13
Use universal @distro_name@ for bootloader
2013-10-16 12:36:29 +04:00
Andrey Cherepanov
fba2b037e6
Remove docs requirements
2013-10-15 19:59:53 +04:00
Andrey Cherepanov
f6cdc25f4c
Fix indexhtml stylesheet
2013-10-14 18:44:24 +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
a1bf1fc51e
Modernize indexhtml view
2013-09-30 17:21:31 +04:00
Andrey Cherepanov
675f54529f
Fix wallpaper generation
2013-09-27 17:34:30 +04:00
Andrey Cherepanov
2afe235ed6
Fix installer step name color and size
2013-09-27 16:59:13 +04:00
Andrey Cherepanov
769cb6b4a9
Fix bootloader colors
2013-09-27 16:58:30 +04:00
Andrey Cherepanov
e47532711a
Fix product logo
2013-09-26 17:08:51 +04:00
Andrey Cherepanov
aeb9913777
Fix pack indexhtml content
2013-09-26 15:11:43 +04:00
Andrey Cherepanov
ac752ced9e
Generate wallpapers
...
Conflicts:
Makefile.in
components/ahttpd/images/product-logo.png
images/background16x9.png
images/background4x3.png
images/boot.jpg
images/boot.png
images/console.jpg
images/grub.png
images/installer.png
images/product-logo.png
2013-09-26 14:57:11 +04:00
Andrey Cherepanov
a6548ba4b6
Clean spec file
...
Conflicts:
branding.spec
2013-09-26 11:32:20 +04:00
Andrey Cherepanov
f1ba02a8bc
Set correct color for installer title and gfxboot menu items
...
Conflicts:
components/bootloader/gfxboot.cfg.in
2013-09-26 11:20:57 +04:00
Andrey Cherepanov
353f47a143
Generate wallpapers
2013-09-25 17:32:10 +04:00
Andrey Cherepanov
19ac249524
Clean spec file
2013-09-25 17:29:10 +04:00
Andrey Cherepanov
4c1c83674b
Set correct color for installer title and gfxboot menu items
2013-09-25 17:27:47 +04:00
Andrey Cherepanov
4058a1bd7d
Remove Centaurus slideshow
2013-09-12 15:48:03 +04:00
Andrey Cherepanov
c84b415f19
Update alterator-browser-qt design
2013-09-12 15:45:11 +04:00
Andrey Cherepanov
6cd045009c
Import kde4-settings from branding-informika-schoolmaster
2013-09-12 07:19:45 +04:00
Andrey Cherepanov
bf68ff0d1c
Remove XFCE-specific WM run
2013-09-10 10:46:56 +04:00
Andrey Cherepanov
800540e364
Use %distro_name macro for distribution name
2013-09-10 09:27:52 +04:00
Andrey Cherepanov
a3de5db680
Fix substitution variables and typo in requirements
2013-09-10 09:23:48 +04:00
Andrey Cherepanov
6355da5a98
Use School theme for alterator-browser-qt
2013-09-10 00:20:33 +04:00
Andrey Cherepanov
edf764aa57
6.9.9-alt1
...
- Update branding for Seven platform
2013-09-10 00:16:55 +04:00
Andrey Cherepanov
1c020c4784
Set codename for Informika 7.0 School Teacher
2013-09-09 23:59:05 +04:00
Andrey Cherepanov
60577e92fa
Make step title in DodgerBlue color more suitable for School theme
2013-09-09 23:57:25 +04:00
Andrey Cherepanov
147b08d012
Make step title in DodgerBlue color more suitable for School theme
2013-09-09 23:54:57 +04:00
Andrey Cherepanov
1d9f3bef11
Make step title in DodgerBlue color more suitable for School theme
2013-09-09 23:48:04 +04:00
Andrey Cherepanov
50c78b5ad7
Update SVG images for ahttpd
2013-09-09 23:35:01 +04:00
Andrey Cherepanov
afafe26426
6.9.9-alt1
...
- Update branding for Seven platform
2013-09-09 23:33:38 +04:00
Andrey Cherepanov
546ea2c0e0
Fix typo in GRUB2 theme
2013-09-09 15:32:28 +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
