Commit Graph

4520 Commits

Author SHA1 Message Date
Michael aea122cd20 Little improvements to the queries in ping.php 2016-12-01 13:44:30 +00:00
Tobias Diekershoff 1fc35d5f44 Merge pull request #2979 from annando/issue-2772
Issue 2772: Pending contacts should now be displayed
2016-12-01 08:51:04 +01:00
Michael 57c95c93e1 The frontend worker is now working as a full replacement for the crontab. 2016-11-30 19:24:58 +00:00
Michael 1f50dc368e Merge remote-tracking branch 'upstream/develop' into 1611-frontend 2016-11-30 04:46:47 +00:00
Michael cc5eebd173 The frontend worker can now fork background processes 2016-11-29 22:40:19 +00:00
Michael Vogel d620c5d996 Merge pull request #2982 from rabuzarus/20161129_-_small_dfrn_request_polish
dfrn_request: include the graphic of the connection process into the doxygen header
2016-11-29 21:09:59 +01:00
rabuzarus a208d2e72b dfrn_request: include the graphic of the connection process into the doxygen header 2016-11-29 19:57:30 +01:00
Michael Vogel efb2df41ba Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing
Add protocol docu to the help docs
2016-11-29 19:38:31 +01:00
Michael Vogel fa8eb101d4 Merge pull request #2981 from rabuzarus/20161129_-_small_dfrn_request_polish
dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries
2016-11-29 19:33:57 +01:00
rabuzarus 54f3867ebd dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries 2016-11-29 15:52:12 +01:00
Michael Vogel 86665d47a6 Merge pull request #2980 from rabuzarus/20161129_-_small_dfrn_request_polish
dfrn_request: added $blocked and $pending as variable to make code mo…
2016-11-29 09:42:26 +01:00
Tobias Diekershoff d55d500e35 Merge pull request #2975 from annando/1611-frontend-worker
The worker can now run from the frontend as well
2016-11-29 09:40:59 +01:00
rabuzarus 0d223aa6f1 dfrn_request: added $blocked and $pending as variable to make code more understandable 2016-11-29 03:08:46 +01:00
Michael 3a76a6766f Issue 2772: Pending contacts should now be displayed 2016-11-28 22:11:13 +00:00
Michael Vogel 0ef764b167 Merge pull request #2970 from Hypolite/improvement/ping-php-json
ping.php: Ensure data structure consistency
2016-11-28 21:08:36 +01:00
Michael Vogel 37e8f6b442 Merge pull request #2973 from rabuzarus/berlin_parse_url
parse_url: recognize image/video/audio files + move functions into own class
2016-11-28 21:05:31 +01:00
rabuzarus ac39928e5d upload connection graphics & update doxygen headers to insert link to the spec 2016-11-28 16:23:47 +01:00
rabuzarus d0cdf863a1 fix accidentally deleted line with local_user() 2016-11-28 15:30:36 +01:00
rabuzarus 743378129b legacy support for function parseurl_getsiteinfo_cached() 2016-11-28 15:26:51 +01:00
rabuzarus 5458f40f6a Bugfix: better detection dfrn_request of double connection requests 2016-11-28 01:13:47 +01:00
rabuzarus f229d65f85 ParseUrl: some docu work 2016-11-27 23:41:55 +01:00
Michael df0d33c138 Try to get more execution time 2016-11-27 10:01:24 +00:00
Michael 636a033364 Added documentation, config stuff, ... 2016-11-27 09:02:08 +00:00
Michael e856ab9a09 The worker can now run from the frontend as well 2016-11-27 00:55:05 +00:00
rabuzarus c96a53b4b4 parse_url: fix typo 2016-11-26 04:10:50 +01:00
rabuzarus 26664c22e0 parse_url: add some docu 2016-11-25 16:59:31 +01:00
rabuzarus e9226eaf45 parse_url: recognize image/video/audio files + move functions into own class 2016-11-24 01:11:22 +01:00
Hypolite Petovan 0f33311f65 pig.php: remove debug 2016-11-22 23:04:00 -05:00
Hypolite Petovan 133120007c Merge remote-tracking branch 'friendica/develop' into improvement/ping-php-json 2016-11-22 21:14:25 -05:00
Hypolite Petovan 58e03c5155 ping.php: Ensure data structure consistency
- Formatting
- Documentation
2016-11-22 21:11:22 -05:00
Michael Vogel 61da46677d Merge pull request #2967 from Hypolite/issue/#2955
ping.php: Prevent $register_count from being undefined
2016-11-22 21:00:34 +01:00
Hypolite Petovan e0322546d8 ping.php improvement: Prevent $register_count from being undefined 2016-11-22 14:17:05 -05:00
Michael edbdd0e34a Bugfix: We should only search in the current database for MyISAM tables 2016-11-22 16:47:08 +00:00
Tobias Diekershoff 754de768f2 Merge pull request #2960 from Hypolite/issue/#2955
ping.php Fix confusion between count vars and array vars
2016-11-22 08:13:36 +01:00
Hypolite Petovan cc242d52f8 ping.php Fix confusion between count vars and array vars 2016-11-21 16:02:36 -05:00
Tobias Diekershoff 0628068977 Merge pull request #2952 from annando/issue-2772
Issue 2772: Posts from pending contacts should be displayed as well.
2016-11-20 17:56:05 +01:00
Michael 3de862712d Issue 2772: Posts from pending contacts should be displayed as well. 2016-11-20 16:52:57 +00: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
Tobias Diekershoff dd4a23070c Merge pull request #2950 from rabuzarus/berlin_fix_post_preview
Bugfix: preview has sometimes phantom mentions and tags
2016-11-20 16:46:31 +01:00
Tobias Diekershoff 97c6f668e6 add a warning to the admin panel when the MySQL version is problematic 2016-11-20 16:32:38 +01:00
rabuzarus 66341046d2 Bugfix: preview has sometimes phantom mentions and tags 2016-11-20 16:19:55 +01:00
Tobias Diekershoff b03009d962 use an array for warnings in admin panel 2016-11-20 16:14:09 +01:00
Michael 7ad4a8ca93 The warning if a group contains members of several network types can now be supressed. 2016-11-20 12:09:18 +00:00
Michael Vogel 7ca4648ffd Merge pull request #2945 from tobiasd/20161119-admindbwarn
Show a warning message in the admin panel when MyISAM is still in use
2016-11-20 12:38:52 +01:00
Tobias Diekershoff 38f9fab6c4 mysql keywords 2016-11-20 10:44:54 +01:00
Tobias Diekershoff 20f987e814 Merge pull request #2946 from annando/1611-bugfix-groups
Bugfix: Filtering by group has to be done with the contact id in the thread table
2016-11-20 10:39:01 +01:00
Michael 68a31e084a Bugfix: Filtering by group has always to be done with the contact id in the thread table 2016-11-20 09:24:56 +00:00
Tobias Diekershoff 7aaaa0a3c7 Show a warning message in the admin panel when MyISAM is still in use 2016-11-20 09:50:14 +01:00
Michael d6be33cbbb Avoid UTF8 warning in mod/proxy.php 2016-11-20 08:30:30 +00:00
Michael Vogel 5be5fa1b1d Merge pull request #2930 from Hypolite/issue/#2925
Overhauling proxy_url/Fix encoded ampersand
2016-11-19 21:57:57 +01:00
Michael Vogel 67c1a20ed0 Merge pull request #2941 from Hypolite/improvement/ping-php-json
ping.php performance: fix typo
2016-11-19 21:40:31 +01:00
Hypolite Petovan 61afd71897 ping.php performance: fix typo 2016-11-19 15:23:36 -05:00
Hypolite Petovan 1cf9506646 Overhauling proxy_url: use $shortpath for long URL in writemode 2016-11-19 14:03:31 -05:00
Tobias Diekershoff b95bf00e89 Additional info in registration request 2016-11-19 18:22:49 +01:00
Michael Vogel ea38af9799 Merge pull request #2931 from tobiasd/20161118-issue2926
send email confirming pending registration #2916
2016-11-19 15:21:06 +01:00
Tobias Diekershoff f4c52f5a0e send email confirming pending registration #2916 2016-11-18 20:16:22 +01:00
Hypolite Petovan a6bdb2c34a overhauling proxy_url
- Decode possible HTML entities in the input URL
- Add the safe extension for the shortpath as well
- Formatting
- Documentation
2016-11-17 23:08:00 -05:00
Hypolite Petovan c6fbb46108 ping.php performance: Add JSON output
- Added JSON/JSONP support
- Added XML backward-compatible output
- Updated main.js to handle JSON data
- Removed unused references to non-existant DOM elements
2016-11-16 23:26:43 -05:00
Michael 126c4774c3 Merge remote-tracking branch 'upstream/develop' into 1607-performance
Conflicts:
	include/dbstructure.php
	mod/item.php
	mod/nodeinfo.php
2016-11-16 06:27:21 +00:00
rabuzarus 9878974e1f fix photos page permissions 2016-11-14 18:49:51 +01:00
Michael 1aa9b7242d Merge remote-tracking branch 'upstream/develop' into 1611-parseurl 2016-11-13 19:12:11 +00:00
Michael Vogel ce96624452 Merge pull request #2899 from tobiasd/20161109-stats
prepare for Mastodon in the federation stats and include BlaBlaNet
2016-11-13 09:42:42 +01:00
Tobias Diekershoff df3c776e1b shorter foreach loop 2016-11-13 09:03:22 +01:00
Tobias Diekershoff 772d33342c add unkown to empty version strings 2016-11-13 08:12:09 +01:00
Tobias Diekershoff 32b2d9952b some platforms don't provide version information 2016-11-13 07:03:38 +01:00
Michael e5f55a5919 Improved handling with wrong formatted urls and fetchinfo 2016-11-12 20:23:00 +00:00
Michael e6148f4c1c Performance improvements when storing items (via API) 2016-11-12 13:17:28 +00:00
Tobias Diekershoff f9911637e3 help text for settings should be translateable 2016-11-10 10:21:24 +01:00
Tobias Diekershoff 350887f892 prepare for Mastodon in the federation stats and include BlaBlaNet 2016-11-09 14:25:51 +01:00
Michael 4b33573c20 Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean 2016-11-05 05:25:22 +00:00
rabuzarus 5459b00499 cache: serialize the cache content directly in the cache class 2016-11-04 16:44:49 +01:00
Michael Vogel 9dd3e9d19a Merge pull request #2878 from Hypolite/improvement/ping-performance
Improving ping.php performance
2016-11-02 21:56:18 +01:00
Michael 4d966e1e21 Changed priority for onepoll/further enhancement for dbclean 2016-10-31 21:32:08 +00:00
Michael 8ab90f02c3 Shadow entry mechanism improved 2016-10-29 21:27:56 +00:00
Michael 7bd79c67a7 Avoiding deadlocks and small sql improvements 2016-10-29 20:17:33 +00:00
Hypolite Petovan 8e50254bb9 Merge branch 'develop' into improvement/ping-performance 2016-10-28 22:26:38 -04:00
Hypolite Petovan bc407080d2 ping.php performance: improve documentation and formatting 2016-10-28 22:14:51 -04:00
Hypolite Petovan f1c855e755 ping.php performance: Cache notification bbcode
- Add two fields to notifiy table to store cached bbcode result
- Add bbcode conversion on notif creation
- Add postfact caching if cache field is empty on retrieval
2016-10-28 06:28:16 -04:00
Michael 3f0656fdbd Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-27 12:18:45 +00:00
Michael Vogel 4996003800 Merge pull request #2874 from Hypolite/bug/fix-pgettext-typo
Fix pgettext function name typo
2016-10-25 22:31:59 +02:00
Michael 967ecb4205 Merge remote-tracking branch 'upstream/develop' into 1610-performance
Conflicts:
	include/Core/Config.php
	include/Core/PConfig.php
2016-10-25 16:16:01 +00: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 2fc2a1a228 Fix typo in get_available_languages function name
- Add Doxygen comment block
- Fix formatting
- Renamed variable for faster understanding
2016-10-24 22:17:02 -04:00
Hypolite Petovan 9ef63efa1c Leave formatting alone 2016-10-24 16:16:49 -04:00
Hypolite Petovan fb75394766 Some more formatting reverts 2016-10-24 12:43:38 -04:00
Hypolite Petovan 8787587011 Fix undiscriminate spaces=>tabs replace 2016-10-24 12:34:10 -04:00
Hypolite Petovan 789e1f4275 Revert some more unwarranted formatting 2016-10-24 12:27:27 -04:00
Michael Vogel 3463a442ba Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-24 08:12:13 +00:00
Michael Vogel 8cab3b5592 More transactions, more queries on uncommitted data 2016-10-24 08:10:27 +00:00
Michael Vogel ee5ada6991 We now use memcache if configured and installed. 2016-10-23 21:59:40 +00:00
Hypolite Petovan 2741726402 Reverting too extensive formatting changes 2016-10-22 21:33:54 -04:00
Michael Vogel 561f45b83b And again ... 2016-10-22 10:33:18 +00:00
Michael Vogel b429b85680 CSR changes, split dbclean in separate processes if worker is active 2016-10-22 10:14:41 +00:00
Michael Vogel 4c5a7fac83 Some stuff to make Hypolite happy :) 2016-10-21 21:32:27 +00:00
Michael Vogel b56bdf06ed Merge remote-tracking branch 'upstream/develop' into 1610-duplicate-check 2016-10-21 21:17:58 +00:00
Michael Vogel 501c45def5 Some more improved queries 2016-10-21 18:25:21 +00:00
Michael Vogel fd2d8cc180 Orphans are removed without giant lock problems 2016-10-20 22:05:21 +00:00
Michael Vogel abb827b784 Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-20 08:44:19 +00:00
Michael Vogel 493d7bc698 Remove orphaned data 2016-10-19 21:06:37 +00:00
Michael Vogel 356414846b Check for duplicated postings from connectors 2016-10-17 19:17:11 +00:00
Michael Vogel 3e5cf5290e Improved queries, more uncommitted queries 2016-10-17 18:38:51 +00:00
Michael Vogel e09c55527c Merge pull request #2856 from rabuzarus/0510-update_fullcalendar
update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover
2016-10-16 18:04:11 +02: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
Michael Vogel e5c7ce0902 Use "last-item" in the contact table instead of an expensive sql query 2016-10-14 05:45:32 +00:00
Hypolite Petovan a843858654 Merge from develop 2016-10-08 13:45:14 -04:00
Michael Vogel b70676d231 Optimized query for nodeinfo and admin user page 2016-10-07 21:07:21 +00:00
Michael Vogel 6abac720e2 Small performance tweaks for "item_store" as well. 2016-10-07 06:05:43 +00:00
Michael Vogel f9b9ee6b77 Increased performance when storing items 2016-10-06 21:24:29 +00:00
Michael Vogel aca6f63985 Merge remote-tracking branch 'upstream/develop' into 1610-performance-nodeinfo 2016-10-05 16:19:42 +00:00
Michael Vogel 5fb2e47809 Increased performance when storing items 2016-10-05 16:12:53 +00:00
rabuzarus 2a3e235f9a show/hide page-flags according to the account-type 2016-10-05 14:45:19 +02:00
Michael Vogel 8cde8b375b Merge remote-tracking branch 'upstream/develop' into 1610-gcontact-type 2016-10-04 03:52:22 +00:00
Michael Vogel 66bec9475d Improved queries for the nodeinfo functionality and the admin page 2016-10-04 03:51:13 +00:00
Michael Vogel 095fa872ed Contact Type is now transmitted via poco 2016-10-04 03:48:01 +00:00
Michael Vogel 860f11e71b Merge pull request #2842 from tobiasd/20160929-lng
lang handling for #2752
2016-10-04 05:22:38 +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 08a30bc1c6 Fix Issue #2822 - Update update_*.php files with new bandwitdh_saver user setting
- Fix formatting according to PSR-2
- Add bandwitdh_saver setting check before replacing with "Embedded
content - Please reload"
2016-10-02 15:23:05 -04:00
Michael Vogel 6d16c39b7e dbstructure now switches in the maintenance mode when updating 2016-10-02 13:52:52 +00:00
rabuzarus fa33f94b29 Merge pull request #2830 from annando/1610-account_type
The account type is now read and displayed
2016-10-02 14:55:52 +02:00
Michael Vogel 60a0235af0 The account type is now read and displayed 2016-10-01 20:03:27 +00:00
Tobias Diekershoff 5cfca894c1 On registration use the browser preferred language for the new account 2016-10-01 15:55:56 +02:00
Tobias Diekershoff 7aa4f5297d when the admin creates a new account, use the system language for this accounts 2016-10-01 15:55:18 +02:00
Hypolite Petovan f0382bb159 Restore admin notification email on register approval
- Reverted changes to mod/register.php
- Added "show_in_notification_page" flag to prevent `notify` DB
insertion
2016-09-30 08:57:16 -04:00
Hypolite Petovan aa985502c9 Fix Issue #2813
- Remove adding a notification for each admin on register approval
request
- Fix wrong display of the above notification that is removed anyway
- Fix comments
2016-09-29 23:17:35 -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
Hypolite Petovan fdacc40b5f Fix wrong data type 2016-09-24 13:51:53 -04:00
Hypolite Petovan fac2d9a880 Fix registration request notification query
- Removed wrong usage of COUNT in registration request query
- Added simple count() of results
2016-09-24 13:49:55 -04:00
Michael Vogel 3f35fed35a Special characters should be escaped 2016-09-23 06:29:02 +00:00
Roland Haeder c1a15befc5
Some improvements/fix:
- fixed curly brace bug (introduced by myself)
- make all SQL keywords upper-case, column and table names lower-case
- used some more dbm::is_result

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-20 22:18:35 +02:00
Tobias Diekershoff e5c2c66487 Show the worker queue count if the workers are active 2016-09-20 15:45:55 +02:00
Roland Haeder e171a1cd22
Some fixes:
- avoids warning if no result is coming back
- brought back init variable before using it

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-18 23:39:07 +02:00
Roland Haeder c825cc8d0d
This merge brings back dbm::is_result() where I could find it.
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-18 23:21:18 +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 1bfdc216d0 Only close the session if it had been opened. 2016-08-16 21:35:12 +02:00
rabuzarus 2d0c503bf1 frio: fix - permissions string was missing 2016-08-13 18:58:49 +02:00
rabuzarus 826a13eb23 fix: own calendar is now always exportable for local_user() 2016-08-13 13:59:55 +02:00
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 4e02b80868 Merge remote-tracking branch 'upstream/develop' into 1607-performance 2016-07-26 22:16:37 +02:00
Michael Vogel 287c9cfbdd Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-26 22:15:49 +02:00
Michael Vogel 4961fb3a45 Unused indexes removed, queries changed 2016-07-26 22:10:13 +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
Roland Haeder 738e22d3eb
Some fixes:
- Letting $profile_link and $hcard always been overwritten with newly found
  entries has caused DFRN network detectio to fail and "connect" is no longer
  working. This fix makes sure that these both variables are only set if they
  are still empty.
