nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
13213 commits 2 branches 55 tags 148 MiB
Commit graph

3289 commits

Author SHA1 Message Date
Michael Vogel 1c31526d6e HTML entities in Notifications aren't a problem anymore 2016-08-11 19:59:07 +02:00
Michael Vogel b6dec53ec1 Bugfix: A parameter in xml::from_array was missing. 2016-08-11 08:44:03 +02:00
Michael Vogel 0ea9af3d7d Ping is now using a standard routine to generate the xml. 2016-08-10 22:51:03 +02:00
Michael Vogel 61e3a8ca3a Merge pull request #2702 from rabuzarus/0308-Notifications-restructure 
notifications restructure
 2016-08-08 07:41:48 +02:00
rabuzarus 0532dc6a61 notifications - correct boolean variable checking 2016-08-07 12:26:49 +02:00
rabuzarus de02154a1b notifications - set default values for some varibles 2016-08-06 18:59:39 +02:00
Tobias Diekershoff 78514db6e8 now the installer checks for iconv module as well #2506 2016-08-06 08:54:41 +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 ce3188d5c6 notifications - move intros to NotificationsManager & make json output work 2016-08-03 12:44:04 +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
Michael Vogel 02b5f6a34d Merge remote-tracking branch 'upstream/develop' into develop 2016-08-01 08:02:26 +02:00
Michael Vogel 668da905e2 "proc_run" is now called with priority. 2016-08-01 07:48:43 +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
trebor 52f641904b notifications.php: reduce code duplication 2016-07-30 10:51:21 +02:00
rabuzarus f09cd57165 notifications.php - move duplicated code in an own function 2016-07-28 11:39:09 +02:00
rabuzarus 819b374401 notifications.php - move some template creation to the end of the file 2016-07-27 21:07:54 +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 8bf7db06db New indexes for the API 2016-07-19 08:43:57 +02:00
Michael Vogel f27bc00464 Remove obsolote functions 2016-07-09 20:09:09 +02:00
Michael Vogel 4e5d335492 Removed the legacy function calls, removed unused functions 2016-07-04 08:05:30 +02:00
Michael Vogel e4c6cfd2d8 Moves the function "is_result" from dba to dbm. 2016-07-02 14:00:42 +02:00
Michael Vogel 7d531afd00 Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced 
Conflicts:
	boot.php
 2016-07-02 13:38:23 +02:00
Michael Vogel a7ee8a8bc9 Avoid redirection loops at /fetch/ and /p/ 2016-06-30 12:02:35 +02:00
Michael Vogel 6f203b0a75 urlencode is better 2016-06-30 08:58:36 +02:00
Michael Vogel 5341223617 Do a redirect when the post doesn't come from our system but we know where it comes from. 2016-06-30 08:55:26 +02:00
Michael Vogel d125939888 Just some more centralised functionality 2016-06-30 07:46:00 +02:00
Michael Vogel 99f0746660 Cleaned up the code 2016-06-30 07:32:07 +02:00
Michael Vogel 2c7fd1cb3c It should be now valid 2016-06-30 01:18:44 +02:00
Michael Vogel c0669d365b The key_id was added 2016-06-30 00:22:42 +02:00
Michael Vogel 2d72e2d932 Diaspora: Support for new fetch functionality (replacement for /p/) 2016-06-29 22:50:30 +02:00
rabuzarus 1f50db2b2a viewcontacts - fix: tabmenu was not returned 2016-06-28 12:32:09 +02:00
rabuzarus 60b767168a hovercard.php - fix tags for hovercard 2016-06-27 11:57:47 +02:00
Tobias Diekershoff 773517a734 Merge pull request #2638 from annando/1606-avatar-handling 
Imrpoved avatar handling when storing them/partly use of "micro"
 2016-06-25 19:51:00 +02:00
rabuzarus 06959d745e viewcontacts - make the tabbar available even if hide-friends is active 2016-06-25 16:20:44 +02:00
Michael Vogel 0b1188b7fe Imrpoved avatar handling when storing them/partly use of "micro" 2016-06-25 13:56:55 +02:00
rabuzarus 073f520cee add missing strings for frio 2016-06-25 12:21:13 +02:00
Tobias Diekershoff 782e31c5cf Merge pull request #2634 from rabuzarus/2306_Update_Network 
network.php - raw && update mode don't need the network tabs
 2016-06-24 06:59:35 +02:00
