clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,348 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

458 Commits

Author SHA1 Message Date
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