1. 24 Dec, 2013 1 commit
  2. 18 Dec, 2013 1 commit
  3. 17 Dec, 2013 3 commits
  4. 05 Dec, 2013 8 commits
  5. 22 Nov, 2013 2 commits
  6. 21 Nov, 2013 3 commits
  7. 20 Nov, 2013 2 commits
    • Andrey Cherepanov's avatar
      Fix disto name in merge · 0328fc75
      Andrey Cherepanov authored
      0328fc75
    • Andrey Cherepanov's avatar
      Merge branch 'school-master' into school-junior · 07a7bcee
      Andrey Cherepanov authored
      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
      07a7bcee
  8. 25 Oct, 2013 8 commits
  9. 16 Oct, 2013 7 commits
    • Andrey Cherepanov's avatar
      Merge branch 'school-server' into school-master · 000989f5
      Andrey Cherepanov authored
      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
      000989f5
    • Andrey Cherepanov's avatar
      Fix size of product logo · 96f4010d
      Andrey Cherepanov authored
      96f4010d
    • Andrey Cherepanov's avatar
      Fix case of placeholders · cfb3b1cc
      Andrey Cherepanov authored
      cfb3b1cc
    • Andrey Cherepanov's avatar
      Fix indent · e4f60164
      Andrey Cherepanov authored
      e4f60164
    • Andrey Cherepanov's avatar
      Change issuer name · e3403492
      Andrey Cherepanov authored
      e3403492
    • Andrey Cherepanov's avatar
      Fix distro name for @Name@ placeholder · 817bf468
      Andrey Cherepanov authored
      817bf468
    • Andrey Cherepanov's avatar
      5df1fffd
  10. 15 Oct, 2013 1 commit
  11. 14 Oct, 2013 2 commits
    • Andrey Cherepanov's avatar
      Fix indexhtml stylesheet · f6cdc25f
      Andrey Cherepanov authored
      f6cdc25f
    • Andrey Cherepanov's avatar
      Merge branch 'school-teacher' into school-server · 0c91ca4a
      Andrey Cherepanov authored
      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
      0c91ca4a
  12. 30 Sep, 2013 1 commit
  13. 27 Sep, 2013 1 commit