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
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
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
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
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
3d3cde2aed
Merge pull request #2497 from annando/1604-local-copy
...
Copy an item to the local user if it's only available as public copy
2016-05-02 06:07:50 +02:00
Michael Vogel
b677f63e85
Added some more explanation/now copy the whole thread
2016-05-01 09:48:05 +02:00
Michael Vogel
5fc1eebdab
Copy an item to the local user if it's only available as public copy
2016-05-01 00:19:24 +02:00
Michael Vogel
8e0b3b28da
Bugfix: The message list always showed "x and you"
2016-04-30 14:13:43 +02:00
9a79b0c5f2
count from 0
2016-04-27 20:23:06 +02:00
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
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
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
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
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
ac9d392264
make en the default language
2016-04-06 20:21:41 +02:00
a28372c032
intendation...
2016-04-06 20:18:33 +02:00
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
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
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
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
7f0ae9843f
count() didn't notice about FALSE ... #2390
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-12 22:54:52 +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
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
c60605ce0c
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop
2016-03-12 18:50:14 +01:00
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
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
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
2d154ae72f
Closed TODO: no .= needed here. #2392
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 18:31:49 +01:00
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
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
7d5166c9fe
Closed TODO: no .= needed here. #2392
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 18:28:06 +01:00
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
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
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
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
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¬ification/<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
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
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
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
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
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
1770267934
move @brief to the top of the doc block
2016-01-16 14:12:55 +01:00
8730c72156
removed commented out code, beautification of MySQL statements
2016-01-16 13:45:21 +01:00
7f80de6db8
removed calls to the remote_update funcions
2016-01-16 12:45:48 +01:00
20fe67f378
removed remote update functionality from admin panel
2016-01-16 11:52:21 +01:00
