32 Commits

Author SHA1 Message Date
Sarah Tsumayoi
2c1137009b Fix: Typo 2017-03-22 16:33:34 -04:00
Lucas Bartholemy
6090419f18 Moved icons into theme 2016-10-21 13:27:15 +02:00
Lucas Bartholemy
062d531da9 Merge branch 'master' into v1.1-dev
Conflicts:
	protected/humhub/config/common.php
	protected/humhub/modules/admin/controllers/UserController.php
	protected/humhub/modules/user/models/User.php
	protected/humhub/modules/user/views/auth/login.php
2016-02-16 15:59:09 +01:00
andystrobel
4b9bd3bf3f Added theme classes for modules and merged style.css and theme.css 2015-08-05 15:42:36 +02:00
Lucas Bartholemy
b757e1c766 Yii2 updates 2015-06-25 03:13:44 +02:00
Lucas Bartholemy
17f54cdf33 Combine and optionally compress used JS/CSS files 2015-05-01 11:49:04 +02:00
Lucas Bartholemy
3548f673fc Merge branch 'master' into develop 2014-10-21 16:04:14 +02:00
andystrobel
e3fa4918f5 Optimized theme structure 2014-10-14 14:45:24 +02:00
andystrobel
569fa8a242 Optimized some views for translation 2014-10-08 16:32:53 +02:00
Lucas Bartholemy
f6353719ed Merge master to develop 2014-10-07 04:00:30 +02:00
luke-
290bd155d6 Merge pull request #249 from andystrobel/develop
Integrated post and comment edit feature
2014-10-07 03:55:38 +02:00
Lucas Bartholemy
2fd0f10168 Updated Jquery Timeago plugin (https://github.com/rmm5t/jquery-timeago) to 1.4.1 & added locales 2014-10-06 08:39:03 +02:00
andystrobel
2d378e3404 Integrated comment editing feature 2014-10-03 21:02:45 +02:00
andystrobel
b7f2de382c Integrated Open Sans font as local files #212 2014-10-02 19:57:54 +02:00
Lucas Bartholemy
17ef7f2d4b Merge branch 'master' into develop 2014-09-24 17:16:59 +02:00
Lucas Bartholemy
ad4a03e88a Only show visible spaces at directory space sidebar 2014-09-24 06:41:04 +02:00
andystrobel
2b0e77cb84 Hide private spaces in Directory -> New Spaces panel 2014-09-22 12:31:33 +02:00
Lucas Bartholemy
c625dc7a9b File uploader cleanups, allow files also in comments 2014-09-19 12:44:51 +02:00
andystrobel
2efe225282 Fixed blank emails for outlook.com and some broken content links #85 #147 2014-09-11 14:08:35 +02:00
Andy Strobel
446a7feb49 Built in dynamic links for javascript and css files for better caching behavior 2014-07-23 19:46:56 +02:00
Lucas Bartholemy
60e2a94f58 Changed deprecated title attribute access 2014-07-07 09:34:34 +02:00
Andy Strobel
6bd48f4a3a Integrate new template for all kind of email notifications 2014-07-01 16:45:39 +02:00
Andy Strobel
49eecef751 Global design and usability changes (spaces, profile, directory; Integrated animate.css and jQuery File Upload for profile images) 2014-06-28 21:07:21 +02:00
Andy Strobel
e7eb1b05b6 Integrated support HTML5 input placeholder attribute for older browsers (#49) Putted recurring jquery plugin calls in one ajaxComplete event. 2014-05-15 12:25:36 +02:00
Andy Strobel
44b4caff64 Updated fontawesome to version 4.0.3 and fixed glyphicons #65 2014-05-14 20:41:18 +02:00
Andy Strobel
605a961222 Fixing multiple page loading through ajax #66 2014-05-14 18:28:09 +02:00
Andy Strobel
6ee31c6a52 Converted jQuery Mention Plugin in a Widget 2014-05-14 13:07:04 +02:00
Andy Strobel
819a5339a8 Integrate mentioning for the HumHub theme 2014-05-12 18:11:52 +02:00
Andy Strobel
d1ea05e3e2 Added jquery flatelements plugin 2014-04-27 13:48:58 +02:00
Andy Strobel
398c763cd0 Added NiceScroll jQuery Plugin 2014-04-22 11:48:50 +02:00
Lucas Bartholemy
3702ac72a5 Google Fonts via HTTPS 2014-02-24 10:30:38 +01:00
Lucas Bartholemy
d3ff1c3c4a Initial Commit 2014-02-10 06:36:00 +01:00