Michael Vogel
|
8871591a98
|
Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default
Conflicts:
mod/admin.php
|
2015-02-08 13:26:28 +01:00 |
|
Tobias Diekershoff
|
b4dc344f9c
|
Merge pull request #1374 from annando/1502-noscrape-always-active
Noscrape is now enabled all the time
|
2015-02-08 12:48:13 +01:00 |
|
Tobias Diekershoff
|
1418d6bc27
|
Merge pull request #1373 from annando/1502-bugfix-admin-aside
Bad HTML in the admin side menu for webfinger and probe
|
2015-02-08 12:47:46 +01:00 |
|
Michael Vogel
|
1781fbff13
|
Bad HTML in the admin side menu for webfinger and probe
|
2015-02-08 12:12:19 +01:00 |
|
Michael Vogel
|
f931eba7f2
|
Noscrape is now enabled all the time.
|
2015-02-08 12:07:35 +01:00 |
|
Michael Vogel
|
1d48ab0191
|
"altpager" is now the standard value and can be disabled. Depending upon the user reactions we can disable it in an upcoming version.
|
2015-02-08 11:54:42 +01:00 |
|
Tobias Diekershoff
|
cea445de2e
|
FR update for the strings
|
2015-02-08 10:44:47 +01:00 |
|
Tobias Diekershoff
|
5aba3abfc1
|
CS DE FR: update to the strings
|
2015-02-05 11:06:23 +01:00 |
|
Tobias Diekershoff
|
485432e734
|
FR: some more updates to the strings
|
2015-02-04 11:54:13 +01:00 |
|
Tobias Diekershoff
|
14dec94d33
|
DE FR: update to the strings
|
2015-02-04 11:41:06 +01:00 |
|
Michael Vogel
|
f5ec5a4349
|
Some diabook features can dramatically slow down the system. There is a new switch to disable this.
|
2015-02-03 19:59:47 +01:00 |
|
Tobias Diekershoff
|
09b90244c3
|
Merge pull request #1344 from annando/1502-new-vier-version
New version for "Vier"
|
2015-02-02 21:50:54 +01:00 |
|
Michael Vogel
|
9c0dc86eea
|
Merge pull request #1342 from tobiasd/20150202_admin
added diagnostics tools to the admin side panel
|
2015-02-02 21:14:41 +01:00 |
|
Michael Vogel
|
dbe52c74b5
|
Added Beanow as author, since he did most of the last changes.
|
2015-02-02 21:03:14 +01:00 |
|
Michael Vogel
|
9f0e19762e
|
New version for "Vier". The navigation was restructured and several other stuff was changed as well, thanks to Beanow!
|
2015-02-02 21:00:32 +01:00 |
|
Tobias Diekershoff
|
8a17c3d348
|
added diagnostics tools to the admin side panel
|
2015-02-02 18:26:38 +01:00 |
|
Michael Vogel
|
1fb79a1a59
|
Merge pull request #1333 from tobiasd/20150131_ptbr
PT-BR: update to the strings
|
2015-02-01 16:40:24 +01:00 |
|
Silke Meyer
|
c90e47556a
|
added setting for server's sender email address
|
2015-01-31 15:54:12 +01:00 |
|
Tobias Diekershoff
|
ac86aa5822
|
PT-BR: update to the strings
|
2015-01-31 08:42:36 +01:00 |
|
fabrixxm
|
147413507b
|
Merge pull request #1320 from tobiasd/20150127adminpanel
add links to the plugin config pages for active plugins
|
2015-01-28 08:24:29 +01:00 |
|
Tobias Diekershoff
|
3df7370fa8
|
add links to the plugin config pages for active plugins
|
2015-01-27 14:34:11 +01:00 |
|
Michael Vogel
|
6a34210353
|
Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list
|
2015-01-27 10:20:00 +01:00 |
|
Michael Vogel
|
848c09935a
|
The contact list in mails now contains not only the name but also the address.
|
2015-01-27 08:04:24 +01:00 |
|
fabrixxm
|
44df625bad
|
Merge pull request #1305 from tobiasd/20150123-quaddro
making the ignore button in contact suggestions visible in quattro
|
2015-01-25 11:59:17 +01:00 |
|
fabrixxm
|
174d78c768
|
Merge pull request #1317 from tobiasd/20150125cs
CS update to the strings
|
2015-01-25 11:55:22 +01:00 |
|
Tobias Diekershoff
|
fc62c329c5
|
Merge pull request #1316 from annando/issue-1197
Issue 1197: New hook for "oembed_fetch_url"
|
2015-01-25 08:23:52 +01:00 |
|
Tobias Diekershoff
|
5cb3a0fced
|
CS update to the strings
|
2015-01-25 08:21:55 +01:00 |
|
Michael Vogel
|
cb9196f6d6
|
Issue 1197: New hook for "oembed_fetch_url"
|
2015-01-25 00:58:51 +01:00 |
|
Tobias Diekershoff
|
a33ca89bb7
|
adding missing styling to the ignore button in quattro
|
2015-01-24 07:22:55 +01:00 |
|
Tobias Diekershoff
|
c5b8956730
|
FR update to the strings
|
2015-01-24 07:05:55 +01:00 |
|
Tobias Diekershoff
|
619f2a86f3
|
DE update to the strings
|
2015-01-24 07:05:42 +01:00 |
|
Tobias Diekershoff
|
d3bb944700
|
making the ignore button in contact suggestions visible in quattro
|
2015-01-23 09:51:24 +01:00 |
|
Michael Vogel
|
ed037124b3
|
Merge pull request #1299 from fabrixxm/optional-text-only-email
Optional text only email
|
2015-01-20 23:26:44 +01:00 |
|
fabrixxm
|
b2527039b7
|
add text-only email option
add a checkbok to notification settings. if checked, html body is not added to email.
|
2015-01-20 19:19:58 +01:00 |
|
Tobias Diekershoff
|
c5200f9327
|
profile edit homepage field type URL
|
2015-01-19 08:15:20 +01:00 |
|
Tobias Diekershoff
|
d58bac1138
|
template for password now support required and autofocus
|
2015-01-16 19:36:09 +01:00 |
|
Tobias Diekershoff
|
8b20af6ef5
|
template for input fields now supports required, autofocus and types email, url
|
2015-01-16 19:31:23 +01:00 |
|
Tobias Diekershoff
|
a21fe4059b
|
Merge pull request #1285 from annando/1501-enhanced-poco
"location" and "about" for contacts, improved suggestions, improved contacts exchange
|
2015-01-09 08:37:05 +01:00 |
|
Michael Vogel
|
b36d799044
|
Fetching "location" and "about" from diaspora. Displaying them on the "display" page.
|
2015-01-07 01:46:13 +01:00 |
|
Tobias Diekershoff
|
b0ffe11b21
|
add thread un/ignore functionality to quattro theme
|
2015-01-05 09:05:27 +01:00 |
|
Tobias Diekershoff
|
882f9c83d6
|
FR update to the strings
|
2015-01-02 08:26:08 +01:00 |
|
Tobias Diekershoff
|
32400f5127
|
FR IT update to the strings
|
2014-12-31 12:41:00 +01:00 |
|
Tobias Diekershoff
|
e24f97de43
|
FR update to the strings
|
2014-12-30 09:04:35 +01:00 |
|
hauke
|
a72d60f481
|
Added h-card and functionality for IndieAuth/Web-sign-in
|
2014-12-28 15:48:24 +01:00 |
|
Rabuzarus
|
432cf6f2ce
|
insert new line at the end
|
2014-12-25 16:31:52 +01:00 |
|
Rabuzarus
|
73f9d06e3e
|
move some html code from photos.php to photo_album.tpl
|
2014-12-25 16:20:55 +01:00 |
|
Tobias Diekershoff
|
dcd78603d3
|
Merge pull request #1243 from tobiasd/20141212
RO and FR: update to the core strings
|
2014-12-14 07:56:18 +01:00 |
|
Michael Vogel
|
8b433c2d11
|
Vier: New style "dark"
|
2014-12-13 23:13:34 +01:00 |
|
Tobias Diekershoff
|
f02435408c
|
RO and FR: update to the core strings
|
2014-12-12 19:01:08 +01:00 |
|
Silke Meyer
|
f493252ac8
|
Use a sans-serif font-family in breathe
|
2014-12-06 20:05:30 +01:00 |
|
Michael Vogel
|
70ba1667e1
|
It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions.
|
2014-11-08 00:07:21 +01:00 |
|
Carsten Pfeiffer
|
00c16b387a
|
Make TinyMCE editors resizable
|
2014-11-01 22:18:42 +01:00 |
|
Michael Vogel
|
691aa17025
|
fetch further information: it is now possible to define a blacklist for keywords for "fetch further information"
|
2014-10-30 00:24:23 +01:00 |
|
Michael Vogel
|
2b5372aebe
|
Forcing all non-SSL requests to SSL requests is now an option.
|
2014-10-26 22:15:12 +01:00 |
|
Michael Vogel
|
c77a63fb27
|
remote self: There is now an option if the keyswords should be used as tags or not.
|
2014-10-24 01:37:33 +02:00 |
|
Fabrixxm
|
295b4d7f61
|
Update develop from 'master'
|
2014-10-16 10:47:40 +02:00 |
|
Tobias Diekershoff
|
56cd536652
|
use noscrape by default, add opt-out option to disable it
|
2014-10-13 19:19:54 +02:00 |
|
fabrixxm
|
6f92dd00d3
|
Merge pull request #1182 from tobiasd/20141009
RO: update to the strings
|
2014-10-13 15:01:42 +02:00 |
|
Tobias Diekershoff
|
5c316fa541
|
RO: update to the strings
|
2014-10-09 17:59:27 +02:00 |
|
Tobias Diekershoff
|
75f6f3d68b
|
PT-BR: updating the strings
|
2014-10-07 18:34:43 +02:00 |
|
Fabrixxm
|
e2dc4f922c
|
Friendica 'Ginger' 3.3
|
2014-10-06 08:56:55 +02:00 |
|
Tobias Diekershoff
|
74be3ac543
|
updating core translations from transifex
|
2014-09-28 15:04:54 +02:00 |
|
fabrixxm
|
bd0b93e630
|
Merge pull request #1165 from annando/1409-issue-1157
Issue 1157: Unused javascript function is removed.
|
2014-09-27 19:03:20 +02:00 |
|
Michael Vogel
|
2bbd7ab67f
|
Issue 1157: Unused javascript function is removed.
|
2014-09-27 14:17:50 +02:00 |
|
hauke
|
2743514791
|
bug fix #1135, show more is usable again
|
2014-09-22 13:53:16 +02:00 |
|
fabrixxm
|
f6cebf607f
|
remove unneeded htconfig templates
|
2014-09-20 12:14:59 +02:00 |
|
fabrixxm
|
f6cfdf4af1
|
remove uneeded email templates
|
2014-09-20 12:10:24 +02:00 |
|
fabrixxm
|
d2afb263ae
|
Set internal PuSH server as default
|
2014-09-20 12:08:10 +02:00 |
|
fabrixxm
|
6da5cf8037
|
fix residual curCSS, should fix #1153
|
2014-09-20 11:24:06 +02:00 |
|
Fabrixxm
|
133b5bca59
|
fix oembed video template
|
2014-09-17 11:02:58 +02:00 |
|
Fabrixxm
|
d1029e1fb2
|
tweak quattro theme
|
2014-09-17 10:59:19 +02:00 |
|
hauke
|
76535578ba
|
bug fix: live function is deprecated
|
2014-09-15 19:48:17 +02:00 |
|
Michael Vogel
|
f9bec79a2c
|
In the profiles the remote connect field was missing
|
2014-09-11 23:38:24 +02:00 |
|
fabrixxm
|
fd97f3013d
|
fix quattro scroll and flash and vier flash on display page
|
2014-09-11 18:56:33 +02:00 |
|
fabrixxm
|
df1f9d5eb7
|
Update IT strings
|
2014-09-10 19:05:43 +02:00 |
|
Tobias Diekershoff
|
2234f257b6
|
missed the settings template for duepunto
|
2014-09-07 18:02:58 +02:00 |
|
Beanow
|
948c52f13e
|
Added styling to show settings headers can be clicked.
|
2014-09-07 16:24:40 +02:00 |
|
fabrixxm
|
a7302daf96
|
Merge pull request #1123 from fabrixxm/mail_notification_cleanup
Mail notification cleanup
|
2014-09-07 15:05:06 +02:00 |
|
fabrixxm
|
b7bd29c347
|
Merge pull request #1124 from tobiasd/duepuntoderivs
added variations of duepuntozero to the theme as options to be selected
|
2014-09-07 15:04:26 +02:00 |
|
hauke
|
baabb5ba8b
|
removed fancybox as it is not used anywhere
|
2014-09-07 14:54:10 +02:00 |
|
Tobias Diekershoff
|
6415cc1a2c
|
remove screenshot for greenzero
|
2014-09-07 14:31:46 +02:00 |
|
fabrixxm
|
21b1e09fad
|
Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup
|
2014-09-07 14:28:03 +02:00 |
|
Tobias Diekershoff
|
2c8ca3ec36
|
deleted some editicon.png copies
|
2014-09-07 14:23:24 +02:00 |
|
fabrixxm
|
a8c90155f8
|
db update mail via notification()
remove last template
|
2014-09-07 14:23:03 +02:00 |
|
Tobias Diekershoff
|
a9782251e5
|
updating config files for duepuntozero
|
2014-09-07 14:00:09 +02:00 |
|
Tobias Diekershoff
|
c72d850113
|
added slackr to duepuntoderivates
|
2014-09-07 13:57:51 +02:00 |
|
fabrixxm
|
5861bdd6e9
|
registration request as system notification
kill the template
send email to all admins
|
2014-09-07 13:55:02 +02:00 |
|
Tobias Diekershoff
|
0989ad335f
|
added purplezero to duepunto as variation
|
2014-09-07 13:41:02 +02:00 |
|
Tobias Diekershoff
|
22d0190041
|
revive easterbunny from the dead
|
2014-09-07 13:29:56 +02:00 |
|
Tobias Diekershoff
|
bbf22938ae
|
added Comix as a colorset of duepuntozero
|
2014-09-07 13:09:02 +02:00 |
|
Tobias Diekershoff
|
2802402e57
|
added darkzero as colorset of duepuntozero
|
2014-09-07 13:01:23 +02:00 |
|
Tobias Diekershoff
|
f0aaafa7aa
|
added Greenzero as colorset of duepuntozero
|
2014-09-07 12:48:23 +02:00 |
|
fabrixxm
|
735e6bbcb4
|
Merge pull request #1121 from Beanow/hotfix/bug-1105
Fix illegal offset error for vier and quattro.
|
2014-09-07 12:48:13 +02:00 |
|
fabrixxm
|
a5df9b8b5d
|
Somebody stop me! (not really..)
|
2014-09-07 12:35:08 +02:00 |
|
fabrixxm
|
5997fb19ee
|
More template gore!
|
2014-09-07 12:29:13 +02:00 |
|
fabrixxm
|
803854738b
|
another massacre of templates
|
2014-09-07 11:48:23 +02:00 |
|
Beanow
|
8345ac7313
|
Fix illegal offset error for vier and quattro.
Fixes #1105
|
2014-09-07 11:47:08 +02:00 |
|
fabrixxm
|
cab46e2772
|
Merge pull request #1120 from silke/deprecated-themes
Deprecated themes
|
2014-09-07 11:42:04 +02:00 |
|
fabrixxm
|
a58e990cfc
|
Merge pull request #1118 from tugelbend/master
bug fix #1115: settings were hidden on "social network" and "plugin" page
|
2014-09-07 11:37:55 +02:00 |
|
fabrixxm
|
9368c7e510
|
html mail template add img tag only if source_photo is defined
|
2014-09-07 11:20:56 +02:00 |
|
fabrixxm
|
9a0c37eb47
|
new password mail via notification()
new include/text.php::deindent() function
remove unused templates
|
2014-09-07 11:20:06 +02:00 |
|
Silke Meyer
|
12012be79d
|
marked four more themes as unsupported
|
2014-09-07 11:00:58 +02:00 |
|
fabrixxm
|
d85bdd8fb0
|
lost password verification mail via notification()
|
2014-09-07 10:27:39 +02:00 |
|
Silke Meyer
|
d001ee5c65
|
Marked several themes from the zero theme as deprecated (all but
duepunto).
|
2014-09-07 10:26:45 +02:00 |
|
hauke
|
a162ea7251
|
bug fix #1115
|
2014-09-07 10:26:38 +02:00 |
|
Silke Meyer
|
a9b69b063c
|
Marked several old themes as unsupported
|
2014-09-07 08:17:22 +02:00 |
|
hauke
|
2947be66b6
|
bug fix, wrong js lib included
|
2014-09-06 19:14:58 +02:00 |
|
fabrixxm
|
0e628f840f
|
send ostatus follow/share notifications via notification()
remove unused templates
|
2014-09-06 18:15:18 +02:00 |
|
hauke
|
392b53dbf9
|
minified js files where out of date and inconsistently used. Removed until decision on minifying strategy
|
2014-09-06 17:46:31 +02:00 |
|
fabrixxm
|
1bdddebd44
|
connection confirm notification mail via notification()
remove unused email templates
add a check for unexpected reponse from server
|
2014-09-06 17:28:46 +02:00 |
|
hauke
|
5205756898
|
Merge branch 'release/ui-improvements'
|
2014-09-06 17:02:25 +02:00 |
|
hauke
|
7dcf37f053
|
changed cursor style on settings page globally
|
2014-09-06 17:01:05 +02:00 |
|
hauke
|
25d7087d9e
|
Merge branch 'feature/2014-09-hackathon-ui-improvements' into develop
|
2014-09-06 16:55:07 +02:00 |
|
Tobias Diekershoff
|
0e9c8f6f1a
|
Merge pull request #1108 from tugelbend/master
jquery update to version 1.11
|
2014-09-06 16:35:24 +02:00 |
|
hauke
|
87fa2ee2af
|
updated jquery to version 1.11, updated themes frost and diabook where necessary
|
2014-09-06 16:21:03 +02:00 |
|
fabrixxm
|
83df1f4583
|
fix italian smarty3 email templates
|
2014-09-06 16:12:05 +02:00 |
|
Tobias Diekershoff
|
267927d2dd
|
Merge pull request #1106 from silke/frost-mobile-modifications
Frost mobile modifications
|
2014-09-06 14:52:12 +02:00 |
|
Silke Meyer
|
6369399b9f
|
Shrink user icons in timeline to 48x48
|
2014-09-06 14:38:43 +02:00 |
|
Silke Meyer
|
b9b490057a
|
different minor modifications
|
2014-09-06 14:25:36 +02:00 |
|
hauke
|
ec68e33c6b
|
make items on settings pages fold/unfold on click
|
2014-09-06 13:53:23 +02:00 |
|
Silke Meyer
|
3290f6b360
|
Reduced height of navbar
|
2014-09-06 12:20:55 +02:00 |
|
Tobias Diekershoff
|
4aa2ae488b
|
Merge pull request #1102 from tobiasd/newstrings20140906a
updating message.po and string.php
|
2014-09-06 12:20:42 +02:00 |
|
Tobias Diekershoff
|
97a8a7b362
|
ZH-CN: update to the strings
|
2014-09-06 12:13:04 +02:00 |
|
Tobias Diekershoff
|
d0b1f0f5ba
|
RO: update to the strings
|
2014-09-06 12:12:38 +02:00 |
|
Tobias Diekershoff
|
dd65b06ecf
|
PT-BR: update to the strings
|
2014-09-06 12:12:19 +02:00 |
|
Tobias Diekershoff
|
4571670e4f
|
PL: update to the strings
|
2014-09-06 12:11:59 +02:00 |
|
Tobias Diekershoff
|
b948dca729
|
NL: update to the strings
|
2014-09-06 12:11:44 +02:00 |
|
Tobias Diekershoff
|
c0e9e1849a
|
NB-NO: update to the strings
|
2014-09-06 12:11:00 +02:00 |
|
Tobias Diekershoff
|
70031d8d3e
|
IT: update to the strings
|
2014-09-06 12:10:36 +02:00 |
|
Tobias Diekershoff
|
414451cdad
|
IS: update to the strings
|
2014-09-06 12:09:08 +02:00 |
|
Tobias Diekershoff
|
57f3ccc967
|
RU: update to the strings
|
2014-09-06 12:08:48 +02:00 |
|
Tobias Diekershoff
|
cb0a2b3d35
|
FR: update to the strings
|
2014-09-06 12:08:20 +02:00 |
|
Tobias Diekershoff
|
ebbaedb97d
|
ES: update to the strings
|
2014-09-06 12:08:02 +02:00 |
|
Tobias Diekershoff
|
d283ed4f51
|
EO: update to the strings
|
2014-09-06 12:07:45 +02:00 |
|
Tobias Diekershoff
|
6ddfaaae82
|
DE: update to the strings
|
2014-09-06 12:07:13 +02:00 |
|
Tobias Diekershoff
|
e982697e17
|
CA: update to the strings
|
2014-09-06 12:05:44 +02:00 |
|
Tobias Diekershoff
|
582b90613b
|
CS: update to the strings
|
2014-09-06 12:05:25 +02:00 |
|
Tobias Diekershoff
|
fe8a5a93b4
|
BG: update to the strings
|
2014-09-06 12:04:23 +02:00 |
|
hauke
|
9a8d106414
|
fixed contact action button bar, typo correction
|
2014-09-06 11:49:31 +02:00 |
|
hauke
|
191595766d
|
removed old comment that is no longer true
|
2014-09-06 00:14:25 +02:00 |
|
Michael Vogel
|
e21bcb82d2
|
Enhance the database structure checks when they failed.
|
2014-09-04 09:26:56 +02:00 |
|
Michael Vogel
|
0e2376b457
|
Updated font awesome to new version
|
2014-09-04 01:01:39 +02:00 |
|
Michael Vogel
|
7eeb320085
|
It is now possible to ignore threads.
|
2014-09-04 00:58:52 +02:00 |
|
Michael Vogel
|
73904bfa03
|
Added an alternate link to the profile in the atom feeds (feature request #925)
|
2014-09-03 09:52:31 +02:00 |
|
Michael Vogel
|
e35c55dd3b
|
Remote-self: It is now possible to chose between two different modes of mirroring.
|
2014-09-01 14:00:21 +02:00 |
|
Michael Vogel
|
ea0f75a315
|
Bugfix: It was impossible to add groups.
|
2014-08-30 02:08:33 +02:00 |
|
Michael Vogel
|
4d3e3eb4d1
|
Bugfix: connecting with other users now works again.
|
2014-08-28 01:15:40 +02:00 |
|
Michael Vogel
|
316f0a75cd
|
Showing the network name on the display page.
|
2014-08-25 16:17:49 +02:00 |
|
Michael Vogel
|
dd511ac70a
|
The "display" page now shows the current author profile with a "connect" link (if there is no current connection)
|
2014-08-25 14:09:56 +02:00 |
|
Michael Vogel
|
c5cc99c716
|
BBCode: Depending upon the image size of the preview picture for a link, the image is displayed differently
|
2014-08-25 14:08:26 +02:00 |
|