- added more debug lines to see which URL was it before and after webfinger "detection"

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 14:52:48 +02:00
Roland Haeder 3e701b90ac
Continued rewriting:
- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 14:24:44 +02:00
Roland Haeder 6177607bca More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE).
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 13:51:48 +02:00
Roland Haeder 3448437156 More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE).
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 13:51:10 +02:00
Tobias Diekershoff 098ac5b077
count from 0 2016-05-01 13:49:58 +02:00
Tobias Diekershoff e2c1eb34ed
installer check for XML module 2016-05-01 13:48:52 +02:00
Michael Vogel ca98b47ee5
Remove test code 2016-05-01 13:48:52 +02:00
Michael Vogel 33436132a0
Use data from contact and gcontact prior to probe_url 2016-05-01 13:48:52 +02:00
Michael Vogel e7c4d0bc50
Bugfix DFRN and bookmark detection 2016-05-01 13:48:52 +02:00
Michael Vogel cea445b6f3
Check the global contacts every 90 days/Better handling in item creation 2016-05-01 13:48:52 +02:00
Michael Vogel c69aab6ee0
Avoid write operations if not needed 2016-05-01 13:48:52 +02:00
Michael Vogel 761fa37f94
Diaspora: Comments and Likes are now signed at any time 2016-05-01 13:48:52 +02:00
Tobias Diekershoff cc0b4ff0f9
during installation choose the highest RINO version possible 2016-05-01 13:48:52 +02:00
Michael Vogel 5efd25a0eb
Some more checks that the gcontact table contains valid data 2016-05-01 13:48:52 +02:00
Michael Vogel 468e5b9f57
Use "like" instead of "regexp" for the gcontact search 2016-05-01 13:48:52 +02:00
Michael Vogel 02808c8d12
Bugfix: ' in titles were a problem. 2016-05-01 13:48:52 +02:00
Michael Vogel 1021111241
Bugfix: Messages work now again 2016-05-01 13:48:52 +02:00
Michael Vogel 6cdcbabb3b
Use the "attachment" element instead of a mixture of several elements 2016-05-01 13:48:52 +02:00
Michael Vogel 313586e224
Speed up the contact search, proxy the images, search for addresses 2016-05-01 13:48:52 +02:00
rabuzarus db581c08d0
rework autocomplete: some polishing 2016-05-01 13:47:24 +02:00
Michael Vogel 535f382c4e
Bugfix: "default_group" behaviour wasn't implemented correctly 2016-05-01 13:47:24 +02:00
Michael Vogel 1584f2ee00
Bugfix: Sometimes mentions vanished - now they shouldn't do this anymore 2016-05-01 13:47:24 +02:00
Michael Vogel 94bf0e2ad8
fbrowser: Take the picture as that mostly fits 2016-05-01 13:47:24 +02:00
Tobias Diekershoff f3cfaad70a
make en the default language 2016-05-01 13:47:24 +02:00
Tobias Diekershoff bff7f015e0
intendation... 2016-05-01 13:47:24 +02:00
Tobias Diekershoff fe97315acb
Issue 2241: added language selector to the admin wizard 2016-05-01 13:47:24 +02:00
Michael Vogel 761dac7ccd
issue 2247: Update more fields when relocation the server 2016-05-01 13:47:24 +02:00
Michael Vogel 4b0506879a
Post update ist now done. 2016-05-01 13:47:24 +02:00
Michael Vogel 0c6ff4202d
Bugfix: The nickname vanished/better way to fetch the alias 2016-05-01 13:47:24 +02:00
Michael Vogel f2ce7f51cd
New OStatus implementation 2016-05-01 13:47:24 +02:00
Michael Vogel 5a90f865ed
Add the guid to items that we create locally 2016-05-01 13:47:24 +02:00
Michael Vogel 6786da1049
Take the second largest picture as preview - not the smallest one 2016-05-01 13:47:24 +02:00
Michael Vogel 8d82bf922e
The signature creation now moved into the Diaspora class. That's much cleaner. 2016-05-01 13:47:24 +02:00
Michael Vogel 07bd89c35f
Removed just more old diaspora function calls. 2016-05-01 13:46:08 +02:00
Michael Vogel d176fff214
New implementation is now live. 2016-05-01 13:46:08 +02:00
Michael Vogel 7a0edc86ae
The display contained bad sql queries 2016-05-01 13:46:08 +02:00
rabuzarus 0e531e148e
rework autocomplete: polishing class and methods naming 2016-05-01 13:46:08 +02:00
rabuzarus 12479fb478
rework autocomplete: Access list of smilies over JSON 2016-05-01 13:46:08 +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
Michael Vogel 206c26ae30 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-21 06:47:47 +01:00
Tobias Diekershoff 0bcd6886f0 Merge pull request #2419 from annando/1603-fbrowser
Take the second largest picture as preview - not the smallest one
2016-03-21 06:41:48 +01:00
Michael Vogel 8f00836ffb Add the guid to items that we create locally 2016-03-20 15:01:50 +01:00
Michael Vogel 186eaf1264 Take the second largest picture as preview - not the smallest one 2016-03-20 10:30:06 +01:00
Michael Vogel d676ae0f32 The signature creation now moved into the Diaspora class. That's much cleaner. 2016-03-19 15:49:47 +01:00
Michael Vogel 56cb6cc897 Removed just more old diaspora function calls. 2016-03-14 20:53:44 +01:00
Michael Vogel 2841aa0281 New implementation is now live. 2016-03-13 19:47:02 +01:00
Tobias Diekershoff e884b0e579 Merge pull request #2414 from annando/1603-display-query
The display contained bad sql queries
2016-03-13 13:18:53 +01:00
Michael Vogel 99d5f8afc6 The display contained bad sql queries 2016-03-13 13:04:12 +01:00
Roland Haeder e48c446a29
Merge branch 'rewrites/is_filled_array_introduced' into rhaeder-develop 2016-03-12 23:03:06 +01:00
Roland Haeder 47b591c09a
Fixes another warning because of count()'s lazyness. #2390
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-12 23:02:42 +01:00
Roland Haeder a589e5a49a
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop 2016-03-12 22:57:10 +01:00
Roland Haeder 7f0ae9843f
count() didn't notice about FALSE ... #2390
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-12 22:54:52 +01:00
Roland Haeder 74d4f7fcd6
count() didn't notice about FALSE ... #2390
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-12 22:54:06 +01:00
Michael Vogel 4020b51f8f Merge pull request #2413 from tobiasd/20160312-socnetsettings
missing include file for the SocNet settings
2016-03-12 19:49:03 +01:00
Roland Haeder 9cfc249b12
Moved is_filled_array() to both dba classes and named it is_result().
Please see ticket #2390 for full discussion.

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-12 18:54:55 +01:00
Roland Haeder c60605ce0c
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop 2016-03-12 18:50:14 +01:00
Tobias Diekershoff 2a864d889e missing include file for the SocNet settings 2016-03-12 16:25:17 +01:00
Michael Vogel 14a2aa552a The name in the notifications has to be double encoded 2016-03-12 09:21:13 +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
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
Tobias Diekershoff bdfd81e723 Merge pull request #2400 from annando/1603-ostatus-thread
Only import OStatus threads that are started by our contacts
2016-03-06 19:40:01 +01:00
Michael Vogel 4bd1061a09 Only import OStatus threads if we follow the thread starter 2016-03-06 14:53:30 +01:00
Michael Vogel bb06026147 Settings for only importing threads from our ostatus contacts 2016-03-06 14:09:04 +01:00
Michael Vogel 4ef33b4d5b Clarification of description 2016-03-06 13:26:30 +01:00
Michael Vogel 8752ec11b2 Central function for default group, special setting for OStatus 2016-03-06 13:15:27 +01:00
Roland Haeder cc4349777a
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-04 20:05:24 +01:00
fabrixxm 3184a6263b Merge pull request #2392 from Quix0r/minor/logging
Minor: Some more logging to trace down bugs
2016-03-02 12:21:18 +01:00
Michael Vogel ce5f6fae51 Small bugfix: Fixes problen when version number contains linebreaks 2016-03-01 19:14:45 +01:00
Roland Haeder 2d154ae72f Closed TODO: no .= needed here. #2392
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 18:31:49 +01:00
Roland Haeder 8cb011a07e More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE).
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 18:31:49 +01:00
Roland Haeder 4ec377008d Introduced is_filled_array() + added some missing array initialization
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 18:31:49 +01:00
Roland Haeder 7d5166c9fe
Closed TODO: no .= needed here. #2392
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 18:28:06 +01:00
Roland Haeder 76b042ddee
More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE).
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:42:55 +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
Michael Vogel 99bac3a4d8 Corrected explanation 2016-02-24 07:22:32 +01:00
Michael Vogel eec0dbf738 Bugfix: Resharing on the display page works again. 2016-02-24 07:20:23 +01:00
rabuzarus b93326bb23 contactedit-actions-button: use internal links instead of full links 2016-02-23 19:26:03 +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 c5b724828a Just some more removed baseurls ... 2016-02-17 08:08:28 +01:00
Michael Vogel f7537c9e90 Remove the baseurl where possible to avoid mixed content 2016-02-17 00:01:24 +01:00
Michael Vogel 7f1f549c6f Fallback when there is no nick name 2016-02-14 15:08:49 +01:00
Michael Vogel 9261154eab Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup 2016-02-13 20:12:31 +01:00
Tobias Diekershoff d0b5c16a20 Merge pull request #2351 from annando/1602-performance-unread-group
Optimized query for unread group postings
2016-02-13 19:43:33 +01:00
Michael Vogel bf7dedb03b Optimized query for unread group postings 2016-02-13 18:15:24 +01:00
Tobias Diekershoff 4ee15cc682 Merge pull request #2334 from fabrixxm/feature_autoloader
Autoloader
2016-02-13 12:27:24 +01:00
Michael Vogel 2ca6cdf6b6 Improvements how gcontact entries are updated 2016-02-13 12:26:58 +01:00
Fabrixxm 89d63b2523 docs: small fixes to help sidebar 2016-02-12 09:26:42 +01:00
Tobias Diekershoff f48a639537 Merge pull request #2341 from annando/1602-contact-bugfix
Bugfix: The "keywords" field in the gcontact table wasn't set correctly
2016-02-11 07:35:32 +01:00
Michael Vogel 20d7d18379 Bugfix: The "keywords" field in the gcontact table wasn't set correctly 2016-02-10 23:39:18 +01:00
Fabrixxm 04dceb9551 Merge branch 'develop' into api_ping 2016-02-09 14:06:57 +01:00
rabuzarus 743f2e0391 Merge develop into 0602_contact_profile
Conflicts:
	mod/contacts.php
2016-02-09 13:44:30 +01:00
Michael Vogel 7b2fadcf43 Get rid of the "guid" table. We don't need it anymore. 2016-02-09 10:21:10 +01:00
Michael Vogel 804c04a06f Merge pull request #2326 from fabrixxm/revert_db949bb8
Revert "Updated modules to allow for partial overrides without errors"
2016-02-09 06:55:49 +01:00
rabuzarus c1c21ada0a contactedit-actions-button: remove contact tabs which aren't needed anymore 2016-02-08 23:51:51 +01:00
rabuzarus 0c764684bb Merge develop into 0602_contact_profile 2016-02-08 23:16:02 +01:00
rabuzarus 0b5d7b300e contactedit-actions-button: adjust the themes and template polishing 2016-02-08 23:15:20 +01:00
fabrixxm 0c67c89715 Merge pull request #2323 from annando/1601-dfrn-import
Complete rewrite of DFRN import
2016-02-08 15:48:16 +01:00
rabuzarus cc18fd7ad9 contactedit-actions-button: doing some availability checks for the actions 2016-02-08 15:00:53 +01:00
rabuzarus 991cbd604a contact-edit-actions-button: initial commit 2016-02-08 01:56:15 +01:00
fabrixxm b202e02fbf Revert "Updated modules to allow for partial overrides without errors"
This reverts commit db949bb802.
2016-02-07 15:11:34 +01:00
fabrixxm 44592611e1 new api for notifications
/api/friendica/notification
returns first 50 notifications for current user

/api/friendica&notification/<id>
set note <id> as seen and return item object if possible

