keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13389 commits 4 branches 0 tags 179 MiB
Commit graph

3337 commits

Author SHA1 Message Date
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
Tobias Diekershoff
e5c2c66487 Show the worker queue count if the workers are active 2016-09-20 15:45:55 +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