Hypolite Petovan
e93f4e5c0c
Merge pull request #5348 from astifter/use_h3_for_showing_contacts
...
Use h3 instead of h4 in contacts block
2018-07-09 08:21:43 -04:00
Andreas Neustifter
56b6adc396
Fix relocate button label.
...
In settings the 'Start Relocate' button is also labeld 'Save Settings'.
2018-07-09 12:42:32 +02:00
Andreas Neustifter
d442024c0e
Make sure contacs header is same size as everything in aside.
...
All the widgets in asside have h3 for their headers, use this for showing contacts too.
2018-07-09 12:42:31 +02:00
72638acac3
admins can forbid some nicknames from being registered
2018-07-06 15:32:56 +02:00
rabuzarus
1c7f4e3c63
port hubzillas OpenWebAuth - remote authentification
2018-06-18 23:05:44 +02:00
rabuzarus
a2fc1be187
fix scroll position in stream while ajax update
2018-06-16 13:05:33 +02:00
rabuzarus
b8186ba98b
Frio: provide a template for received contact suggestions
2018-06-14 17:05:23 +02:00
Pascal Deklerck
ba4ddb1d8d
Test if addon_hooks is an array before using it
2018-06-13 21:05:54 +02:00
Pascal Deklerck
d488512ca0
5118 Create Javascript hook mechanism
2018-06-07 22:23:30 +02:00
bc9140affd
Make htconfig.php
fit for MariaDB
2018-05-26 13:31:07 +02:00
becd9b4879
forgot to rename vars in TOS template
2018-05-21 06:02:49 +02:00
Hypolite Petovan
c41332364f
Merge pull request #5089 from tobiasd/20180519-tos
...
privacy statement
2018-05-20 08:20:16 -04:00
c70ebadd7d
Issue-3412 related: Don't send connection posts anymore
2018-05-19 19:34:51 +00:00
dd629d5fa4
registration: added display of privacy statement if enabled
2018-05-19 18:53:54 +02:00
ae62c1d1ea
admin panel: added privacy statement preview
2018-05-19 18:52:23 +02:00
eec0826750
added link to the TOS page if it is activated
2018-05-16 11:57:06 +02:00
eb4650ff23
dbclean settings are now available from the frontend
2018-05-07 05:37:20 +00:00
Hypolite Petovan
5bb35756dc
Update directory URL protocol
2018-04-27 20:56:34 -04:00
Andreas Neustifter
70a781fa5a
Proper error when rewrite fails during install.
...
When Curl tries to fetch the rewrite test URL and something goes wrong the user
has no clue what was the problem. This problems can include:
- The rewriting not working at all.
- HTTPS redirects do not work.
- Curl does not accept the presented SSL cert.
This commit fixes this by providing the Curl error message to the user to further
debug the problem.
Fixes #3629.~
2018-04-27 21:27:55 +02:00
rabuzarus
a19784d209
Merge pull request #4890 from astifter/reorganize_login
...
Reorganize Login to Fix #4878
2018-04-27 19:56:25 +02:00
rabuzarus
ac753e3320
frio - provide a template for invite page
2018-04-24 17:33:48 +02:00
Andreas Neustifter
e5ed2fdede
Remove complete section when registering disabled.
...
Move out the check so that the complete div containing the register-link is removed.
2018-04-23 20:29:55 +00:00
Andreas Neustifter
2d8a4a923f
Fix login dialog layout.
...
Rearrange login dialog distinguish better between logging und registering.
2018-04-23 20:29:55 +00:00
Andreas Neustifter
5d1d0d1a9f
Remove empty help spans from templates.
...
The empty spans from the templates mess up the layout sometimes, and are useless weight anyway.
Lets get rid of them.
2018-04-23 20:29:55 +00:00
Hypolite Petovan
a66e9b81ba
Merge pull request #4873 from astifter/develop
...
Remove pagination when empty, move new Member Tips and use common widget to find people.
2018-04-23 10:23:21 -04:00
Hypolite Petovan
087bfbc6a7
Forgot new line at end of file in templates/wall/content_filter.tpl
2018-04-22 18:13:13 -04:00
Hypolite Petovan
48122733b8
Move content filter HTML in a template
2018-04-22 18:02:00 -04:00
Friendica
390983a331
Haromonize Find People Widget.
...
In the right_aside on the /contacts page in the left aside there are
almost identical widgets to search for contacts. Drop one and use common
widget in both places.
2018-04-22 20:44:22 +00:00
Friendica
54cfbe039b
Only shown pagination when not empty.
...
Currenty the pagination bar is always shown, even when no prev/next buttons are active.
This only shows the bar when actual navigation is possible.
2018-04-22 20:44:22 +00:00
Hypolite Petovan
69a7afc577
Merge pull request #4855 from M-arcus/env-var-mysql
...
[TASK] Config: Add MySQL environment variables
2018-04-20 12:30:17 -04:00
Marcus Müller
26ba5edda7
[TASK] Template: Add check for environment values
2018-04-20 18:24:28 +02:00
Marcus Müller
fc8b11283a
[TASK] Template: Environment variables for MySQL
2018-04-17 18:40:24 +02:00
f3c8631cbd
display the thing
2018-04-16 10:25:39 +02:00
Hypolite Petovan
59d42e9681
Merge pull request #4762 from annando/frio-accessibility
...
Some more accessibility for "Frio"
2018-04-06 17:07:25 -04:00
ed316b38ee
Some more accessibility for "Frio"
2018-04-06 20:42:38 +00:00
Hypolite Petovan
180f7d8218
Add disabled_cw user setting
2018-04-04 23:08:47 -04:00
ca0b0e92c8
indentation
2018-04-03 06:58:21 +02:00
4f221d6334
indentation
2018-04-03 06:57:27 +02:00
6f5b6a073a
register template may link to the TOS as well
2018-04-02 18:41:16 +02:00
6c20b4507d
Added /tos module
2018-04-02 18:40:30 +02:00
rabuzarus
4efa2109ee
cropperjs: use npm-asset for composer
2018-03-29 18:39:26 +02:00
rabuzarus
51841ab148
cropperjs: fix indention
2018-03-29 18:06:56 +02:00
rabuzarus
34204ca580
update javascript cropper library
2018-03-29 17:57:06 +02:00
17a6cb18b8
Relais settings are added to admin backend
2018-03-28 06:16:46 +00:00
Hypolite Petovan
daffc27061
Move suppress_tags config to template
...
- Add new item.suppress_tags template variable
- Fix template formatting
2018-03-25 00:38:23 -04:00
Hypolite Petovan
27d94023ee
Merge branch 'master' into develop
2018-03-23 06:15:55 -04:00
7a13ede69f
activate the frio theme during installation
2018-03-17 10:14:19 +01:00
858fd127a1
Fix: subscribing to the old followers hadn't worked
2018-03-14 00:27:15 +00:00
eaf4fdefac
Security: You have to enter the password of the parent to delegate to this account
2018-03-11 13:12:15 +00:00
Hypolite Petovan
17e0d6b6c1
Add feedtest module
2018-03-10 12:43:34 -05:00
Hypolite Petovan
71c1be8207
Add external template to mod/babel
...
- Add HTML methods diagnostic
2018-03-08 23:48:32 -05:00
Hypolite Petovan
274ce95d13
Move Composer assets to view/
2018-03-07 08:07:36 -05:00
rabuzarus
2c7e8f35d4
localize the datepicker
2018-03-04 14:56:51 +01:00
fd53b541e5
Frontend to set the parent-uid field
2018-02-18 13:19:47 +00:00
rabuzarus
9a4d19e284
move membersince addon to core
2018-02-09 20:44:45 +01:00
rabuzarus
96d24af20f
provide/fix adminpage div container for all admin pages
2018-02-07 16:23:19 +01:00
Hypolite Petovan
5cca8562bc
Move datetimepicker javascript to field_datetime.tpl
...
- Add type hint to getDateTimeField() arguments
2018-02-03 09:53:45 -05:00
c28b62b302
lets print out the internets
2018-01-31 11:31:47 +01:00
7ef77b926a
Admin menu reorganisation
...
The aside menu in the admin panel is now handled in one array, which also
holds the submenu items. Also the sections of the menu are now a bit more
structured and separated from each other.
2018-01-30 13:37:00 +01:00
8eb8288b68
positioning of the fedstat graph
...
This is a followup on #4266 resizing the fedstat graph in the admin panel
so that it fits alongside the intro text again. Checked also with duepunto,
quattro and vier theme.
2018-01-29 17:39:44 +01:00
Hypolite Petovan
cd392db078
Move js/ folder under view/
...
- Move library/cropper to view/js/cropper
- Move library/jquery-textcomplete to view/js/jquery-textcomplete
2018-01-28 16:17:36 -05:00
Hypolite Petovan
a05eeeb49c
Remove jQuery Migrate file
...
- Remove script references
2018-01-28 15:54:20 -05:00
Hypolite Petovan
17faeca241
Improve addon readme display
...
- Add maintainer display support
- Remove extra comma after author/maintainer lists
2018-01-28 00:10:22 -05:00
Hypolite Petovan
19e197ef51
Forgot a path element in perfect-scrollbar paths
2018-01-27 21:09:49 -05:00
Hypolite Petovan
e54cdb1f72
Fix wrong path to perfect-scrollbar library files
2018-01-27 19:06:20 -05:00
Hypolite Petovan
341d2fae12
Updated references to perfect-scrollbar
2018-01-27 18:04:02 -05:00
Hypolite Petovan
e34bc8761e
Update references to fullcalendar and moment
2018-01-27 15:51:08 -05:00
Hypolite Petovan
9b0fc558f7
Update references to jgrowl
2018-01-27 11:52:06 -05:00
Hypolite Petovan
9d78010e7f
Update references to jquery.datetimepicker
2018-01-27 08:09:30 -05:00
Hypolite Petovan
30c1cc0e8c
Merge pull request #4312 from zeroadam/feature/L10n
...
Move pgettext to src
2018-01-24 11:48:55 -05:00
Adam Magness
21f593bf4b
Adjust for templates
...
Use new t() for template button text
2018-01-22 22:20:35 -05:00
Hypolite Petovan
b021b76661
Remove references to video.js
2018-01-22 20:45:42 -05:00
Adam Magness
fb372877f6
Rename template and doc
...
Rename admin/plugins.tpl to admin/addons.tpl and update references. Rename doc/de/Plugins.md to Addons.md
2018-01-20 09:45:22 -05:00
Adam Magness
b86b04a81a
Change plugin to addon
...
change the use of plugin to addon where appropriate.
2018-01-20 07:48:22 -05:00
Hypolite Petovan
5bc7f4a442
Remove RINO2 and RINO3
2018-01-19 11:27:53 -05:00
Hypolite Petovan
910fda2383
Fix formatting in federation.tpl
2018-01-18 16:38:23 -05:00
Hypolite Petovan
b963e7cc38
Revert tabs into space in federation.tpl
2018-01-18 16:38:23 -05:00
Hypolite Petovan
383641f58f
Migrate federation page to latest version of Chart.js
2018-01-18 16:38:23 -05:00
Hypolite Petovan
b432a17538
Update references to jquery
2018-01-18 11:27:14 -05:00
Hypolite Petovan
9ee1b14b2b
Update references to colorbox css and js files
...
- Remove commented out references to other css/js files
2018-01-18 11:27:14 -05:00
Hypolite Petovan
0d9595d80a
Update all references to webtoolkit.base64
2018-01-17 21:23:51 -05:00
Michael Vogel
a13ad278ef
Merge pull request #4259 from MrPetovan/task/4116-remove-vendor-from-git
...
Remove vendor from git
2018-01-18 01:02:55 +01:00
fabrixxm
0aafdab810
Use template home.tpl for mod/home
2018-01-17 13:27:41 +01:00
Hypolite Petovan
6fe64a5ac6
Fix references to text_highlighter css
2018-01-16 23:48:07 -05:00
Hypolite Petovan
c157e7ffa4
Improve connectors settings display
...
- Move settings templates to subfolder
- Add accordion display to "General Theme Settings" in frio
- Replace hand-written template with form field includes
- Simplify sprintf(t()) structures
2018-01-05 02:17:36 -05:00
Hypolite Petovan
50e04d87c2
Add no_oembed_rich_content and allowed_oembed admin settings
2018-01-04 11:58:32 -05:00
Hypolite Petovan
66dbef93e3
Fix formatting and PHP notices in bb_ShareAttributes
...
- Use x() to check for existence of key in $matches
- Remove unused $reldate from template shared_content
2018-01-02 08:09:49 -05:00
2b50f001b9
Added statistics
2017-12-19 07:39:21 +00:00
Adam Magness
8bbfc44d47
Remove templates
...
remove associated template files.
2017-12-06 23:44:52 -05:00
df89e0384d
Added description to networks, renaming some network names
2017-12-03 13:26:52 +00:00
6f7510550d
NETWORK_MAIL2 was never finished, so remove it as well
2017-12-03 09:19:58 +00:00
Hypolite Petovan
75181322ba
Improve page contacblock for frio theme
2017-12-01 22:33:04 -05:00
Hypolite Petovan
dc09319695
Add admin/contactblock page
...
- Add page template
2017-12-01 00:43:39 -05:00
Hypolite Petovan
16d0c30328
Move admin templates to dedicated sub-folder
2017-12-01 00:40:55 -05:00
Hypolite Petovan
052ba729d7
Improved translation functions
...
- Add built-in vsprintf to t()
- Add built-in sprintf to tt()
2017-12-01 00:35:40 -05:00
8bffee43b3
Threads are now always enabled.
2017-11-28 18:54:39 +00:00
Hypolite Petovan
3fbf2e3bcf
Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud
...
A tag cloud widget for the profile page
2017-11-26 11:16:14 -05:00
rabuzarus
655b2cd0d3
tag cloud: clear align settings in the tagcloud widget
2017-11-26 04:36:45 +01:00
cb7648359c
When we are requesting a conneczion, the contactis no longer "blocked"
2017-11-26 02:31:26 +00:00
rabuzarus
4224209497
Merge develop into 20171122_-_port_tagcloud
...
Conflicts:
include/features.php
2017-11-25 23:41:20 +01:00
3cb906c420
Issue 3911: Fetch keywords for feeds
2017-11-25 11:59:20 +00:00
rabuzarus
19afabd268
tags: possibility to filter posts for tags and profile owner (profile)
2017-11-23 00:59:20 +01:00
rabuzarus
59ae5633ec
tag-cloud: some polishing + remove authors (we don't use it at the moment)
2017-11-22 23:18:01 +01:00
rabuzarus
d7d653aab6
port tag cloud widget from hubzilla
2017-11-22 21:29:07 +01:00
Hypolite Petovan
2336fa9d74
Add smart_threading user setting
2017-11-19 00:57:31 -05:00
df547a8bc9
move HTML from mod/community into template file
2017-11-10 18:22:28 +01:00
Hypolite Petovan
c847a2f9cc
Merge pull request #3874 from tobiasd/20171009-checkversion
...
check upstream version
2017-11-06 13:59:49 -05:00
f097d4d479
std foo 2
2017-11-06 18:21:16 +01:00
2894214347
Misspelled "detailed"
2017-11-04 12:08:12 +00:00
7de3eae8d0
There is now a user switch to change between condensed and detailled notifications
2017-11-04 12:01:08 +00:00
b6f1a0be5a
and it is not used in the template anymore as well
2017-11-04 08:34:47 +01:00
503ffa98d2
settings for checkversion
2017-11-04 08:15:28 +01:00
1928217f83
added config wrapper around new option, opt-in
2017-11-03 15:52:40 +01:00
e2224a2ddc
Some Webfinger clean up
2017-10-28 11:48:29 +00:00
Michael Vogel
2c55d9f3ce
Merge pull request #3817 from rabuzarus/20171019_-_fix_some_html_violations
...
fix some HTML violations in frio
2017-10-22 07:48:06 +02:00
Michael Vogel
2a5dd1e857
Merge pull request #3815 from rabuzarus/20171019_-_fix_more_posted_date_widget
...
fix some more HTML violations in posted_date_widget.tpl
2017-10-21 08:14:52 +02:00
rabuzarus
30a4857842
more template code simplification in posted_date_widget
2017-10-20 16:12:43 +02:00
rabuzarus
781c4986c6
a little bit template code simplification in posted_date_widget
2017-10-20 15:59:14 +02:00
rabuzarus
f2d51737eb
fix some HTML violations in frio
2017-10-20 15:21:42 +02:00
rabuzarus
8167e75e6a
fix some more HTML violations in posted_date_widget.tpl
2017-10-19 16:34:08 +02:00
rabuzarus
184bfc722d
fix #3812 - some brocken parts in the display of events (default template)
2017-10-19 14:16:39 +02:00
rabuzarus
8cc17bdde6
fix coding style
2017-10-19 00:52:01 +02:00
rabuzarus
6630e50ecf
Bugfix:useless li end tag in posted_date_widget.tpl
2017-10-18 22:49:16 +02:00
Michael Vogel
d60f96f0e1
Merge pull request #3797 from rabuzarus/20171015_-_duplicate_event
...
add event action: duplicate events
2017-10-18 18:57:58 +02:00
4744d6bf84
we now provide a feed for the conversation
2017-10-18 06:25:22 +00:00
rabuzarus
67b9e57547
add event copy link to default event.tpl
2017-10-15 22:52:22 +02:00
rabuzarus
74d813042f
extend checkbox template for customized attributes
2017-10-15 18:45:49 +02:00
rabuzarus
553428d1b1
event items are now more themeable in the networkstream.
...
The event description stays the same - but the theme developer can provide an template how the other event data should be organized and look
2017-10-13 19:42:27 +02:00
c8eefbd091
Force a republish to the directory server
2017-10-09 19:26:45 +00:00
289dde39ce
Removed unused setting
2017-09-25 19:05:05 +00:00
a5cf2c69c8
Reworked network page
2017-09-13 06:43:43 +00:00
b1668ffdda
Address instead of url
2017-09-01 19:32:12 +00:00
0e8104b172
Links to profiles in mails mow show the profile address and "redir" always works
2017-08-31 12:01:44 +00:00
04f286dca2
Support for JSON based webfinger
2017-08-30 05:34:37 +00:00
5c53544118
Removed external pubsubhubbub URL
2017-08-25 02:58:38 +00:00
016e4a0efc
Show contacts personal message in local profile
2017-08-01 17:47:13 +02:00
c98ae304c0
Endless scroll now avoids showing the same items
2017-07-31 06:04:37 +00:00
Michael Vogel
896bf4046c
Merge pull request #3569 from tobiasd/20170702-delete
...
delete item from admin panel
2017-07-10 18:44:19 +02:00
d535864d98
added template for delete item
2017-07-07 10:37:36 +02:00
RJ Madsen
fec2f8fd82
Replacing quotes around new directory link
2017-07-06 17:56:18 -04:00
RJ Madsen
c4b40babb0
Switched to proper global directory instead of local directory
2017-07-06 17:31:36 -04:00
RJ Madsen
255f38710c
Added global directory link to the find people side panel
2017-07-06 14:19:58 -04:00
Michael Vogel
2b161108fe
Merge pull request #3439 from tobiasd/20170506-token
...
[Needs OpenID testing] Add token to register
2017-07-02 21:31:53 +02:00
e0c46678e5
autofocus for search input field
2017-06-24 10:17:16 +02:00
a9b948d6f9
added hints how to specify a port for the database connection
2017-06-08 15:00:50 +02:00
6e6941a546
We have an alternate link
2017-06-06 21:56:25 +00:00
932e14971f
Issue 2864: Add a "alternate" link on display page
2017-06-06 17:56:22 +00:00
Hypolite Petovan
cbd3edbc05
Update remaining "dir.friendi.ca" instances
2017-06-02 22:15:43 -04:00
7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2
...
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-11 14:54:26 +02:00
dacef3683a
add token to register
2017-05-06 14:49:53 +02:00
715e15cbe1
There is now a memory limit for the poller
2017-04-29 17:36:46 +00:00
ba5780c4a1
Remove the "discard" button for contact requests from Diaspora.
2017-04-28 08:36:10 +00:00
Hypolite Petovan
7d9d22914f
Refactor "URL" to "domain" for blocklist
...
- Add slash trimming to domain
- Reformatted mod/friendica
2017-04-25 22:45:42 -04:00
Hypolite Petovan
0b8f80c747
Merge pull request #3388 from tobiasd/20170424-blocklistadminpanel
...
blocklist front end for the admin panel
2017-04-25 21:23:20 -04:00
f146c85e75
standards
2017-04-25 18:57:50 +02:00
Hypolite Petovan
82ea7ead66
Merge pull request #3374 from rabuzarus/20170407_-_group_edit
...
Frio: provide own group template + some restructuring in group.php
2017-04-24 19:50:46 -04:00
1a436281c5
added template for the blocklist editor in the admin panel
2017-04-24 23:44:27 +02:00
Sandro Santilli
e08228ca09
Add auth_cookie_lifetime variable to installation config template
2017-04-21 17:19:58 +02:00
rabuzarus
f99bb958f6
Merge develop into 20170407_-_group_edit
...
Conflicts:
mod/group.php
2017-04-21 16:09:48 +02:00
rabuzarus
40e5436604
some restructuring in groups.php + Frio: provide own group template
2017-04-21 16:04:29 +02:00
3592f90910
Merge remote-tracking branch 'upstream/develop' into 1704-mastodon
...
Conflicts:
include/bbcode.php
2017-04-20 05:44:31 +00:00
Michael Vogel
83cc56e713
Merge pull request #3326 from Alkarex/utf8mb4
...
Default to utf8mb4
2017-04-20 05:28:16 +02:00
e16fb74b0c
Reworked OStatus communication part to better support Mastodon.
2017-04-19 21:37:00 +00:00
33d5e5b818
Issue 3157: No fulltext anymore
2017-04-18 20:09:05 +00:00
Alexandre Alapetite
5d3bf9307f
More replaces UTF8 to UTF8MB4
2017-04-16 15:53:48 +02:00
a0a0885527
Merge pull request #3339 from Hypolite/issue/#2803-icons
...
Change icon of contact page links
2017-04-14 07:35:16 +02:00
b8fd48dddc
Merge pull request #3335 from annando/issue-3331
...
Issue 3331: Remove unneeded table "deliverq"
2017-04-14 07:32:30 +02:00
Hypolite Petovan
440fd29c1e
Change icon of contact page links
2017-04-13 23:00:02 -04:00
Pierre Rudloff
ead9cbe534
Web app manifest ( fixes #3317 )
2017-04-13 16:46:36 +02:00
d82684219a
Issue 3331: Removed unneeded table "deliverq"
2017-04-13 04:51:16 +00:00
42cc8d729b
Merge pull request #3306 from Hypolite/issue/#3274
...
Fix path to default Text_Highlighter CSS
2017-04-08 15:24:16 +02:00
Hypolite Petovan
318166a381
Fix path to default Text_Highlighter CSS
2017-04-08 08:59:41 -04:00
Sandro Santilli
27cce1e6dc
Add type="text" attribute for openid input field
2017-04-06 21:48:20 +02:00
f6d7ee2781
Issue 3142: mcrypt is no more (as well as phpseclib)
2017-04-01 08:28:42 +00:00
0d49143a63
"no_utf" wasn't in use anymore - it is now removed completely
2017-03-25 10:51:00 +00:00
Hypolite Petovan
29fb28de43
Remove Embedly integration
...
- Remove admin setting input
2017-03-25 01:57:19 -04:00
Hypolite Petovan
b9f4a6e4f0
Code cleanup + standards
2017-03-25 01:54:16 -04:00
rabuzarus
0060e2449e
Merge develop into 20170316_-_fix_event_edit
...
Conflicts:
mod/events.php
2017-03-20 16:46:36 +01:00
8dd732a896
Issue 3242: Define a maintenance reason
2017-03-19 13:24:07 +00:00
rabuzarus
3cef98caf6
Merge pull request #3226 from annando/1702-only-worker
...
The worker is now the only background processing system
2017-03-17 13:22:23 +01:00
rabuzarus
8ae8465d48
add dop event & fix event edit
2017-03-16 20:15:25 +01:00
fabrixxm
fa3490ba5b
Merge pull request #3224 from annando/1702-no-old_pager
...
The old pager is now removed
2017-03-14 10:29:03 +01:00
Michael Vogel
199bba20d9
Merge pull request #3200 from Hypolite/issue/#3195
...
Improve pagination on frio
2017-03-14 06:05:42 +01:00
dfc5dc2e9e
Merge pull request #3223 from annando/1702-no-language
...
The language string isn't displayed anymore
2017-03-13 08:26:43 +01:00
77e8c44016
Merge remote-tracking branch 'upstream/develop' into 1702-only-worker
...
Conflicts:
include/onepoll.php
include/queue.php
2017-03-12 21:03:44 +00:00
259598e569
Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share
2017-03-12 20:52:48 +00:00
044e9a6603
Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
...
Conflicts:
mod/profile.php
2017-03-12 20:52:14 +00:00
b6a4a2ec7f
Merge remote-tracking branch 'upstream/develop' into 1702-no-language
2017-03-12 20:50:20 +00:00
1d667d7a45
tag change
2017-03-03 17:18:09 +01:00
2fa9f76e67
better wording and placeholder for name
2017-03-03 10:28:29 +01:00
Hypolite Petovan
a3cd804ff1
Fix default paginate.tpl
...
Adding missing curly braces
2017-03-01 23:23:14 -05:00
cc86d8ea14
Language data won't be displayed anymore (it was experimental stuff)
2017-02-27 23:59:05 +00:00
997e94555b
The old pager is removed
2017-02-27 21:46:37 +00:00
39386ded36
"old_share" is removed
2017-02-27 21:26:37 +00:00
99fb15037b
Removed some more unneeded stuff
2017-02-27 06:27:22 +00:00
48209f0ecd
Now there is only the worker.
2017-02-26 23:16:49 +00:00
7442ce3d6d
change Fan/Admirer to Subscriber
2017-02-26 16:47:11 +01:00
cec79ddf2b
See issue 3157: Fulltext is now disabled
2017-02-21 05:23:37 +00:00
rabuzarus
d27c8f4932
fix oembeded video floating
2017-02-08 02:18:42 +01:00
94694aae86
RInO is not true / false anymore
2017-02-01 08:45:13 +01:00
rabuzarus
ec4e60ce3a
style the photo album page of the vier theme
2017-01-30 15:00:26 +01:00
4b2f6138a4
smoothly is also allowed
2017-01-28 11:08:05 +01:00
d6e81117f9
system -> allowed_themes was not set in htconfig template
2017-01-28 08:26:40 +01:00
Hypolite Petovan
c38a5e443d
Merge branch 'develop' into issue/#3062
...
* develop: (68 commits)
Added documentation
update to the translation
update to the translations
translation docs now contain basic usage of the Transifex client
- Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
- Remove misc TinyMCE mentions in docs and minifyjs
- Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
- Remove TinyMCE mentions in themes
- Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
Remove tinyMCE libraries
limit the description of the meta tag to 160 characters in /mod/display
Improved handling of non string values in the config
Bugfix: Caching of non string cache values now works.
Reformatted stuff, improved query
Auto-focus first input field of modal when shown
Use cache instead of config for storing last proc_run time
Some added logging
Bugfix for masses of php warnings
Rearranged the logging
Some changed logging
...
# Conflicts:
# view/theme/frost-mobile/js/theme.js
# view/theme/frost/js/theme.js
2017-01-27 15:30:21 -05:00
Hypolite Petovan
bf6d235b26
- Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
2017-01-26 23:04:38 -05:00
Hypolite Petovan
9d5384f107
- Remove tinyMCE mentions or convert to addeditortext()
...
- Remove $editselect template value
2017-01-26 22:50:27 -05:00
Hypolite Petovan
af4e6a36d4
Fix overzealous quote replace
2017-01-09 12:25:52 +11:00
Hypolite Petovan
b50f1f970f
Use placeholder attribute for Comment message
...
- Remove global aStr.comment
- Remove global window.commentEmptyText
- Remove head.tpl $comment parameter
2017-01-08 02:13:55 +11:00
Hypolite Petovan
b6ce646d71
Use placeholder attribute for Share message
2017-01-08 02:06:03 +11:00
Hypolite Petovan
daa8e4f901
Cleaning up, actual changes are in the next commits
...
- Formatting
- Trailing spaces
- Extraneous blank lines
- Large comments
2017-01-08 02:03:11 +11:00
rabuzarus
898761b4a0
Show mobile theme selection only if mobile themes are available (default template)
2017-01-07 00:22:22 +01:00
rabuzarus
a6d7ad0755
Update cache on photo edit only when album name has changed
2016-12-26 02:41:00 +01:00
rabuzarus
3677467cef
update perfect-scrollbar to version 0.6.15
2016-12-24 02:27:17 +01:00
rabuzarus
2fcbba9410
provide local time for notifications
2016-12-22 00:28:52 +01:00
bc323b0bfa
OStatus: Follow/Unfollow should now work again.
2016-12-18 17:10:38 +00:00
132477990d
move that option up, as the admin panel has no control over it ATM
2016-12-10 07:16:16 +01:00
89caa18fe0
add the kickstart allowed protocols to htconfig.tpl. 2932 follow-up
2016-12-10 07:05:35 +01:00
71cfe6db94
show some of the worker options only when the worker process is active
2016-12-06 21:47:37 +01:00
ac5617c40c
add frontend worker to the admin panel and regen master messages.po file
2016-12-06 08:44:59 +01:00
Hypolite Petovan
065c12e652
Add active like style to duepuntozero
...
- Update general wall_thread.tpl
- Add specific styles for duepuntozero
2016-11-22 16:31:14 +01:00
Michael Vogel
b33e817586
Merge pull request #2951 from tobiasd/20161120-mysql
...
add MySQL warning in admin panel
2016-11-20 17:09:49 +01:00
b03009d962
use an array for warnings in admin panel
2016-11-20 16:14:09 +01:00
7ad4a8ca93
The warning if a group contains members of several network types can now be supressed.
2016-11-20 12:09:18 +00:00
7aaaa0a3c7
Show a warning message in the admin panel when MyISAM is still in use
2016-11-20 09:50:14 +01:00
b95bf00e89
Additional info in registration request
2016-11-19 18:22:49 +01:00
Michael Vogel
75a996c4e4
Merge pull request #2839 from Hypolite/Issue-#2822
...
Issue #2822 - Fix [Embedded content - reload the page to view]
2016-10-25 07:31:20 +02:00
Hypolite Petovan
71e93d9eb9
Remove debug and extra new lines
2016-10-21 14:24:43 -04:00
Hypolite Petovan
c340d590f7
Fix calendar strings escape
...
- Fix base event_head.tpl file
- Fix the rest of frio strings
2016-10-21 14:14:20 -04:00
Hypolite Petovan
b0a0cf94e4
Fix Issue #2865 - reshared posts and additional text
...
😉
2016-10-20 21:41:17 -04:00
rabuzarus
8064ff6ecb
update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover
2016-10-16 16:04:53 +02:00
Hypolite Petovan
a843858654
Merge from develop
2016-10-08 13:45:14 -04:00
rabuzarus
2a3e235f9a
show/hide page-flags according to the account-type
2016-10-05 14:45:19 +02:00
Hypolite Petovan
d9a5554543
Fix Issue #2822 - Add new setting to user settings page
...
- Convert formatting to PSR-2
- Add new bandwitdh saver setting
2016-10-02 15:25:10 -04:00
Hypolite Petovan
4021109696
Improve field_checkbox.tpl
...
- Adds a hidden field to ensure the checkbox item will have a value
during save.
- Fix quotes for HTML attribute values
2016-10-02 15:21:20 -04:00
Hypolite Petovan
4242c3f749
Fix Issue #2800 - Prevent internal link from switching to Safari in standalone mode
...
- Add link switch prevention to frio theme
- Add reference to the script page
2016-10-01 18:53:25 -04:00
Hypolite Petovan
f302f66dcd
Fix Issue #2800 - Prevent internal links to switch to Safari in standalone mode
...
Add a event delegation to keep internal links inside the standalone
window.
Fixes 1. of #2800
2016-10-01 18:19:43 -04:00
Michael Vogel
2f06e9360f
"Company" is now "Organisation" and there is an auto update
2016-09-26 19:35:01 +00:00
Michael Vogel
d632d282cd
We are now having an account type and are publishing it
2016-09-25 20:37:27 +00:00
Michael Vogel
196eb6009f
The XMPP address is now in the profile and will be transmitted
2016-09-25 15:28:00 +00:00
e5c2c66487
Show the worker queue count if the workers are active
2016-09-20 15:45:55 +02:00
88285b4cbf
The info is not that important
2016-09-14 06:45:05 +02:00
f85821839b
display current state of PHP logging in admin panel logging informations
2016-09-13 22:52:21 +02:00
Michael Vogel
9209d88c4a
Set the charset for the SQL connection for new installations
2016-09-01 03:50:41 +00:00
rabuzarus
37ae63e120
fix contact dropping on contact edit page also for other themes
2016-08-17 16:51:04 +02:00
Michael Vogel
61e3a8ca3a
Merge pull request #2702 from rabuzarus/0308-Notifications-restructure
...
notifications restructure
2016-08-08 07:41:48 +02:00
991914d563
vier
2016-08-06 10:54:54 +02:00
rabuzarus
3921113e5c
photos - include paginate into the templates - provide a photo_album.tpl for frio
2016-08-04 21:53:22 +02:00
Michael Vogel
2d63f9deb6
Worker fastlane can now be activated from the admin interface
2016-08-04 08:51:34 +02:00
rabuzarus
ae905cbd1b
Merge develop into 0308-Notifications-restructure
...
Conflicts:
mod/notifications.php
2016-08-03 12:53:38 +02:00
rabuzarus
6d3c15fe91
notifications - add attendance notifications
2016-08-02 00:01:43 +02:00
rabuzarus
bcee356f66
notifications - add docu & pagination
2016-08-01 23:04:41 +02:00
rabuzarus
7a4be1cead
notifications.php: move more code to NotificationsManager
2016-08-01 18:18:11 +02:00
75be187216
Merge pull request #2682 from annando/1607-api-generic-xml
...
API: XML is now generated without templates
2016-08-01 07:25:24 +02:00
a684a1c519
Merge pull request #2691 from rabuzarus/2607-contact_confirm
...
frio: intro templates + some restructure of core notifications.php
2016-08-01 07:15:24 +02:00
rabuzarus
f7fa5f166b
notifications.php: unify label strings
2016-07-30 11:03:21 +02:00
rabuzarus
320751660d
frio: intro notifications + some restructuring in core for notifications
2016-07-27 19:53:22 +02:00
Michael Vogel
287c9cfbdd
Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml
2016-07-26 22:15:49 +02:00
18a35e9ceb
Merge pull request #2688 from rabuzarus/2607-drop
...
frio: provide confirm modal
2016-07-26 10:45:52 +02:00
rabuzarus
694637f9c3
frio: provide confirm modal
2016-07-26 10:36:34 +02:00
rabuzarus
768d10536f
frio: templates for contact_edit and crepair
2016-07-26 09:09:40 +02:00
Michael Vogel
0e7ff6b4db
Removed (now) unused templates
2016-07-19 08:46:41 +02:00
Michael Vogel
838f976715
Some more improvements to xml.php, code cleanup
2016-07-17 23:59:35 +02:00
fabrixxm
ce2f765d28
API: rework share as retweet
...
new shared status xml template.
<retweeted_status> element in xml.
parent status keeps his body and author, 'retweeted_status'
get body, author and plink from share bbcode.
2016-07-13 22:29:07 +02:00
fabrixxm
d98ab84d76
API: update template for friendica:owner data
...
api_user_xml.tpl lost his root element.
Includer templates must provide it.
This allow to use same data structure under different root tag.
2016-07-13 20:11:18 +02:00
Michael Vogel
2ef50cb7e6
Site settings: some settings are disabled when the worker is active
2016-07-02 23:08:33 +02:00
rabuzarus
fd72f36ffe
move html from function micropro() to own templates
2016-06-25 18:46:47 +02:00
Michael Vogel
49c19a3c00
Merge pull request #2628 from rabuzarus/1906-event-test
...
move the cal addon (exporting calendars) to core
2016-06-21 22:48:31 +02:00
Ben Roberts
864cf0f70d
update MF2 and vcard data for issue #2629
2016-06-21 10:23:43 -04:00
rabuzarus
71c9f562ae
move the cal addon (exporting calendars) to core
2016-06-20 23:31:49 +02:00
rabuzarus
7495a34b32
implement a public calendar for vistors of someones profile page
2016-06-19 22:04:34 +02:00
Michael Vogel
bf2e23c205
Merge pull request #2616 from rabuzarus/1206-events-template
...
use standard templates in events + frio templates for events
2016-06-18 15:01:00 +02:00
rabuzarus
7dc5fc8b9f
Merge develop into 1206-events-template
...
Conflicts:
view/theme/frio/css/style.css
2016-06-17 14:33:08 +02:00
rabuzarus
0148d0e5d2
frio - event - correct some js
2016-06-17 11:18:54 +02:00
rabuzarus
c99da380cf
frio: events - adapt changes to the templates of the other themes
2016-06-17 10:33:12 +02:00
rabuzarus
0167a2bd61
port of Hubzillas code highlight feature
2016-06-16 11:38:12 +02:00
Michael Vogel
6d50d18242
Merge pull request #2584 from rabuzarus/0906-profiles
...
some restructure in profiles.php + frio template for profiles settings
2016-06-12 14:20:42 +02:00
rabuzarus
3a9a9e6a1c
frio + core: some restructure in profiles.php + frio template for profiles settings
2016-06-10 11:24:38 +02:00
e8d39b290a
show the workerqueue in the admin panel summary
2016-06-09 18:08:40 +02:00
Michael Vogel
aad00ddc04
Renamed template
2016-06-08 07:11:16 +02:00
Michael Vogel
f59b21d4a8
Merge remote-tracking branch 'upstream/develop' into 1606-shared-template
2016-06-07 22:40:29 +02:00
Michael Vogel
e2e32eecac
New template for shared content instead of hardcoded stuff in source
2016-06-07 22:29:50 +02:00
rabuzarus
26336a60e9
content_wrapper.tpl respects content with no title
2016-06-07 16:38:22 +02:00
rabuzarus
71b30e0651
profice a general content wrapper template.
2016-06-07 16:32:02 +02:00
Michael Vogel
4b640dbd97
Fetching of profile data improved
2016-06-05 21:17:55 +02:00
Michael Vogel
e2c0f04eeb
Added short description to "mark as seen"
2016-06-01 07:05:44 +02:00
2d280f55ac
Merge pull request #2544 from annando/issue-1769
...
Issue 1769: Some enhancements for sending wall mails
2016-05-30 14:35:04 +02:00
Michael Vogel
0a617da044
Wall message can now redirect to your own page if you are connected.
2016-05-29 21:29:26 +02:00
Michael Vogel
98f7c73d10
Frio: Hovercard is now a core function
2016-05-29 15:28:31 +02:00
Fabrixxm
6734aa5c28
Make user table in admin sortable via table headers
...
new GET param for /admin/user: 'o'
value is db table to order by. values are limited by script.
invalid values are discarded.
preped with '-' to order descending.
show unicode arrows in table headers to visually indicate sorting.
2016-05-16 14:38:00 +02:00
d6a124ee2b
Merge pull request #2511 from rabuzarus/1205_photo_live_update
...
1205 photo live update
2016-05-13 07:57:13 +02:00
rabuzarus
6944d67dbc
photos view: fix js error with undefined variable
2016-05-13 01:26:07 +02:00
rabuzarus
d454905d3c
infinite_scroll: move js from index.php to main.js
2016-05-11 01:52:05 +02:00
rabuzarus
7e199c72ac
login: use ARIA instead of <fieldset> tag
2016-04-25 23:40:07 +02:00
Michael Vogel
ee72f1e4bd
Merge pull request #2468 from tobiasd/2242-and-htconfig
...
stuff for the installer and htconfig template
2016-04-21 06:41:02 +02:00
caa541f939
make doxygen a bit more happy
2016-04-20 16:08:17 +02:00
6601582a12
make doxygen a bit more happy
2016-04-20 16:06:39 +02:00
rabuzarus
7ee9c536ee
fix: contact edit poll_interval wasn't submitted
2016-04-20 15:37:34 +02:00
7c6ebae5c0
reorganize the htconfig template
2016-04-20 14:30:22 +02:00
d3293dfcf2
during installation choose the highest RINO version possible
2016-04-20 14:17:48 +02:00
rabuzarus
ed6ada0da5
rework autocomplete: use minified version + delete old fk.autocomplete.js
2016-04-15 02:25:58 +02:00
rabuzarus
98b62b80f3
rework autocomplete: seperate bbcode completion
2016-04-14 23:59:29 +02:00
rabuzarus
01b02dbcaa
Merge develop into 1404_reworked_autocomplete
...
Conflicts:
include/text.php
view/templates/head.tpl
view/theme/duepuntozero/style.css
view/theme/vier/style.css
2016-04-14 16:23:51 +02:00
5df20fda11
Issue 2241: added language selector to the admin wizard
2016-04-06 20:13:34 +02:00
1ee405c9c3
added aria describedby elements refering to field help to the input templates
2016-04-04 08:10:27 +02:00
Michael Vogel
3f2a23d48c
Unused files are removed
2016-03-15 07:05:10 +01:00
Michael Vogel
a0aeea4a89
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
2016-03-12 07:38:25 +01:00
Michael Vogel
bc21fca345
Remove the setting description from the documentation since it isn't a hidden one anymore.
2016-03-11 23:44:46 +01:00
Michael Vogel
b12dbe8831
The worker settings are now available in the admin settings
2016-03-11 23:28:11 +01:00
Michael Vogel
918efbafac
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
2016-03-06 21:20:00 +01:00
fabrixxm
d30d13959b
Merge pull request #2328 from rabuzarus/0602_contact_profile
...
polishing of the contact-edit page
2016-03-06 19:56:59 +01:00
Michael Vogel
bb06026147
Settings for only importing threads from our ostatus contacts
2016-03-06 14:09:04 +01:00
Michael Vogel
6468fbb905
Retraction could work now as well.
2016-03-06 01:37:47 +01:00
08abdfda68
<form> and <html> or <head> are not self-closing tags.
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:49:56 +01:00
09060c0ed3
adding some colors to the Federation Statistics page of the admin panel
2016-02-29 17:24:34 +01:00
rabuzarus
0db83b9586
contactedit-actions-button: move repair back to tabbar
2016-02-23 19:19:45 +01:00
Michael Vogel
7d4c99ebbc
"get_baseurl" and "z_root" are disappearing ...
2016-02-17 23:47:32 +01:00
Michael Vogel
f7537c9e90
Remove the baseurl where possible to avoid mixed content
2016-02-17 00:01:24 +01:00
rabuzarus
0b5d7b300e
contactedit-actions-button: adjust the themes and template polishing
2016-02-08 23:15:20 +01:00
rabuzarus
991cbd604a
contact-edit-actions-button: initial commit
2016-02-08 01:56:15 +01:00
fabrixxm
102c06a41f
fix error in template in notifications page
2016-02-07 14:29:07 +01:00
fabrixxm
e11ff25de2
fix empty ACL window on desktop
2016-02-03 23:22:45 +01:00
Fabrixxm
3c6ebfa5a9
Vier - mobile friendly ACL window and form fields
2016-02-03 14:03:00 +01:00
rabuzarus
aee94b38c1
rework autocomplete: add class dir and static function
2016-02-01 18:21:29 +01:00
rabuzarus
162f754e2d
Merge develop into 1901_autocomplete
2016-01-30 16:57:54 +01:00
rabuzarus
d0ade828c0
rework autocomplete: some cleanup and docu
2016-01-24 19:56:23 +01:00
Michael Vogel
f38f1806c1
We don't need these templates anymore
2016-01-24 08:22:09 +01:00
rabuzarus
39a849c113
rework autocomplete: new ac for poke, contacts, prv_messages
2016-01-22 17:47:48 +01:00
rabuzarus
03bef2c8f8
fix events_reminder popup
2016-01-21 13:44:38 +01:00
rabuzarus
e3475bd587
rework autocomplete: css work
2016-01-21 13:28:29 +01:00
rabuzarus
16e4e94b29
rework autocomplete: initial commit
2016-01-19 18:11:40 +01:00
846153d388
some beautification to the template code
2016-01-19 07:20:07 +01:00
c6f0333026
moved some CSS stuff from the template to global.css
2016-01-18 13:22:07 +01:00
Michael Vogel
36ba415df3
Merge pull request #2257 from rabuzarus/locked_features_united
...
feature management for admins
2016-01-18 00:51:50 +01:00
rabuzarus
f428635682
vier: add missing forumlist_profile
2016-01-17 15:54:58 +01:00
rabuzarus
c1ed2bd975
feature management for admins: Merge branch 'devolop'
2016-01-17 03:25:17 +01:00
75f0053550
forgot the template
2016-01-16 13:57:40 +01:00
20fe67f378
removed remote update functionality from admin panel
2016-01-16 11:52:21 +01:00
629c69d9dd
only show the reload link if plugins are found
2016-01-15 19:35:45 +01:00
7a7ffb2299
issue 2240 when no addon are installed hint the location of sources in the admin panel
2016-01-15 18:19:22 +01:00
5099f43c42
only show platforms with counts > 0
2016-01-15 18:19:22 +01:00
8e7d53cd41
added Chart.js 1.0.2 to friendica library and use it instead of CDN version for graphs
2016-01-15 18:19:21 +01:00
0d5fed5b3b
beautification of HTML code
2016-01-15 18:19:21 +01:00
0a5c9e96a8
moved viewing of friendica logs into a separate subpage, thus created a new template
2016-01-15 18:19:21 +01:00
ddb17d36a2
added PHP logging hint fields to the template
2016-01-15 18:19:21 +01:00
c1aa668fef
add log viewer to the aside menu of the admin panel
2016-01-15 18:19:21 +01:00
a4104d7c17
1st stuff for federation stats in the admin panel
2016-01-15 18:19:19 +01:00
fabrixxm
fcf7a791f1
Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget"
...
This reverts commit 83e54f70d3
, reversing
changes made to ecf576bdd0
.
2016-01-04 11:46:19 +01:00
fabrixxm
83e54f70d3
Merge pull request #2223 from rabuzarus/2912_photo_widget
...
photo aside widget for profile page
2016-01-04 10:06:07 +01:00
Michael Vogel
771d0c4bfa
Merge pull request #2224 from rabuzarus/2812_js_scrollbars
...
Since we can easily remove it, we can accept this - and change it back if we need to. I haven't check accessibility - but this can be done later.
2016-01-03 14:09:17 +01:00
rabuzarus
3366e530cd
photo aside widget: little polish
2015-12-30 00:37:24 +01:00
rabuzarus
20fbf670db
photo aside widget for profile page
2015-12-30 00:26:50 +01:00
rabuzarus
e93156427e
use perfect-scrollbars for nav-notifications-menu (and in vier aside)
2015-12-28 23:16:34 +01:00
99861b9fa6
Merge pull request #2216 from fabrixxm/feature-api-like
...
Works on API and a small refractor, updated docs
2015-12-28 18:39:21 +01:00
fabrixxm
6da04d16bd
get rid of unwanted <br>s in items with oembed
...
fix video thumbnail in quattro, vier, duepuntozero themes
2015-12-28 18:07:31 +01:00
fabrixxm
696fe53d8f
sizes links in xml output of api/frienidca/photo is an array
2015-12-28 10:23:06 +01:00
fabrixxm
6b60560ea2
Changes in api
...
- Api functions can define an HTTP method to use to call them. "405 Method Not Allowed" is returned on error
- Api function that modify data accepts only POST as method.
- A list of HTTP return code related exception is added
- Api functions throw HTTP exceptions instead of return false or die()
- api_call() catches HTTP exceptions and return error message with corret HTTP response code
- api_format_items() returns also item activities count (# of like/dislike etc)
- api/friendica/photos/list return more info about photos. xml format added.
- api/friendica/photo/detail return more info, links to all sizes, no data except if 'size' parameter is passed. xml format added.
- new api api/friendica/activity/<verb> and api/friendica/activity/un<verb> to add or remove like/dislike/attend status
2015-12-28 10:23:06 +01:00
Michael Vogel
8b25f51116
XRD now should react more like an OStatus server
2015-12-28 01:04:14 +01:00
Michael Vogel
ec9b1b7afd
There is now a fragmentation level for the table optimisation
2015-12-12 17:46:24 +01:00
Michael Vogel
01c9d13927
Issue 1871: Show an information if a group is empty
2015-12-05 23:29:42 +01:00
Michael Vogel
1a170c8743
Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
...
Conflicts:
mod/contacts.php
mod/crepair.php
2015-12-03 14:38:04 +01:00
Michael Vogel
1f9644bded
Merge pull request #2131 from rabuzarus/3011_hcard_vcard
...
unify hcard and vcard
2015-12-03 14:16:52 +01:00
rabuzarus
1d6d9d3d24
photos-albms widget: add some classes
2015-12-01 21:07:05 +01:00
rabuzarus
cd7ec72b20
unify hcard and vcard: make $pdesc available in hcard&vcard
2015-12-01 19:47:23 +01:00
rabuzarus
39b37281a7
Merge develop into 3011_hcard_vcard
2015-12-01 18:34:13 +01:00
rabuzarus
89c5989cfb
unify hcard and vcard
2015-12-01 18:31:08 +01:00
Michael Vogel
06a4b0dc5e
Header removed in the contact area
2015-12-01 18:21:05 +01:00
Michael Vogel
fe900ac576
Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
2015-12-01 17:16:31 +01:00
Michael Vogel
6910604ffb
Merge pull request #2125 from rabuzarus/2911_event_template
...
vier event_form: include bb-tags for editing
2015-12-01 17:13:46 +01:00
Michael Vogel
1c93729c46
Tab is added to "all friends" and "common friends"
2015-12-01 08:12:05 +01:00
rabuzarus
39b85c8486
vier event_form: include bb-tags for editing
2015-11-30 16:00:41 +01:00
fabrixxm
2753e62483
Merge pull request #2119 from annando/1511-contact-evolution
...
Refurbished contact settings/contact posts
2015-11-30 14:45:23 +01:00
fabrixxm
a60b702df1
Merge pull request #2113 from annando/1511-manage-notifications
...
The manage page now shows the notifications
2015-11-30 12:04:53 +01:00
Michael Vogel
4efb6c6f79
Merge pull request #2120 from rabuzarus/2911_network_header
...
2911 network header
2015-11-30 08:30:34 +01:00
rabuzarus
a6aac8f950
networkheader: do css work the other supported themes
2015-11-30 01:24:22 +01:00
Michael Vogel
42d903dd68
Redesign of the contact pages, new tab for contact statuses
2015-11-29 23:22:05 +01:00
Michael Vogel
5649e9e193
The contact page now contains more data
2015-11-29 17:04:48 +01:00
rabuzarus
70860e5836
new_event: default size of textfields
2015-11-29 16:16:18 +01:00
Michael Vogel
583a2f709b
Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design
2015-11-29 10:25:44 +01:00
be40fb8186
Merge pull request #2110 from annando/1511-subscribe-feed
...
Issue 1779: Atom feed link under the connect link on the profile page
2015-11-29 08:40:39 +01:00
rabuzarus
f5597da059
forumlist - mark selected forum as selected
2015-11-28 23:52:12 +01:00
Michael Vogel
3067663909
The manage page now shows the unread notifications
2015-11-28 22:56:48 +01:00
rabuzarus
a3059d02d4
group_side - unify look with forumlist
2015-11-28 20:09:28 +01:00
Michael Vogel
388847e1f3
Issue 1779: There is now an atom feed link under the connect link on the profile page
2015-11-28 18:11:34 +01:00
Michael Vogel
679ce3243e
Admin settings for table optimisation
2015-11-28 16:35:16 +01:00
Michael Vogel
3b6d3d1ade
Merge pull request #2099 from rabuzarus/2611_new_user_addr
...
generate addr for new registered users
2015-11-27 21:35:46 +01:00
rabuzarus
620299dc25
include friendica address in hcard
2015-11-26 17:46:38 +01:00
rabuzarus
ddf3589fc5
count unread forum items for forumlist widget (ping.php)
2015-11-24 22:14:26 +01:00
Michael Vogel
41fe07e128
Merge remote-tracking branch 'upstream/develop' into 1511-forumlist-fix
2015-11-17 21:34:01 +01:00
Michael Vogel
edb303d44a
Merge pull request #2086 from rabuzarus/0711_forumlist
...
0711 forumlist
2015-11-17 21:33:25 +01:00
rabuzarus
a07a0fd1d7
forumlist: fix id conflict and js show-more
2015-11-17 20:57:12 +01:00
Michael Vogel
4b21512f56
This is a quick fix for the the forumlist.
2015-11-17 19:56:32 +01:00
Michael Vogel
e43c7a4447
Merge pull request #2061 from rabuzarus/0711_forumlist
...
move forumlist addon to core
2015-11-17 08:46:15 +01:00
Fabrixxm
0a9e017d34
Installer use static css, fix #2071
2015-11-13 10:56:06 +01:00
rabuzarus
902735f6d4
forumlist: dbupdate
2015-11-11 23:39:14 +01:00
rabuzarus
abf9ebd466
forumlist: small fix
2015-11-10 12:53:56 +01:00
rabuzarus
96b764425e
move forumlist addon to core
2015-11-09 15:56:20 +01:00
fabrixxm
c700a6fb37
duepuntozero, vier: add unread messages per group
2015-11-08 18:02:04 +01:00
631afe5810
Merge pull request #2035 from FlxAlbroscheit/develop
...
Preview the last 5 conversations in message-sidebar
2015-11-08 16:03:04 +01:00
fabrixxm
ae9c9829fa
Remove language selectors from themes
...
This is now a user setting
2015-11-08 14:42:54 +01:00
fabrixxm
fb3ac68cc0
Add user language in settings, use that field as language for UI
2015-11-08 14:23:49 +01:00
fabrixxm
0363bab040
js: add new Dialog object
...
The Dialog is used by code to show urls in colorbox.
Templates can overwrite `show()` function to change its behaviour
2015-11-08 12:01:19 +01:00
FlxAlbroscheit
603dad93f3
Preview last five conversations in message-sidebar
2015-11-07 18:54:20 +01:00
fabrixxm
5f6ea6357d
Add 'Reload active themes' to admin
...
It will call 'uninstall()' and 'install()' on every active themes
2015-11-06 23:53:10 +01:00
rabuzarus
e785759a8b
template-rework:make use of get_contact_details_by_url()
2015-11-03 14:31:15 +01:00
rabuzarus
f196389580
Merge develop into allfriends
2015-11-02 14:31:20 +01:00
Michael Vogel
709aac0652
Only offer the choice to activate Diaspora and OStatus if the system is ready for it
2015-11-01 13:55:49 +01:00
c00847a79d
use section_title.tpl for page title
2015-10-30 18:05:45 +01:00
a48156aab6
display names listed in credits.txt from /credits
2015-10-29 08:48:41 +01:00
rabuzarus
299c8b83ac
template-rework: let common friends and allfriends use viewcontact_template.tpl
2015-10-27 15:27:26 +01:00
367699f785
Merge pull request #1987 from annando/1510-manage-enhancements
...
Some small optical and structural changes to the manage template
2015-10-27 09:01:35 +01:00
4079084492
Merge pull request #1975 from rabuzarus/template_rework
...
Template rework for contact related pages
2015-10-27 08:59:03 +01:00
Michael Vogel
99ee45e627
The username is now a link
2015-10-26 23:11:42 +01:00
Michael Vogel
ac744b61f9
Some small optical and structural changes to the manage template
2015-10-26 08:16:37 +01:00
rabuzarus
4c263aa4ac
Merge develop into manage
...
Conflicts:
view/global.css
2015-10-25 16:57:04 +01:00
03ff349a94
Merge pull request #1982 from annando/1510-reduced-profile
...
Profile data are now reduced to only the most important fields
2015-10-25 16:54:24 +01:00
rabuzarus
bac61cf596
manage-selector: some cleanup and css work
2015-10-25 16:49:45 +01:00
Michael Vogel
78a8db55c6
Merge pull request #1981 from rabuzarus/poke
...
some work on poke template
2015-10-25 14:59:39 +01:00
rabuzarus
e0e6762ed8
some inital work to have profile pics on manage page
2015-10-25 14:00:08 +01:00
Michael Vogel
4631c13d08
Profile data are now reduced to only the most important fields
2015-10-25 09:15:36 +01:00
rabuzarus
8f92b6eea4
some work on poke template
2015-10-24 19:51:58 +02:00
rabuzarus
eb33698556
some minor changes in crepair.tpl
2015-10-24 16:01:55 +02:00
rabuzarus
ea2b3b2f76
move html from crepair.php to template
2015-10-24 15:57:46 +02:00
rabuzarus
442d59abc4
template rework: multi-row view for the other themes
2015-10-23 21:45:16 +02:00
rabuzarus
86f94570ef
template rework: delete unused templates
2015-10-23 16:49:12 +02:00
rabuzarus
0c3979720f
template rework: rearrange sidebar widgets for contact related pages
2015-10-23 00:12:00 +02:00
rabuzarus
2aad62190f
template rework: use viewcontact_template.tpl also for directory
2015-10-22 22:48:49 +02:00
rabuzarus
f9c0c1d696
template rework: use viewcontact_template.tpl for contact dealing pages
2015-10-18 17:12:48 +02:00
rabuzarus
4c1c614fa6
Merge viewcontact into template_rework
2015-10-17 22:28:09 +02:00
rabuzarus
452a3011f7
Merge suggest into template_rework
2015-10-17 22:22:52 +02:00
rabuzarus
dbf1f9efcd
Merge dirfind into template_rework
2015-10-17 22:22:35 +02:00
rabuzarus
4b8ca578d1
dirfind: move pagination into template
2015-10-17 22:09:19 +02:00
rabuzarus
b9d9bf8ecd
directory: move pagination into template
2015-10-17 21:45:55 +02:00
rabuzarus
6d559bf8a9
viewcontact: use section_title.tpl as headding
2015-10-17 21:40:41 +02:00
rabuzarus
9176e739a4
sugest.php: themeable as whole page
2015-10-17 21:25:21 +02:00
rabuzarus
72896b0f6b
unify directory page
2015-10-17 19:45:57 +02:00
rabuzarus
20bb16859f
dirfind.php: move html to templates
2015-10-17 00:19:01 +02:00
rabuzarus
6ebb21a935
directory.php: move html to templates
2015-10-16 21:44:10 +02:00
fabrixxm
fd8e8d005a
attend functionality for duepuntozero
2015-10-12 20:09:33 +02:00
rabuzarus
649578ae33
Merge develop-new into event-attendance-new
...
Conflicts:
include/conversation.php
2015-10-11 19:39:55 +02:00
Michael Vogel
efbdb57f92
Reworked contact relations between Friendica and Diaspora
2015-10-10 11:06:18 +02:00
Michael Vogel
607817d1b3
Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated.
2015-10-05 17:38:57 +02:00
Michael Vogel
d3ac3f8490
Added the contact menu to the search as well.
2015-10-05 08:08:59 +02:00
Michael Vogel
72ecb9e67b
Bugfix: Repairing a contact was more like killing the contact ...
2015-10-04 19:39:55 +02:00
Michael Vogel
4003b9cc5d
Let the notification look more like the follow dialog
2015-10-04 17:18:58 +02:00
Michael Vogel
83ea4f7253
transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues.
2015-10-04 15:55:24 +02:00
Michael Vogel
d0ae5ce326
Show more information when following a new contact
2015-10-04 14:41:39 +02:00
Michael Vogel
42ad8c2b25
New template for http status messages
2015-10-03 23:19:09 +02:00
d6beb7db1f
add a header to seperate the beginning of week settings
2015-10-01 06:19:57 +02:00
Michael Vogel
389b7de451
Setting for the first day of the week
2015-09-30 19:18:13 +02:00
rabuzarus
7cb4ea52fd
port of the event attendance feature of red matrix with example implementation for vier theme.
2015-09-30 16:58:02 +02:00
rabuzarus
f5c7006f30
rest of the consensus porting work and integration into friendica
...
Credits to Mike Macgirvin for the code
2015-09-30 14:38:13 +02:00
Michael Vogel
6e981ed798
Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events
2015-09-29 10:35:50 +02:00
Michael Vogel
c33957a6e9
Internationalisation of events/Move events to the navigation bar
2015-09-27 14:00:15 +02:00
Michael Vogel
25fc2c9799
Some changes to stay compatible to Diaspora
2015-09-19 14:00:33 +02:00
Michael Vogel
5ac38b7f99
There is now only one central parameter for the global directory.
2015-09-15 22:29:02 +02:00
Michael Vogel
c6d9b2da23
New setting for requery days
2015-09-05 10:54:39 +02:00
Michael Vogel
56ae056f1d
The "manage" option list is now larger.
2015-08-30 22:45:48 +02:00
Michael Vogel
6942b16ef5
See issue 1855. OOhembed is removed.
2015-08-25 19:50:23 +02:00
Michael Vogel
b1dddd2936
Only offer forum search in local mode.
2015-08-25 05:54:50 +02:00
26c5c7991a
Merge pull request #1849 from fabrixxm/issue-1841
...
filebrowser: link image to original picture, show error messages
2015-08-24 14:26:09 +02:00
fabrixxm
cbabac298d
filebrowser: link image to original picture, show error messages
2015-08-24 13:54:41 +02:00
Michael Vogel
3bca2db11b
Don't show search options in side bar.
2015-08-24 12:12:14 +02:00
Michael Vogel
3ff196f00d
Now you can set search options so that searching for contacts or forums isn't occult science anymore.
2015-08-24 11:55:29 +02:00
fabrixxm
81d1dfc006
add 'reload active plugins' button in admin/plugins
2015-08-20 15:01:15 +02:00
621dec1606
reconstruct the description for more flexible translations
2015-08-17 07:20:50 +02:00
eea258f74c
add the profile url to the settings pages as alternative to the webfinger. See issue 1621
2015-08-16 22:39:08 +02:00
Michael Vogel
c2a1cf958d
The addon "statistics_json" becomes the system setting "nodeinfo"
2015-08-16 21:45:51 +02:00
Michael Vogel
887372a0d7
Bugfix: Conversations with Diaspora now work reliable
2015-08-13 22:49:57 +02:00
5013e5daf1
use to link to queue inspector
2015-08-12 19:58:53 +02:00
f439ac47c4
admin panel: inspect queue
2015-08-12 15:44:59 +02:00
6b93325f70
make Inspect Queue link visible in admin adide menu
2015-08-12 15:44:03 +02:00
Michael Vogel
a0f69dc92c
Contact requests now contain more information.
2015-08-12 08:07:21 +02:00
Michael Vogel
811e4b6ba1
Documentation for accesskeys added
2015-08-09 09:16:45 +02:00
Michael Vogel
ccaeb00973
Better link descriptions.
2015-08-08 22:30:43 +02:00
Michael Vogel
b4d09777b9
Added many accesskeys ...
2015-08-08 17:33:43 +02:00
Michael Vogel
a8a21da6f5
Some steps for a better screen reader compatibility
2015-08-06 08:13:15 +02:00
cd8be48ca7
Merge pull request #1791 from annando/1507-new-poco
...
Improved Local Directory
2015-08-02 10:31:34 +02:00
rabuzarus
bef827f1cc
small fixes for filebrowser
2015-08-01 21:20:13 +02:00
Fabrixxm
b7aa259c67
hide buglink
2015-07-30 14:19:50 +02:00
Fabrixxm
f5657e283c
fix folder links in filebrowser dialog
2015-07-29 11:55:26 +02:00
Fabrixxm
52f9465578
filebrowser fixs, use it in comment textareas
...
move filebrowser js to single file
document filebrowser usage
replace "onclick" for comment style buttons with data-* and move logic to main.js
use filebrowser to insert images in comments
2015-07-29 11:30:04 +02:00
Fabrixxm
70b7de39a7
Upload/Browse popup for files and images
...
Jot buttons to upload images and files show a popup, where the
user can select a previously uploaded item o upload a new one
2015-07-28 17:20:40 +02:00
Michael Vogel
9717fa82fe
New field "created" in gcontacts. New option for timeframe when polling global contacts
2015-07-21 00:05:44 +02:00
Michael Vogel
f3c83fb514
Automatically updating the searched contacts while searching it.
2015-07-19 18:02:24 +02:00
Michael Vogel
0bede65a6b
Use local search
2015-07-19 13:23:01 +02:00
Michael Vogel
2a5fb7b175
Option to discover contacts from remote users (fallback option)
2015-07-19 09:41:36 +02:00
Michael Vogel
a0734ceede
Merge remote-tracking branch 'upstream/develop' into 1507-new-poco
2015-07-18 22:37:39 +02:00
Michael Vogel
cf3214c904
Query other servers periodically for their known contacts
2015-07-18 22:26:06 +02:00
9bb805f3dc
show profile url in contact-edit overview listing
2015-07-18 10:57:31 +02:00
Michael Vogel
f1e7369283
Poco: Option to activate and deactivate detection of last activity.
2015-07-18 00:48:42 +02:00
bbd2e4abc1
make the 'noshare' checkbox checked by default for photo upload
2015-07-17 17:05:55 +02:00
Michael Vogel
9ebaa45670
Removed unused template
2015-07-13 23:56:45 +02:00
1efda90498
Merge pull request #1755 from annando/1507-template-update
...
Vier: Some template updates
2015-07-12 21:08:11 +02:00
Michael Vogel
6a646d68c5
Updated templates for "vier" (See issue 1733)
2015-07-12 20:27:54 +02:00
Michael Vogel
e22ce8403e
Merge pull request #1752 from tobiasd/20150712-issue1747
...
issue 1747
2015-07-12 18:12:19 +02:00
rabuzarus
2c39387e44
fix for saving searches
2015-07-12 17:43:50 +02:00
d920cf25b0
dont use an empty li, but make a new list for visual separation
2015-07-12 16:16:54 +02:00
3349bba665
Merge pull request #1722 from annando/1506-password-on-install
...
Ability to enter a password when the first user is created
2015-07-01 07:53:25 +02:00
Michael Vogel
055ee962c9
Ability to enter a password when the first user is created
2015-06-30 23:37:31 +02:00
rabuzarus
cf2a90dfa2
system settings is now a variable in settings_display.tpl
2015-06-30 14:51:14 +02:00
fabrixxm
28f0e9a2de
Merge pull request #1696 from rabuzarus/acl-var
...
move jotnets to populate_acl
2015-06-29 13:53:37 +02:00
Michael Vogel
b795bf2935
Merge pull request #1683 from fabrixxm/issue-1655
...
Deprecate RINO1 function, implements RINO2, remove unused crypro functions
2015-06-27 17:39:00 +02:00
rabuzarus
8cca849c2e
Merge acl-var into develop
...
Conflicts:
mod/settings.php
2015-06-27 15:23:19 +02:00
Michael Vogel
6eebfb2e13
Merge pull request #1692 from fabrixxm/desktopnotifications
...
Desktop notifications
2015-06-26 08:45:16 +02:00
rabuzarus
37501a883e
make notes work
2015-06-25 22:57:26 +02:00
rabuzarus
94b21245bc
some more work to get acl data into populate_acl
2015-06-25 18:57:42 +02:00
fabrixxm
d2a593b4a0
Merge pull request #1693 from rabuzarus/events-reminder
...
use title in events-reminder
2015-06-25 15:06:55 +02:00
rabuzarus
d23440af15
use colorbox to display upcomming events
2015-06-25 13:43:41 +02:00
Fabrixxm
6fc864c947
rework mod/ping and desktop notification logic
...
`mod/ping.php` returns all notifications ordered by date
mixing system notifications, private messages, intros, registrations
remove 'notify_full' mode
remove `&arr;` from unseen notes, 'seen' attrib now is "1" or "0"
new note attribute 'timestamp'
desktop notification logic use timestamp to check which notification show to the user
notification html template use timestamp to show full date to user in tooltip
`relative_date()` don't append full date on dates older than 24 hours
2015-06-25 10:02:26 +02:00
Fabrixxm
4036ad2554
Fix desktop notification
...
use on/off field for enable/disable desktop notification
show only new notifications after enable
use localstorage to save enabled/disalbed and last notification id
hide settings on browsers without desktop notification
2015-06-24 09:49:53 +02:00
Fabrixxm
511c2d2c91
rino: settings in admin, choose lowest common on notify
2015-06-23 17:36:26 +02:00
Fabrixxm
d06beb1431
install: load htconfig template from templates/
2015-06-23 12:35:51 +02:00
5549dd1dbe
Merge pull request #1682 from fabrixxm/issue-1625
...
admin: allow deletion of any users but yourself
2015-06-23 11:05:16 +02:00
Fabrixxm
3168b44317
admin: allow deletion of any users but yourself
...
fix #1625
2015-06-23 10:39:28 +02:00
Fabrixxm
53e6dd6637
Add contact detail to contact drop confirm
...
fix #1629
2015-06-23 10:09:27 +02:00
fabrixxm
35e9fc3b02
use fields template in photo edit form
2015-06-22 20:07:19 +02:00
Michael Vogel
66058c6cf4
Remote subscribe from a GNU Social site is now possible
2015-06-13 19:51:45 +02:00
fabrixxm
1cf3e778e8
Merge pull request #1622 from rabuzarus/albums_widget
...
move html to photo_albums.tpl
2015-05-31 10:07:43 +02:00
rabuzarus
74267310d6
html to section_title.tpl
2015-05-30 02:21:30 +02:00
rabuzarus
553a152345
Merge photo-template into develop
2015-05-29 16:24:58 +02:00
rabuzarus
5cbb5b140c
css work
2015-05-29 16:08:17 +02:00
9a22b4818e
Merge pull request #1618 from rabuzarus/vcard
...
remove html and make use of vcard-widget.tpl
2015-05-29 08:52:27 +02:00
rabuzarus
415a606a59
better solution to exclude Contact Photos and include count of Photos
2015-05-28 15:54:53 +02:00
fabrixxm
b3992e1c65
Merge pull request #1599 from fabrixxm/issue-1574
...
Issue #1574
2015-05-27 11:07:30 +02:00
rabuzarus
15499ff1aa
first step to get html code from photos.php removed
2015-05-27 03:35:29 +02:00
rabuzarus
f309f3a681
remove html and use vcard-widget.tpl
2015-05-26 14:32:40 +02:00
rabuzarus
b3054ee9d0
template for searchbox
2015-05-24 20:01:08 +02:00
fabrixxm
b29b01fad4
Merge branch 'develop' into issue-1574
2015-05-24 10:26:21 +02:00
fabrixxm
4554526515
Merge pull request #1570 from rabuzarus/archive-widget
...
port of red matrix archive widget
2015-05-24 10:18:10 +02:00
fabrixxm
3a71978b0d
Merge pull request #1598 from rabuzarus/datepicker
...
new datetimepicker for event creation
2015-05-24 10:16:29 +02:00
fabrixxm
7c2608e07d
quattro: style video delete button
2015-05-23 22:51:34 +02:00
fabrixxm
83697cf3e5
Delete attachments on item deletion
...
Delete video from videos page
2015-05-23 22:35:02 +02:00
fabrixxm
3cb4f91807
Merge pull request #1596 from rabuzarus/event-preview
...
event preview for frost theme
2015-05-23 20:15:10 +02:00
rabuzarus
6731ffbfc8
event preview for frost theme
2015-05-23 19:23:32 +02:00
rabuzarus
2ad8fdc40b
port of red matrix datepicker implementation
2015-05-22 18:53:18 +02:00
rabuzarus
101804d505
minor polishing
2015-05-19 01:07:40 +02:00
rabuzarus
30348a1bc0
port of red matrix archive-widget
2015-05-19 01:03:08 +02:00
9575fd4a73
Merge pull request #1560 from rabuzarus/add_event
...
Double click on day in calendar creats new event starting that day
2015-05-15 08:20:15 +02:00
rabuzarus
fc4a76c033
Double click on day in calendar creats new event starting that day
2015-05-15 00:07:41 +02:00
fabrixxm
cbbb5da321
Merge pull request #1558 from rabuzarus/event-preview
...
Event preview
2015-05-14 16:32:24 +02:00
rabuzarus
de197405d0
port of red's event editing preview
2015-05-14 13:20:58 +02:00
2dd8db7de8
Merge pull request #1554 from FlxAlbroscheit/develop-1
...
Issue #1504 : Creating groups directly from the sidebar in contacts-page
2015-05-13 19:59:58 +02:00
FlxAlbroscheit
4667d0e7e8
Add a group with one click
2015-05-12 14:09:51 +02:00
Michael Vogel
237b5a6e40
New page setting for the maximum frontend load value.
2015-05-02 22:05:04 +02:00
Michael Vogel
1058d055d1
Merge remote-tracking branch 'upstream/develop' into 1504-contact-update
...
Conflicts:
mod/contacts.php
2015-04-12 09:59:28 +02:00
Michael Vogel
2c3e2908b2
There is now a new possibility to update contact data.
2015-04-11 23:51:47 +02:00
Michael Vogel
f6ea872986
The behaviour when following a new contact is now unified.
2015-04-09 00:10:21 +02:00
FlxAlbroscheit
f054dbfc8d
Feature for desktop-notifications
2015-03-31 02:11:46 +02:00
FlxAlbroscheit
82359bb6cc
Give access to contact's profile-URL
2015-03-10 22:47:38 +01:00
Michael Vogel
f3cc065e66
Show the profile visibility only for Friendica contacts.
2015-02-21 20:03:02 +01:00