new class NotificationsManager to query for notifications and set seen
state
2016-02-07 14:27:13 +01:00
fabrixxm 9330a6994c Merge pull request #2319 from stieben/develop
Added the possibility for themes to override core module functions
2016-02-07 09:52:20 +01:00
Andrej Stieben db949bb802 Updated modules to allow for partial overrides without errors
Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.
2016-02-05 21:52:39 +01:00
Michael Vogel d408cea871 DFRN import has now gone live 2016-02-05 21:25:20 +01:00
rabuzarus 30c375d238 rework autocomplete: polishing class and methods naming 2016-02-05 14:26:22 +01:00
rabuzarus 52dbb0b4a2 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:51:54 +01:00
rabuzarus 9a54afa629 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:47:20 +01:00
rabuzarus c1070e4655 forums.php is now forum.php and providing class forum 2016-02-03 18:05:26 +01:00
rabuzarus 5f7c5e6ab6 rework autocomplete: Access list of smilies over JSON 2016-02-01 17:43:12 +01:00
Michael Vogel d04e1bdf69 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import 2016-01-30 16:38:06 +01:00
Michael Vogel 69457a4a5b DFRN import seems to work. Improvements are possible :-) 2016-01-30 02:57:40 +01:00
Michael Vogel 596416defe Profile data from the gcontact should only be taken if there is content 2016-01-29 12:14:04 +01:00
Michael Vogel 845a769dc2 Only check size if needed - should speed up the uploading. 2016-01-28 12:28:04 +01:00
Michael Vogel 04725d1283 Reverted some work ... 2016-01-28 11:14:13 +01:00
Michael Vogel 78e79de7c9 New central function to store avatar data in contacts 2016-01-28 11:09:08 +01:00
Michael Vogel 6f662b8c74 New avatar picture fields to better cope with changing avatars 2016-01-28 01:26:19 +01:00
Michael Vogel d3bf80a1f3 Show contact posts by searching for "contact-id" - not "gcontact-id" 2016-01-27 11:16:56 +01:00
Michael Vogel 4208acf4b6 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-25 23:51:11 +01:00
Michael Vogel 62de6be495 Switched to static methods for DFRN 2016-01-25 15:20:58 +01:00
Matthew Exon 2aa0c6d00d Only proxy URLs using HTTP or HTTPS 2016-01-25 02:50:57 +01:00
Michael Vogel 937196d6ee Poco fields now moved to the header, function to create formatted location string 2016-01-24 14:30:57 +01:00
Michael Vogel 74ed37aa87 Some more removed code 2016-01-24 00:21:58 +01:00
Michael Vogel 7371318376 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-23 18:50:14 +01:00
Tobias Diekershoff 39099b56d1 a total number count would be nice 2016-01-23 08:01:54 +01:00
Michael Vogel 444b417de0 New routines are now enabled 2016-01-23 02:44:30 +01:00
Michael Vogel c66b4387bf dfrn functions could now work/Removed unused code 2016-01-22 20:26:11 +01:00
Tobias Diekershoff 080319d82d issue #2270 2016-01-20 17:52:58 +01:00
Fabrixxm 7e83ba090f Merge branch 'hotfix_diaspora' into develop 2016-01-20 08:50:18 +01:00
Michael Vogel c6b0e57aa4 Bugfix: Comments weren't relayed anymore to Diaspora due to a Diaspora change 2016-01-20 08:40:04 +01:00
Tobias Diekershoff f4a65cf6ca some more doc strings 2016-01-19 09:15:32 +01:00
Michael Vogel 32c7896c5d Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 18:49:04 +01:00
Tobias Diekershoff 2ef63b6593 Merge pull request #2262 from annando/1601-http-timeouts
Timeout problems while fetching image data
2016-01-18 18:34:15 +01:00
Michael Vogel 5ec2c7e965 When a server isn't reachable there were timeout problems with fetching image data 2016-01-18 15:38:38 +01:00
Tobias Diekershoff c243087b89 readd plugin features to admin aside 2016-01-18 13:04:25 +01:00
Michael Vogel 6c7cf2a766 Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 00:53:18 +01:00
rabuzarus 78e282734f feature management for admins: delete double entries from merging process 2016-01-17 12:59:06 +01:00
rabuzarus c1ed2bd975 feature management for admins: Merge branch 'devolop' 2016-01-17 03:25:17 +01:00
Michael Vogel 228ce9e27e Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-16 17:39:45 +01:00
Michael Vogel 8b90e5c077 Removed unused functionality 2016-01-16 14:46:00 +01:00
Tobias Diekershoff 1770267934 move @brief to the top of the doc block 2016-01-16 14:12:55 +01:00
Tobias Diekershoff 8730c72156 removed commented out code, beautification of MySQL statements 2016-01-16 13:45:21 +01:00
Tobias Diekershoff 7f80de6db8 removed calls to the remote_update funcions 2016-01-16 12:45:48 +01:00
Tobias Diekershoff 20fe67f378 removed remote update functionality from admin panel 2016-01-16 11:52:21 +01:00
Michael Vogel 90a8d6f0f5 Several performance improvements 2016-01-15 23:27:25 +01:00
Tobias Diekershoff 954e4f2754 more docs 2016-01-15 20:40:01 +01:00
Tobias Diekershoff 11aa76c270 Theme listing works again, added some docs for theme and plugin listing funkctions 2016-01-15 20:03:41 +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 e3fd0a269b some doc strings, sort platforms for federation stats page 2016-01-15 18:19:22 +01:00
Tobias Diekershoff 1030c5f4b6 some doc texts 2016-01-15 18:19:21 +01:00
Tobias Diekershoff 4d1545a1a9 viewing and configuration of logs are now on separate subpages in the admin panel 2016-01-15 18:19:21 +01:00
Tobias Diekershoff 8b189aca9e some doxygen stuff 2016-01-15 18:19:20 +01:00
Tobias Diekershoff 0905f18c0f allow -rc in friendica version listings 2016-01-15 18:19:20 +01:00
Tobias Diekershoff ce39992875 combine some versions for ~f and D* 2016-01-15 18:19:20 +01:00
Tobias Diekershoff 25bb977b87 better names for some variable to reflect their intention 2016-01-15 18:19:20 +01:00
Tobias Diekershoff a4104d7c17 1st stuff for federation stats in the admin panel 2016-01-15 18:19:19 +01:00
Michael Vogel 268467fe04 Add the creation date to the cache tables 2016-01-15 00:58:57 +01:00
Michael Vogel d5e1f33506 OEmbed and parse_url are now cached in dedicated tables 2016-01-14 23:59:51 +01:00
Michael Vogel 01c2eacd46 Merge remote-tracking branch 'upstream/develop' into 1601-gcontact-total 2016-01-11 14:25:48 +01:00
Tobias Diekershoff bfdbc0c818 don't mention FB in newhere tipps 2016-01-11 07:54:52 +01:00
Michael Vogel 6b85fa17bb Added some documentation 2016-01-10 19:06:34 +01:00
Michael Vogel b4631cebed Fixed SQL problems 2016-01-10 17:10:56 +01:00
Michael Vogel 23731fc9aa Bugfix: The display hadn't fetched the correct contact for the uid. 2016-01-10 15:44:23 +01:00
Michael Vogel 2f49e984bd Updated database.sql file, further code cleanup 2016-01-10 14:12:05 +01:00
Michael Vogel 214f381e81 Code cleanup 2016-01-10 12:37:49 +01:00
Michael Vogel 885dc1df81 gcontact update script, rebuilt follow page, query speedup for community and network groups 2016-01-10 09:19:00 +01:00
Michael Vogel 6703ba468a Profile data in gcontact overwrites profile data 2016-01-08 08:02:42 +01:00
Michael Vogel 358a9fd6fd Notify and alias will be fetched via OStatus 2016-01-08 00:35:46 +01:00
Michael Vogel 9521cdc18f notify and alias are now in gcontact as well - the contact expansion in mod/item.php is renewed 2016-01-07 23:43:16 +01:00
Michael Vogel fdb31abdfa Use gcontact when adressing contacts in editor 2016-01-07 08:19:28 +01:00
Michael Vogel 5ab2786c00 Get rid of the table "unique_contacts" 2016-01-06 22:23:12 +01:00
Michael Vogel 2bad2cdd91 More fields in gcontact, contact search respects "hide" setting 2016-01-06 14:13:59 +01:00
Michael Vogel 75e2ec01fe The gcontact will now be connected to the items 2016-01-05 15:34:27 +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
Tobias Diekershoff 75ed2f830d moved include Scape to top of the file 2016-01-03 19:15:13 +01:00
rabuzarus 29c671bb22 photos aside widget:permissions cleanup 2016-01-03 16:09:05 +01:00
rabuzarus 1ab022f4df photos aside widget: move dependencies to the header 2016-01-03 15:45:02 +01:00
Michael Vogel 2ed3ae1aab Bugfix: The request process from DFRN hadn't worked anymore since the last pull request 2016-01-01 17:49:07 +01:00
rabuzarus 20fbf670db photo aside widget for profile page 2015-12-30 00:26:50 +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
Tobias Diekershoff 03000beac6 Merge pull request #2219 from fabrixxm/quattro
Fix video oembed appearance
2015-12-28 18:39:03 +01:00
fabrixxm a1c1a6cae8 workaround for media.ccc.de oembed with size 0 2015-12-28 18:28:02 +01:00
Michael Vogel 2f13506180 Bugfix: The participants on the mail page were displayed wrong 2015-12-28 18:13:03 +01:00
fabrixxm f579b2af55 Fix TOC links href, no TOC in home 2015-12-28 10:24:47 +01:00
fabrixxm 1776b19dbf Add table of content in aside of help pages 2015-12-28 10:24:47 +01:00
fabrixxm f27fad7b47 Move Like/Dislike/Attend add/remove code to include/like.php 2015-12-28 10:23:06 +01:00
fabrixxm cf86162a08 Merge pull request #2214 from rabuzarus/2612_db_docu
add db documentation to the help pages
2015-12-28 10:22:33 +01:00
Tobias Diekershoff 497175c56e Merge pull request #2213 from annando/1512-dfrn-request
Support for remote subscription in Diaspora
2015-12-28 05:25:50 +01:00
Tobias Diekershoff b09fd2c39e Merge pull request #2212 from annando/1512-xrd
XRD now should react more like an OStatus server
2015-12-28 05:24:36 +01:00
rabuzarus 038611bcb4 add documentation 2015-12-28 03:17:55 +01:00
Michael Vogel 72f7ee7fd3 Support for remote subscription in Diaspora 2015-12-28 03:14:38 +01:00
Michael Vogel 8b25f51116 XRD now should react more like an OStatus server 2015-12-28 01:04:14 +01:00
Michael Vogel 435a29026d Diaspora: The /p/ only should return top level posts - not comments 2015-12-27 21:12:53 +01:00
Tobias Diekershoff bc9c3d80fa typos in OStatus (re)subscribing 2015-12-27 08:44:23 +01:00
rabuzarus 7530c950e3 help - make use of subfolders 2015-12-26 16:06:38 +01:00
rabuzarus 3df5c17124 reformat todo according to doxygen style 2015-12-25 23:17:34 +01:00
rabuzarus 2cf1aaa791 add pager to common friends and allfriends 2015-12-15 14:31:24 +01:00
Michael Vogel d077dbbcde Bugfix: The bbcode conversion of the profile was inconsistent 2015-12-14 23:53:35 +01:00
rabuzarus e61d6e030e fix account_type 2015-12-14 14:12:56 +01:00
Tobias Diekershoff c0c0d62a2e Merge pull request #2173 from annando/1512-optimize-fragmentation
There is now a fragmentation level for the table optimization
2015-12-13 08:32:03 +01:00
Michael Vogel 5a1041578c Bugfix: The subscribe process took the own contact by random ... 2015-12-12 17:55:57 +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 0869cce45f Code cleaning, real changes will follow 2015-12-12 17:41:25 +01:00
rabuzarus f513b25f6f fix directory search 2015-12-12 01:27:31 +01:00
Michael Vogel 300007a0cf Bugfix: Posts weren't always shown for feeds that start with "www." 2015-12-10 22:47:58 +01:00
Johannes Schwab 2f866fecf9 fix path for photo and proxy 2015-12-08 11:31:50 +01:00
Tobias Diekershoff d944b65253 Merge pull request #2151 from annando/1512-misconfigured-friendica
Workaround for misconfigured Friendica servers with probe_url
2015-12-07 06:37:37 +01:00
Michael Vogel bcf7e673c9 Issue 1924: New configuration value for permitting crawler access 2015-12-06 22:01:20 +01:00
Michael Vogel f880bdd33b Workaround for misconfigured Friendica servers 2015-12-06 18:52:19 +01:00
Tobias Diekershoff 6a05112d98 Merge pull request #2149 from annando/issue-1921
Issue 1921: Disable the auto update
2015-12-06 07:31:13 +01:00
Michael Vogel f406e5ddbd Issue 1921: Disable the auto update 2015-12-06 00:18:59 +01:00
Michael Vogel 01c9d13927 Issue 1871: Show an information if a group is empty 2015-12-05 23:29:42 +01:00
fabrixxm f44846555a quattro: hide acl button in edit post
fix #1780
2015-12-04 19:29:13 +01:00
Tobias Diekershoff eaf975faae Merge pull request #2130 from annando/1512-contact-rework
Some more contact rework
2015-12-04 06:53:29 +01:00
rabuzarus 4b7f080c46 ping: further work 2015-12-03 22:42:53 +01:00
rabuzarus c0406918ec ping: cleanup 2015-12-03 17:15:49 +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 d963cdfe48 photos-albms widget: add some classes 2015-12-02 20:01:22 +01:00
Michael Vogel 4286225f37 Added/Changed accesskeys for the new tab actions 2015-12-02 07:56:10 +01:00
Michael Vogel 7ed73a06ab Solved a problem with author links that are different from what is provided in the contact 2015-12-01 23:51:34 +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
Michael Vogel c45b16d2a1 Unifying the texts. 2015-12-01 19:02:03 +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 1c93729c46 Tab is added to "all friends" and "common friends" 2015-12-01 08:12:05 +01:00
Michael Vogel 712b3c7593 Merge pull request #2121 from rabuzarus/3011_viewcontactstitle
make viewcontacts part of the profile tab
2015-11-30 23:29:35 +01:00
Michael Vogel 0278e60664 Merge pull request #2104 from rabuzarus/2611_contacts_directory
display contact information in contact and directory according to the…
2015-11-30 18:07:35 +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
Michael Vogel 8c35304013 Some SQL improvements 2015-11-30 08:25:11 +01:00
rabuzarus 45c2a4868e make viewcontacts part of the profile tab 2015-11-30 03:25:23 +01:00
rabuzarus a6aac8f950 networkheader: do css work the other supported themes 2015-11-30 01:24:22 +01:00
Michael Vogel a638417ab5 Show contact comments in the post 2015-11-29 23:46:10 +01:00
Michael Vogel 91011b7190 Removing of useless code 2015-11-29 23:36:19 +01:00
Michael Vogel a7ea6ef096 Use the template for the header. 2015-11-29 23:33:32 +01:00
Michael Vogel 42d903dd68 Redesign of the contact pages, new tab for contact statuses 2015-11-29 23:22:05 +01:00
Tobias Diekershoff f45a8f1a03 Merge pull request #2106 from annando/1511-ostatus-bookmark-design
Small OStatus changes
2015-11-29 23:19:12 +01:00
Tobias Diekershoff 93fd6dce84 Merge pull request #2111 from annando/issue-1925
Issue 1925 - display nickname@hostname.com
2015-11-29 19:48:08 +01:00
Michael Vogel ca47c1c4df Merge remote-tracking branch 'upstream/develop' into 1511-contact-evolution 2015-11-29 17:05:40 +01:00
Michael Vogel 5649e9e193 The contact page now contains more data 2015-11-29 17:04:48 +01:00
Michael Vogel 8b23e77171 Only show supported networks in sidebar and contact list 2015-11-29 13:37:24 +01:00
Michael Vogel 583a2f709b Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design 2015-11-29 10:25:44 +01:00
Michael Vogel c77ef0c493 Viewcontacts now only shows native contacts (no more connector contacts) 2015-11-29 09:56:34 +01:00
Tobias Diekershoff a770be3cb6 Merge pull request #2107 from annando/1511-duplicated-keywords
Duplicated tags shouldn't happen anymore when parsing a webpage.
2015-11-29 08:43:19 +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 1a0cb99d56 redesign the network page header when cid selected 2015-11-29 04:57:42 +01:00
rabuzarus 73dbd73990 directory - little change in the sql query 2015-11-29 00:09:09 +01:00
rabuzarus f5597da059 forumlist - mark selected forum as selected 2015-11-28 23:52:12 +01:00
Michael Vogel 68916689de Introductions are now added as well 2015-11-28 23:35:02 +01:00
Michael Vogel 3067663909 The manage page now shows the unread notifications 2015-11-28 22:56:48 +01:00
Michael Vogel 6e957c6c91 Merge pull request #2112 from rabuzarus/2811_group_side
group_side - unify look with forumlist
2015-11-28 21:12:56 +01:00
rabuzarus aa047e16d7 directory - reduce the number of queries 2015-11-28 21:12:44 +01:00
rabuzarus a3059d02d4 group_side - unify look with forumlist 2015-11-28 20:09:28 +01:00
Michael Vogel 25c0c5d4ad Issue 1925 - display nickname@hostname.com 2015-11-28 18:49:37 +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 b53a2c3122 Changed documentation 2015-11-28 17:43:52 +01:00
Michael Vogel 679ce3243e Admin settings for table optimisation 2015-11-28 16:35:16 +01:00
Michael Vogel 20befee9ed Dupilcated tags shouldn't happen anymore when parsing a webpage. 2015-11-28 13:15:00 +01:00
rabuzarus 226bda9f58 add missing info about if contact is forum to contact related pages 2015-11-28 03:50:45 +01:00
rabuzarus 9189971cb8 display contact information in contact and directory according to the other contact related pages 2015-11-28 02:56:36 +01:00
Michael Vogel 9c37fc320e Merge pull request #2095 from rabuzarus/unread_forums
count unread forum items for forumlist widget (ping.php)
2015-11-27 16:28:21 +01:00
Michael Vogel 602821279a scrape_dfrn now scrapes the address as well. 2015-11-25 18:46:02 +01:00
rabuzarus ddf3589fc5 count unread forum items for forumlist widget (ping.php) 2015-11-24 22:14:26 +01:00
Sandro Santilli 573a441d83 Do not notify own posts, closes #1032 2015-11-22 12:28:39 +01:00
fabrixxm d1319d97a2 Merge pull request #2081 from annando/1511-avatar-fix
The own avatar was (sometimes?) changed back when it was changed
2015-11-17 09:13:08 +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
Michael Vogel b53ae0d42a Bugfix: The own avatar was (sometimes?) changed back when it was changed. 2015-11-17 08:39:09 +01:00
Michael Vogel 47d6e43642 Sort the plugin configuration on the admin page by name 2015-11-14 09:27:24 +01:00
Michael Vogel 830870c58e Fix for issue 2060: When password is provided during the register process now the user is redirected correctly. 2015-11-14 08:07:09 +01:00
Tobias Diekershoff 009b3364e5 Merge pull request #2074 from fabrixxm/issue_2071
Use static css in install procedure
2015-11-13 12:50:41 +01:00
Fabrixxm 0a9e017d34 Installer use static css, fix #2071 2015-11-13 10:56:06 +01:00
Michael Vogel ab1edca0be Profile photos are now having an extension 2015-11-13 10:15:30 +01:00
Michael Vogel 6ddf62bdf7 Merge remote-tracking branch 'upstream/develop' into 1511-avatar 2015-11-13 09:48:34 +01:00
Michael Vogel 11905c0bec The avatar picture wasn't updated at the contact table 2015-11-13 08:45:14 +01:00
Michael Vogel 5a8d66e2d4 Just removed blanks with tabs 2015-11-12 23:34:33 +01:00
rabuzarus 862ccb95d2 forumlist: doxygen corrections 2015-11-11 22:41:44 +01:00
rabuzarus 988d0327ae forumlist: forgot some required_once for plugin_enabled() 2015-11-11 21:37:16 +01:00
rabuzarus 215205d376 forumlist: nodeinfo_plugin_enabled() is now plugin_enabled() 2015-11-11 21:31:26 +01:00
rabuzarus dac6f39f41 forumlist: use a more unique identifier 2015-11-11 01:29:31 +01:00
rabuzarus 96b764425e move forumlist addon to core 2015-11-09 15:56:20 +01:00
Tobias Diekershoff 69076b9a01 Merge pull request #2053 from annando/1511-only-supported-themes
Only show supported themes on the admin site.
2015-11-08 18:39:07 +01:00
Michael Vogel e803e56eea Only show supported themes on the admin site. 2015-11-08 18:35:39 +01:00
Tobias Diekershoff 686ba3fcb0 Merge pull request #2052 from fabrixxm/issue_1718
duepuntozero, vier: add unread messages per group
2015-11-08 18:29:15 +01:00
fabrixxm c700a6fb37 duepuntozero, vier: add unread messages per group 2015-11-08 18:02:04 +01:00
Tobias Diekershoff e6202defd1 Merge pull request #2049 from annando/1511-only-valid-contacts
Only show valid contacts on the group page
2015-11-08 16:46:45 +01:00
Michael Vogel 1c5eaa646c Only show valid contacts on the group side 2015-11-08 16:41:00 +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 e6a8a7c8a9 Merge pull request #2048 from strk/group_post
Include per-group count of unseen items in /ping output
2015-11-08 16:01:19 +01:00
Sandro Santilli d31c372376 Revert the rename of <groups> 2015-11-08 15:56:43 +01:00
Sandro Santilli e28072f548 Fix bugs and rename <groups> to <group_posts> 2015-11-08 15:56:08 +01:00
FlxAlbroscheit 613cf41fd6 Preview last five conversations in message-sidebar 2015-11-08 15:45:42 +01:00
Sandro Santilli ba158dfeb1 Include per-group count of unseen items in /ping output
See #1718
Unfinished work
2015-11-08 15:33:12 +01:00
Tobias Diekershoff c0e87b2bea Merge pull request #2045 from annando/1511-dirfind-addr
You can now discover previously unknown users via the dirsearch
2015-11-08 15:19:11 +01:00
Michael Vogel c2beab0d56 Fixed an undefined variable 2015-11-08 15:17:08 +01:00
Michael Vogel 7de6f23f4a Now it is possible to search for @http://profile... 2015-11-08 15:00:52 +01:00
Michael Vogel e12b0d27bb You can now search for @username@domain.tld in dirfind and the search will resolve that. 2015-11-08 14:48:47 +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 24d807221b Image filebrowser dialog links images to image page
fix #1991
2015-11-08 12:05:23 +01:00
fabrixxm 28a8c2369a Not current theme settings in admin page
fix #2022
2015-11-07 21:22:55 +01:00
FlxAlbroscheit 14dff6b0e0 Preview last five conversations in message-sidebar 2015-11-07 18:53:32 +01:00
Tobias Diekershoff 83c45d8d4b Merge pull request #2029 from tugelbend/develop
changed syntax to work with PHP 5.3 #2027
2015-11-07 16:34:13 +01:00
hauke f3eebda4fa changed syntax to work with PHP 5.3 #2027 2015-11-07 16:24:59 +01:00
Michael Vogel 3ccff0c77f Merge pull request #2023 from tobiasd/20151107-registertext
Following n4rky to resolve #1898
2015-11-07 16:02:26 +01:00
Tobias Diekershoff 9a1c57f1bc Following n4rky to resolve #1898 2015-11-07 13:19:55 +01:00
Tobias Diekershoff bb5f7c4db7 Merge pull request #2020 from fabrixxm/install_checks
Install checks
2015-11-07 11:12:37 +01:00
fabrixxm 6befca288f Check for mcrypt_create_iv() for RINO2, update link to cron documentation 2015-11-07 11:03:08 +01:00
Tobias Diekershoff 4e7bf0028c Merge pull request #2019 from rabuzarus/0611_directory
simple photo_menu for directory
2015-11-07 06:54:16 +01:00
fabrixxm 16123f5ad5 Check for ImageMagick and for GIF support 2015-11-07 00:22:26 +01:00
rabuzarus df36ea0d03 simple photo_menu for directory 2015-11-07 00:08:35 +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
Michael Vogel 0f41f35041 The contact template now displays the address if available 2015-11-06 00:47:54 +01:00
rabuzarus a0ae6eb905 template-rework:little cleanup 2015-11-03 14:33:17 +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
Michael Vogel 2f47d63a29 Merge pull request #2000 from tobiasd/20151027-credits
a credits page
2015-10-31 22:34:30 +01:00
Tobias Diekershoff cfc9d2b88f Merge pull request #1998 from annando/1510-network-profile2
New function for fetching contact data
2015-10-31 19:02:01 +01:00
Tobias Diekershoff 7d0ea70cc1 Merge pull request #2001 from annando/1510-empty-poco
Bugfix: /poco was always empty
2015-10-31 12:48:30 +01:00
Michael Vogel 7cf4468353 Bugfix: /poco was always empty 2015-10-31 10:32:01 +01:00
Michael Vogel 09ff2f0dd5 Renamed the function 2015-10-31 00:01:33 +01:00
Tobias Diekershoff c00847a79d use section_title.tpl for page title 2015-10-30 18:05:45 +01:00
rabuzarus fc37f49f23 network.php: add a descriptive comment 2015-10-30 12:47:48 +01:00
rabuzarus 56c9f23e99 prvgroup mentioning in status_editor 2015-10-30 01:59:17 +01:00
Michael Vogel f3ce812a9e New function for fetching contact data 2015-10-30 01:30:42 +01:00
Tobias Diekershoff a48156aab6 display names listed in credits.txt from /credits 2015-10-29 08:48:41 +01:00
fabrixxm fb4adc83dc Merge pull request #1995 from rabuzarus/2810_fbrowser
fbrowser: exclude Contact Photos
2015-10-29 08:41:21 +01:00
Tobias Diekershoff 6f601bf47d Merge pull request #1996 from annando/1510-profile-network-page
Show the profile in the network view when viewing single contacts
2015-10-29 08:39:56 +01:00
Michael Vogel 2e316b5cf2 Show the profile in the network view when viewing single contacts 2015-10-29 08:10:39 +01:00
rabuzarus e88d9153a1 fbrowser: exclude Contact Photos 2015-10-28 23:22:42 +01:00
Tobias Diekershoff 8eda86d8bf lower number of postings displayed per page for not logged in users 2015-10-28 19:01:45 +01:00
Michael Vogel aee4522ad4 The contact page now shows the connection status. 2015-10-27 23:10:52 +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
rabuzarus 7b1a957474 template-rework: try to fix double entries at match.php 2015-10-26 16:15:08 +01:00
rabuzarus 9d720f69aa template-rework: don't show the findpeople_widget on contact edit page 2015-10-26 13:36:01 +01:00
rabuzarus fdda4be452 manage-selector: use an easier sql querry 2015-10-26 00:19:55 +01:00
rabuzarus 87c559d605 manage-selector: sql - check for same baseurl 2015-10-25 18:04:20 +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
Tobias Diekershoff 12d9c46ec5 Merge pull request #1979 from annando/1510-gnusocial
Statusnet is now GNU Social
2015-10-25 16:52:38 +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 65403973c1 Merge pull request #1977 from rabuzarus/crepair
move html from crepair.php to template
2015-10-25 09:44:12 +01:00
Michael Vogel 4631c13d08 Profile data are now reduced to only the most important fields 2015-10-25 09:15:36 +01:00
Michael Vogel a11833e248 Statusnet is now GNU Social 2015-10-24 20:44:18 +02:00
rabuzarus 8f92b6eea4 some work on poke template 2015-10-24 19:51:58 +02:00
rabuzarus ea2b3b2f76 move html from crepair.php to template 2015-10-24 15:57:46 +02:00
rabuzarus 87ecd8f658 tabs have now an ID 2015-10-24 15:04:27 +02:00
rabuzarus eaf5d05030 template rework: display more infos for match and dirfind 2015-10-23 16:48:32 +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 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 e55f9f8f07 Merge dir into template_rework 2015-10-17 22:22:20 +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 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
Michael Vogel 2070c96dd1 Changing the acl does not work when editing posts - so it is disabled for events. 2015-10-17 08:46:45 +02:00
Michael Vogel 316276cb6d Editing an item with an event is now opeing the event edit form. 2015-10-17 08:27:33 +02:00
rabuzarus 67f699403a match.php: restructure acdording to the change of match.tpl 2015-10-17 00:39:50 +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 5299f25920 default value for firstDay in events page 2015-10-12 20:23:09 +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 48309a25ec Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu
Conflicts:
	include/conversation.php
