rabuzarus
95819684c2
Merge develop into 0502_vier_dark
...
Conflicts:
view/theme/vier/dark.css
2016-02-06 13:09:41 +01:00
Michael Vogel
3890415767
Receiving pokes work now
2016-02-06 11:16:00 +01:00
Michael Vogel
bd3e10b132
Bugfix in the poke function / added documentation.
2016-02-06 10:16:16 +01:00
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
4896517385
datetime.php: little more docu
2016-02-06 01:08:10 +01:00
rabuzarus
0bccfea596
vier: some consistency fixes for the dark scheme
2016-02-06 00:54:50 +01:00
Michael Vogel
9e3f849e89
Added documentation
2016-02-05 22:12:54 +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
Michael Vogel
1c82e9f209
Bugfix for OStatus to prevent sending messages from wrong senders
2016-02-05 21:31:11 +01:00
rabuzarus
9fd3d8116b
vier smileybutton: little polish in dark.css
2016-02-05 21:30:31 +01:00
Michael Vogel
d408cea871
DFRN import has now gone live
2016-02-05 21:25:20 +01:00
rabuzarus
41405ed0f2
vier: display smiley-preview as inline-block - needs addons update
2016-02-05 21:24:01 +01:00
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
Michael Vogel
e2a8146307
Added some to-do points
2016-02-05 09:03:17 +01:00
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
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
Michael Vogel
2bd36e5628
Feed should work now as well
2016-02-04 23:52:06 +01:00
Andrej Stieben
48e6ff21aa
Added the possibility for themes to override core module functions
2016-02-04 21:45:21 +01:00
Michael Vogel
92a31344b5
Events do work now.
2016-02-04 20:34:18 +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
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
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
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
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
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
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
82d387272c
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import
2016-02-02 21:09:08 +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