rabuzarus cf696f6d1f network.php - raw && update mode don't need the network tabs 2016-06-24 00:33:31 +02:00
Michael Vogel eabf8734a8 Merge pull request #2631 from rabuzarus/1906-event-test 
cal export && public calendar - fix permissions
 2016-06-23 23:24:27 +02:00
rabuzarus 55205e344f Merge pull request #2632 from annando/1606-parse-title 
Always parse the first title element
 2016-06-23 10:18:58 +02:00
rabuzarus e352458ef0 pub calendar - permission clean up and docu 2016-06-23 10:07:13 +02:00
Michael Vogel 8cabcda5e0 Always parse the first title element 2016-06-22 21:00:58 +02:00
rabuzarus 111f77ac64 pub calendar - add sql perms to the query (I forgot to do this) 2016-06-22 15:06:14 +02:00
rabuzarus cd92a0dc34 Merge pull request #2624 from annando/1606-contact-id 
Item: New fields for author id and owner id - avatar improvement with relocation
 2016-06-22 14:26:39 +02:00
rabuzarus 2cac69ca86 cal export && public calendar - even better permissions testing 2016-06-22 13:50:47 +02:00
rabuzarus 8cc5dd35e8 cal export && public calendar - fix permissions 2016-06-22 00:39:52 +02:00
Michael Vogel 9a7653a4fe Store the author-id and owner-id in mod/item.php as well 2016-06-21 07:54:45 +02:00
rabuzarus d076f61a4a cal export - little fix for json 2016-06-20 23:38:34 +02:00
rabuzarus 71c9f562ae move the cal addon (exporting calendars) to core 2016-06-20 23:31:49 +02:00
Michael Vogel 939bd965c5 Search query optimized 2016-06-20 22:03:40 +02:00
Michael Vogel 65b541413f Merge remote-tracking branch 'upstream/develop' into 1606-contact-id 2016-06-20 07:28:47 +02:00
rabuzarus 7495a34b32 implement a public calendar for vistors of someones profile page 2016-06-19 22:04:34 +02:00
Michael Vogel 51b5d16f1b Improved SQL queries 2016-06-19 21:41:06 +02:00
Michael Vogel 91db7a549c Optimised the amount of function for the item query 2016-06-19 08:32:38 +02:00
Michael Vogel e512a83ecc Massively updated avatar handling 2016-06-19 01:07:20 +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 606f42701c frio - event - some js and template refactoring + event view css styling 2016-06-17 14:09:18 +02:00
rabuzarus c99da380cf frio: events - adapt changes to the templates of the other themes 2016-06-17 10:33:12 +02:00
rabuzarus 82b6917c5f frio: settings_display.tpl + rise frio to 0.2 Alpha 2016-06-13 10:57:42 +02:00
rabuzarus 5e98f27fcd frio: events - work on event_form.tpl + datetime.php 2016-06-13 10:19:38 +02:00
rabuzarus 869a439466 Merge pull request #2595 from annando/1606-contact-priority 
Priority for native networks when searching by contact url
 2016-06-13 09:28:54 +02:00
Michael Vogel c68f28bc77 Merge remote-tracking branch 'upstream/develop' into 1606-item-query-cleanup 2016-06-12 21:07:45 +02:00
Michael Vogel c05898c57d The queries for items are unified (a little bit) 2016-06-12 21:04:55 +02:00
rabuzarus b2ba25bd27 fix federation statistics 2016-06-12 19:15:12 +02:00
rabuzarus 0af572ffba frio: first part for event template work 2016-06-12 18:23:10 +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
Michael Vogel c138455c5e Merge remote-tracking branch 'upstream/develop' into 1606-contact-priority 2016-06-12 12:16:24 +02:00
Michael Vogel aac9caab2d Priority for native networks when searching by contact url 2016-06-12 10:46:15 +02:00
Michael Vogel 5fc0f06786 Merge pull request #2590 from rabuzarus/1106_finding_string 
unify heading of search results to "results for:"
 2016-06-11 11:53:20 +02:00
rabuzarus ca269b6329 unify heading of search results to "results for:" 2016-06-11 10:44:52 +02:00
Michael Vogel d48afb6c1b Merge pull request #2586 from rabuzarus/1006-search 
frio: improvements in search behavior
 2016-06-11 10:26:20 +02:00