2015-10-11 05:11:46 +02:00
Tobias Diekershoff 27fa20ab22 Merge pull request #1947 from annando/1510-diaspora-follower
Reworked contact relations between Diaspora and Friendica
2015-10-10 18:50:20 +02:00
Michael Vogel bb0dff2c75 Improved contact menu 2015-10-10 16:23:20 +02:00
Michael Vogel efbdb57f92 Reworked contact relations between Friendica and Diaspora 2015-10-10 11:06:18 +02:00
Michael Vogel ab0fbc3a65 Bugfix: Unidirectional Diaspora connect request have to be followers - not sharers 2015-10-10 04:56:40 +02:00
rabuzarus 0eae67ea48 update attendance state on profile wall 2015-10-09 14:20:01 +02:00
rabuzarus d85d215bb8 attendance update in network stream 2015-10-09 13:46:08 +02:00
Michael Vogel 16da708e07 Contact names with ">" and "<" are a problem ... 2015-10-09 07:39:38 +02:00
rabuzarus 6a9ec14878 small bugfix in like.php 2015-10-08 20:26:11 +02:00
Michael Vogel 61c3ce7a21 Bugfix: The contact names had to be escaped 2015-10-08 00:25:55 +02:00
Michael Vogel 1f0b759e2f Added resize possibility to proxy function 2015-10-07 08:25:10 +02:00
Michael Vogel 14e17b944f Reworked fetching of contact data on "display" page 2015-10-06 18:31:08 +02:00
Michael Vogel eefedc019b Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy 2015-10-06 07:41:09 +02:00
Michael Vogel 901b95e935 Hide some profile data if not connected. 2015-10-06 06:56:31 +02:00
Michael Vogel 7ed61b2edc Removed "proxy_parse_html" since it is now done in the bbcode function. 2015-10-05 22:25:14 +02:00
Michael Vogel d3ac3f8490 Added the contact menu to the search as well. 2015-10-05 08:08:59 +02:00
Michael Vogel 8a2d1fe301 Show RedMatrix and use the proxy for the profile pictures 2015-10-04 22:24:58 +02:00
Michael Vogel 05ae3d528e A contact that couldn't be resolved is know known as "UNKNOWN" 2015-10-04 19:48:29 +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 8c514307cf For safety reasons include the include 2015-10-04 17:20:47 +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 ba41336099 Preparation for a not found contact. 2015-10-04 14:49:12 +02:00
Michael Vogel d0ae5ce326 Show more information when following a new contact 2015-10-04 14:41:39 +02:00
Tobias Diekershoff be70dde61f Merge pull request #1928 from annando/issue-1913
Issue 1913: Report invalid feed
2015-10-04 08:54:59 +02:00
Tobias Diekershoff 05b2836d66 Merge pull request #1926 from annando/1510-permit-crawler
New option to permit crawlers
2015-10-04 08:53:32 +02:00
rabuzarus f93a2242e0 missed one to delete 2015-10-04 01:00:24 +02:00
Michael Vogel c0e277cec8 Issue 1913: Report invalid feed 2015-10-04 00:28:15 +02:00
Michael Vogel 2840bf2293 New option to permit crawlers 2015-10-03 23:16:40 +02:00
rabuzarus c775d6885b port of reds geotag feature 2015-10-03 20:24:35 +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
Michael Vogel 68a6f0298e The events moved from the profile to the navigation bar - for supported themes 2015-09-30 18:50:44 +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 2ff67ef5ed fixes like/dislike for photos 2015-09-30 14:39:00 +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
rabuzarus 0077494396 make event confirmation work 2015-09-30 14:35:17 +02:00
rabuzarus 37fccee503 first work for consensus 2015-09-30 14:34:10 +02:00
fabrixxm 2e8caf7f27 Merge pull request #1915 from rabuzarus/hide_profilepics
don't show profile photos in albums to others than owner or remote
2015-09-30 08:57:31 +02:00
rabuzarus 3d7602a5a3 don't show profile photos in albums to others than the owner or remote user 2015-09-29 19:44:26 +02:00
Michael Vogel 6e981ed798 Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events 2015-09-29 10:35:50 +02:00
Fabrixxm 880dda4257 Merge branch 'master' back into develop 2015-09-29 10:00:13 +02:00
Michael Vogel c33957a6e9 Internationalisation of events/Move events to the navigation bar 2015-09-27 14:00:15 +02:00
fabrixxm af5da5bece Merge pull request #1903 from annando/1509-bbcode-notifications
The "about" field in the introductions should be send through bbcode
2015-09-25 18:24:48 +02:00
Michael Vogel c7b80b532a Bugfix: The "about" field in the introductions should be send through bbcode 2015-09-25 17:47:37 +02:00
Sandro Santilli 2a2dd6a1b9 Remove duplicated calls to language detection
Also avoids overriding existing "lang" specification in an item
2015-09-23 10:47:34 +02:00
Tobias Diekershoff 53719d4ecc Merge pull request #1897 from annando/3.4.2
Bugfix: Following mail accounts is now possible again
2015-09-23 06:20:49 +02:00
Michael Vogel 7c8c8b821a Bugfix: Following mail accounts is now possible again 2015-09-22 22:31:22 +02:00
Fabrixxm 554948c22a Adds checks for mcrypt module for RINO2
- check for module on install
- check for module when RINO2 is enabled in admin
- check for module when RINO2 is used in communications
2015-09-22 09:50:24 +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 d20dbedddd Merge remote-tracking branch 'upstream/develop' into 1509-diaspora-import 2015-09-06 09:15:23 +02:00
Tobias Diekershoff c67fbc89c4 Merge pull request #1879 from annando/1509-fixing-ostatus
Improvements to OStatus subscriptions
2015-09-06 09:03:28 +02:00
Tobias Diekershoff 8504cf4f05 Merge pull request #1880 from annando/1509-performance
Some settings to control the system load
2015-09-06 09:02:27 +02:00
Michael Vogel f918109351 We forgot to include the title ... 2015-09-06 08:18:55 +02:00
Michael Vogel 6aac9dfc9c Merge branch '1509-diaspora-import' of github.com:annando/friendica into 1509-diaspora-import 2015-09-05 12:13:38 +02:00
Michael Vogel c6d9b2da23 New setting for requery days 2015-09-05 10:54:39 +02:00
Michael Vogel cecbc58729 Mass-subscribing to OStatus contacts is enabled again 2015-09-05 10:32:10 +02:00
Michael Vogel 3cccb5ecb1 The repair option is added to the settings 2015-09-05 04:54:48 +02:00
Michael Vogel 30e7ce2e2a The links for nodeinfo in "well-known" need to be an array of objects. 2015-09-05 04:33:18 +02:00
Michael Vogel d9f23dbb20 New switch that restricts the search only for registered users 2015-09-05 04:29:37 +02:00
Michael Vogel 635e92249a Bugfix: The first contact was never repaired 2015-09-03 22:24:57 +02:00
Michael Vogel fd239ebf7b Try to repair OStatus subscriptions 2015-09-03 22:18:25 +02:00
Tobias Diekershoff 658c99dcf3 Merge pull request #1874 from annando/1509-pubsub
Bugfix: pubsub tend to unsubscribe subscriptions in the past
2015-09-01 07:07:22 +02:00
Michael Vogel 389738b1c1 Bugfix: pubsub tend to unsubscribe subscriptions in the past 2015-09-01 00:12:15 +02:00
Michael Vogel 3614df650f Some admin settings hadn't been made translatable. 2015-08-31 19:32:01 +02:00
Michael Vogel d1e3ea7b46 Soapbox-Improvements 2015-08-30 19:07:30 +02:00
Michael Vogel 3246352ba8 More detailled log entries 2015-08-29 16:55:25 +02:00
Michael Vogel 38c8431527 Rino Bugfix: A variable was used that never was fetched 2015-08-29 11:38:40 +02:00
Tobias Diekershoff 5b78353fff Merge pull request #1861 from annando/1508-deactivated-ostatus-contacts
There seems to be a problem with the function to add all friends of a GNU Social account.
2015-08-26 22:51:55 +02:00
Michael Vogel 86f2eb005f There seems to be a problem with the function to add all friends of a GNU Social account. So it is deactivated by now. 2015-08-26 22:46:59 +02:00
fabrixxm b988aa7cb4 fix warning in /dfrn_request 2015-08-26 19:17:41 +02:00
Michael Vogel 6942b16ef5 See issue 1855. OOhembed is removed. 2015-08-25 19:50:23 +02:00
Michael Vogel 5c084b754a Don't show the alternate url syntax in searches 2015-08-25 05:31:21 +02:00
Michael Vogel b52bc71c6c Now you can define the duration of the cache entries. 2015-08-24 17:24:14 +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
Michael Vogel cf5fce855e Bugfix: Don't show "appnet" in "inbound" when only "buffer" is enabled. 2015-08-24 08:18:17 +02:00
Michael Vogel 3e08024839 Moved the rss/atom part to the protocols. 2015-08-24 08:15:34 +02:00
Michael Vogel 157c64cac2 The rss/atom feed is added to the inofficial "services" section. 2015-08-24 08:02:46 +02:00
Michael Vogel 2a676ee312 The nodeinfo is changed to the new specifications 2015-08-24 07:47:42 +02:00
Michael Vogel b0ddde22c0 By entering a GNU Social account name, the friends of this contact will be added to the friendica account 2015-08-23 22:21:15 +02:00
Tobias Diekershoff 37ab7ee052 Merge pull request #1842 from annando/1508-directory-configurable
Make the hardcoded path to dir.friendica.com configurable
2015-08-23 15:10:34 +02:00
Michael Vogel 123ad84689 Make the hardcoded path to dir.friendica.com configurable 2015-08-23 11:05:10 +02:00
fabrixxm 81d1dfc006 add 'reload active plugins' button in admin/plugins 2015-08-20 15:01:15 +02:00
Tobias Diekershoff 033f89c6fa Merge pull request #1831 from annando/1508-twidere-crash
New versions of Twidere crashed during posting.
2015-08-18 07:17:30 +02:00
Michael Vogel 57ebb00a1f New versions of Twidere crashed during posting. 2015-08-17 22:38:05 +02:00
Tobias Diekershoff 86f6532c61 adding the subdir 2015-08-17 08:20:19 +02:00
Tobias Diekershoff 03e81b06d5 we dont need the or anymore 2015-08-17 07:24:48 +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
Tobias Diekershoff 0f505b92f6 Merge pull request #1827 from annando/1508-only-real-contacts
In the contact search only suppress the "follow" link if you really d…
2015-08-16 22:25:32 +02:00
Michael Vogel 32e080933f Improved the settings description 2015-08-16 22:17:36 +02:00
Michael Vogel c2a1cf958d The addon "statistics_json" becomes the system setting "nodeinfo" 2015-08-16 21:45:51 +02:00
Michael Vogel 46ec2638fa In the contact search only suppress the "follow" link if you really don't follow the contact 2015-08-16 15:48:26 +02:00
Michael Vogel bacd71e1c6 Replace random strings with guids where appropriate. 2015-08-14 07:48:28 +02:00
Michael Vogel 43fda0d626 Merge remote-tracking branch 'upstream/develop' into 1508-random-becomes-guid 2015-08-14 07:19:11 +02:00
Michael Vogel a2d742ec91 For unique values we should use our guid function - not the random function 2015-08-14 00:40:36 +02:00
Michael Vogel 0e9b2c132a Bugfix: There are some problems with Friendica installed in subdirectories 2015-08-14 00:13:23 +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 9d0786531d Merge pull request #1810 from annando/issue-1739
Contact requests now contain more information.
2015-08-12 08:17:27 +02:00
Michael Vogel a0f69dc92c Contact requests now contain more information. 2015-08-12 08:07:21 +02:00
Michael Vogel d5f2d9b39a Bugfix ... 2015-08-11 23:50:31 +02:00
Michael Vogel bf9ab389a2 Just some removed blanks 2015-08-11 20:16:53 +02:00
Michael Vogel c18c598baf Nodeinfo: Include the sitename 2015-08-11 10:23:33 +02:00
Michael Vogel 986eee48ac Some corrections in the addon names 2015-08-11 00:37:27 +02:00
Michael Vogel e60456fb66 Metadata should be an object. 2015-08-10 23:11:07 +02:00
Michael Vogel 6aeb4c0ad7 Corrected the output 2015-08-10 21:54:57 +02:00
Michael Vogel 820ded2c2d Support for the new nodeinfo protocol that will replace statistics.json 2015-08-10 21:33:57 +02:00
Michael Vogel c8e0685788 Merge remote-tracking branch 'upstream/develop' into 1508-public-relay 2015-08-10 10:52:54 +02:00
Tobias Diekershoff 6cfe7b698e Merge pull request #1803 from annando/1508-accessibility
Improved accessibility
2015-08-10 08:48:48 +02:00
Michael Vogel b24453f8da Messages are now sent to the relay server - and the options are configurable 2015-08-09 20:39:11 +02:00
Michael Vogel 8974c147e0 First steps for a public relay for posts. 2015-08-09 08:31:42 +02:00
Michael Vogel b4d09777b9 Added many accesskeys ... 2015-08-08 17:33:43 +02:00
fabrixxm e94e6d7500 escape user data to sql 2015-08-06 16:08:14 +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
Michael Vogel 2f147451f7 Just some more improved setting descriptions. 2015-08-02 10:08:08 +02:00
Michael Vogel ebae45babc Clarified the settings. 2015-08-02 10:05:50 +02:00
Michael Vogel 0a998f99df Added community search mode 2015-07-30 23:27:50 +02:00
Fabrixxm f5657e283c fix folder links in filebrowser dialog 2015-07-29 11:55:26 +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 dcfcd6f906 Poco: added caching 2015-07-25 12:05:27 +02:00
Michael Vogel 68e318e316 Don't export contacts with empty network 2015-07-25 10:50:00 +02:00
Michael Vogel e3e9de2e74 Export all federation contacts through poco 2015-07-24 07:23:57 +02:00
Michael Vogel 880f486044 Check not only for the last contact but also for the last update for the sanity check. 2015-07-23 22:21:22 +02:00
Michael Vogel cbd2fc1572 "last_contact" is now set automatically if it is lower than the update value. 2015-07-23 20:57:08 +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 93e93f58bd Query Redmatrix contacts for their contacts as well. 2015-07-19 10:40:33 +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
root 54a5a80b24 Poco: New fields for last contact and last failure of a contact. 2015-07-17 01:08:28 +02:00
Michael Vogel fca8aecc9b Show "Redmatrix" as network name. 2015-07-16 10:09:59 +02:00
Michael Vogel 6800b07fc5 Update the name in the "self" contact when it is changed. 2015-07-14 22:24:43 +02:00
Michael Vogel 0de1926113 removed logger entry 2015-07-14 08:52:54 +02:00
Michael Vogel 2b3ebb9c3e Follow/Unfollow now works from OStatus. 2015-07-13 23:50:33 +02:00
Michael Vogel 3457f85833 Salmon: Don't store contact data before the message was authenticated. 2015-07-13 14:34:28 +02:00
Michael Vogel 0398bb67be Reworked salmon import 2015-07-13 08:06:51 +02:00
Michael Vogel 5f89cb0923 The autofollow option is moved from the addons to the core. 2015-07-12 21:37:49 +02:00
rabuzarus e5809dce79 add jotnets for sharing posts 2015-07-12 17:52:25 +02:00
Tobias Diekershoff 179201d2bf Merge pull request #1750 from annando/1507-contact-update
Automatic contact update
2015-07-12 15:32:29 +02:00
Michael Vogel fe137a92ef Automatically update contact data. 2015-07-11 14:36:04 +02:00
Tobias Diekershoff a22581e86c typo 2015-07-08 13:15:14 +02:00
Fabrixxm 95945ecae6 Merge branch 'master' into develop 2015-07-06 16:56:49 +02:00
fabrixxm 75998b62de Merge pull request #1726 from rabuzarus/acl-var
fix for #1725
2015-07-02 12:13:14 +02:00
rabuzarus b827c2e805 inlude jotnets for bookmark acl 2015-07-02 12:09:40 +02:00
Tobias Diekershoff 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 836058c477 Added help text 2015-07-01 00:41:04 +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 5a23bd400c Merge pull request #1715 from rabuzarus/theme_uid
use local theme settings for visitors
2015-06-30 08:41:07 +02:00
Michael Vogel 836432bb9a Removed Google Maps 2015-06-30 07:42:59 +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
fabrixxm 1a1c2d74f6 Merge pull request #1698 from rabuzarus/identity
move some identity related functions to identity.php
2015-06-29 13:52:07 +02:00
fabrixxm 17514e0d68 Merge pull request #1703 from rabuzarus/readable_bytes
show maximagesize warning in a human readable format
2015-06-29 13:50:55 +02:00
rabuzarus a982320ba9 show maximagesize warning in a human readable format 2015-06-29 02:39:08 +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
rabuzarus 373bb0822b get the themes settings of foreign profiles 2015-06-27 14:10:43 +02:00
rabuzarus 787604026f move some identity based functions to identity.php 2015-06-26 18:57:20 +02:00
rabuzarus 5ce125d6e0 cleanup of some unused code 2015-06-26 15:13:52 +02:00
rabuzarus 65286f79ed respect hidewall 2015-06-25 20:29:09 +02:00
rabuzarus 94b21245bc some more work to get acl data into populate_acl 2015-06-25 18:57:42 +02:00
rabuzarus bfebf9636b acl for events and photos 2015-06-25 12:38:09 +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 e29d05ce4a notifications order, unseen css class
ping return notfications ordered by notification id
notifications list get seen/unseen class from ping xml
global.css define 'notify-unseen'
2015-06-24 16:10:06 +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 17e8c29768 fix spelling 2015-06-24 08:23:56 +02:00
Fabrixxm 511c2d2c91 rino: settings in admin, choose lowest common on notify 2015-06-23 17:36:26 +02:00
Fabrixxm 6fbb02fb93 RINO 2 based on php-encryption
reenable RINO 1 functions, add a deprecation note.
use by default RINO 2 , with crypto from php-encryption
fallback to RINO 1 for old nodes.
2015-06-23 16:13:09 +02:00
Fabrixxm d06beb1431 install: load htconfig template from templates/ 2015-06-23 12:35:51 +02:00
Fabrixxm 7d83a19fd4 Disable RINO
Comment out functions for RINO crypt and disable RINO request and response.
2015-06-23 12:02:35 +02:00
Tobias Diekershoff 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
Tobias Diekershoff 24c91a4fed Merge pull request #1679 from fabrixxm/smallfixestothemes
use fields template in photo edit form
2015-06-23 09:12:25 +02:00
Michael Vogel a7cf3639f0 Just some more fixing for issue 1642 2015-06-22 23:47:08 +02:00
fabrixxm 35e9fc3b02 use fields template in photo edit form 2015-06-22 20:07:19 +02:00
Michael Vogel df7b907bc4 Display: Look for the network name when fetching the contact (important because of the statusnet connector) 2015-06-21 01:34:57 +02:00
Tobias Diekershoff 78321c2a43 Merge pull request #1670 from annando/setup-rewrite-check
The installation prozess has a problem with self signed certificates
2015-06-15 13:25:54 +02:00
Michael Vogel 7feda0120f This is working fix for issue 1642 2015-06-15 01:20:04 +02:00
Michael Vogel 0e157b1288 Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check 2015-06-15 00:55:05 +02:00
fabrixxm 42f4f3fce9 Merge pull request #1668 from annando/issue-1642
Better detection for the mobile client to avoid "{0}" in notifications
2015-06-14 15:58:52 +02:00
Michael Vogel abc84f96ab The installation prozess has a problem with self signed certificates. 2015-06-13 21:58:40 +02:00
Michael Vogel c89c0916e2 Better detection for the mobile client to avoid "{0}" in notifications. 2015-06-13 20:23:26 +02:00
Michael Vogel 66058c6cf4 Remote subscribe from a GNU Social site is now possible 2015-06-13 19:51:45 +02:00
Tobias Diekershoff e02546880f Merge pull request #1662 from annando/issue-1628
The values for "sitename" and "register_text" was nedlessly encoded
2015-06-11 06:33:38 +02:00
Michael Vogel 5907c62851 The values for "sitename" and "register_text" was nedlessly encoded with "htmlentities" 2015-06-11 00:12:16 +02:00
Michael Vogel df3b38679f This fixes issue 1657 2015-06-10 22:54:41 +02:00
Michael Vogel cb0351dba0 Send a salmon notification to every mentioned person. 2015-06-09 08:27:04 +02:00
Michael Vogel 419a3ab2d3 Better behaviour when contact wasn't found. 2015-06-08 01:19:40 +02:00
Michael Vogel a3c497190d Complete new OStatus import. 2015-06-07 23:18:02 +02:00
Michael Vogel ba36910343 Removed bad plink detection. 2015-06-03 21:03:46 +02:00
Michael Vogel c416ce4893 Improved tagging 2015-06-03 11:27:56 +02:00
Michael Vogel b60677ef1b OStatus: New fields in OStatus export/ Auto-tagging of replyed authors. 2015-06-03 01:26:46 +02:00
Michael Vogel 39d4856abb Merge remote-tracking branch 'upstream/develop' into 1506-tag-users 2015-06-02 23:19:00 +02:00
Tobias Diekershoff 7305a27392 Merge pull request #1647 from annando/1506-performance
Performance improvements when searching for existing GUIDs
2015-06-02 22:46:07 +02:00
Michael Vogel b5129a3e11 Store the GUID from here as well. 2015-06-02 22:10:28 +02:00
Michael Vogel 1a26d464dd Always add the addressed contacts in a post to the tags. 2015-06-02 20:36:10 +02:00
fabrixxm a36014fb0f Merge pull request #1619 from rabuzarus/block-local-dir
block local directory for public access
2015-06-02 17:53:19 +02:00
fabrixxm 46052740be Merge pull request #1632 from annando/1505-ostatus2
Send a hubsub notification for every comment
2015-06-01 09:00:17 +02:00
fabrixxm c12a647f13 Merge pull request #1639 from rabuzarus/albums_widget
fix photo_albums upload
2015-06-01 08:34:18 +02:00
rabuzarus 8257e7e1e5 block poco if block_local_dir is true 2015-06-01 01:50:27 +02:00
rabuzarus a674e782b2 fix Issue #1638 2015-06-01 01:36:37 +02:00
Michael Vogel fae3592c79 Bugfix: You wasn't able to add an OStatus contact when you are following the same contact via Statusnet connector. 2015-05-31 13:28:16 +02:00
fabrixxm 18e44001e5 Merge pull request #1630 from annando/1505-ostatus
OStatus communication improvements
2015-05-31 10:08:24 +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
Michael Vogel d732d9d1a8 OStatus replies should now work even if the thread starter isn't in the mentions. 2015-05-31 00:26:11 +02:00
Michael Vogel 788d3cf1ab Ostatus: The automatical adding of @-replies now uses the correct contact. 2015-05-30 21:45:43 +02:00
rabuzarus 74267310d6 html to section_title.tpl 2015-05-30 02:21:30 +02:00
rabuzarus b61e39a1cb cleaning after local merge 2015-05-29 16:30:42 +02:00
rabuzarus 553a152345 Merge photo-template into develop 2015-05-29 16:24:58 +02:00
rabuzarus a7d417abb2 remove whitespace 2015-05-29 16:18:30 +02:00
rabuzarus 5cbb5b140c css work 2015-05-29 16:08:17 +02:00
Tobias Diekershoff 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 3e0635992f change the conditions 2015-05-29 04:05:41 +02:00
rabuzarus a2a8afa583 block local directory for public access 2015-05-28 19:54:23 +02:00
rabuzarus 5990d62b06 use z_root 2015-05-28 16:15:48 +02:00
rabuzarus 415a606a59 better solution to exclude Contact Photos and include count of Photos 2015-05-28 15:54:53 +02:00
rabuzarus 1067718018 little revision 2015-05-27 12:44:40 +02:00
fabrixxm b3992e1c65 Merge pull request #1599 from fabrixxm/issue-1574
Issue #1574
2015-05-27 11:07:30 +02:00
fabrixxm 50b3e49b5d Merge pull request #1601 from rabuzarus/event-warning
event can not end before it has started warning
2015-05-27 11:06:47 +02:00
rabuzarus 15499ff1aa first step to get html code from photos.php removed 2015-05-27 03:35:29 +02:00
rabuzarus 46338f5e87 using sprintf 2015-05-26 14:49:53 +02:00
rabuzarus f309f3a681 remove html and use vcard-widget.tpl 2015-05-26 14:32:40 +02:00
rabuzarus 3ad674fa67 better space handling 2015-05-25 16:49:57 +02:00
rabuzarus e040b60f67 make the heading of the search result translatable 2015-05-24 20:46:40 +02:00
rabuzarus b754a79968 event can not end before it has started. 2015-05-24 13:33:07 +02:00
Michael Vogel c6e605992b Events: Query improvement 2015-05-24 11:46:20 +02:00
fabrixxm b29b01fad4 Merge branch 'develop' into issue-1574 2015-05-24 10:26:21 +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 83697cf3e5 Delete attachments on item deletion
Delete video from videos page
2015-05-23 22:35:02 +02:00
Michael Vogel ab67788b4e SQL speed increase for query and search. 2015-05-23 01:23:31 +02:00
rabuzarus 2ad8fdc40b port of red matrix datepicker implementation 2015-05-22 18:53:18 +02:00
Tobias Diekershoff 72e3ffbb4d Merge pull request #1563 from annando/1505-no-intelligent-shortening
Disable intelligent shortening - issue 1540
2015-05-16 12:04:28 +02:00
Michael Vogel 472a6f1380 Added explanation for shortening. 2015-05-15 21:09:00 +02:00
Michael Vogel d995fc3994 The intelligent shortening for social media systems like Twitter, GNU Social and App.net can now be disabled. 2015-05-15 20:56:05 +02:00
rabuzarus de197405d0 port of red's event editing preview 2015-05-14 13:20:58 +02:00
Tobias Diekershoff 9244e8727d dbesc and normalise_link 2015-05-10 09:10:27 +02:00
Tobias Diekershoff 0b8b1fdef3 add procy_url around the profile images 2015-05-06 16:14:27 +02:00
Tobias Diekershoff fd8c9a9dac avoid some contacts from profile match listing 2015-05-06 13:02:02 +02:00
Michael Vogel 237b5a6e40 New page setting for the maximum frontend load value. 2015-05-02 22:05:04 +02:00
Michael Vogel 100f6343ad Highlighting of user names should now work in every case 2015-04-30 06:11:05 +02:00
Michael Vogel 5368fbba82 Bugfix: The android app will have readable notifications again. 2015-04-26 13:25:04 +02:00
Michael Vogel c348f27e84 Show unread notifications in a different order than read notifications 2015-04-23 08:59:30 +02:00
Michael Vogel 7254f42333 Show unread mails and introductions as well. 2015-04-23 08:37:31 +02:00
Michael Vogel 04cda104ca New function that will prevent notifications from deleted posts 2015-04-22 08:39:27 +02:00
Michael Vogel e2827c0af7 The ID field will be stored with notifications as well. 2015-04-21 10:14:20 +02:00
Michael Vogel 261cd441c7 Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications 2015-04-21 10:13:28 +02:00
Michael Vogel 7a1db2e083 Only show one notification per parent 2015-04-16 06:47:09 +02:00
Tobias Diekershoff 8367cadeef dont normalise OpenID URLs and fallback to https if no protocol is specified 2015-04-14 12:27:36 +02:00
Michael Vogel 2285b3b7a7 Storing the parent with every notification 2015-04-14 06:54:41 +02:00
Michael Vogel 64e343ed4b Some refinement to the contact update 2015-04-12 10:32:02 +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
fabrixxm 8b2742dc7d Merge pull request #1505 from annando/1504-unified-follow
The behaviour when following a new contact is now unified
2015-04-12 08:48:36 +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 0e895e24f7 Code reworks: replaced hardcoded network text with the corresponding constants. 2015-04-11 22:14:56 +02:00
Michael Vogel 190b7d6070 Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow 2015-04-10 11:34:21 +02:00
Tobias Diekershoff dea1b067bd Merge pull request #1479 from annando/1504-parse_url
The order for the page parsing is changed
2015-04-10 10:13:13 +02:00
Michael Vogel 489af0d55d Just added some forgotten escaping. 2015-04-10 00:54:42 +02:00
Michael Vogel 662fd84891 Automention of communities when a single contact is selected on the network page. 2015-04-10 00:42:03 +02:00
Michael Vogel e81f9c91fa Merge remote-tracking branch 'upstream/develop' into 1504-parse_url 2015-04-09 19:49:33 +02:00
Michael Vogel ccbac6874b The "connect" link ar the display page now directs to the new "follow" page as well. 2015-04-09 07:45:48 +02:00
Michael Vogel f6ea872986 The behaviour when following a new contact is now unified. 2015-04-09 00:10:21 +02:00
Michael Vogel 539a93b3f1 The timestamp was at the wrong place 2015-04-06 13:49:57 +02:00
Michael Vogel 3cbd72d907 API: New picture upload function (Enhanced Twidere support) 2015-04-06 03:19:12 +02:00
Tobias Diekershoff 8ae90035f4 Merge pull request #1480 from annando/1504-diaspora-enhancement
Diaspora uses this to fetch single public items
2015-04-05 21:24:21 +02:00
Michael Vogel 32206cd681 Diaspora uses this to fetch single public items. 2015-04-05 20:50:15 +02:00
Michael Vogel 57528cb987 New function for building the "share" header 2015-04-05 20:43:06 +02:00
Michael Vogel aea83f0bec The order for the page parsing is changed. 2015-04-05 20:40:31 +02:00
Tobias Diekershoff 106b0b5d23 Merge pull request #1460 from FlxAlbroscheit/develop
Issue 1163: Feature allowing desktop-notifications
2015-04-05 11:37:05 +02:00
fabrixxm 2d3437daa3 different help text for different network 2015-04-04 18:02:26 +02:00
Silke Meyer c05f95b54e Improved help text, issue 1349. 2015-04-01 10:10:00 +02:00
fabrixxm 0226258e7b Block settings page for unauthorized users
fixes issue #1459
2015-03-31 10:24:23 +02:00
FlxAlbroscheit 001e940c6c Feature for desktop-notifications
see issue #1163
2015-03-31 02:06:07 +02:00
Michael Vogel f1c6d6f1ba Merge pull request #1442 from fabrixxm/issue-1362
Add scheme if missing to url inserted by user in 'insert link' jot button
2015-03-24 12:34:31 +01:00
fabrixxm 250b466ed3 Fix blank reponse if no siteinfo are fetched 2015-03-22 11:03:46 +01:00
fabrixxm 1cc9e7db0f Add scheme if missing to url inserted by user in 'insert link' jot
button
2015-03-22 10:59:00 +01:00
fabrixxm 05d1aaf0ed Use correct class name to send post to email recipients. Fix #1437 2015-03-22 10:12:16 +01:00
fabrixxm c18ace5517 Merge pull request #1436 from annando/1503-global-copy-comments
The global copy now copies comments as well
2015-03-22 09:49:49 +01:00
Michael Vogel 81b199cfdc The global copy now copies comments as well. This is important for the search. 2015-03-21 20:23:47 +01:00
fabrixxm 9bdd41b774 Merge pull request #1435 from FlxAlbroscheit/develop
Access a contact directly from the contact-manager-page [UPDATED]
2015-03-20 15:13:17 +01:00
FlxAlbroscheit 1e15cba631 Access a contact directly from the contact-manager-page
Improved my former commit (see: https://github.com/friendica/friendica/pull/1428)
2015-03-20 15:10:55 +01:00
Tobias Diekershoff dd21750d90 Merge pull request #1428 from FlxAlbroscheit/develop
Access a contact directly from the contact-manager-page
2015-03-12 07:13:31 +01:00
FlxAlbroscheit 21237ddba6 Give access to contact's profile-URL 2015-03-10 22:44:57 +01:00
Michael Vogel ea06a1ec45 There is now a "global" field in the item table that tells if this item is present as global copy as well. 2015-03-09 00:45:53 +01:00
Michael Vogel b080eddf8d Improved logging for the search. 2015-03-08 03:24:54 +01:00
Michael Vogel dbe8275ae5 Added some more timestamp measuring 2015-03-07 23:14:26 +01:00
Michael Vogel 1cf3cb493f removed unneeded code. 2015-03-07 21:39:28 +01:00
Michael Vogel 7c4a1a059d New fields for the term table, improved query for the tag search. Changed the cache handling for rendered bbcode. 2015-03-07 21:24:39 +01:00
Michael Vogel 027b11ebb5 Small bugfix for likes 2015-03-02 23:34:59 +01:00
Michael Vogel 3f1d186106 Remove the old hashtag functions, change it to the new functionality. 2015-03-01 20:40:38 +01:00
Tobias Diekershoff 20208acb23 Merge pull request #1417 from annando/1502-improved-markdown
Updated libraries for Markdown and mobile detection
2015-02-28 08:17:22 +01:00
Michael Vogel 25eb323d69 Removed the last traces of the old Markdown library 2015-02-23 23:56:44 +01:00
Michael Vogel 440e2d82b1 Global setting for the behaviour of likes. 2015-02-23 12:44:50 +01:00
Michael Vogel 6504568f2e Merge remote-tracking branch 'upstream/develop' into 1502-like-no-update-commented 2015-02-23 12:35:22 +01:00
fabrixxm d4b092cec6 Merge pull request #1356 from silke/develop
Added help text as requested in #1349.
2015-02-23 08:51:02 +01:00
Michael Vogel 9eeff0d891 Received "likes" and "dislikes" don't update the "commented" value anymore. 2015-02-22 17:34:04 +01:00
Michael Vogel f3cc065e66 Show the profile visibility only for Friendica contacts. 2015-02-21 20:03:02 +01:00
Michael Vogel 8179f2f65e Only show the relation on native networks. 2015-02-20 23:56:41 +01:00
Michael Vogel 1dc961713d Bugfix: If "all" is selected then no contacts were shown. 2015-02-20 23:33:21 +01:00
Michael Vogel a8a37a35db Only show the options that fit to the current network. 2015-02-20 23:12:04 +01:00
Michael Vogel 4a1105ede6 scrape/noscrape now contains the date the profile was last updated or the last message was sent. 2015-02-18 23:40:46 +01:00
Michael Vogel 219932f692 Removed Statusnet from the counting of contacts for scrape/noscrape 2015-02-17 19:27:13 +01:00
Michael Vogel a26d04574d Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape 2015-02-17 19:18:17 +01:00
Michael Vogel 2dafc9eac1 Merge remote-tracking branch 'upstream/develop' into 1502-poco-generation-counter 2015-02-15 10:54:41 +01:00
Michael Vogel d1d794f1ab The global contacts now contain a "generation" value that defines how we know this contact 2015-02-15 10:52:45 +01:00
Tobias Diekershoff d39612ac25 Merge pull request #1393 from annando/1502-cleaned-item-storage-code
Additional check for notifications
2015-02-14 15:40:35 +01:00
Johannes Schwab 12d7ca9b84 improved infinite scrollling 2015-02-13 00:40:59 +01:00
Michael Vogel 1a75503b1c Relocated the cache code. 2015-02-10 08:22:21 +01:00
Michael Vogel 21c63e8b65 Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape 2015-02-09 10:16:48 +01:00
Michael Vogel e7b2c5dbf3 Bugfix: The value for "global community" wasn't read. 2015-02-09 08:25:12 +01:00
Michael Vogel c0411ae25a Enhanced SQL query so that the search is faster. 2015-02-08 23:50:45 +01:00
Michael Vogel 842ac46857 Scrape now contains the number of contacts as well. 2015-02-08 23:35:29 +01:00
Michael Vogel 2a02e1cb9c Just cleaning up the code. 2015-02-08 20:55:48 +01:00
Michael Vogel 7e9ae24511 Moved several settings from .htconfig.php to the admin settings page. 2015-02-08 20:35:40 +01:00
Michael Vogel a97d4383a1 Searching for items now always searches public entries from the central item storage with uid=0. 2015-02-08 15:59:22 +01:00
Michael Vogel 8871591a98 Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default
Conflicts:
	mod/admin.php
2015-02-08 13:26:28 +01:00
Michael Vogel f931eba7f2 Noscrape is now enabled all the time. 2015-02-08 12:07:35 +01:00
Michael Vogel 1d48ab0191 "altpager" is now the standard value and can be disabled. Depending upon the user reactions we can disable it in an upcoming version. 2015-02-08 11:54:42 +01:00
Michael Vogel 89f260eb6c The title in the bookmarklet had several asterisk in the title. This had no use for friendica. 2015-02-06 21:10:49 +01:00
Tobias Diekershoff be40d9d265 Merge pull request #1359 from annando/1502-more-detailled-location
More details in the location field for poco
2015-02-05 08:31:15 +01:00
Silke Meyer cdd3089444 Help text sounded too complicated 2015-02-04 16:43:31 +01:00
Silke Meyer 6bccf0be79 Added help text as requested in #1349. 2015-02-04 16:13:07 +01:00
Tobias Diekershoff ed280df383 typo in side panel link 2015-02-04 11:27:54 +01:00
Michael Vogel 29f732e811 More details in the location field for poco. 2015-02-04 10:43:30 +01:00
Michael Vogel 8490bedefe Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage 2015-02-02 22:15:39 +01:00
Tobias Diekershoff 677f46c076 Merge pull request #1338 from annando/1501-global-contacts
Added "about" to noscrape
2015-02-02 21:52:09 +01:00
Michael Vogel 9c0dc86eea Merge pull request #1342 from tobiasd/20150202_admin
added diagnostics tools to the admin side panel
2015-02-02 21:14:41 +01:00
Tobias Diekershoff e5766a4793 make strings translate able 2015-02-02 20:37:05 +01:00
Tobias Diekershoff 8a17c3d348 added diagnostics tools to the admin side panel 2015-02-02 18:26:38 +01:00
Silke Meyer 57a80c3867 Let the browser check if it's a valid email address 2015-02-01 16:25:49 +01:00
Michael Vogel e02b982f77 Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage 2015-02-01 13:28:32 +01:00
Michael Vogel e3da549ab5 Reshared diaspora items that aren't on this server are now stored with uid=0 2015-02-01 10:26:35 +01:00
Silke Meyer 8991319d9d Added a description to the help field 2015-01-31 16:09:59 +01:00
Silke Meyer c90e47556a added setting for server's sender email address 2015-01-31 15:54:12 +01:00
Silke Meyer 89946b8660 fixed a typo 2015-01-31 15:23:36 +01:00
Michael Vogel 036ccf84de And yet another two places where pictures have to be sent through the proxy. 2015-01-28 23:34:46 +01:00
Michael Vogel b309187e3d Just two more places where pictures have to be send through the proxy function. 2015-01-28 10:09:16 +01:00
Michael Vogel 04ab875a62 Added "about" to noscrape. 2015-01-27 19:52:54 +01:00
Michael Vogel 848c09935a The contact list in mails now contains not only the name but also the address. 2015-01-27 08:04:24 +01:00
Michael Vogel 583c2ce13e poco can now be used to query the global contacts. 2015-01-27 08:01:37 +01:00
Michael Vogel e8bfa32b37 Scrape now doesn't fetch page data when its twitter and Co./Update script that updates the contacts from the profile 2015-01-26 01:07:15 +01:00
Michael Vogel bc2c046446 poco: Only update the global contacts when there is a network value/Export your own contact as well 2015-01-25 16:40:20 +01:00
Michael Vogel 105d6a22a4 gender will be updated in the profiles as well. 2015-01-25 13:22:25 +01:00
Michael Vogel 2f400627c7 Support for keywords and gender in (global) contacts. 2015-01-25 13:19:37 +01:00
Michael Vogel dff2384e82 Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts 2015-01-25 08:44:42 +01:00
Tobias Diekershoff 1c424a5425 Merge pull request #1315 from annando/1501-issue-1283
issue 1283 - Share-it button support for friendica
2015-01-25 08:24:21 +01:00
Michael Vogel 344210bd6d Global contacts are now added with reshares as well. Better support for "aboutme" and "location" in poco. 2015-01-25 00:19:59 +01:00
Michael Vogel 58d814b793 issue 1283 - Share-it button support for friendica 2015-01-25 00:10:58 +01:00
Tobias Diekershoff eaaed02ffd use type email in users settings as well 2015-01-24 09:40:01 +01:00
Tobias Diekershoff 8b558eb7ea type email for email field in add user form 2015-01-24 09:30:44 +01:00
Michael Vogel 1f23d691f3 Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus 2015-01-21 01:30:09 +01:00
Michael Vogel ed037124b3 Merge pull request #1299 from fabrixxm/optional-text-only-email
Optional text only email
2015-01-20 23:26:44 +01:00
Michael Vogel 184dcf75a7 Caching for scrape, keywords for remote_self, notifications for addresses that aren't in your contact list. 2015-01-20 22:54:25 +01:00
fabrixxm 816d3f86e7 reword checkbox help text 2015-01-20 22:17:03 +01:00
fabrixxm b2527039b7 add text-only email option
add a checkbok to notification settings. if checked, html body is not added to email.
2015-01-20 19:19:58 +01:00
Tobias Diekershoff 3483cd35f8 use HTML5 attributes in the installer wizard 2015-01-16 19:32:31 +01:00
Johannes Schwab 9cb3a4188e fix network tab urls 2015-01-16 02:25:17 +01:00
Michael Vogel beaca70126 OStatus: Replies now arrive their target. 2015-01-12 00:14:51 +01:00
Michael Vogel 94fb0305f7 Poco now shows "about" and the location as well. 2015-01-10 00:34:08 +01:00
Michael Vogel 8f1cfac20a The global contacts now contain the network name so that the suggestions can select between this. 2015-01-08 07:59:20 +01:00
Michael Vogel 46db8575a0 The table "unique_contacts" now has an "about" and "location" field as well. 2015-01-08 01:32:19 +01:00
Michael Vogel 044eaa778f Markdown is now supported in the location field as well. 2015-01-08 00:13:43 +01:00
Michael Vogel e7e3857f5c The "about" section is now run through bbcode. 2015-01-07 18:06:32 +01:00
Michael Vogel b36d799044 Fetching "location" and "about" from diaspora. Displaying them on the "display" page. 2015-01-07 01:46:13 +01:00
Michael Vogel 16e4e61cc5 Only show contacts from open networks 2015-01-05 22:44:55 +01:00
Michael Vogel 011f5b9cae Bugfix: Postings disappeared due to a small variable ... 2015-01-05 14:28:17 +01:00
Michael Vogel 47560fc6c7 Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco 2015-01-04 21:07:45 +01:00
Michael Vogel 47129c01f8 Check for filesize before trying to fetch site infos. 2015-01-04 20:04:59 +01:00
Michael Vogel 11c82816b3 Poco now returns the last update date as well. This date will be stored in the gcontact table. 2015-01-04 19:19:47 +01:00
fabrixxm ecc76c6090 Merge pull request #1254 from annando/1409-shadow-items
Global Community
2014-12-31 18:13:58 +01:00
Rabuzarus 5939a8cea5 revert last commit f59e574, remove some html code 2014-12-26 14:44:48 +01:00
Rabuzarus f59e574068 removed Pagination 2014-12-26 12:54:23 +01:00
Rabuzarus cb47fdfcb9 minor change: rel should not be part of the PHP 2014-12-26 03:32:21 +01:00
Rabuzarus 73f9d06e3e move some html code from photos.php to photo_album.tpl 2014-12-25 16:20:55 +01:00
Michael Vogel 043c406091 Update function for creating the shadow entries. 2014-12-21 21:19:37 +01:00
Michael Vogel d054ac8d9c redone the changes I accidentally overwrote ... Me and GIT will never be in love ... 2014-12-21 11:02:31 +01:00
Michael Vogel bc5c470cac Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active 2014-12-14 12:47:16 +01:00
Michael Vogel 086b3e30c6 Clarification for the hidewall property. 2014-12-12 23:03:23 +01:00
Michael Vogel 9124d922e9 In "parse_url" now links with [ or ] are replaced with shortened versions to avoid parsing problems. 2014-12-01 22:54:01 +01:00
Michael Vogel 9a414cc4a0 Bugfix: There was a SQL error when trying to deliver friendica posts because of a parameter mismatch 2014-11-15 19:21:54 +01:00
Fabrixxm 2fee5966f1 fix #1222 2014-11-10 15:37:52 +01:00
Fabrixxm 84e93602de small indentation fix 2014-11-10 15:07:35 +01:00
fabrixxm fd61391e3e Merge pull request #1221 from annando/1411-default-value-type
Fix: "not null" fields were not set
2014-11-10 09:57:42 +01:00
Michael Vogel 030784ad35 Fix for issue "Field 'type' doesn't have a default value" in the challenge table. 2014-11-08 20:52:15 +01:00
Michael Vogel 70ba1667e1 It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions. 2014-11-08 00:07:21 +01:00
Michael Vogel 691aa17025 fetch further information: it is now possible to define a blacklist for keywords for "fetch further information" 2014-10-30 00:24:23 +01:00
tobiasd ec4e3d76bc Merge pull request #1212 from annando/1410-remote-self
Remote-Self is now working for Friendica and Diaspora contacts as well
2014-10-29 15:06:21 +01:00
Michael Vogel 59517f6e58 Remote self is now working for diaspora contacts as well. 2014-10-29 01:42:43 +01:00
Michael Vogel 3e57954807 remote-self: Moved the code in a single function and cleaned it up. 2014-10-29 01:05:09 +01:00
Michael Vogel b1cdaefcb2 Merge branch 'develop' of github.com:annando/friendica into 1410-remote-self 2014-10-27 11:45:39 +01:00
Michael Vogel 2b5372aebe Forcing all non-SSL requests to SSL requests is now an option. 2014-10-26 22:15:12 +01:00
fabrixxm 4c66a3486a Merge pull request #1207 from annando/1410-remote-self-with-keywords
remote self: There is now an option if the keyswords should be used as tags or not
2014-10-24 10:55:22 +02:00
Michael Vogel c77a63fb27 remote self: There is now an option if the keyswords should be used as tags or not. 2014-10-24 01:37:33 +02:00
Michael Vogel 26c82f210e Merge pull request #1198 from fabrixxm/issues/1190
Issues/1190
2014-10-23 22:29:50 +02:00
Fabrixxm f7cf72e450 fix use of $->query_string 2014-10-22 09:32:24 +02:00
Fabrixxm 63168905ec Fix #1190 2014-10-22 09:04:32 +02:00
Michael Vogel f6522658f6 Using "remote self" to synchronize Frandiaca accounts 2014-10-22 08:30:16 +02:00
fabrixxm 9d6bcd2572 Merge pull request #1195 from annando/1410-new-hook-getsiteinfo
New hook "getsiteinfo" and "page_info_data"
2014-10-22 08:18:42 +02:00
Michael Vogel 97ec2787c6 New feature: Storing the field "extid" is now possible 2014-10-20 08:21:23 +02:00
Michael Vogel 3600289262 New hook "getsiteinfo", separating fetching site info from generating bbcode 2014-10-20 08:03:47 +02:00
Tobias Diekershoff 56cd536652 use noscrape by default, add opt-out option to disable it 2014-10-13 19:19:54 +02:00
fabrixxm bff688ef91 Merge pull request #1175 from fabrixxm/master
Friendica 'Ginger' 3.3
2014-10-06 10:18:36 +02:00
Fabrixxm e2dc4f922c Friendica 'Ginger' 3.3 2014-10-06 08:56:55 +02:00
Michael Vogel 759f199b6f Created hashtags from keywords now are links. URL are cleaned from tracking data. 2014-10-03 13:02:15 +02:00
Michael Vogel 904f8ac422 Creating hashtags from keywords of a feed, when additional data should be fetched. 2014-10-03 12:18:33 +02:00
Michael Vogel 459fc2fabd Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID. 2014-09-27 12:49:00 +02:00
Fabrixxm 51e6c30188 add id to album name tag
this should be in template
2014-09-17 11:02:18 +02:00
Fabrixxm f971f52482 remove messages link from notification tabs bar 2014-09-17 11:01:47 +02:00
Fabrixxm fbe664cc44 fix settings page aside menu active item
add aside menu to delegate page
2014-09-17 11:00:34 +02:00
Michael Vogel f9bec79a2c In the profiles the remote connect field was missing 2014-09-11 23:38:24 +02:00
Michael Vogel c8482ae19e Bugfix: When repairing the url, the nurl wasn't set. 2014-09-11 23:37:55 +02:00
fabrixxm 7687342849 fix email for
- registration request
- registration approval
- account created by admin

add a reditect after registration approval or deny
2014-09-09 22:07:47 +02:00
fabrixxm 3ac5e4508b fix email to new registerd users.
fix notification in case of error sending email.
2014-09-07 17:46:31 +02:00
fabrixxm 21b1e09fad Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup 2014-09-07 14:28:03 +02:00
fabrixxm a8c90155f8 db update mail via notification()
remove last template
2014-09-07 14:23:03 +02:00
fabrixxm 5861bdd6e9 registration request as system notification
kill the template
send email to all admins
2014-09-07 13:55:02 +02:00
fabrixxm 5997fb19ee More template gore! 2014-09-07 12:29:13 +02:00
fabrixxm 803854738b another massacre of templates 2014-09-07 11:48:23 +02:00
fabrixxm 36a67158d2 Merge pull request #1119 from annando/1409-issue-881
The useragent string doesn't contains of the words "Mozilla" anymore
2014-09-07 11:41:51 +02:00
fabrixxm 89f8341ce8 Merge pull request #1117 from annando/1409-suppress-unsported-themes
Unsupported themes aren't displayed anymore
2014-09-07 11:37:25 +02:00
fabrixxm fe02619114 fix indentation 2014-09-07 11:31:42 +02:00
fabrixxm 9a0c37eb47 new password mail via notification()
new include/text.php::deindent() function
remove unused templates
2014-09-07 11:20:06 +02:00
Michael Vogel 7af5c3c560 The useragent string doesn't contains of the words "Mozilla" anymore - but the name "Friendica" and the base url 2014-09-07 10:47:37 +02:00
fabrixxm d85bdd8fb0 lost password verification mail via notification() 2014-09-07 10:27:39 +02:00
Michael Vogel 871b425c6e Unsupported themes aren't displayed anymore 2014-09-07 10:06:57 +02:00
fabrixxm 1bdddebd44 connection confirm notification mail via notification()
remove unused email templates
add a check for unexpected reponse from server
2014-09-06 17:28:46 +02:00
Michael Vogel 3b6c6d0cd9 Issue 1094: "remote self" is not working on twitter contacts but can be activated. It is now disabled to enable it. 2014-09-06 17:22:59 +02:00
tobiasd 0e9c8f6f1a Merge pull request #1108 from tugelbend/master
jquery update to version 1.11
2014-09-06 16:35:24 +02:00
hauke 87fa2ee2af updated jquery to version 1.11, updated themes frost and diabook where necessary 2014-09-06 16:21:03 +02:00
tobiasd ca1f408f9b Merge pull request #1107 from annando/1409-issue-964
Issue 964 "Image upload from Twidere" is solved now
2014-09-06 15:57:35 +02:00
Michael Vogel f8845b6014 Issue 964 "Image upload from Twidere" is solved now 2014-09-06 15:47:45 +02:00
Tobias Diekershoff 2312b56947 when editing a posting save it, not edit it to submit the changes 2014-09-06 12:49:34 +02:00
tobiasd 7eef05e4f5 Merge pull request #1098 from Beanow/release/profile-editor-improvements
Profile editor improvements
2014-09-05 22:20:31 +02:00
Beanow 992684c362 Merge branch 'feature/edit-profile-improvements' into develop 2014-09-04 23:58:22 +02:00
Michael Vogel e21bcb82d2 Enhance the database structure checks when they failed. 2014-09-04 09:26:56 +02:00
Michael Vogel e32e458cb8 Added new file for ignoring threads 2014-09-04 01:04:43 +02:00
Michael Vogel dd908c8415 Bugfix: Messages when ignoring, blocking and archiving contacts now returns the correct messages. 2014-09-03 01:03:23 +02:00
Michael Vogel 2b182b2dcf After a new friendica contact is added, the user is directed to the contact page of the new contact. (Instead of the remote profile) 2014-09-01 16:55:16 +02:00
Michael Vogel e35c55dd3b Remote-self: It is now possible to chose between two different modes of mirroring. 2014-09-01 14:00:21 +02:00
Michael Vogel 4bdd905b3e Only show foreign items if the profile of the user isn't hidden. Show the user's theme - not the theme of the viewed profile. 2014-08-28 01:06:41 +02:00
Michael Vogel 4ad2bbddc7 If a post is a pure reshare, then show the profile of the original author on the display page. 2014-08-26 17:10:46 +02:00
Michael Vogel 69bb3ff637 Make the network page the new default page after login. 2014-08-25 23:34:29 +02:00
Michael Vogel dd511ac70a The "display" page now shows the current author profile with a "connect" link (if there is no current connection) 2014-08-25 14:09:56 +02:00
Michael Vogel 94d2557077 Vier: Some more design changes to "plus" style. 2014-08-21 01:00:56 +02:00
Michael Vogel d23d26f44d Reduced options when adding a friendica contact and an address was provided via URL parameter. 2014-08-21 00:56:21 +02:00
Michael Vogel 271a184e1e proxy: Added support for long addresses. "vier": New style "Plus" 2014-08-16 01:40:38 +02:00
Michael Vogel de75d8ca7f Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/admin.php
2014-08-13 00:18:05 +02:00
Michael Vogel d4b2d3bf8a Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings. 2014-08-13 00:13:13 +02:00
tobiasd d28c1febc7 Merge pull request #1069 from annando/master
Solved (possible) encoding problem, encoding of URLs with GUID
2014-08-12 09:01:12 +02:00
tobiasd 016b6428a0 Merge pull request #1067 from Beanow/feature/noscrape
Added noscrape feature.
2014-08-10 13:24:21 +02:00
Beanow 9026810496 Added noscrape feature. 2014-08-10 12:45:34 +02:00
Michael Vogel b99737986d The GUID in the link to the items has to be encoded, since it could contain special characters 2014-08-09 09:17:28 +02:00
tobiasd cf0ebd952f Merge pull request #1065 from annando/master
Refreshing of the network page only when the page is at the beginning
2014-08-07 08:42:25 +02:00
Michael Vogel f2f73799ba When storing items, the object-type is detected and stored. 2014-08-07 08:02:24 +02:00
Michael Vogel e974e586cc Unified user agent string when fetching data. 2014-08-07 07:58:20 +02:00
Michael Vogel 4d6f28d224 Optimized version of the possibility to reload the content of the network page only at its top. 2014-08-02 00:35:25 +02:00
Michael Vogel 1a865bf400 New description for the option to reload the page only when on top. 2014-08-01 20:11:56 +02:00
Michael Vogel 2f89a9b3e8 Auto update of network page only at top of the page 2014-08-01 19:59:06 +02:00
fabrixxm 27024e3b1d preferred item image size for theme, get smallest photo near scale requested
themes can declare preferred image size for images in items, with

   $a->theme_info = array(
    "item_image_size" => 1
   );

0: original, 1:640px, 2:320px

mod/photo.php returns the nearest scaled image near requested one
if it doesn't exists, instead of nothing
2014-07-30 15:37:34 +02:00
Michael Vogel 25237c0929 Make the friendica android client work again (it had problems with the GUID in the notifications) 2014-07-26 15:01:01 +02:00
Michael Vogel dbcfe58ea8 parse_url: Removing of warnings with invalid charsets 2014-07-24 22:50:56 +02:00
Michael Vogel ed1dce93d6 Usage of /display/(guid) as path instead of /display/(user)/(id)
Bugfix for adding tags to photos
2014-07-22 00:36:20 +02:00
Michael Vogel bb5f797047 Preventing an endless loop while fetching site infos 2014-07-14 08:37:40 +02:00
Michael Vogel 58c3ac09a3 Improved option to suppress message flooding by some users. 2014-07-10 23:13:50 +02:00
Michael Vogel 6f5bc8d9a7 Setting the user agent to "Mozilla/5.0 (compatible; Friendica)" 2014-07-10 23:13:07 +02:00
tobiasd 829a92a10e Merge pull request #1042 from annando/master
Workaround for likes from Diaspora, disabling of the automatic reload of the network page
2014-07-10 07:45:27 +02:00
Michael Vogel 6e67d39241 Relocate the site now relocates adresses in the "unique_contacts" table as well. 2014-07-09 21:36:20 +02:00
Michael Vogel c980e6d20d Possibility to disable the automatic reload of the network page 2014-07-09 21:32:32 +02:00
Michael Vogel 660bd39efa Let an item be accssible via the GUI (additionally to uid and item id) 2014-07-09 20:48:34 +02:00
Beanow e9dc6e4faa Some changes to the labels and an edit profile button. 2014-07-03 18:39:22 +02:00
Beanow 6089bc94b3 Extend profile editor information.
* Labels for splitting fields into sections.
* Security token for profile_photo action.
2014-06-28 01:31:11 +02:00
Beanow e6364f6680 Redirect profiles list to default profile, when multi_profiles is disabled. 2014-06-28 01:30:10 +02:00
Beanow a3895c8dee Exposes new profile data for templating.
* Boolean value of whether multi_profiles is enabled.
* Array needed for yesno_field for the hide-friends option.
2014-06-27 18:12:15 +02:00
tobiasd 3600ab1ffc Merge pull request #1033 from annando/master
Temporary paths are now defined automatically
2014-06-24 06:29:35 +02:00
Michael Vogel 5ed5773f57 The temporary paths (temp, lock, itemcache) are now detected automatically when used. 2014-06-23 01:24:39 +02:00
Tobias Diekershoff b6e546d1e3 don't add http:// if homepage is not set 2014-06-22 09:44:59 +02:00
Michael Vogel 405a0aaee2 Community: New option to reduce the maximum amount if posts per person. 2014-06-10 20:21:43 +02:00
Michael Vogel 48e2b422dd Preparation for an bidirectional app.net connector 2014-06-04 21:25:31 +02:00
Michael Vogel 0c77cee667 New database update system that uses the database structure defined in dbstructure.php 2014-06-04 00:44:58 +02:00
Michael Vogel 13fea42d8c Merge remote-tracking branch 'upstream/master' 2014-05-29 23:04:57 +02:00
Michael Vogel 00b8355ad5 The number of comments per post are now editable. 2014-05-29 22:26:03 +02:00
fabrixxm d5f80f54d4 Merge pull request #999 from annando/master
Starring now works again
2014-05-29 14:22:15 +02:00
Michael Vogel 3da39a0b0d Starring now works again 2014-05-29 14:17:37 +02:00
fabrixxm 77a54c66be Merge pull request #998 from annando/master
"Vier": New font version, fallback for oembed, more tracking variables removed
2014-05-29 14:04:04 +02:00
Michael Vogel 53d925095f Added some functionality if oembed isn't working. (Should be extended in the future) 2014-05-29 11:45:32 +02:00
tobiasd 97e74f1570 Merge pull request #987 from annando/master
Auto-killing processes, somce changed code in the plaintext function and speed issues in network
2014-05-25 07:59:22 +02:00
Michael Vogel 235eae66bb New query parameter that Speeds up the network viee when there are many contacts 2014-05-24 11:01:52 +02:00
tobiasd 01c146414c Merge pull request #965 from annando/master
Only show connectors when not "hide wall" is enabled
2014-05-10 06:28:41 +02:00
tobiasd 31312ab1d2 Merge pull request #956 from annando/master
New database system that uses PDO if present/Test script for doing database upgrades.
2014-05-09 21:55:01 +02:00
Michael Vogel 5616c58535 Better error handling during install. 2014-05-09 20:44:25 +02:00
Tobias Diekershoff fd7e17f91e save selection to suppress language results (fix 961) 2014-05-05 13:44:33 +02:00
Michael Vogel 6b38968f80 The template "register_adminadd_eml.tpl" was missing for all languages except german. That lead to an empty page when adding users. 2014-05-04 21:11:25 +02:00
Michael Vogel c41b1c2d55 Building a central functionality to export postings to all networks that only support plaintext postings. In near future this will replace the similar code in the several addons. 2014-05-03 12:04:54 +02:00
Michael Vogel 2db1029830 APC support is removed due to problems with PHP 5.5. 2014-05-03 12:02:25 +02:00
Michael Vogel a6b03b6263 The remove page now has the settings menu. 2014-04-29 22:34:48 +02:00
Michael Vogel 7b7e372fb0 Suppress showing unsupported addons in the administration. 2014-04-29 14:22:37 +02:00
Fabrixxm aba27ad404 fix photo comments: use $drop array as in wall_thread and search_item 2014-04-28 09:29:48 -04:00
tobiasd a9c8aed9b1 Merge pull request #942 from davidmoerike/master
Line: 68 f.
2014-04-26 09:16:03 +02:00
tobiasd c1d14bcc98 Merge pull request #944 from annando/master
Some more frontend stuff/Native Diaspora reshare
2014-04-26 09:13:17 +02:00
Michael Vogel 2846dfeb05 Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values. 2014-04-26 02:22:30 +02:00
David 741aab0916 Now more friendly error message. Will tomorrow add a german translation.
David
2014-04-25 06:29:03 +02:00
Tobias Diekershoff 2dfbd448a3 ideni.ca is now pump.io, so don't mention it in OStatus settings 2014-04-24 21:18:12 +02:00
Michael Vogel 9ae9b66328 Export personal data: Now the settings menu on the left side is taken from the settings module. 2014-04-24 11:58:04 +02:00
Michael Vogel b9656cbe23 Delegations: Now the menu of the settings appears at the delegations settings 2014-04-24 11:49:11 +02:00
fabrixxm 807fc60d3e Merge pull request #941 from annando/master
Moved and renamed menu entries to improve the usability, global css, icons for social networks
2014-04-24 10:48:07 +02:00
Michael Vogel 30efb0c1e6 menu entry for "Delegations" moved to the settings. 2014-04-24 10:16:02 +02:00
David 44beff1a9a Line: 68 f.
When trying to upload a file greater than PHP's max_upload_filesize,

the filesize is 0, and maybe some html code appears in the
text input window of the form. Problem seems to disappear
when refusing all uploads if filesize <=0.
2014-04-23 20:22:53 +02:00
fabrixxm 84189ac775 Merge pull request #932 from annando/master
Preparation for bidirectional statusnet sync, functions moved from addons into the core and some converting stuff
2014-04-07 09:53:47 +02:00
Michael Vogel 5f3d584716 Code beautification and some more logging data - no changes in the functionality. 2014-04-04 11:02:36 +02:00
Michael Vogel 12866209e8 parse url: Emtpy values in meta headers are now ignored. Oembed data has priority. Videos are embedded with some further information. 2014-04-04 10:58:31 +02:00
Michael Vogel 77986d76fa Preparations for statusnet connector import 2014-04-04 10:40:46 +02:00
fabrixxm 29092ace44 Merge pull request #927 from annando/master
Massive SQL stuff
2014-04-04 07:28:06 +00:00
Michael Vogel e1a41aff05 Groups should now be fast (and accurate) 2014-03-20 23:34:09 +01:00
Michael Vogel a03014a47c Adding functions for the file- and category handling 2014-03-20 18:51:13 +01:00
Michael Vogel 8689ab3e1b Now changing categories also changes them in the term table. 2014-03-20 18:48:08 +01:00
Michael Vogel 9877e43bda Search with tags now works fast. 2014-03-18 22:51:50 +01:00
Michael Vogel 8392217b72 Fixing SQL problem and speeding up search. 2014-03-16 22:42:47 +01:00
Michael Vogel b23dd95c5e OStatus auto completion: option to completely disable the auto completion. 2014-03-16 18:09:42 +01:00
Michael Vogel 285f0774a1 Auto creation of photo directory to improve caching 2014-03-16 17:49:56 +01:00
Michael Vogel b013537124 parse url: Improvements for detecting the page type 2014-03-16 17:48:28 +01:00
Michael Vogel 9496537e5f Now term table is used for categories and putting items to folder 2014-03-16 17:16:01 +01:00
Michael Vogel bbf9378a49 Even more SQL improvements. 2014-03-16 17:12:56 +01:00
Michael Vogel 6e7bd68ebb More "LIMIT 1" removed - and some other SQL improvements. 2014-03-11 23:52:32 +01:00
Michael Vogel 6b8585d48d Database stuff. New table "thread". Changing "left join" to "inner join", removing "limit 1" at update and delete. 2014-03-09 09:19:14 +01:00
tobiasd d29c981aa2 Merge pull request #919 from annando/master
plink, disabling features, triming the content of parsed urls
2014-03-02 08:31:03 +01:00
Michael Vogel 37edb3079d parse_url: Trim the content of the description field. 2014-03-02 01:00:36 +01:00
tobiasd 0eec22f656 Merge pull request #914 from annando/master
Vier, API and Twitter cards
2014-02-24 07:21:15 +01:00