24293 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	0390001d4e	Added some more logging	2016-02-04 15:53:22 +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
Michael Vogel	3a649047df	DFRN: Contact-id is now stored depending on the author/Some more bugfixes	2016-02-04 12:51:34 +01:00
Michael Vogel	5f6ba00408	Added documentation, fixed some bug	2016-02-04 10:19:13 +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
Michael Vogel	2d0c2990ea	Differences fixed between old and new code	2016-02-03 23:04:52 +01:00
Silke Meyer	5559c02662	Revert "Updated docs about Let's Encrypt" ... This reverts commit ac26611e05.	2016-02-03 21:49:07 +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
Silke Meyer	ac26611e05	Updated docs about Let's Encrypt	2016-02-03 20:39:50 +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	811ed4e1c0	datetime.php cleanup	2016-02-03 19:48:09 +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
Michael Vogel	d9b5d6d5f5	Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import	2016-02-03 08:34:11 +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
rabuzarus	ad5be2901e	rework autocomplete: some styling if contact is forum	2016-02-03 00:25:33 +01:00
rabuzarus	aff775e55c	rework autocomplete: add NavBar forum search	2016-02-02 22:33:14 +01:00
Michael Vogel	82d387272c	Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import	2016-02-02 21:09:08 +01:00
Michael Vogel	c18d17e65b	Merge pull request #2305 from nerdoc/patch-1 ... add simple option for HTTPS in .htaccess	2016-02-02 21:07:52 +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
Michael Vogel	1aa225b03b	Code beautification	2016-02-01 23:52:37 +01:00
rabuzarus	00e319faa2	rework autocomplete: add bbcode autocompletion to editor	2016-02-01 18:22:26 +01:00
rabuzarus	aee94b38c1	rework autocomplete: add class dir and static function	2016-02-01 18:21:29 +01:00
rabuzarus	5f7c5e6ab6	rework autocomplete: Access list of smilies over JSON	2016-02-01 17:43:12 +01:00
Michael Vogel	8a9862c9ce	Entry import could work but need clean up	2016-02-01 00:09:03 +01:00
Christian González	545e4f645e	really uncomment the lines.	2016-01-31 16:20:06 +01:00
Tobias Diekershoff	447ed7af53	IT update to the strings	2016-01-31 12:02:05 +01:00
Christian González	e80d5a7f23	additional blank line	2016-01-30 23:22:40 +01:00
Christian González	2ca9d011fe	add simple option for HTTPS in .htaccess ... people have it easier to just uncomment 2 lines if they want such an important feature	2016-01-30 23:21:03 +01:00
rabuzarus	162f754e2d	Merge develop into 1901_autocomplete	2016-01-30 16:57:54 +01:00
rabuzarus	9fba5041a0	rework autocomplete: update query-textcomplete	2016-01-30 16:42:46 +01:00
Michael Vogel	d04e1bdf69	Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import	2016-01-30 16:38:06 +01:00
Michael Vogel	3ea5706d16	Resolved namespace trouble	2016-01-30 16:37:18 +01:00
Michael Vogel	eb17fe7324	Some missing parts added	2016-01-30 14:13:58 +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
Michael Vogel	4e513d3885	DFRN: Deletions should work now as well	2016-01-30 03:17:46 +01:00