rabuzarus eafad7145b mod/admin.php: some clean up 2016-06-11 10:12:03 +02:00
rabuzarus db5438ab1a frio: improvements in search behavior 
- search value woll be added to nav search input
- focus on nav search input as main search
- save search button appears in the second navbar if search is available
- search heading appears in the second navbar
- provide a mobile search by pressing the search icon
- dirfind: heading distinguish between people and form search
- some js fixes in theme.js
 2016-06-10 20:34:25 +02:00
rabuzarus e773da9ea2 frio + core: forgot to delete a comment 2016-06-10 11:29:23 +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 ee06d2fa3c Merge pull request #2582 from annando/1606-more-avatar-stuff 
Some more places where the avatar picture is taken from the database
 2016-06-10 09:39:01 +02:00
Michael Vogel 807fbe173b Some more places where the avatar picture is taken from the database 2016-06-10 07:44:32 +02:00
Michael Vogel baf68af735 Merge pull request #2581 from tobiasd/adm-workerqueue 
show the workerqueue in the admin panel summary
 2016-06-10 00:03:37 +02:00
Michael Vogel c9342ccf1d Merge pull request #2579 from rabuzarus/0806-content-experimental 
content: make experimental mod/content.php work again
 2016-06-10 00:01:33 +02:00
Tobias Diekershoff e8d39b290a show the workerqueue in the admin panel summary 2016-06-09 18:08:40 +02:00
rabuzarus e4ba493a01 Renamed "Search results for:" in "Results for:" to have more space on mobile 2016-06-09 13:06:21 +02:00
rabuzarus 5a48ab5a8c content.php: remove load_contact_links() 2016-06-09 01:39:45 +02:00
rabuzarus 9e5a4b2050 content: make experimental mod/content.php work again 2016-06-09 01:35:57 +02:00
rabuzarus 71b30e0651 profice a general content wrapper template. 2016-06-07 16:32:02 +02:00
Michael Vogel fc66a86dc5 Some optimized sql queries 2016-06-06 22:57:27 +02:00
rabuzarus 5c52736221 photo_menu: now the photo_menu does have at all places the same structure 2016-06-06 16:54:29 +02:00
Michael Vogel 8fbcba0096 The local contact search now uses local data if present 2016-06-05 22:21:34 +02:00
Michael Vogel 4b640dbd97 Fetching of profile data improved 2016-06-05 21:17:55 +02:00
Michael Vogel ea3a6ec6eb Some more cleanup and code removal. 2016-06-05 20:01:38 +02:00
Michael Vogel 71d3274841 Unified contact data handling 2016-06-05 13:57:11 +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 77f7619720 Issue 1769: Some enhancements for sending wall mails 2016-05-29 19:35:23 +02:00
Michael Vogel 98f7c73d10 Frio: Hovercard is now a core function 2016-05-29 15:28:31 +02:00
Sandro Santilli 10e6a243ea Simplify openid query, and (needlessly) quote all fields 
Fields quoting was requested by rabuzarus
 2016-05-25 16:06:16 +02:00
Sandro Santilli b7bc428630 Fix OpenID login 
The problem was that while openid was stored not-normalized in the database,
the checking code was looking for a normalized form instead.

The commit removing normalization step on saving user preferences
was 8367cad, which might have left old users with normalized openid
and new users with non-normalized one.

This commit makes the checking code look for both normalized and not
normalized form, to be backward compatible.
 2016-05-25 12:50:09 +02:00
