Lucas Bartholemy beb208f460 Merge branch 'master' into v1.2-dev ...

# Conflicts:
#	protected/humhub/docs/guide/README.md
#	protected/humhub/modules/content/controllers/ContentController.php
#	protected/humhub/modules/dashboard/components/actions/DashboardStream.php
#	protected/humhub/modules/dashboard/controllers/DashboardController.php
#	protected/humhub/modules/space/controllers/SpaceController.php
#	protected/humhub/modules/stream/widgets/views/stream.php
#	protected/humhub/views/layouts/main.php
#	themes/HumHub/css/theme.css

2016-06-03 13:11:57 +02:00

..

dist

JS Action/Content refactoring Implementation of action components.

2016-05-02 21:40:26 +02:00

app.js

Merge branch 'master' into v1.2-dev

2016-06-03 13:11:57 +02:00

bootstrap3-wysihtml5.js

…

bootstrap-datepicker.js

…

bootstrap-datetimepicker.js

…

datetimefield-init.js

…

desktop-notify-config.js

…

desktop-notify-min.js

…

ekko-lightbox-modified.js

Static max width/height for ligthbox gallery + removed outline from gallery

2016-04-15 14:47:10 +02:00

html5shiv.js

…

humhub.actions.js

JS Action/Content refactoring Implementation of action components.

2016-05-02 21:40:26 +02:00

humhub.additions.js

Added package.json, pjax dependencie + js rewrite enhancements

2016-04-19 15:47:05 +02:00

humhub.client.js

JS Module safe module boot + new theme path updates.

2016-05-02 01:45:36 +02:00

humhub.content.js

JS Action/Content refactoring Implementation of action components.

2016-05-02 21:40:26 +02:00

humhub.core.js

JS Action/Content refactoring Implementation of action components.

2016-05-02 21:40:26 +02:00

humhub.js

…

humhub.scripts.js

Added package.json, pjax dependencie + js rewrite enhancements

2016-04-19 15:47:05 +02:00

humhub.stream.js

JS Action/Content refactoring Implementation of action components.

2016-05-02 21:40:26 +02:00

humhub.ui.js

JS rewrite . initial stream implementation.

2016-04-28 14:35:30 +02:00

humhub.ui.modal.js

Modal close on click fix.

2016-05-01 22:58:04 +02:00

humhub.util.js

JS rewrite . initial stream implementation.

2016-04-28 14:35:30 +02:00

jquery-ui-core-int.min.js

…

jquery.autosize.min.js

…

jquery.caret.min.js

…

jquery.color-2.1.0.min.js

…

jquery.cookie.js

…

jquery.flatelements.js

…

jquery.highlight.min.js

…

jquery.loader.js

…

jquery.nicescroll.min.js

…

jquery.pjax.js

Added package.json, pjax dependencie + js rewrite enhancements

2016-04-19 15:47:05 +02:00

markdownEditor.js

…

modernizr.js

…

moment-with-locales.min.js

…

panelMenu.js

…

select2-extension.js

Abstract SocialActivity class for BaseActivity/BaseNotification + Moved Multidropdown (select2) + Tabbed form to own assets + User Admin Layout panel-body change

2016-05-13 12:45:49 +02:00

tabbedForm.js

Admin Settings Text/Layout

2016-05-13 19:58:51 +02:00

wysihtml5-0.3.0.js

…