Yarik / artbox-basic

  • Merge remote-tracking branch 'origin/master' ...
    542dacfb 
    # Conflicts:
#	backend/views/site/index.php
#	common/config/settings.php
#	common/widgets/Alert.php
#	composer.lock
#	frontend/models/ContactForm.php
#	frontend/models/PasswordResetRequestForm.php
#	frontend/models/ResetPasswordForm.php
#	frontend/models/SignupForm.php
#	frontend/views/site/login.php
#	frontend/views/site/requestPasswordResetToken.php
#	frontend/views/site/resetPassword.php
#	frontend/views/site/signup.php
    Alexey Boroda authored
     
    Browse Dir »
  • -GA js ready
    6b69a279
    Alexey Boroda authored
     
    Browse Dir »
  • Merge branch 'master' of gitlab.artweb.com.ua:yarik.nechyporuk/artbox-core ...
    0ffdb7f9 
    # Conflicts:
#	behaviors/LanguageBehavior.php
#	components/LanguageRequest.php
#	components/LanguageUrlManager.php
#	controllers/SettingsController.php
#	language_instruction.txt
#	models/Feedback.php
#	models/FeedbackSearch.php
#	models/Language.php
#	models/Page.php
#	models/PageLang.php
#	models/PageSearch.php
#	models/User.php
#	widgets/LanguageForm.php
#	widgets/LanguagePicker.php
#	widgets/views/language_form_frame.php
#	widgets/views/view.php
    Yarik authored
     
    Browse Dir »