root 7fbb51adb9 Do not normalize openid url when logging in 
(since it isn't normalized when setting it via user settings)

NOTE: this broke with 8367cad
 2016-05-24 22:36:51 +02:00
Michael Vogel 06998f13b6 Events: Now with guid. 2016-05-22 18:05:01 +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
Michael Vogel 6f72bc8d3a Better implementation of "hidewall" 2016-05-06 11:04:21 +02:00
Michael Vogel de431e185e New function to update the global contact for the user id. 2016-05-05 15:08:05 +02:00
Michael Vogel 3df235e5bd The global contact for server users is now stored directly 2016-05-05 12:02:51 +02:00
Michael Vogel ed485b9d61 Set "hide" in noscrape 2016-05-04 23:50:31 +02:00
Michael Vogel 8992577bb6 Better handling of hidden profiles 2016-05-04 09:30:55 +02:00
Michael Vogel 26e1c4d458 Avoid SQL errors because of existing entries 2016-05-03 19:20:58 +02:00
Tobias Diekershoff 3d3cde2aed Merge pull request #2497 from annando/1604-local-copy 
Copy an item to the local user if it's only available as public copy
 2016-05-02 06:07:50 +02:00
Michael Vogel b677f63e85 Added some more explanation/now copy the whole thread 2016-05-01 09:48:05 +02:00
Michael Vogel 5fc1eebdab Copy an item to the local user if it's only available as public copy 2016-05-01 00:19:24 +02:00
Michael Vogel 8e0b3b28da Bugfix: The message list always showed "x and you" 2016-04-30 14:13:43 +02:00
Tobias Diekershoff 9a79b0c5f2 count from 0 2016-04-27 20:23:06 +02:00
Tobias Diekershoff a5f4f47c41 installer check for XML module 2016-04-27 20:16:35 +02:00
Michael Vogel cd92521c1d Remove test code 2016-04-25 21:39:54 +02:00
Michael Vogel 1aa6c1dc5b Use data from contact and gcontact prior to probe_url 2016-04-25 21:35:42 +02:00
Michael Vogel 93347d3279 Bugfix DFRN and bookmark detection 2016-04-24 17:00:19 +02:00
Michael Vogel 5711e561fc Check the global contacts every 90 days/Better handling in item creation 2016-04-23 10:46:16 +02:00
Michael Vogel ca2454eeb4 Avoid write operations if not needed 2016-04-23 00:06:34 +02:00
Tobias Diekershoff 778935eb48 Merge pull request #2471 from annando/1604-diaspora-always-on 
Diaspora: Comments and Likes are now signed at any time
 2016-04-21 08:39:42 +02:00
Michael Vogel e333efc9aa Diaspora: Comments and Likes are now signed at any time 2016-04-20 23:27:33 +02:00
Tobias Diekershoff d3293dfcf2 during installation choose the highest RINO version possible 2016-04-20 14:17:48 +02:00
Michael Vogel 28f97845ca Some more checks that the gcontact table contains valid data 2016-04-20 07:00:55 +02:00
Michael Vogel e1ca622b27 Use "like" instead of "regexp" for the gcontact search 2016-04-19 07:27:26 +02:00
Michael Vogel 3e76ad7793 Bugfix: ' in titles were a problem. 2016-04-18 20:57:01 +02:00
Tobias Diekershoff a5f97b2d87 Merge pull request #2457 from annando/1604-attachments 
Use the "attachment" element instead of a mixture of several elements
 2016-04-18 05:53:47 +02:00
Michael Vogel 0f24f2d9ae Bugfix: Messages work now again 2016-04-17 22:07:01 +02:00
Michael Vogel 49d52faab5 Use the "attachment" element instead of a mixture of several elements 2016-04-17 20:43:41 +02:00
Michael Vogel f8c96d24b4 Speed up the contact search, proxy the images, search for addresses 2016-04-16 15:01:03 +02:00
Tobias Diekershoff bbd5878734 Merge pull request #2449 from rabuzarus/1404_reworked_autocomplete 
new autocompletion
 2016-04-16 08:16:21 +02:00
rabuzarus ce1faf17d1 rework autocomplete: some polishing 2016-04-14 17:05:19 +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
Michael Vogel d6a79abb68 Bugfix: "default_group" behaviour wasn't implemented correctly 2016-04-13 22:21:23 +02:00
Michael Vogel 71caebdae0 Bugfix: Sometimes mentions vanished - now they shouldn't do this anymore 2016-04-13 07:00:36 +02:00
Michael Vogel 90f5cb23f2 fbrowser: Take the picture as that mostly fits 2016-04-10 13:36:26 +02:00
Tobias Diekershoff ac9d392264 make en the default language 2016-04-06 20:21:41 +02:00
Tobias Diekershoff a28372c032 intendation... 2016-04-06 20:18:33 +02:00
Tobias Diekershoff 5df20fda11 Issue 2241: added language selector to the admin wizard 2016-04-06 20:13:34 +02:00
Michael Vogel 47563d34ee Merge remote-tracking branch 'upstream/develop' into 1604-item-shadow 2016-04-03 18:46:14 +02:00
Michael Vogel 94e8139c7e issue 2247: Update more fields when relocation the server 2016-04-03 18:18:36 +02:00
Michael Vogel 9f57425d08 Post update ist now done. 2016-04-03 16:36:05 +02:00
Michael Vogel b4b62493e6 Bugfix: The nickname vanished/better way to fetch the alias 2016-04-02 15:41:55 +02:00
Michael Vogel b93e1d73a1 New OStatus implementation 2016-03-30 12:43:15 +02:00