Tobias Diekershoff
88285b4cbf
The info is not that important
2016-09-14 06:45:05 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
caa541f939
make doxygen a bit more happy
2016-04-20 16:08:17 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
7c6ebae5c0
reorganize the htconfig template
2016-04-20 14:30:22 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
5df20fda11
Issue 2241: added language selector to the admin wizard
2016-04-06 20:13:34 +02:00
Tobias Diekershoff
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
Roland Häder
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
Tobias Diekershoff
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
Tobias Diekershoff
846153d388
some beautification to the template code
2016-01-19 07:20:07 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
75f0053550
forgot the template
2016-01-16 13:57:40 +01:00
Tobias Diekershoff
20fe67f378
removed remote update functionality from admin panel
2016-01-16 11:52:21 +01:00
Tobias Diekershoff
629c69d9dd
only show the reload link if plugins are found
2016-01-15 19:35:45 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
5099f43c42
only show platforms with counts > 0
2016-01-15 18:19:22 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
0d5fed5b3b
beautification of HTML code
2016-01-15 18:19:21 +01:00
Tobias Diekershoff
0a5c9e96a8
moved viewing of friendica logs into a separate subpage, thus created a new template
2016-01-15 18:19:21 +01:00
Tobias Diekershoff
ddb17d36a2
added PHP logging hint fields to the template
2016-01-15 18:19:21 +01:00
Tobias Diekershoff
c1aa668fef
add log viewer to the aside menu of the admin panel
2016-01-15 18:19:21 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
c00847a79d
use section_title.tpl for page title
2015-10-30 18:05:45 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
621dec1606
reconstruct the description for more flexible translations
2015-08-17 07:20:50 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
5013e5daf1
use to link to queue inspector
2015-08-12 19:58:53 +02:00
Tobias Diekershoff
f439ac47c4
admin panel: inspect queue
2015-08-12 15:44:59 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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