Commit Graph

11411 Commits

Author SHA1 Message Date
fabrixxm b202e02fbf Revert "Updated modules to allow for partial overrides without errors"
This reverts commit db949bb802.
2016-02-07 15:11:34 +01:00
fabrixxm d6cf791677 Merge pull request #2324 from rabuzarus/0502_vier_dark
vier: some consistency fixes for the dark scheme
2016-02-07 09:53:24 +01:00
fabrixxm 9330a6994c Merge pull request #2319 from stieben/develop
Added the possibility for themes to override core module functions
2016-02-07 09:52:20 +01:00
fabrixxm ecfb6ec924 Merge pull request #2313 from rabuzarus/0302_forum_class
forums.php is now ForumManager.php and providing class ForumManager
2016-02-07 09:28:50 +01:00
rabuzarus 95819684c2 Merge develop into 0502_vier_dark
Conflicts:
	view/theme/vier/dark.css
2016-02-06 13:09:41 +01:00
Tobias Diekershoff 99c3db98a7 Merge pull request #2322 from rabuzarus/0502_vier_smiley
vier: display smiley-preview as inline-block - needs addons update
2016-02-06 07:27:33 +01:00
rabuzarus 0bccfea596 vier: some consistency fixes for the dark scheme 2016-02-06 00:54:50 +01:00
Andrej Stieben db949bb802 Updated modules to allow for partial overrides without errors
Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.
2016-02-05 21:52:39 +01:00
rabuzarus bcf1020635 vier smileybutton: dark.css insert new line at the end of the file 2016-02-05 21:38:55 +01:00
rabuzarus 9fd3d8116b vier smileybutton: little polish in dark.css 2016-02-05 21:30:31 +01:00
rabuzarus 41405ed0f2 vier: display smiley-preview as inline-block - needs addons update 2016-02-05 21:24:01 +01:00
Tobias Diekershoff 0a5297970b Merge pull request #2321 from fabrixxm/mobile_acl_dialog
ACL: fix TypeError when selecting permissions
2016-02-05 19:06:24 +01:00
fabrixxm f70f4bb899 ACL: fix TypeError when selecting permissions 2016-02-05 18:43:46 +01:00
Andrej Stieben a81d929cdf Minor documentation update, as requested by @tobiasd 2016-02-05 14:11:10 +01:00
Tobias Diekershoff 8bca68c77c Merge pull request #2317 from rabuzarus/0402_vier_mobile_textarea
vier: remove some hardcoded css to be more mobile friendly
2016-02-05 06:57:07 +01:00
Tobias Diekershoff 437784b7bb Merge pull request #2318 from annando/1602-vier-font
Vier: The font "system" can make the system look ugly
2016-02-05 06:56:26 +01:00
Andrej Stieben 48e6ff21aa Added the possibility for themes to override core module functions 2016-02-04 21:45:21 +01:00
Andrej Stieben acefb84681 Improved documentation formatting (of Plugins.md) 2016-02-04 19:37:06 +01:00
Michael Vogel b85369a03b Vier: The font "system" can make the system look ugly 2016-02-04 18:58:33 +01:00
rabuzarus a75be65860 vier: little float fix 2016-02-04 16:45:39 +01:00
rabuzarus 12c6ba9081 vier: remove some hardcoded css to be more mobile friendly 2016-02-04 16:21:40 +01:00
rabuzarus 52dbb0b4a2 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:51:54 +01:00
rabuzarus 9a54afa629 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:47:20 +01:00
Tobias Diekershoff 4d0778bfe1 Merge pull request #2316 from fabrixxm/mobile_acl_dialog
fix empty ACL window on desktop
2016-02-04 07:47:45 +01:00
fabrixxm e11ff25de2 fix empty ACL window on desktop 2016-02-03 23:22:45 +01:00
Tobias Diekershoff fb2d19b61e Merge pull request #2315 from silke/documentation
Slightly updated docs about Let's Encrypt
2016-02-03 20:54:32 +01:00
Silke Meyer c715877261 Slightly updated docs about Let's Encrypt 2016-02-03 20:47:41 +01:00
Tobias Diekershoff 127ef04aa2 Merge pull request #2312 from fabrixxm/mobile_acl_dialog
Mobile acl dialog and other mobile fix for Vier
2016-02-03 20:00:58 +01:00
rabuzarus c1070e4655 forums.php is now forum.php and providing class forum 2016-02-03 18:05:26 +01:00
Fabrixxm f21e3e46c7 Vier mobile: better jot buttons on small screens 2016-02-03 15:01:24 +01:00
Fabrixxm 1ddae21cff Vier mobile: fix content width, events style, oembed 2016-02-03 14:48:46 +01:00
Fabrixxm 3c6ebfa5a9 Vier - mobile friendly ACL window and form fields 2016-02-03 14:03:00 +01:00
Fabrixxm 9fcd74f470 Pass App class instace to all templates via "$APP" variable 2016-02-03 14:01:37 +01:00
Tobias Diekershoff f0912d6219 Merge pull request #2310 from rabuzarus/0302_vier_photo
vier: use object-fit: cover for recent photos view
2016-02-03 07:07:38 +01:00
Tobias Diekershoff ada4fbdfb9 Merge pull request #2309 from annando/1602-new-guid
New method to create a guid if none was given
2016-02-03 07:07:13 +01:00
Michael Vogel 47d2e3b142 Added some documentation 2016-02-03 05:00:26 +01:00
rabuzarus 58c1f9a60f vier: use object-fit: cover for recent photos view 2016-02-03 03:59:42 +01:00
Michael Vogel 32c92cdefe Merge pull request #2306 from tobiasd/20160131-IT
IT update to the strings
2016-02-02 21:07:24 +01:00
Michael Vogel 9911fcbc97 Merge pull request #2308 from rabuzarus/0202_update_ps
perfect-scrollbar: update to 0.6.10
2016-02-02 21:06:56 +01:00
Michael Vogel f604f13d7d New method to create a guid if none was given 2016-02-02 20:57:19 +01:00
rabuzarus 24d4716204 perfect-scrollbar: update to 0.6.10 2016-02-02 15:56:06 +01:00
Tobias Diekershoff 447ed7af53 IT update to the strings 2016-01-31 12:02:05 +01:00
Tobias Diekershoff 748d0e576c Merge pull request #2304 from rabuzarus/3001_event_map_fix
event_form: use [map] tag to embedd a map
2016-01-30 06:59:30 +01:00
rabuzarus 088b075bba event_form: use [map] tag to embedd a map 2016-01-30 05:12:27 +01:00
Michael Vogel 4cac6a744f Merge pull request #2303 from rabuzarus/2901-vier-mobile
vier: some fixes for mobile view
2016-01-30 03:21:28 +01:00
rabuzarus 8e0f04026c vier: some fixes for mobile view 2016-01-30 01:53:21 +01:00
Tobias Diekershoff cb34e86aec Merge pull request #2302 from annando/1601-profile-data
Profile data from the gcontact table should only be taken if there is content
2016-01-29 18:02:45 +01:00
Michael Vogel 596416defe Profile data from the gcontact should only be taken if there is content 2016-01-29 12:14:04 +01:00
fabrixxm 863d49ccd0 Merge pull request #2300 from annando/1601-gcontact-guessing
gcontact-id now depends on the owner, not the author of a post
2016-01-29 05:27:58 +01:00
fabrixxm fdb864157d Merge pull request #2299 from annando/1601-contact-photos
Improved avatar storage in contacts
2016-01-29 05:26:26 +01:00