ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-29 04:55:02 +03:00
Code Issues Releases Wiki Activity
2577 commits 5 branches 13 tags 27 MiB
Commit graph

2577 commits

This branch
This branch
All branches
Author SHA1 Message Date
vatseek 9a969e23f9 Merge remote-tracking branch 'livestreet/master' into com 
* livestreet/master:
  Fix modals
  Frontend framework, fix synio
 2013-04-08 10:56:59 +03:00
vatseek 26f643d3f8 fix broken commit 2013-04-08 10:54:55 +03:00
Denis Shakhov 97b04b1021 Fix modals 2013-04-07 20:14:40 +07:00
Denis Shakhov 6fdaf0e3fd Frontend framework, fix synio 2013-04-07 02:06:48 +07:00
vatseek 6f9dff2d01 Merge remote-tracking branch 'livestreet/master' into comment2 
* livestreet/master:
  added logout function
  Frontend framework
  Move vendor js libs to framework folder
  fix count users blog
  fix даты рождения в профиле с учетом часовых поясов
  fix бага с прямым эфиром при удалении блога
  fix mailer return-path
  fix Issue #252
  Issue #246
  Issue #223
  Email notifications: grammatically and stylistically revised English version
  fix Issue #245
  fix  Issue #238
  fix Issue #228

Conflicts:
	classes/actions/ActionBlog.class.php
 2013-04-05 21:23:43 +03:00
Mzhelskiy Maxim b50fcacf17 Merge pull request #260 from stfalcon-studio/master 
added logout function
 2013-04-05 08:15:55 -07:00
Stepan Tanasiychuk 18522d4fb9 Merge pull request #28 from vatseek/test 
added logout function
 2013-04-05 06:49:41 -07:00
vatseek 173cd7529b set parent_id null if 0 before Comment_GetCommentUnique 2013-04-05 13:00:41 +03:00
vatseek bb150c9c16 added logout function 2013-04-05 10:58:06 +03:00
Denis Shakhov da1eebf461 Merge branch 'master' of https://github.com/livestreet/livestreet 
Conflicts:
	templates/skin/developer/blocks/block.stream.tpl
 2013-04-03 04:11:27 +07:00
Denis Shakhov 25454d21e3 Frontend framework 2013-04-03 04:08:55 +07:00
Denis Shakhov de45d9c630 Move vendor js libs to framework folder 2013-04-03 04:05:41 +07:00
Mzhelskiy Maxim f8de678ebe fix count users blog 2013-04-02 16:24:04 +07:00
Mzhelskiy Maxim 7dcb0dd4d5 fix даты рождения в профиле с учетом часовых поясов 2013-04-02 15:15:19 +07:00
Mzhelskiy Maxim a769ec5916 fix бага с прямым эфиром при удалении блога 2013-04-02 14:54:40 +07:00
Mzhelskiy Maxim 91632a5318 Merge remote-tracking branch 'origin/master' 2013-04-02 14:27:41 +07:00
Mzhelskiy Maxim c5dace38d0 fix mailer return-path 2013-04-02 14:27:23 +07:00
Mzhelskiy Maxim ca2477e8a4 Merge pull request #257 from sksdes/master 
Грамматические правки в шаблонах писем
 2013-04-02 00:19:01 -07:00
Mzhelskiy Maxim 6f5e98a57e fix Issue #252 2013-04-02 14:06:28 +07:00
Mzhelskiy Maxim 42003862ca Issue #246 2013-04-02 13:53:16 +07:00
Mzhelskiy Maxim f104cf2ed8 Issue #223 2013-04-02 13:47:29 +07:00
Sergey Zheleznov 05592b05c4 Email notifications: grammatically and stylistically revised English version 2013-04-01 18:47:57 +03:00
Mzhelskiy Maxim 01e9d4c925 fix Issue #245 2013-04-01 17:02:46 +07:00
Mzhelskiy Maxim 941087e58f fix Issue #238 2013-04-01 16:01:38 +07:00
Mzhelskiy Maxim 57b63b7851 fix Issue #228 2013-04-01 15:54:39 +07:00
vatseek 40c0424c46 fix remark 2013-04-01 10:18:12 +03:00
vatseek 5dc19f68f3 Merge pull request #3 from livestreet/master 
update
 2013-03-31 23:59:34 -07:00
Mzhelskiy Maxim 867155d795 Merge pull request #250 from stfalcon/patch-1 
Update english.php
 2013-03-31 23:44:04 -07:00
Mzhelskiy Maxim fd2368376d Merge pull request #249 from stfalcon-studio/master 
add php 5.4 in .travis.yml
 2013-03-31 23:42:39 -07:00
Mzhelskiy Maxim eb165b740f fix session 2013-03-22 11:15:46 +07:00
Mzhelskiy Maxim 0947c90956 fix plugin Page 2013-03-21 22:00:03 +07:00
Mzhelskiy Maxim 716668f2b1 fix Jevix config 2013-03-21 19:57:46 +07:00
Mzhelskiy Maxim 195f5bffb3 fix XSS 2013-03-21 15:50:13 +07:00
Stepan Tanasiychuk 9f0179db16 Update english.php 2013-03-19 18:54:45 +02:00
Mzhelskiy Maxim 87b6310b8b fix раскрытия путей при использовании сессий 2013-03-05 21:53:26 +07:00
vatseek 7449a692d4 comments 2013-03-01 14:58:34 +02:00
Denis Shakhov 5df5eadeef Frontend framework 
* Обновлены дропдауны
* Обновлены табы
* Исправлены мелкие баги
 2013-02-20 01:50:07 +07:00
Mzhelskiy Maxim 21ac736895 fix login modal 2013-02-15 14:50:20 +07:00
Denis Shakhov 6d18b1d525 Fix modals 2013-02-12 05:40:13 +07:00
Mzhelskiy Maxim f2e5453d71 Merge branch 'framework' 2013-02-11 17:49:38 +07:00
Mzhelskiy Maxim 3c27883255 Merge commit '6d086b4da88bbf447b5d173d1dc4a8f83457d100' into framework 2013-02-11 17:45:41 +07:00
Mzhelskiy Maxim 038a761555 fix ORM - теперь при запросах к БД учитываются только реальные поля таблицы 2013-02-11 17:38:24 +07:00
Denis Shakhov 6d086b4da8 Fix modal's close button 2013-02-11 16:40:46 +07:00
Denis Shakhov 7cd5625350 Merge pull request #237 from kpoxas/master 
Fix footer links
 2013-02-10 15:51:37 -08:00
Denis Shakhov 5a0afc5118 Fix modals and photoset 2013-02-11 06:41:53 +07:00
kpoxas 8e2aa8d23f fix 2013-02-11 01:25:42 +02:00
Denis Shakhov 1ab54be430 Merge pull request #236 from kpoxas/master 
Fix в synio.
 2013-02-10 14:55:06 -08:00
kpoxas fd9c0daa21 template fix 2013-02-11 00:36:36 +02:00
Mzhelskiy Maxim 00bbcb5e04 fix Issue #234 2013-02-10 09:51:09 +04:00
Denis Shakhov db5165c216 Minor bug fixes 2013-02-09 22:21:18 +07:00