Michael Vogel
|
de75d8ca7f
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/admin.php
|
2014-08-13 00:18:05 +02:00 |
|
Michael Vogel
|
d4b2d3bf8a
|
Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings.
|
2014-08-13 00:13:13 +02:00 |
|
|
|
016b6428a0
|
Merge pull request #1067 from Beanow/feature/noscrape
Added noscrape feature.
|
2014-08-10 13:24:21 +02:00 |
|
Beanow
|
9026810496
|
Added noscrape feature.
|
2014-08-10 12:45:34 +02:00 |
|
Michael Vogel
|
1a865bf400
|
New description for the option to reload the page only when on top.
|
2014-08-01 20:11:56 +02:00 |
|
Michael Vogel
|
c980e6d20d
|
Possibility to disable the automatic reload of the network page
|
2014-07-09 21:32:32 +02:00 |
|
Michael Vogel
|
297d8a6cc6
|
The icon for the website is now changeable in the config
|
2014-06-17 20:11:35 +02:00 |
|
Michael Vogel
|
13fea42d8c
|
Merge remote-tracking branch 'upstream/master'
|
2014-05-29 23:04:57 +02:00 |
|
Michael Vogel
|
00b8355ad5
|
The number of comments per post are now editable.
|
2014-05-29 22:26:03 +02:00 |
|
Michael Vogel
|
b0df06dd72
|
Vier: When clicking on the reply button, the focus now automatically changes to the textarea.
|
2014-05-29 20:27:06 +02:00 |
|
fabrixxm
|
77a54c66be
|
Merge pull request #998 from annando/master
"Vier": New font version, fallback for oembed, more tracking variables removed
|
2014-05-29 14:04:04 +02:00 |
|
Michael Vogel
|
0eafed3353
|
Vier: New "font awesome" version, changed "reply" button, comment area is now hidden until the first reply came. (Saves space)
|
2014-05-29 11:51:13 +02:00 |
|
|
|
1388b7ac27
|
Merge pull request #984 from annando/master
Better look for embedded videos, removing tracking parameters, new shortening function
|
2014-05-19 08:05:16 +02:00 |
|
Michael Vogel
|
665139660a
|
Make embedded videos look better. (better margin data)
|
2014-05-18 20:30:27 +02:00 |
|
|
|
31312ab1d2
|
Merge pull request #956 from annando/master
New database system that uses PDO if present/Test script for doing database upgrades.
|
2014-05-09 21:55:01 +02:00 |
|
Sven Anders
|
0dac5bf804
|
Make uimport URL work for Sites with subfolder
BUGFIX: If you have a site like http://exmaple.com/friendica you will get a wrong url
|
2014-05-06 14:15:15 +02:00 |
|
Michael Vogel
|
c27bd7d0b4
|
The pagetypes are rearrange to make the differences better understandable.
|
2014-05-03 12:10:38 +02:00 |
|
Michael Vogel
|
4ca857e110
|
Empty template to avoid errors when installing themes.
|
2014-04-29 13:33:39 +02:00 |
|
Fabrixxm
|
aba27ad404
|
fix photo comments: use $drop array as in wall_thread and search_item
|
2014-04-28 09:29:48 -04:00 |
|
|
|
c1d14bcc98
|
Merge pull request #944 from annando/master
Some more frontend stuff/Native Diaspora reshare
|
2014-04-26 09:13:17 +02:00 |
|
Michael Vogel
|
2846dfeb05
|
Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values.
|
2014-04-26 02:22:30 +02:00 |
|
Michael Vogel
|
79da821c75
|
Added template for Diaspora reshare
|
2014-04-26 01:33:33 +02:00 |
|
Michael Vogel
|
1227d071d1
|
The preview button is now a button. This is more consistent
|
2014-04-24 13:27:08 +02:00 |
|
Michael Vogel
|
ec1f07d5b7
|
Only show the preview button when it is activated/Menü arrangement changed for settings menu.
|
2014-04-24 12:39:27 +02:00 |
|
Michael Vogel
|
59c9a9adae
|
OAuth-settings: The "cancel" button generated an error message (and is superfluous), so it is removed
|
2014-04-24 12:18:51 +02:00 |
|
Michael Vogel
|
2e7549c945
|
Show preview of the correct theme, not the mobile theme.
|
2014-04-24 12:14:45 +02:00 |
|
fabrixxm
|
807fc60d3e
|
Merge pull request #941 from annando/master
Moved and renamed menu entries to improve the usability, global css, icons for social networks
|
2014-04-24 10:48:07 +02:00 |
|
Michael Vogel
|
b005423ebf
|
New layout for connector settings. New global CSS for things that seems to be identical in most themes.
|
2014-04-24 10:17:19 +02:00 |
|
fabrixxm
|
22c45b9bf1
|
Merge pull request #938 from annando/master
API: Don't show own posts in mentions, some "vier" changes and provider name for diaspora
|
2014-04-22 16:15:42 +02:00 |
|
Michael Vogel
|
9185321c8b
|
Diaspora-XML-Templates: Added provider name and some rearrangements to fit the exact order of the elements in diaspora (only for the beauty)
|
2014-04-22 01:01:21 +02:00 |
|
|
|
3bbe7a75ec
|
Merge pull request #911 from annando/master
target="_blank" and api improvements
|
2014-02-16 14:15:44 +01:00 |
|
Michael Vogel
|
01971428aa
|
target="_blank" instead of target="external-link"
|
2014-02-11 23:42:06 +01:00 |
|
|
|
2cc72a1bc7
|
removed copy and paste leftover
|
2014-01-13 14:49:49 +01:00 |
|
|
|
1e87780f5d
|
removed copy and paste leftover
|
2014-01-13 14:45:37 +01:00 |
|
|
|
b84502c4e6
|
move <div> to the register.tpl
|
2014-01-13 14:40:26 +01:00 |
|
Michael Vogel
|
8eedebfee3
|
Cleaning up some changes from the merge
|
2014-01-05 16:28:42 +01:00 |
|
Michael Vogel
|
aed28a24f1
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/crepair.php
|
2014-01-05 16:22:42 +01:00 |
|
Michael Vogel
|
28df35052a
|
Send notifications for each new post of a contact, option for creating a summary for a feed post
|
2014-01-05 16:10:02 +01:00 |
|
fabrixxm
|
b0e8dbc4da
|
Merge pull request #864 from fabrixxm/acl_automention
Acl automention
|
2014-01-03 06:09:12 -08:00 |
|
fabrixxm
|
ad5a47aecf
|
add fetaure switch for acl-automention
|
2014-01-03 14:40:43 +01:00 |
|
|
|
25d83f780d
|
only show the remote_self option if admin allows it
|
2013-12-22 19:30:09 +01:00 |
|
|
|
f515def280
|
added remote_self as option to the contact repair dislog
|
2013-12-22 17:05:49 +01:00 |
|
|
|
22a6c72b31
|
added option to the admin panel to allow users to set the remote_self flag
|
2013-12-22 16:14:34 +01:00 |
|
Fabrixxm
|
9a94c35120
|
acl selector add and remove mentions when a forum is selected.
|
2013-12-18 10:18:26 -05:00 |
|
Fabrixxm
|
06e8f31695
|
change action container div class to id. fix bug in quattro theme
|
2013-12-18 06:38:57 -05:00 |
|
Fabrixxm
|
9febcedf93
|
user contacts: fix #797 , add searching in url and nickname, add batch actions
|
2013-12-17 05:19:06 -05:00 |
|
|
|
acd29f22a0
|
Merge pull request #842 from annando/master
mail settings: inflate/deflate settings
|
2013-12-01 02:26:36 -08:00 |
|
Michael Vogel
|
9c2b1d39ea
|
mail settings: inflate/deflate settings
|
2013-11-30 21:32:44 +01:00 |
|
|
|
d4c56b227d
|
add the hint also as a placeholder in the add contact form (issue #786)
|
2013-11-17 16:09:44 +01:00 |
|
Fabrixxm
|
0414e0a316
|
More "relocate":
button in user's setting to resend relocate message to contacts
option in admin's site setting to relocate a server
|
2013-11-13 06:07:49 -05:00 |
|
