rabuzarus
497df57ef7
more standards work
2017-03-18 04:41:54 +01:00
Michael
f3bcf63d46
Standards and some logging improvements
2017-03-17 19:25:01 +00:00
rabuzarus
c785eb29c6
more work on standards compliance
2017-03-17 17:57:57 +01:00
Michael
87771cf617
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
...
Conflicts:
include/discover_poco.php
2017-03-17 15:53:19 +00:00
rabuzarus
3cef98caf6
Merge pull request #3226 from annando/1702-only-worker
...
The worker is now the only background processing system
2017-03-17 13:22:23 +01:00
Michael
24a57020b9
Better version transformation for nodeinfo and statistics.json
2017-03-16 21:34:53 +00:00
rabuzarus
8ae8465d48
add dop event & fix event edit
2017-03-16 20:15:25 +01:00
Michael
58bf1c50af
Bugfix: When a query fails we mustn't use the result value.
2017-03-16 09:23:12 +00:00
Michael
4812f4c0f9
Without only the worker queue we don't need the deliverq anymore.
2017-03-16 07:30:59 +00:00
Michael
a211c8cb77
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-16 05:51:22 +00:00
rabuzarus
6fdc219143
Merge pull request #3227 from annando/1703-pdo
...
We now support PDO
2017-03-16 00:25:16 +01:00
Michael
8e12b159d9
Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup
2017-03-15 14:37:30 +00:00
Michael
9f9497f2ca
Merge remote-tracking branch 'upstream/develop' into 1701-poco
2017-03-15 14:34:09 +00:00
Michael
88a69b93d5
Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server
2017-03-15 13:56:17 +00:00
Michael
8decd15565
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-15 13:55:43 +00:00
Michael
dc3fcf0487
Standard stuff
2017-03-15 06:00:22 +00:00
Michael
35ec1c8f26
Bugfix for pull request 3216 - feed items were mixed
2017-03-14 21:14:09 +00:00
Michael Vogel
e57bd5fe55
Merge pull request #3233 from rabuzarus/20170314_-_pagination
...
limit pagination page buttons to max 10
2017-03-14 20:05:29 +01:00
rabuzarus
0143369e54
limit pagination page buttons to max 10
2017-03-14 18:31:03 +01:00
Michael Vogel
a7e8e86800
Merge pull request #3221 from strk/remember-openid
...
Fix "remember me" cookie for OpenID logins
2017-03-14 16:30:15 +01:00
Michael
0d32f0be46
One forgotten standard
2017-03-14 15:18:56 +00:00
Michael
f73389dd12
Standard stuff
2017-03-14 15:17:21 +00:00
fabrixxm
fa3490ba5b
Merge pull request #3224 from annando/1702-no-old_pager
...
The old pager is now removed
2017-03-14 10:29:03 +01:00
Michael
43ceb72196
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-14 07:26:15 +00:00
Michael Vogel
199bba20d9
Merge pull request #3200 from Hypolite/issue/#3195
...
Improve pagination on frio
2017-03-14 06:05:42 +01:00
Michael
748caa0807
Removed debug output
2017-03-14 04:58:05 +00:00
Michael
a2b7b2a968
Daily updating the server status
2017-03-13 22:16:09 +00:00
Sandro Santilli
0b46a5f935
Standards: add braces
...
(thanks @Hypolite)
2017-03-13 23:09:09 +01:00
Sandro Santilli
8517ba1fab
Remove extra space after open parentheses
2017-03-13 23:08:03 +01:00
Michael Vogel
98945eb6fa
Merge pull request #3213 from Hypolite/issue/#2792-2
...
Like behavior fix/improvements
2017-03-13 18:35:32 +01:00
Michael
ae64f6f7e2
z_fetch_url now always returns an array
2017-03-13 14:37:51 +00:00
Sandro Santilli
cbaf196f50
Only remove the "remember me" cookie at submitting the auth form
...
Fixes loss of remember (Friendica) cookie on switching Managed accounts
2017-03-13 11:59:05 +01:00
Michael
fbb84ee219
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-13 10:18:29 +00:00
Michael
6a16565642
Merge remote-tracking branch 'upstream/develop' into 1701-poco
2017-03-13 07:23:32 +00:00
Michael
44888590e5
One error, one documentation, one brace
2017-03-13 06:32:33 +00:00
Michael
acadb8ecdb
Remove redundancies.
2017-03-13 06:09:00 +00:00
Michael
eb6a6228f7
more spaces
2017-03-13 05:57:37 +00:00
Michael
80e58964ce
Standard stuff
2017-03-13 00:09:32 +00:00
Michael
97d3176754
Querying via nodeinfo
2017-03-13 00:03:27 +00:00
Michael
49b22de705
Changes from previous pull request applied again
2017-03-12 21:57:09 +00:00
Michael
e10339a47f
Merge remote-tracking branch 'upstream/develop' into 1703-pdo
2017-03-12 21:05:10 +00:00
Michael
77e8c44016
Merge remote-tracking branch 'upstream/develop' into 1702-only-worker
...
Conflicts:
include/onepoll.php
include/queue.php
2017-03-12 21:03:44 +00:00
Michael
1624150db4
Merge remote-tracking branch 'upstream/develop' into 1702-null-date
...
Conflicts:
include/onepoll.php
2017-03-12 20:54:28 +00:00
Michael
259598e569
Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share
2017-03-12 20:52:48 +00:00
Michael
044e9a6603
Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
...
Conflicts:
mod/profile.php
2017-03-12 20:52:14 +00:00
Michael
18d23ca443
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
2017-03-12 20:49:48 +00:00
Tobias Diekershoff
7d1e54664a
Merge pull request #3133 from mexon/mat/cidfix
...
Allow cid URLs for images
2017-03-12 15:44:22 +01:00
Tobias Diekershoff
7275319eb6
Merge pull request #3214 from Hypolite/get_contact-rewrite
...
Reformatted get_contact()
2017-03-12 15:42:17 +01:00
Tobias Diekershoff
1bf089e424
Merge pull request #3216 from annando/1701-performance
...
Better network handling, improved structure
2017-03-12 15:40:56 +01:00
Tobias Diekershoff
e29d7f19d1
Merge pull request #3222 from Hypolite/issue/#3220
...
Diaspora: Normalize line endings instead of adding <br> before Markdown()
2017-03-12 15:35:42 +01:00
Michael
bfad58a777
We don't need to show the id.
2017-03-12 09:41:10 +00:00
Michael
3a3fa017a6
Discovery of new servers
2017-03-12 09:13:04 +00:00
Hypolite Petovan
2310bf994a
Normalize line endings instead of adding <br> before Markdown()
2017-03-12 03:55:22 -04:00
Sandro Santilli
df6304cc42
Fix "remember me" cookie for OpenID logins
...
Closes #2432
NOTE: in order to obtain the same "cookie hash" it was required
to include unneeded fields in the user record structure, this would
be good to change in the future...
2017-03-12 01:11:35 +01:00
Michael
2d2a35af73
Make Hypolite happy
2017-03-08 18:03:41 +00:00
Michael
32f1b2de20
Forgotten debug output
2017-03-08 13:15:24 +00:00
Michael
d898616f8d
Remove junk from the version number
2017-03-08 05:40:57 +00:00
Hypolite Petovan
37b15995d8
Add pump.io network to probing supported networks
...
- Remove useless condition
2017-03-07 16:43:22 -05:00
Hypolite Petovan
d7f62e82b9
Fix behavior regression
...
Reverted quitting get_contact if Probe::uri didn’t yield an url for
“nick@server.tld” form.
2017-03-07 16:28:15 -05:00
Michael
f7f23038db
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-03-07 21:24:20 +00:00
Michael
f09a8609df
Better separation between queries with or without result
2017-03-07 17:16:17 +00:00
Hypolite Petovan
97378893cd
Switch nurl and addr lookups
...
- nurl lookup is more frequent than addr lookup, saves queries
2017-03-06 16:26:04 -05:00
Hypolite Petovan
89f0b85905
Split slow catch-all query into three fast queries
...
Thanks @annando for the tip.
2017-03-06 16:19:12 -05:00
Hypolite Petovan
116b9e1c1f
Use Probe::uri instead of probe_url()
...
- Moved file inclusion to enable lazy loading
2017-03-06 06:01:08 -05:00
Hypolite Petovan
ff64beeb4e
Reformatted get_contact()
...
- Resolved one `@todo` (the catch-all contact query)
- Improved code readability by naming variables
- Code standards compliance
2017-03-06 05:37:01 -05:00
Hypolite Petovan
4931ecafbb
Rewriting of do_like()
...
- Fix behavior where event actions had to be performed twice to switch
from one to another
- Simplify the contact data retrieval
- Make sure contact-id, owner-id and author-id are correctly set
2017-03-06 05:28:01 -05:00
Michael
d686bdcf09
Quickfix for SQL commands that should return "true" instead of an empty array
2017-03-06 10:10:22 +00:00
Hypolite Petovan
67ae0fed7f
Fix response "self" assigment
...
- Switch from unreliable `uid` matching to `author-id` using
public_contact()
2017-03-06 05:07:17 -05:00
Michael
2ea50d9c47
Emulation for the mysqli behaviour when executing insert, update, ...
2017-03-05 23:59:53 +00:00
Michael
07516c318c
We now support PDO for database connections as well
2017-03-05 21:56:50 +00:00
Michael
9a71472be6
Only store a new gserver entry if it is a valid one
2017-03-04 14:32:40 +00:00
Michael
953477de87
Improved check for the server base url
2017-03-04 13:30:34 +00:00
Michael
b42167f0ac
We can now return a list of known servers
2017-03-04 11:04:00 +00:00
Michael
25e6244950
BlaBlaNet is now detected again. No false positive for Statusnet anymore
2017-03-04 07:57:55 +00:00
Michael
9965061359
Better detection for Hubzilla
2017-03-02 21:20:33 +00:00
Michael
324d8bfe8e
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-detect-server
2017-03-02 20:20:38 +00:00
Michael
5c92e97173
Added index for performance issues
2017-03-02 05:46:44 +00:00
Hypolite Petovan
07aefe61bf
Update paginate_data()
...
- Formatting: Normalize quotes, spaces, braces
- Add "disabled" CSS class to links previously ommitted
- Add "previous" and "next" CSS classes to minimal pager links
- Add main pager CSS class depending on type
2017-03-01 23:26:49 -05:00
Michael
60adf67f13
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-null-date
2017-02-28 06:50:46 +00:00
Michael
4de057804c
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-only-worker
2017-02-28 06:49:21 +00:00
Michael
c829dc8e71
The service at gstools.org doesn't exist anymore.
2017-02-28 06:26:50 +00:00
Michael
0afb0c2ea4
NULL_DATE is now a constant
2017-02-27 23:37:15 +00:00
Michael
997e94555b
The old pager is removed
2017-02-27 21:46:37 +00:00
Michael
39386ded36
"old_share" is removed
2017-02-27 21:26:37 +00:00
Michael
3c220dd40c
Queue.php is now reworked
2017-02-27 21:07:32 +00:00
Michael
df6913f7e1
pidfile.php is in use by two addons. So we restore it here.
2017-02-27 06:31:49 +00:00
Michael
99fb15037b
Removed some more unneeded stuff
2017-02-27 06:27:22 +00:00
Michael
48209f0ecd
Now there is only the worker.
2017-02-26 23:16:49 +00:00
Michael
2a8a5a6d88
Improved server vitality detection
2017-02-26 18:19:20 +00:00
Michael
6bd59cd094
Bugfix: "ALTER IGNORE" was missing on structure and index change
2017-02-26 08:36:05 +00:00
Michael
da8a48f89e
Bugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic
2017-02-25 13:59:24 +00:00
Michael
ca6171eb5c
For 3.5.1 use "0000-00-00 00:00:00" as lowest datetime value
2017-02-23 07:21:47 +00:00
Michael
06b16cce8b
Define the lowest possible datetime string as "0001-01-01 00:00:00"
2017-02-23 07:09:55 +00:00
Michael
f9f27c2f5f
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-23 06:55:35 +00:00
Michael
8986edf070
Merge remote-tracking branch 'upstream/develop' into bugfix-sql-date
2017-02-23 06:54:50 +00:00
Michael
ffeae7e048
Bugfix for bugfix :-)
2017-02-23 05:45:06 +00:00
Michael
c84565633e
Added check for invalid "contact-type"
2017-02-22 22:25:35 +00:00
Michael
194d80c326
Bugfix for badly formatted date time string.
2017-02-22 22:04:56 +00:00
Michael
564bc22900
Merge remote-tracking branch 'upstream/develop' into more-temp-stuff
2017-02-19 18:46:20 +00:00
Michael
9251d2af6f
Ensure that the spool path is set
2017-02-19 10:13:40 +00:00
Michael
2bfc40d74c
Bugfix for not createable spool path
2017-02-19 08:23:21 +00:00
Hypolite Petovan
58a444b430
Add original_url() param documentation
2017-02-18 20:39:16 -05:00
Hypolite Petovan
2c959b925d
Add param documentation
2017-02-18 20:35:31 -05:00
Hypolite Petovan
432587464c
Fix Diaspora link attachment probe
...
- Move analytics param stripping out of original_url
- Remove HEAD curl request in ParseUrl::getSiteInfo
- Replace original_url with strip_tracking_query_params in
ParseUrl::getSiteInfo to prevent massive curl fest in border cases
2017-02-17 22:35:46 -05:00
Hypolite Petovan
99cfae63d7
Clean trailing whitespaces
2017-02-17 22:32:33 -05:00
Tobias Diekershoff
e647aa8846
Merge pull request #3169 from annando/bugfix-delete-spool
...
We have to delete spool files after posting in any case
2017-02-17 08:04:22 +01:00
Michael
03653072a2
We have to delete spool files after posting in any case
2017-02-16 20:23:07 +00:00
Michael
531074a72f
Handle the case when a contact is unknown.
2017-02-16 20:03:44 +00:00
Michael
7ba5228814
Bugfix: Only delete spool files that are spool files
2017-02-14 21:13:00 +00:00
Michael
e5e6f4fd19
Better logging to analyze unwanted messages from Diaspora
2017-02-11 23:37:15 +00:00
Tobias Diekershoff
a4dcd8be55
Merge pull request #3159 from annando/bugfix-diaspora-relay
...
Bugfix: Only accept postings from anyone when the relay is configured
2017-02-11 08:58:38 +01:00
Michael
40390cc5ec
Diaspora Relay: Only accept postings from anyone when the relay is configured
2017-02-10 20:45:22 +00:00
Michael
f5a634abbc
Changed server detection.
2017-02-10 19:23:46 +00:00
rabuzarus
3474b40732
fix - pending contacts shouldn't be shown in contacts widgit and viewcontacts
2017-02-10 03:51:01 +01:00
Michael
6dd27b83ef
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-06 21:28:42 +00:00
Tobias Diekershoff
3c5f7e457a
Merge pull request #3149 from annando/1601-new-diaspora-mention
...
Support for the new Diaspora mention format
2017-02-05 16:38:09 +01:00
Michael
e9d719a299
removed to-do
2017-02-05 07:02:20 +00:00
Michael
9f706fcfbb
Add include
2017-02-04 22:27:49 +00:00
Michael
0d1f88033b
Support for the new Diaspora mention format
2017-02-04 22:22:12 +00:00
Michael
21accc0a53
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-04 16:28:36 +00:00
Michael
9c4a53e380
Optimized query for nodeinfo, better way to analyze posting problems with DFRN
2017-02-04 16:16:15 +00:00
Tobias Diekershoff
adedf18b30
Merge pull request #3146 from annando/1701-pnut
...
Preparation to add the social network "pnut"
2017-02-02 09:10:28 +01:00
Michael
5ffef9c96d
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-02 06:27:10 +00:00
Michael
275a1c6574
Preparation to add the social network "pnut"
2017-02-02 06:06:23 +00:00
Michael
9a19ae7ce1
The queue now works with the cache - whoch should speed it up
2017-02-02 05:52:45 +00:00
Michael
ef0fb5148c
Some more timeout checks
2017-02-01 21:35:01 +00:00
Michael
8a75a20d26
Bugfix: An index was missing
2017-02-01 21:08:13 +00:00
Michael
f6e1fbfcaa
Merge remote-tracking branch 'upstream/develop' into 1701-performance
2017-02-01 17:29:20 +00:00
Michael
da30538a98
Bugfix for pull request 3125
2017-02-01 13:50:05 +00:00
Michael
7a89d06465
Make sure that we only quit when we are sure we can
2017-02-01 08:43:18 +00:00
Michael
7324a661f1
Optimized timeouts during network operations
2017-02-01 00:15:37 +00:00
Michael
2424cb78d1
Only process feed and dfrn items when they aren't already stored
2017-01-31 19:39:09 +00:00
Matthew Exon
96aadb23f8
Change $allowed_src_protocols to static
2017-01-31 03:44:32 +00:00
Michael
dae125e8ee
Issue 3135: dbupdate is started again and again
2017-01-30 21:18:08 +00:00
Matthew Exon
ce10a9aa7f
Break out list of acceptable protocols in "src" attribute into separate variable similar to "href" attributes
2017-01-30 15:48:12 +00:00
Tobias Diekershoff
dd36b2bded
Merge pull request #3128 from annando/bugfix-no-self-destroy
...
Bugfix: Sometimes the self contact seems to destroy itself
2017-01-30 09:11:10 +01:00
Matthew Exon
d99a96ef49
Global is an integer, do not set it to an empty string
2017-01-30 00:56:21 +00:00
Michael
7ca809a00e
Addind unique indexes should now work with every MySQL flavour
2017-01-29 17:31:20 +00:00
Michael
ac88471e55
Make the code nicer
2017-01-29 14:00:44 +00:00
Michael
c1eea3771f
Bugfix: Sometimes the self contact seems to destroy itself
2017-01-29 13:57:03 +00:00
Michael
46ab87a303
Typo fixed
2017-01-28 13:38:18 +00:00
Michael
ea22828d37
Alternate solution for pull request 3124
2017-01-28 12:19:04 +00:00
Tobias Diekershoff
9259feec6f
Merge pull request #3121 from annando/1701-bugfix-config
...
Issue 3117: Can't store values that are only in the .htconfig.php
2017-01-28 08:30:22 +01:00
Tobias Diekershoff
0b5ef73d4a
Merge pull request #3119 from annando/1701-bugfix-events
...
Bugfix: Avoid duplicated birthday events
2017-01-28 07:29:29 +01:00
Michael
32b997823f
Don't forget the brackets
2017-01-28 06:21:58 +00:00
Michael
82086eea36
Bugfix: When a value was only in the .htconfig.php then it never was stored
2017-01-28 06:18:16 +00:00
Michael Vogel
d61a4a67db
Merge pull request #3109 from Hypolite/issue/scrap-tinymce
...
Scrap TinyMCE
2017-01-27 21:08:33 +01:00
Michael
5760cfeb94
Added to-do
2017-01-27 19:57:57 +00:00
Michael
cb0600976d
Bugfix: Avoid duplicated birthday events
2017-01-27 17:04:52 +00:00
Michael
2a77e426f9
Split poco discovery in smaller function calls
2017-01-27 17:00:34 +00:00
Michael
64d06b98b2
Added documentation
2017-01-27 15:13:37 +00:00
Hypolite Petovan
66482c1d9c
- Remove $theme_richtext_editor boot var
...
- Remove "richtext" feature
- Remove fix_mce_lf() function
- Remove nomce parameter
2017-01-26 22:57:53 -05:00
Hypolite Petovan
9d5384f107
- Remove tinyMCE mentions or convert to addeditortext()
...
- Remove $editselect template value
2017-01-26 22:50:27 -05:00
Michael
422be7e212
Improved handling of non string values in the config
2017-01-25 05:33:23 +00:00
Michael
becfeaf0b7
Bugfix: Caching of non string cache values now works.
2017-01-24 18:55:07 +00:00
Michael
ea18d1829f
Reformatted stuff, improved query
2017-01-24 06:45:46 +00:00
Michael
69f1deb166
Some added logging
2017-01-21 20:15:49 +00:00
Michael
dc439c6e50
Bugfix for masses of php warnings
2017-01-21 19:50:56 +00:00
Michael
c74b7565a9
Rearranged the logging
2017-01-21 06:16:15 +00:00
Michael
45d6f6c0a3
Some changed logging
2017-01-21 06:06:29 +00:00
Michael
72884d75d5
Added callstack
2017-01-21 05:05:41 +00:00
Michael
68115581d0
Avoiding some error messages
2017-01-20 22:22:05 +00:00
Michael
8939a25502
Better number format
2017-01-20 22:05:50 +00:00
Michael
9d77e91f5f
Some more logging
2017-01-20 21:58:53 +00:00
Michael
850419dd14
Hopefully better index length.
2017-01-20 13:30:06 +00:00
Michael
7757505e40
Bugfix: Quarter Hour cache was cleared every time.
2017-01-19 23:07:12 +00:00
Michael
6bbc0e4c78
Bugfix: The caching of values didn't really work for boolean values
2017-01-19 22:47:20 +00:00
Michael
1360a0a003
The worker now tells the process runtime length.
2017-01-19 17:06:23 +00:00
Michael
4e91379f4a
Added reminder
2017-01-19 07:09:56 +00:00
Michael
0548099f6c
The config class now makes less database reads.
2017-01-18 21:45:32 +00:00
Michael
53393233c3
Replace the direct access of config variables
2017-01-17 19:21:46 +00:00
Michael
b935b57c66
Merge remote-tracking branch 'upstream/develop' into 1701-index-again
2017-01-17 06:49:01 +00:00
Michael
79866f620a
OOpppss ...
2017-01-16 22:15:04 +00:00
Michael
6972faa3a8
Redo some work
2017-01-16 22:11:35 +00:00
Michael
6e1986a0f2
Removed commented text
2017-01-16 21:48:35 +00:00
Michael
2cdf87c56a
Deactivated the alternative update script by now
2017-01-16 21:35:35 +00:00
Michael
d6ca6f24a7
Merge remote-tracking branch 'upstream/develop' into 1701-index-again
2017-01-16 21:06:43 +00:00
Michael
0c310db23d
Bugfix for failed events page and api
2017-01-16 20:59:16 +00:00
Tobias Diekershoff
b81a1fde09
Merge pull request #3093 from annando/issue-3011
...
Issue 2364: OStatus: Don't fetch liked contents
2017-01-16 07:31:53 +01:00
Tobias Diekershoff
e7966171dd
Merge pull request #3094 from annando/1701-hubzilla-probe
...
Fixing avatar problems when probing Hubzilla contacts
2017-01-16 07:27:03 +01:00
Michael
ced7cb6828
Smarter way to create unique indexes
2017-01-15 23:30:43 +00:00
Michael
e63e241f8f
Hubzilla doesn't send a width attribute in the avatar picure in the hcard
2017-01-15 19:46:04 +00:00
Michael
021a4fad71
Some more database stuff
2017-01-15 12:36:06 +00:00
Michael
2362e78c8f
Issue 3011 (and others): OStatus: Don't fetch liked contents
2017-01-15 09:07:57 +00:00
Michael
e16afc0450
Some more changed indexes and improved queries
2017-01-14 21:36:34 +00:00
Michael
85397f3bb9
Some removed indexes
2017-01-14 00:49:41 +00:00
Michael
29ef8d29ce
Better usage of text and mediumtext.
2017-01-13 22:13:52 +00:00
Michael
3af099298c
Some more caching
2017-01-13 17:31:10 +00:00
Michael
a9833a395f
The relay query now uses a better index
2017-01-13 10:37:39 +00:00
Michael
fd5f151a72
New function to detect heavily used indexes
2017-01-13 07:46:47 +00:00
Michael
e67133ef56
Merge remote-tracking branch 'upstream/develop' into 1701-curl-range
...
Conflicts:
mod/oexchange.php
mod/uimport.php
2017-01-12 07:25:44 +00:00
rabuzarus
63e2695d22
Merge pull request #3074 from annando/1701-diaspora-ostatus-mentions
...
Bugfix: Answers to OStatus posts should never reach Diaspora
2017-01-12 02:12:25 +01:00
rabuzarus
4a8cff74f2
Merge pull request #3081 from annando/1701-top-level
...
When commenting too fast, messages weren't delivered to Diaspora
2017-01-12 02:11:43 +01:00
Michael
fcd0b198f5
Correction of commit a96eb3428d
2017-01-11 23:18:51 +00:00
Michael
12dd06f726
Merge remote-tracking branch 'upstream/develop' into 1701-top-level
2017-01-11 23:15:23 +00:00
rabuzarus
0e64d462df
diaspora - add braces
2017-01-11 13:02:18 +01:00
rabuzarus
2daa0936db
diaspora - switch logger for "non subscribed messages" to LOGGER_DEBUG
2017-01-11 12:45:25 +01:00
Michael Vogel
3c51820515
Merge pull request #3076 from Hypolite/issue/#3039-boot-doc-include
...
Normalize App parameter declaration (doc-include folders, boot)
2017-01-11 09:01:48 +01:00
Michael
84b733e1bf
Standards stuff should make Hypolite happy.
2017-01-10 16:11:08 +00:00
Michael
3cf1f5e532
Compare instead of assign ...
2017-01-10 10:23:51 +00:00
Michael
c44f859edf
We should check for the item, not the parent.
2017-01-10 07:58:17 +00:00
Michael
fafeea4382
When commenting too fast, messages weren't delivered to Diaspora
2017-01-10 07:40:57 +00:00
Michael
a2debaa68a
Download limit for fetching data via "z_fetch_url"
2017-01-09 23:10:32 +00:00
Hypolite Petovan
87eb3d5ef2
Normalize App parameter declaration (doc-include folders, boot)
2017-01-09 23:09:01 +11:00
Michael
16f0221e4c
DBClean now has a smaller limit/Query improvements
2017-01-09 09:37:37 +00:00
Michael
65226778fe
More standards
2017-01-09 06:40:56 +00:00
Michael
fc60e7f5dd
Making Hypolite smile
2017-01-08 22:29:55 +00:00
Michael
906c7d528b
Bugfix: Answers to OStatus posts should never reach Diaspora
2017-01-08 20:35:41 +00:00
Michael
28b2e599fb
it should be "gid" not "cid"
2017-01-08 20:11:15 +00:00
Michael
ed0143c9f0
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
2017-01-07 16:13:57 +00:00
Michael
1febf182ad
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
2017-01-07 14:31:25 +00:00
Michael
c2543f918b
Last minutes changes
2017-01-07 13:52:30 +00:00
Michael
414c5ddae0
Use Config class/Option to deactivate the count on albums
2017-01-07 09:05:52 +00:00
Roland Häder
4530f4ac9d
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-06 17:10:40 +01:00
Michael
cb5df4d715
Some corrections
2017-01-06 13:30:12 +00:00
Michael
6976ad4892
Removed some removed indexes
2017-01-06 06:37:27 +00:00
Michael
ff3728be47
Cleaning up the stuff
2017-01-05 22:51:31 +00:00
Michael
2deb2b637b
Some new indexes and some removed.
2017-01-05 22:23:00 +00:00
Michael
6cdccbe2f6
Will we now find the best index fort the contact?
2017-01-05 17:48:51 +00:00
Michael
7aaf91a620
Removing and adding some indexes
2017-01-05 13:16:27 +00:00
Michael
9c7a2d2f9a
Another index
2017-01-05 09:32:16 +00:00
Michael
a4e437b56f
Contact testing
2017-01-05 09:10:02 +00:00
Michael
a92c5f464d
Hopefully this it it ...
2017-01-05 08:02:21 +00:00
Michael
db1c6c06d6
Finding the best index ...
2017-01-05 07:30:10 +00:00
Michael
00d7835ba6
Some more contact indexes
2017-01-05 07:12:13 +00:00
rabuzarus
686a7dbe01
Bugfix: make some todos usable for doxygen in dfrn.php
2017-01-05 02:23:34 +01:00
Michael
cefb36fb67
Some more indexes on the contact table
2017-01-04 23:28:51 +00:00
Michael
c221376041
Some notification thingy
2017-01-04 23:12:28 +00:00
Michael
44d966574d
Some more indexes and other query improvements
2017-01-04 19:13:50 +00:00
Michael
6b6e3e264f
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
2017-01-04 13:57:27 +00:00
Roland Häder
42c2e09382
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-04 09:03:00 +01:00
Michael
9a6478b273
Don't be greedy.
2017-01-02 07:00:44 +00:00
Michael
8aaf09f9ee
Automatically add a Diaspora mention
2017-01-01 23:18:42 +00:00
Roland Haeder
9ca789b952
Merge remote-tracking branch 'upstream/develop' into develop
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-31 17:59:14 +01:00
Michael
4053499c38
Enable caching wirh comments
2016-12-30 23:18:31 +00:00
Michael
66902c7956
We now also transmit Dislikes
2016-12-30 22:40:30 +00:00
Michael
7cf70b64b8
We now send the participation message as well.
2016-12-30 22:31:21 +00:00
Roland Haeder
d2df464d8c
added curly braces + fixed indenting according to code review by Hypolite
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:49:08 +01:00
Roland Haeder
d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop
...
dbm::is_result() calls needed merge
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:33:41 +01:00
Michael
4928d00e22
Standard stuff
2016-12-30 10:03:02 +00:00
Michael
55ee80338f
Events are now shared with Diaspora.
2016-12-30 03:31:38 +00:00
Michael
5222bd2264
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
2016-12-29 23:29:01 +00:00
Michael
94977cca18
Events are now done.
2016-12-29 23:27:11 +00:00
Tobias Diekershoff
51155d7716
Merge pull request #3047 from annando/1612-indexlength
...
New binary data fields to avoid index length problems
2016-12-29 19:11:54 +01:00
Michael
666eb2ddbd
Merge branch '1612-diaspora' of github.com:annando/friendica into 1612-diaspora
2016-12-29 17:13:07 +00:00
Michael
9af3f5b0da
Improved loggin
2016-12-29 17:11:59 +00:00
Michael
1490f2d3b7
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
2016-12-29 10:16:10 +00:00
Michael
483f34c4ce
We now transmit event data as well
2016-12-29 03:13:57 +00:00
Michael
ca0e6cba02
Relaying of Diaspora comments now work with the new fields as well.
2016-12-28 13:30:55 +00:00
Johannes Schwab
aab21838a4
Missing self befor class constants
2016-12-28 13:14:03 +01:00
Michael
6a511066c4
Threaded comments will now be transmitted
2016-12-27 14:37:48 +00:00
Michael
ce4c542e37
Support for threaded comments
2016-12-27 12:59:15 +00:00
Michael
3ba1ac595f
New binary data fields to avoid index length problems
2016-12-25 21:04:10 +00:00
Roland Haeder
b7c9d63b7a
Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated.
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-23 20:09:10 +01:00
Roland Haeder
3dbb92c0dc
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-23 19:51:11 +01:00
Roland Haeder
ca82678a6d
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-23 19:51:04 +01:00
Roland Häder
f8a213e23b
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:49:36 +01:00
Roland Häder
97c507e763
Coding convention applied:
...
- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:49:15 +01:00
rabuzarus
e95337e9ae
correct doxygen @todo
2016-12-23 18:31:42 +01:00
Roland Häder
5547bc2cc2
Continued rewriting a bit:
...
- more usage of dbm::is_result()
- nicer look of code
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 17:03:00 +01:00
Roland Häder
9c81b4948e
Coding convention applied:
...
- added curly braces
- added space between if/foreach and brace
- avoided 2 return statements (true/false) by replacing them with just one
- added TODO for applying above to all findings
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:59:43 +01:00
Roland Häder
8db0be09b8
Coding convention applied:
...
- added curly braces
- added space between if/foreach and brace
- avoided 2 return statements (true/false) by replacing them with just one
- added TODO for applying above to all findings
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:58:50 +01:00
Roland Häder
2325d81048
Code style changed:
...
- added more curly braces
- made SQL keywords all-uppercase
- added spaces between if/foreach and brace
- // Is for single-line comments *only*, please don't abuse it for multiple
line comments, use /* */ instead and a asterisk in front of every line.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:52:28 +01:00
Roland Häder
30642756e5
Code style changed:
...
- added more curly braces
- made SQL keywords all-uppercase
- added spaces between if/foreach and brace
- // Is for single-line comments *only*, please don't abuse it for multiple
line comments, use /* */ instead and a asterisk in front of every line.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:50:40 +01:00
Roland Häder
d82ed5d1b4
Continued with code convention:
...
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 15:31:23 +01:00
Roland Häder
c9194b0381
Continued with code convention:
...
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 15:30:23 +01:00
Roland Häder
20e71d21a6
Merge branch 'rewrites/app_get_baseurl_static' into develop
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/admin.php
mod/bookmarklet.php
mod/community.php
mod/contacts.php
mod/crepair.php
mod/editpost.php
mod/events.php
mod/install.php
mod/lostpass.php
mod/network.php
mod/notify.php
mod/suggest.php
mod/uexport.php
mod/videos.php
view/theme/duepuntozero/config.php
view/theme/frio/config.php
view/theme/quattro/config.php
view/theme/vier/config.php
2016-12-22 11:37:23 +01:00
Roland Häder
ad20c5504d
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/diaspora.php
object/Item.php
2016-12-22 11:33:00 +01:00
Roland Häder
c0df692f5f
Merge remote-tracking branch 'upstream/develop' into develop
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/diaspora.php
object/Item.php
2016-12-22 11:29:56 +01:00
Michael Vogel
9e689e8b9b
Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links
...
Diaspora: Complete /people/* links from fcontact or author domain
2016-12-22 10:17:44 +01:00
Roland Häder
ef5838bbd2
was not missing in develop branch, but here. :-(
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 09:10:17 +01:00
Roland Häder
99c8fd36c0
applied coding convention rule
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 09:10:00 +01:00
Roland Häder
d242e72c65
applied coding convention rule
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 09:09:27 +01:00
Roland Häder
8b7d5d0efc
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
2016-12-22 09:06:00 +01:00
Roland Häder
4c04a78d1b
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-22 09:03:44 +01:00
rabuzarus
2fcbba9410
provide local time for notifications
2016-12-22 00:28:52 +01:00
rabuzarus
125d2f24dd
frio: add profile link to the notifications url
2016-12-21 23:17:55 +01:00
Roland Haeder
d3e666f71a
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:12:28 +01:00
Roland Haeder
d97b6a2eba
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:04:09 +01:00
Roland Haeder
0436782e70
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 20:01:51 +01:00
Hypolite Petovan
769b849665
url_from_contact_guid: move network constant to arg list
2016-12-20 20:52:42 -05:00
Roland Haeder
3befdc6920
used more App::get_baseurl() instead of get_app()->get_baseurl().
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:51:54 +01:00
Roland Haeder
7c342600c3
used more App::get_baseurl() instead of get_app()->get_baseurl().
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:51:25 +01:00
Roland Haeder
b4bc07fdcc
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:32:00 +01:00
Roland Haeder
536f078ed4
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:31:05 +01:00
Roland Haeder
6c0c9d542a
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:16:49 +01:00
Roland Haeder
af2909bf8f
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:13:50 +01:00
Hypolite Petovan
b631442760
Misc changes to url_from_contact_guid
...
- Rename url_from_fcontact_guid to url_from_fcontact_guid
- Use network name constant
- Standards
2016-12-20 14:33:33 -05:00
Hypolite Petovan
a99532707b
Resolve conflict
2016-12-20 12:52:24 -05:00
Hypolite Petovan
e8e1f9253d
Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links
...
# Conflicts:
# include/follow.php
2016-12-20 12:50:36 -05:00
Hypolite Petovan
177f93f9a5
diaspora.php: Standards, standards everywhere
2016-12-20 12:49:50 -05:00
Hypolite Petovan
155e777d19
replace_people_guid: Break down nested calls
...
- Fix typo in function name
- Fix arguments
- Simplify url_from_fcontact_guid
2016-12-20 12:49:32 -05:00
Hypolite Petovan
4a7c3b9eef
Diaspora: Fix class name case + add self
2016-12-20 12:44:15 -05:00
Roland Häder
de689583e2
added more curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/admin.php
2016-12-20 17:58:34 +01:00
Roland Häder
4b221d216e
added more curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 17:57:40 +01:00
Michael
23cef0936f
Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes
2016-12-20 16:27:16 +00:00
Roland Häder
361a55155c
Don't cherry-pick: reverted unrelated changes (dbm::is_result())
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 16:21:59 +01:00
Michael
d72673b162
Only distribute items to active contacts
2016-12-20 16:02:39 +01:00
Michael
4aafbb09a5
The object type "photo" is deprecated and was replaced by "image"
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/like.php
mod/photos.php
mod/subthread.php
2016-12-20 16:00:23 +01:00
Michael
1f93024ed6
Workaround for vanished database connections while authentication
2016-12-20 15:59:28 +01:00
Roland Häder
a020086128
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-20 15:50:39 +01:00
Tobias Diekershoff
d4c3dcf2fc
Merge pull request #3032 from annando/1612-auth-ejabber
...
Workaround for vanished database connections while authentication
2016-12-20 15:45:18 +01:00
Roland Häder
b9e4b9f274
Merge remote-tracking branch 'upstream/develop' into develop
...
Changes in #3034 were somehow conflicting. :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/like.php
mod/photos.php
mod/subthread.php
2016-12-20 15:44:31 +01:00
Tobias Diekershoff
cc16369b6f
Merge pull request #3033 from annando/1612-object-type
...
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 15:44:07 +01:00
Tobias Diekershoff
c1193c9c13
Merge pull request #3034 from annando/1612-no-archive
...
Only distribute items to active contacts
2016-12-20 15:42:41 +01:00
Roland Häder
51716957b2
converted more to dbm::is_result() + added braces/space
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 15:37:27 +01:00
Roland Häder
ace8f753ac
added much more curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/bookmarklet.php
mod/community.php
mod/contacts.php
mod/crepair.php
mod/events.php
mod/network.php
mod/suggest.php
mod/uexport.php
view/theme/duepuntozero/config.php
view/theme/frio/config.php
view/theme/quattro/config.php
view/theme/vier/config.php
2016-12-20 11:59:13 +01:00
Roland Häder
e24c3a5b82
added much more curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:56:34 +01:00
Roland Häder
fc9dbc0899
added spaces + curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:38:28 +01:00
Roland Häder
5588472f6d
added spaces + curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:38:16 +01:00
Roland Häder
f3529e7dbc
added spaces + curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:36:27 +01:00
Roland Häder
c86f09a894
added spaces + curly braces
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:36:03 +01:00
Roland Häder
fb0ed18a43
changed to this:
...
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:58:03 +01:00
Roland Häder
a9bed1422e
added more curyl braces + spaces between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:44:59 +01:00
Roland Häder
be35349495
added more curyl braces + spaces between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:44:27 +01:00
Roland Häder
65e1cd728c
Coding convention:
...
- added curly braces
- added space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:40:09 +01:00
Roland Häder
a5e4882e25
Coding convention:
...
- added curly braces
- added space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:35:28 +01:00
Roland Häder
abff6372dd
Coding convention applied:
...
- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/lock.php
2016-12-20 10:12:31 +01:00
Roland Häder
fb676335db
Coding convention applied:
...
- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:10:33 +01:00
Michael
37ce5ce886
Remove indexes that we don't use anymore
2016-12-20 07:14:59 +00:00
Michael
4c77ae2fe9
Only distribute items to active contacts
2016-12-20 07:13:22 +00:00
Michael
6e46987515
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 07:10:47 +00:00
Michael
75711a947e
Workaround for vanished database connections while authentication
2016-12-20 07:08:03 +00:00
Hypolite Petovan
81d003cad1
Diaspora: Complete /people/* links from fcontact or author domain
2016-12-19 23:30:50 -05:00
Roland Häder
dac1dbd3e9
Merge branch 'rewrites/dbm_is_result' into develop
2016-12-19 14:47:05 +01:00
Roland Häder
a96eb3428d
Used more dbm::is_result() instead of (!$r) or (!count($r)), still there are
...
more pending ...
Also put SQL table columns into back-ticks.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:46:33 +01:00
Roland Häder
884f44ce94
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:27:16 +01:00
Roland Häder
4615f39836
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-19 14:21:26 +01:00
Roland Häder
ff569756ee
Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/follow.php
2016-12-19 09:40:34 +01:00
Michael
8cab220387
Bugfix: Reimported Friendica posts from pump.io had the links missing.
2016-12-18 23:39:44 +00:00
Michael
3f6fd4bf84
Mastodon: Hopefully we can now detect reshares better
2016-12-18 20:34:34 +00:00
Michael
a8e80ef0a6
Ostatus: The follow/unfollow XML should now be even more compliant.
2016-12-18 20:02:13 +00:00
Michael
099f51c7b5
Removal of test code
2016-12-18 17:36:48 +00:00
Michael
bc323b0bfa
OStatus: Follow/Unfollow should now work again.
2016-12-18 17:10:38 +00:00
Roland Häder
f89044ed61
Garrr ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:07:21 +01:00
Roland Häder
9c564c4fd3
Again, static *OR* object-referencing calls? Blue or red pill?
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:06:20 +01:00
Roland Häder
2eb3727542
Again, static *OR* object-referencing calls? Blue or red pill?
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:05:18 +01:00
Roland Häder
378cbd9027
Continued with #3010 :
...
- more reverts of $a->get_baseurl()
- you always do: function foo (&$a), please read my TODO why it is not so good.
- for now I have fixed this inconsistency (compared to other method signatures)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:59:13 +01:00
Roland Häder
8e1796bb1f
Continued with #3010 :
...
- more reverts of $a->get_baseurl()
- you always do: function foo (&$a), please read my TODO why it is not so good.
- for now I have fixed this inconsistency (compared to other method signatures)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:57:55 +01:00
Roland Häder
d26009e408
Garrr ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:52:15 +01:00
Roland Häder
1c82ad0734
Opps, tpzo found ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:51:21 +01:00
Roland Häder
8ad1bdaac1
Opps, tpzo found ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:51:06 +01:00
Roland Häder
d4f737577b
And more reverts:
...
- $a->get_baseurl() -> App::get_baseurl()
- was_recently_delayed() (entirely)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:49:17 +01:00
Roland Häder
f42935421e
And more reverts:
...
- $a->get_baseurl() -> App::get_baseurl()
- was_recently_delayed() (entirely)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:49:00 +01:00
Roland Häder
dea8bef472
more reverts ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:32:57 +01:00
Roland Häder
7849b3f8e3
more reverts ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:32:32 +01:00
Roland Häder
ba3bc420ca
Also reverted these + added spaces for nicer appearance.
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:23:59 +01:00
Roland Häder
6cef88c24e
Also reverted these + added spaces for nicer appearance.
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:23:41 +01:00
Michael
53417aaf39
Create missing self contact
2016-12-15 07:15:33 +00:00
Roland Haeder
9e28f5a0c3
fixed SQL writing: keywords upper-case, column/table names in back-ticks. #3010
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-14 20:51:38 +01:00
Roland Haeder
c830bfcd96
fixed SQL writing: keywords upper-case, column/table names in back-ticks. #3010
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-14 20:50:39 +01:00
Roland Häder
ab50585e9a
reverted change (which duplicated above query), thanks to @annano to point this out. #3010
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:41:56 +01:00
Roland Häder
cef6fce7f0
reverted change (which duplicated above query), thanks to @annano to point this out. #3010
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:41:28 +01:00
Roland Häder
467cdfeb34
3 slashes for Doxygen, 2 are enough for PHP ... :-(
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:28:45 +01:00
Roland Häder
ba45a292c4
3 slashes for Doxygen, 2 are enough for PHP ... :-(
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:28:18 +01:00
Roland Häder
41db906dc4
Continued with #3010 :
...
- removed added debug messages (maybe they will come back in accordance to
code-style guidelines?)
- converted $a->get_baseurl() back to App::get_baseurl()
- reverted back other code I have touched/merged as this was double:
(substr($url, 0, 4) !== 'http') on $url = 'https://bla '; will be FALSE
(means found http at start), too.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:02:10 +01:00
Roland Häder
23d4db5149
Continued with #3010 :
...
- removed added debug messages (maybe they will come back in accordance to
code-style guidelines?)
- converted $a->get_baseurl() back to App::get_baseurl()
- reverted back other code I have touched/merged as this was double:
(substr($url, 0, 4) !== 'http') on $url = 'https://bla '; will be FALSE
(means found http at start), too.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:59:35 +01:00
Roland Häder
307df4ee5c
Also removed this, seems to come in from wrong merging? #3010 Thanks to @annando
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:41:23 +01:00
Roland Häder
b21a1437f4
Also removed this, seems to come in from wrong merging? #3010 Thanks to @annando
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:39:39 +01:00
Roland Häder
c75d6ad850
More dbm::is_result() instead of count()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 12:03:02 +01:00
Roland Häder
b5776ab959
Fixes for #3010 :
...
- used static call, still App::get_baseurl() wraps it into an object-referencing
call which seems to be a bit redundant?
- added spaces around dot (see one line below)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:49:52 +01:00
Roland Häder
a905522eb5
Cleanup for #3010 - added spaces, thanks to @annando .
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:42:36 +01:00
Roland Häder
a8dc8b288c
import dbm here to avoid adding everywhere the namespace (if later changed,
...
only here it needs change, cool ha? ;-)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 15:24:44 +01:00
Roland Häder
797de5bfe0
Nope, get_basepath() should be static, then also mark it as static (in signature).
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 14:53:57 +01:00
Roland Häder
63610c7b73
Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/Photo.php
include/api.php
include/cache.php
include/dbstructure.php
include/enotify.php
include/items.php
include/onepoll.php
include/queue_fn.php
include/session.php
include/text.php
mod/contacts.php
mod/dfrn_request.php
mod/display.php
mod/events.php
mod/item.php
mod/message.php
mod/msearch.php
mod/photos.php
mod/poco.php
mod/profile.php
mod/proxy.php
mod/videos.php
update.php
view/theme/diabook/theme.php
view/theme/vier/theme.php
2016-12-13 11:00:44 +01:00
Roland Häder
6a8a36f12d
More usage of dbm::is_result($r) instead of count($r):
...
- count() returns very different results and never a boolean (not even false on
error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
done in PHP because of its lazyness. But it is discouraged if it comes to
more clean code.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 10:44:13 +01:00
Roland Häder
293436e5fd
Some rewrites:
...
- max_proccesses_reach() and maxload_reached() (why no _ behind max?) are called
both way, static and with object reference.
- this is strongly discouraged and should be avoided as its support (in PHP) may
be dropped in future releases.
- used $a = get_app(); to encapsulate code (even when the function does
currently the same, it may be changed later)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 10:16:36 +01:00
Michael
73e330abbe
Restore empty line
2016-12-12 06:51:08 +00:00
Michael
17f15e793f
Issue 2999: Better Mastodon handling
2016-12-12 06:46:02 +00:00
Tobias Diekershoff
352b168e2d
Merge pull request #3007 from annando/1607-performance
...
Some more performance stuff
2016-12-12 07:04:16 +01:00
Michael
0c99cee092
Some logging to detect possible problems with the probing
2016-12-11 18:39:39 +00:00
Michael
5c04402448
String is no integer
2016-12-11 17:37:12 +00:00
Michael
c666c98559
Code bautification
2016-12-10 12:28:49 +00:00
Michael
00c74a7d6d
Some more ...
2016-12-10 12:21:16 +00:00
Michael
5572bd0cf9
Redo the index changes for testing purposes
2016-12-10 12:19:57 +00:00
Michael
fc3c1601b1
Merge remote-tracking branch 'upstream/develop' into 1607-performance
2016-12-10 12:18:11 +00:00
Michael Vogel
af42e5e481
Merge pull request #2932 from Hypolite/issue/missing-private-image-src
...
Fix Friendica private image URL replacing
2016-12-09 15:54:11 +01:00
Tobias Diekershoff
4059e58bbf
Merge pull request #2990 from Hypolite/fix-diaspora-medium-link
...
Improve diaspora2bb autolinker
2016-12-08 21:11:47 +01:00
Hypolite Petovan
cd354d3a57
Adding default protocols on missing config value for backward compatibility
2016-12-07 23:18:10 -05:00
Hypolite Petovan
88e336b3bc
Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src
...
# Conflicts:
# doc/htconfig.md
2016-12-07 23:15:46 -05:00
Hypolite Petovan
e29023dc8c
Standards
2016-12-07 23:11:53 -05:00
Hypolite Petovan
aef2c7373c
Formatting
2016-12-05 22:48:02 -05:00
Hypolite Petovan
d0cb8cdccf
Fixs edge case where single stars on succeeding lines are wrongly turned into multi-line <em>
2016-12-05 22:47:52 -05:00
Hypolite Petovan
60b9203dd5
Add <br> for each carriage return
...
Fixes #2993
2016-12-05 22:46:51 -05:00
Hypolite Petovan
2b75ad5e0a
src and href attributes sanitization touchups
...
- Use Config::get
- Add default to config call
- Add always allowed protocol to href
- Remove relative root URLs from allowed forms
2016-12-04 21:33:29 -05:00
Hypolite Petovan
5e20aed428
Revert adding a leading slash to redir links
2016-12-04 21:31:28 -05:00
Tobias Diekershoff
9899c30d0f
Merge pull request #2991 from rabuzarus/20161204_-_allowfullscreen
...
Bugfix: Fix full screen for embedded videos
2016-12-04 17:49:15 +01:00
rabuzarus
3d4e1176ec
Bugfix: cached data doesn't need to get unserialized anymore
2016-12-04 15:15:23 +01:00
rabuzarus
5ca93d0541
Bugfix: Fix full screen for embedded videos
2016-12-04 14:55:57 +01:00
Hypolite Petovan
166df0180b
Improve diaspora2bb autolinker for URLs
...
- Add @ support for URLs (Medium URLs)
- Exclude trailing commas from autolinked URLs, likely to be normal text
- Formatting
2016-12-03 22:04:13 -05:00
Hypolite Petovan
979fc6d38a
Add protocol whitelist for href/src attributes
...
- Add strict URL checker for src attributes
- Add protocol whitelist for href attributes
- Add error styling if URL fails to pass filter
- Add doc for new htconfig value
- Add emphasis to config key names in htconfig doc
2016-12-03 14:19:57 -05:00
Hypolite Petovan
47a370c5e3
Revert adding baseurl to private image URL
2016-12-03 10:39:06 -05:00
Hypolite Petovan
0f2c27e041
Merge branch 'develop' into issue/missing-private-image-src
2016-12-03 10:34:48 -05:00
Michael
6619e0791d
Much more standards
2016-12-01 22:52:35 +00:00
Michael
13150c09a5
File was missing
2016-12-01 21:11:52 +00:00
Michael
6845775ff9
Store spooled data
2016-12-01 20:53:18 +00:00
Michael
c5d571287c
Merge branch '1612-spool' of github.com:annando/friendica into 1612-spool
2016-12-01 13:58:47 +00:00
Michael
eff4ad2e0a
Spool items that couldn't be stored
2016-12-01 13:50:26 +00:00
Tobias Diekershoff
6ef69ad2da
Merge pull request #2983 from annando/issue-2915-2918
...
Disable richtext editor for frio - followup for #2938
2016-12-01 14:10:08 +01: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
63389ba23d
Pending or blocked - that's the question ...
2016-11-30 04:30:48 +00:00
Michael
cc5eebd173
The frontend worker can now fork background processes
2016-11-29 22:40:19 +00:00
Michael
624fabf884
Somehow the changes of pull request 2748 got vanished
2016-11-29 20:25:27 +00:00
Michael
d49325d177
Disable richtext editor for frio - followup for #2938
2016-11-29 20:04:31 +00: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
af3549fa01
The first check for "pending" isn't neccessary.
2016-11-29 18:31:37 +00:00
Michael
b2302f6290
Maybe we shouldn't count pending contacts
2016-11-29 18:23:34 +00:00
rabuzarus
250f978872
Merge pull request #2978 from annando/issue-2518
...
Issue 2518: Remove contact data in the background
2016-11-29 14:59:00 +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
Michael
fd28ecaacc
Pending contacts shouldn't be displayed in the sidebar
2016-11-29 06:40:35 +00:00
Michael
eede89f537
Some brackets added
2016-11-28 22:18:37 +00:00
Michael
3a76a6766f
Issue 2772: Pending contacts should now be displayed
2016-11-28 22:11:13 +00:00
Michael
e7ef34298a
remove "blubb"
2016-11-28 21:48:06 +00:00
Michael
a38a5019d0
Issue 2518: Remove contact data in the background
2016-11-28 21:44:04 +00:00
Michael Vogel
9894f7cea7
Merge pull request #2965 from tobiasd/20161122-cpActiveResponse
...
active response
2016-11-28 21:14:42 +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
f229d65f85
ParseUrl: some docu work
2016-11-27 23:41:55 +01:00
rabuzarus
85b51ee41c
xml:php - some code standard work
2016-11-27 20:42:40 +01:00
rabuzarus
56e38dd6bd
move function deletenode() to the xml class
2016-11-27 20:19:43 +01:00
Michael
636a033364
Added documentation, config stuff, ...
2016-11-27 09:02:08 +00:00
Michael
d71321c834
Some added documentation
2016-11-27 01:11:22 +00:00
Michael
e856ab9a09
The worker can now run from the frontend as well
2016-11-27 00:55:05 +00:00
Michael
ba1a304589
Delivery to other systems was needlessly deferred.
2016-11-24 03:34:11 +00:00
rabuzarus
e9226eaf45
parse_url: recognize image/video/audio files + move functions into own class
2016-11-24 01:11:22 +01:00
Michael Vogel
4eeb5a0a17
Merge pull request #2969 from gerhard6380/develop
...
Develop
2016-11-23 05:13:31 +01:00
Hypolite Petovan
4937a3b7d8
Add the self property to conversation responses
...
- Add a condition to check if the current user is amongst the responses
- Populate the responses array with the self attribute
2016-11-22 18:35:19 +01:00
Michael
edbdd0e34a
Bugfix: We should only search in the current database for MyISAM tables
2016-11-22 16:47:08 +00:00
Michael Vogel
46ba1a46f5
Merge pull request #2896 from rabuzarus/0311_fix_photo_albums
...
chache: check for valid serialized data + uncomment caching of contac…
2016-11-21 04:04:36 +01:00
Michael
3de862712d
Issue 2772: Posts from pending contacts should be displayed as well.
2016-11-20 16:52:57 +00:00
rabuzarus
721ac5fb9e
cache: use unserialize(false)
2016-11-20 17:32:37 +01:00
Hypolite Petovan
003e6a7371
Improve BBCode javascript stripping regex
2016-11-19 18:01:45 -05:00
Tobias Diekershoff
914330bb8f
Merge pull request #2940 from annando/1611-dead-contacts
...
Mark contacts as dead or undead while transmitting and receiving messages
2016-11-19 22:59:57 +01:00
Michael
89d5aa64ba
Mark contacts as dead or undead while transmitting and receiving messages
2016-11-19 20:10:29 +00:00
Tobias Diekershoff
b95bf00e89
Additional info in registration request
2016-11-19 18:22:49 +01:00
Tobias Diekershoff
a7dae15e82
added return value to doxygen header
2016-11-19 14:34:06 +01:00
Tobias Diekershoff
32c0a9ef43
added return value to doxygen header
2016-11-19 14:32:01 +01:00
Hypolite Petovan
c2eb2f460b
Fix Friendica private image URL replacing
...
- Add baseurl to redir_private_images to prevent empty src attribute in
generated HTML
- URL encode the URL parameter url and conurl
- Formatting
- Documentation
2016-11-18 22:05:56 -05:00
Tobias Diekershoff
f4c52f5a0e
send email confirming pending registration #2916
2016-11-18 20:16:22 +01:00
Michael
ccd484643d
Polling feeds is now done with a higher priority.
2016-11-17 23:06:22 +00:00
rabuzarus
0f81411b26
Bugfix: avatar images for activty like was not shown notifications page
2016-11-16 13:21:13 +01:00
Michael
b1999459af
Removed commented code
2016-11-16 06:29:30 +00: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
e4a625ad12
Bugfix: seen status was not handled correcty on the notifications page
2016-11-16 04:57:55 +01:00
Tobias Diekershoff
b628e82465
Merge pull request #2910 from annando/1611-slinky
...
Several shorteners doesn't work anymore
2016-11-15 09:53:38 +01:00
Tobias Diekershoff
44d79cbc27
Merge pull request #2911 from annando/1611-well-formatted-uri
...
URI of "remote self" are looking better now.
2016-11-15 09:53:14 +01:00
Michael
d4e3bc1924
Added documentation
2016-11-15 07:05:43 +00:00
rabuzarus
9878974e1f
fix photos page permissions
2016-11-14 18:49:51 +01:00
Jens Tautenhahn
31ad26aae2
Merge remote-tracking branch 'upstream/develop' into develop
2016-11-14 09:52:01 +01:00
Michael
88d073f3d9
URI of "remote self" are looking better now.
2016-11-14 06:55:17 +00:00
Michael
5ef688f1d2
Case correction
2016-11-14 05:44:18 +00:00
Michael
3de7b6d6ce
Several shorteners doesn't work anymore
2016-11-13 19:19:35 +00:00
Michael
1aa9b7242d
Merge remote-tracking branch 'upstream/develop' into 1611-parseurl
2016-11-13 19:12:11 +00:00
Michael
6dfaa5a95f
Some more standard stuff
2016-11-13 19:09:47 +00:00
Michael
e925c4139c
Some documentation
2016-11-13 18:28:55 +00:00
Michael
26936755d9
Bugfix: Locations without coordinates aren't good for Diaspora
2016-11-13 17:42:26 +00:00
Michael
2937df21ad
Standard stuff
2016-11-13 08:50:01 +00:00
Michael
e5f55a5919
Improved handling with wrong formatted urls and fetchinfo
2016-11-12 20:23:00 +00:00
Michael
d24e3a6a92
Removed "&"
2016-11-12 17:20:26 +00:00
Michael
e6148f4c1c
Performance improvements when storing items (via API)
2016-11-12 13:17:28 +00:00
gerhard6380
623d809cc3
changes in api call for showing profiles and disable proxy for images in html code for api calls
2016-11-09 21:35:52 +01:00
Jens Tautenhahn
12dd657868
fixes an sql error in NotificationsManager
2016-11-09 21:32:15 +01:00
rabuzarus
d025b83c93
ref_session_write: fix update for entry in the session table
2016-11-07 22:25:09 +01:00
rabuzarus
a337021c31
chache: correct misspelling
2016-11-07 22:20:13 +01:00
rabuzarus
915689dd79
chache: check for valid serialized data + uncomment caching of contact suggestion
2016-11-07 22:12:11 +01:00
Hypolite Petovan
67cdbe4538
misc performance: restore session write condition, keep 1 query
2016-11-06 01:00:17 -04:00
Hypolite Petovan
7b9470b804
misc performance: remove extraneous session write DB query
2016-11-06 00:52:31 -04:00
Hypolite Petovan
bae9f0852f
misc performance: cache contact details by url during script
2016-11-06 00:51:23 -04:00
Tobias Diekershoff
27a2e44d89
Merge pull request #2888 from annando/1610-priority-dbclean
...
Improved priorities and some more dbclean queries
2016-11-05 08:27:02 +01:00
Tobias Diekershoff
ba1cd57087
Merge pull request #2887 from annando/1611-api-performance
...
API calls should be much faster than before
2016-11-05 08:25:09 +01:00
Michael
4b33573c20
Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean
2016-11-05 05:25:22 +00:00
Michael Vogel
50651340ce
Merge pull request #2886 from rabuzarus/0311_fix_photo_albums
...
cache: serialize the cache content directly in the cache class
2016-11-05 06:12:29 +01:00
Michael
37985a0d3f
Use "micro"
2016-11-04 22:56:50 +00:00
Michael
fbfaef1968
API calls should be much faster than before
2016-11-04 22:45:20 +00:00
rabuzarus
e446e9571f
some more coding style correction
2016-11-04 19:26:28 +01:00
rabuzarus
5459b00499
cache: serialize the cache content directly in the cache class
2016-11-04 16:44:49 +01:00
rabuzarus
75166cae27
Merge pull request #2882 from Hypolite/improvement/bbcode-documentation
...
BBCodes documentation improvement
2016-11-04 02:34:29 +01:00
Hypolite Petovan
3579a14945
bbcode documentation: minor formatting changes
2016-11-03 21:01:09 -04:00
Tobias Diekershoff
3a2ec5e4db
missing placeholder for name_cache value
2016-11-03 14:00:20 +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
Hypolite Petovan
aff467adf2
bbcode documentation: improve cleancss
2016-11-01 23:08:26 -04:00
Hypolite Petovan
73627df520
Merge branch 'develop' into improvement/bbcode-documentation
2016-11-01 19:29:56 -04:00
Michael
b5d004e1d7
run dbclean as long as there is some data to be purged
2016-11-01 21:36:15 +00:00
Hypolite Petovan
5e188a9250
ping.php improvement: datetime.php formatting
2016-11-01 02:04:59 -04:00
Michael
4d966e1e21
Changed priority for onepoll/further enhancement for dbclean
2016-10-31 21:32:08 +00:00
Hypolite Petovan
63b1e822cd
bbcode documentation: improved webfinger profile regexp
2016-10-31 00:00:12 -04:00
Hypolite Petovan
c2e17cb9c4
bbcode documentation: fix broken bookmark form: #^[url]...[/url]
...
- Prevents the advance recognition of `^` in tags before bbcode()
- Formatting
- Documentation
2016-10-30 23:59:14 -04:00
Michael
2e59eec35d
Added some comments
2016-10-29 22:06:18 +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
0131656a06
ping.php perfomance: reverting useless session write changes
2016-10-28 22:15:24 -04:00
Hypolite Petovan
bc407080d2
ping.php performance: improve documentation and formatting
2016-10-28 22:14:51 -04:00
rabuzarus
a65479ccfd
Merge pull request #2861 from annando/1610-performance
...
Some more performance stuff
2016-10-28 22:24:35 +02: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
Hypolite Petovan
747f902e21
ping.php performance: optimizing session_write queries
2016-10-28 05:55:19 -04:00
Hypolite Petovan
63e5342ced
ping.php performance: removing datetime_convert
2016-10-28 05:54:26 -04:00
Michael
d78b4e7ffc
We are doing uncommitted reads a little bit different. (We avoid commit)
2016-10-28 09:08:13 +00:00
Michael
bebcbd04d3
We should check values after we fetched them :-)
2016-10-28 04:29:22 +00:00
Michael
6601e8c2b7
Prevent a memory Access Violation when the database isn't connected
2016-10-27 20:16:56 +00:00
Michael
3f0656fdbd
Merge remote-tracking branch 'upstream/develop' into 1610-performance
2016-10-27 12:18:45 +00:00
Michael
86adaddca4
dbclean.php mustn't be stopped via "killme"
2016-10-26 05:57:11 +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
4fdced1a0a
Merge pull request #2862 from Hypolite/settings-save-perf
...
Performance improvements: Settings save (alt), profiler, logger
2016-10-25 07:56:11 +02:00
Michael Vogel
80efc422bf
Added documentation
2016-10-25 05:44:57 +00:00
Hypolite Petovan
a9e90d111d
Restore newline at end of file
2016-10-24 22:18:22 -04: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
d0b95e642f
Reverted changes to config
2016-10-24 11:57:17 -04:00
rabuzarus
b0d6c244c5
function nav_info(): insert lost comment
2016-10-24 14:02:38 +02: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
47b8975bb6
poller.php is now working with transactions as well.
2016-10-23 23:31:56 +00:00
Michael Vogel
1ade94fd8a
Some code reformatting
2016-10-23 23:14:35 +00:00
Michael Vogel
b99f5b576e
Fixed code structure
2016-10-23 22:12:45 +00:00
Michael Vogel
ee5ada6991
We now use memcache if configured and installed.
2016-10-23 21:59:40 +00:00
Michael Vogel
deb2fee2f0
pconfig: Improved behaviour with already stored values
2016-10-23 07:49:21 +00:00
Hypolite Petovan
437ae412fa
More include/nav.php
formatting
...
- Add Doxygen comment block for `nav_info()`
- Remove superfluous by-reference symbol and added type hinting to
`nav_info()` declaration
- More formatting
2016-10-22 22:58:44 -04:00
Hypolite Petovan
4b0e76f3b7
Fix Issue #2803 - Hovercard view profile link and public directory link
...
- Change "Edit Contact" link to "View Contact" in `include/Contact.php`
and `include/conversation.php`
- Add zrl parameter to public directory on single user instances
- Improved formatting of modified functions
2016-10-22 22:49:12 -04:00
Hypolite Petovan
b806f87874
Formatting changes to make @annando happy
2016-10-22 13:54:30 -04:00
Michael Vogel
561f45b83b
And again ...
2016-10-22 10:33:18 +00:00
Michael Vogel
66da84d1a9
Just some more code adjustments
2016-10-22 10:21:43 +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
31409e2ca1
dbclean is restructured
2016-10-22 04:57:52 +00:00
Hypolite Petovan
f9d713b228
Settings save: Switch from strict to fuzzy comparison
2016-10-21 23:23:44 -04:00
Hypolite Petovan
9a59878190
Standards enforcing
2016-10-21 23:08:42 -04:00
Hypolite Petovan
44d5dec06f
Improve logger performance
...
- Reorder condition to prevent constant lookup (one-time ~3,500 substr)
- Enforce coding standards
2016-10-21 23:00:05 -04:00
Michael Vogel
bc324c3ef4
Setting for the callstack in the database query added
2016-10-21 23:42:45 +00:00
Michael Vogel
a8bef370d3
Some code adjustements and performance improvements to the DFRN feed.
2016-10-21 23:04:04 +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
Tobias Diekershoff
2d0c56fd37
Merge pull request #2866 from annando/1610-probe-hidden-profile
...
Bugfix: probing failed when a profile was hidden
2016-10-20 08:33:44 +02:00
Michael Vogel
4269315d8f
Bugfix: probing failed when a profile was hidden
2016-10-20 06:04:11 +00:00
Michael Vogel
493d7bc698
Remove orphaned data
2016-10-19 21:06:37 +00:00
Hypolite Petovan
a5923bdd4f
Wrong whitespaces
2016-10-17 17:00:06 -04:00
Hypolite Petovan
62bd32c1ac
Improve performance of settings save by not querying the DB if submitted value is the same
2016-10-17 16:54:22 -04:00
Hypolite Petovan
c168d7d4ca
Enforce coding standards in Config.php and PConfig.php
2016-10-17 16:53:37 -04: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
Michael Vogel
a47ae788ba
Improved logging
2016-10-11 06:30:53 +00:00
Michael Vogel
ef6a23caf3
Worker: Reserve some space for low priority processes
2016-10-10 21:01:36 +00:00
Michael Vogel
9cdecd8ec8
webfinger_dfrn now work as expected
2016-10-09 10:47:47 +00:00
Michael Vogel
4322b56c0b
Ensure that with multiple entries the newest one will be fetched
2016-10-09 07:18:52 +00:00
Michael Vogel
4404bf1651
The creation of unique keys failed for MariaDB
2016-10-09 07:01:19 +00:00
Tobias Diekershoff
a1c63994d2
Merge pull request #2851 from annando/1610-performance-nodeinfo
...
Performance improvements to item storage and nodeinfo
2016-10-08 08:42:50 +02:00
Hypolite Petovan
bb800f2992
Improve comment
2016-10-07 08:33:13 -04:00
Michael Vogel
94f7debb52
Loglines removed
2016-10-07 11:08:36 +00:00
Michael Vogel
6abac720e2
Small performance tweaks for "item_store" as well.
2016-10-07 06:05:43 +00:00
Hypolite Petovan
645fd414d5
Merge remote-tracking branch 'refs/remotes/origin/develop' into Issue-#2816-2
2016-10-06 20:58:28 -04:00
Michael Vogel
a81f5859ad
Mastodon is now detected as OStatus network
2016-10-05 20:54:26 +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
Hypolite Petovan
c1611fd3f6
Fix Issue #2816 - Add backward compatible server_info support
2016-10-04 23:43:44 -04:00
Michael Vogel
87300b2b49
When we have the field, we should use it :)
2016-10-04 03:58:47 +00:00
Michael Vogel
8cde8b375b
Merge remote-tracking branch 'upstream/develop' into 1610-gcontact-type
2016-10-04 03:52:22 +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
a052fe4a98
Fix Issue #2816 - MySQL version typo
2016-10-03 19:17:40 -04:00
Hypolite Petovan
0e8ae82a5c
Fix Issue #2816 - Add MySQL version condition for IGNORE
...
- Checks for MySQL version before adding the IGNORE keyword on index
creation
- Added new dryrun command to usage text
2016-10-03 19:06:47 -04:00
Hypolite Petovan
b3ac6189b3
Merge remote-tracking branch 'friendica/develop' into Issue-#2816-2
2016-10-03 19:04:57 -04:00
Tobias Diekershoff
bb423ff9b4
rework fallback code
2016-10-03 21:12:47 +02: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
116520e733
Merge pull request #2837 from rabuzarus/0210-add-missing-at-brief
...
fix @brief in doxygen for function oembed_iframe()
2016-10-02 09:47:55 +02:00
Tobias Diekershoff
ed631ba959
fallback to generic language for specific (de-CH => de)
2016-10-02 09:26:35 +02:00
Michael Vogel
ca53881cd3
Some more explanations
2016-10-02 06:40:08 +00:00
rabuzarus
aba6f2bf27
fix @brief in doxygen for function oembed_iframe()
2016-10-02 06:04:34 +02:00
Hypolite Petovan
3f619726b1
Fix Issue #2816 - Update dbstructure instead of update
...
- Add UNIQUE index support to `update_structure()`
- Move DB update from `update.php` to `dbstructure.php`
- Update DB_VERSION to 1210
2016-10-01 23:29:30 -04:00
rabuzarus
8fa64c43d6
Merge pull request #2818 from Hypolite/Issue-#2813
...
Fix Issue #2813 - Double notification + wrong message for requested registrations
2016-10-02 05:14:05 +02:00
Hypolite Petovan
3c85fb8c9a
Fix Issue #2816
...
- Change (P)Config::set to use INSERT >>> ON DUPLICATE KEY UPDATE
- Add DB update
2016-10-01 21:40:41 -04:00
Michael Vogel
9dee3cc809
Some small changes
2016-10-01 20:20:27 +00:00
Michael Vogel
60a0235af0
The account type is now read and displayed
2016-10-01 20:03:27 +00:00
Tobias Diekershoff
8b972510fe
with translations now in /view/lang/lng shift the array index along
2016-10-01 16:07:23 +02:00
Tobias Diekershoff
aba8313b21
don't save browser selected language on login
2016-10-01 15:57:37 +02:00
Tobias Diekershoff
82dcc3fe79
Merge pull request #2821 from Hypolite/Issue-#2817
...
Fix #2817 - Move translation language folder in a subfolder of view
2016-10-01 10:58:32 +02:00
Tobias Diekershoff
4eaa0c4892
Merge pull request #2826 from annando/1610-utf8mb4
...
Support of utf8mb4
2016-10-01 10:51:33 +02:00
Michael Vogel
40fbe1644d
Merge pull request #2824 from Hypolite/Issue-#2823
...
Fix Issue #2823 - Ugly scrollbars in oembed iframes and broken resizing
2016-10-01 10:40:08 +02:00
Michael Vogel
f4f09f08b5
Removed unneeded line
2016-10-01 08:33:09 +00:00
Michael Vogel
efd574ab83
Support of utf8mb4
2016-10-01 08:21:37 +00:00
Hypolite Petovan
76b1b109e5
Fix Issue #2823 - Ugly scrollbars in oembed iframes and broken resizing
...
- Fix _resizeIframe function, shorten the timeout between calls
- Simplify the oembed iframe generation code and reduce the minimum
iframe height to 200px
- Add smooth CSS transition for iframe resizing
2016-09-30 23:26:22 -04:00
Hypolite Petovan
8fc558b8e6
Fix #2817
...
- Change all references to language folders
2016-09-30 10:46:56 -04:00
Hypolite Petovan
76382147ae
Fix Issue #2816
...
- Fix wrong variable name in Config and PConfig
2016-09-30 09:22:35 -04:00
Hypolite Petovan
f9678bb6c3
Remove extraneous comments
...
- If needed, the version control system can be used to restore this code
2016-09-30 09:22:00 -04: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
Tobias Diekershoff
92dac133a0
Merge pull request #2815 from annando/1609-mysql
...
We should only use utf8mb4 for dumpsql and new installations
2016-09-29 09:26:17 +02:00
Michael Vogel
6b318ed304
We should only use utf8mb4 for dumpsql and new installations
2016-09-29 06:31:42 +00:00
Tobias Diekershoff
1cfcc939c0
Merge pull request #2790 from gerhard6380/develop
...
New API /api/friendica/profile/show
2016-09-28 08:11:20 +02:00
Tobias Diekershoff
4aa834564a
Merge pull request #2802 from annando/xmpp-profile
...
New fields for the DFRN protocol (XMPP and Account Type)
2016-09-27 20:57:56 +02:00
Michael Vogel
d632d282cd
We are now having an account type and are publishing it
2016-09-25 20:37:27 +00:00
gerhard6380
6c3c3a64ae
remove parameter from doxygen description
2016-09-25 22:25:59 +02:00
gerhard6380
0e8a9f93d7
another correction of spaces
2016-09-25 18:52:59 +02:00
gerhard6380
0581cbcfc8
change spaces/tabstopps
2016-09-25 18:50:08 +02:00
gerhard6380
5e1726184a
correct some spaces/tabs
2016-09-25 18:45:00 +02:00
gerhard6380
01ff105a43
correct tab indents and CRLF
2016-09-25 18:22:42 +02:00
Michael Vogel
196eb6009f
The XMPP address is now in the profile and will be transmitted
2016-09-25 15:28:00 +00:00
Tobias Diekershoff
252f1827c1
correction of typos
2016-09-24 08:08:04 +02:00
Tobias Diekershoff
1ea9df5974
correction of typos
2016-09-24 08:07:48 +02:00
gerhard6380
528a492282
Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop
2016-09-23 19:38:57 +02:00
gerhard6380
afc7d316a7
Change API documentation to contain new API call /api/friendica/profile/show
2016-09-23 19:26:44 +02:00
gerhard6380
4de12dacc7
New API /api/friendica/profile/show to return data of all profiles a user has to a client
2016-09-23 19:06:41 +02:00
Michael Vogel
5f9a392fc4
At the search we should do it as well.
2016-09-23 06:36:48 +00:00
Michael Vogel
6fd54df940
Some additional beautification
2016-09-22 18:18:26 +00:00
Michael Vogel
abbf501602
The string is an array ...
2016-09-22 18:07:32 +00:00
Michael Vogel
c6f50d0468
Reworked ejabberd authentification
2016-09-22 02:57:40 +00:00
Roland Haeder
50d168ab6b
Use more dbm::is_result()
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-19 22:13:33 +02:00
Roland Haeder
636164e9ef
Opps, wrong brace and removed invert of dbm::is_result()
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-18 23:31:27 +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
Michael Vogel
4f5997f30a
XMPP authentification for multi domain systems
2016-09-13 20:29:47 +00:00
Michael Vogel
1caa87dce6
Restructured the way, processes are inserted and removed
2016-09-09 20:55:49 +00:00
Michael Vogel
22f32d9721
New process table for a better detection of running workers
2016-09-09 20:33:54 +00:00
Michael Vogel
ac1787d1e5
Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value
2016-09-05 11:52:41 +00:00
Michael Vogel
1cb6043aea
Attachments are now displayed again.
2016-09-04 18:06:07 +02:00
Michael Vogel
6e25077893
Merge pull request #2760 from gerhard6380/3.5rc
...
API: change friendica_activities to include arrays of users
2016-09-03 20:47:52 +02:00
Michael Vogel
6df40b1161
sQL: No "NOT NULL" on text fields.
2016-09-03 15:06:42 +00:00
Michael Vogel
c02b1c3f36
The "tagged with" message now works again.
2016-09-03 12:48:51 +02:00
gerhard6380
3a31619509
API: change friendica_activities to include arrays of users
2016-09-02 17:01:52 +02:00
Tobias Diekershoff
014fc5dccb
Merge pull request #2758 from annando/1609-sql-charset
...
Set the charset for the SQL connection for new installations
2016-09-01 09:22:07 +02:00
Michael Vogel
59ff309ee5
Add the new charset parameter to the database creation
2016-09-01 04:44:29 +00:00
Michael Vogel
9209d88c4a
Set the charset for the SQL connection for new installations
2016-09-01 03:50:41 +00:00
Tobias Diekershoff
02c29f1313
Merge pull request #2748 from rabuzarus/rabuzarus-pending
...
best_link_url: don't use redirect for pending contacts
2016-08-31 15:55:26 +02:00
Tobias Diekershoff
c62a28d95e
Merge pull request #2755 from rabuzarus/theme-init-identity
...
fix theme loading
2016-08-31 15:53:42 +02:00
rabuzarus
aedd2cfa60
Update identity.php
2016-08-31 13:49:24 +02:00
Michael Vogel
41613ec55d
Bugfix: Fixed two bad sql queries
2016-08-29 18:40:40 +00:00
rabuzarus
e0d329ece9
Merge pull request #2750 from annando/1608-worker-priority-again
...
Prevent lowest priority calls from never being called
2016-08-28 00:39:58 +02:00
Michael Vogel
6a167cf8b1
Prevent lowest priority calls from never being called
2016-08-27 21:05:38 +00:00
Michael Vogel
e46dae3937
Removed some accidentally written code
2016-08-27 19:53:09 +02:00
Michael Vogel
a156d59e2a
dbstructure: Set the version when updating manually
2016-08-27 19:50:19 +02:00
rabuzarus
c1555b623a
best_link_url: don't use redirect for pending contacts
2016-08-26 15:47:45 +02:00
Tobias Diekershoff
dc6cce4080
Merge pull request #2746 from annando/1608-diaspora-handle-lowercase
...
The handle for Diaspora contacts must always be low…
2016-08-23 07:52:35 +02:00
Michael Vogel
80bfcc7694
The handle (user@domain.tld) for Diaspora contacts must always be lowercase
2016-08-23 07:48:48 +02:00
Tobias Diekershoff
be4ce36a97
Merge pull request #2745 from annando/1608-atachments
...
Bugfix: Handle attachments with bbcode inside/handle the [p] bbcode
2016-08-23 07:48:18 +02:00
Michael Vogel
50dc7a6047
Bugfix: Handle attachments with bbcode inside/handle the [p] bbcode
2016-08-23 07:40:16 +02:00
Tobias Diekershoff
f344813054
events with no finish should not export it to ical
2016-08-20 16:16:19 +02:00
Michael Vogel
108a1c4ac6
New priority level for stale processes.
2016-08-18 12:33:17 +02:00
Tobias Diekershoff
789e9577c6
Merge pull request #2737 from annando/1608-worker-again
...
Performance improvements for the poller
2016-08-14 22:10:13 +02:00
gerhard6380
078767630c
improved sql statements for direct_messages calls
2016-08-14 22:03:59 +02:00
gerhard6380
01a2eb3555
Implement api/direct_messages/destroy
...
Twitter compliant call replaces api/friendica/direct_messages_delete;
JSON return expected by Twitter API and parameter include_entities not
yet implemented
2016-08-14 22:03:40 +02:00
gerhard6380
ef0cc850d4
remove api_friendica_direct_messages_all
...
instead included 'friendica_verbose' parameter into standard function
api_direct_messages_box()
2016-08-14 22:03:27 +02:00
gerhard6380
f9f1825e33
Removing api_friendica_direct_messages_conversations
...
due to implementing 'seen' and 'parent-uri' into standard
api_format_messages() this call is not needed anymore. Adapting comment
blocks.
2016-08-14 22:03:08 +02:00
gerhard6380
f99a646328
remove api_format_messages_win and include new fields in api_format_messages
2016-08-14 22:02:56 +02:00
gerhard6380
fe5182559f
new API calls for private messsages in Win10 app
...
new API calls used for Windows 10 app (similar calls to existing but
extended to include seen id and parent-uri)
2016-08-14 22:02:43 +02:00
Michael Vogel
67b16507f1
Performance improvements for the poller
2016-08-14 21:02:29 +02:00
Michael Vogel
0ea9af3d7d
Ping is now using a standard routine to generate the xml.
2016-08-10 22:51:03 +02:00
rabuzarus
5e4eaa433b
Merge pull request #2720 from annando/1608-kill-stale-worker
...
Process timeouts are now priority depending
2016-08-08 22:34:45 +02:00
Michael Vogel
d138b11868
Use a 10 minute timeout for high priority processes. This may be better.
2016-08-08 21:28:44 +02:00
Michael Vogel
29168de677
Process timeouts are now priority depending
2016-08-08 19:20:40 +02:00
Michael Vogel
61e3a8ca3a
Merge pull request #2702 from rabuzarus/0308-Notifications-restructure
...
notifications restructure
2016-08-08 07:41:48 +02:00
Michael Vogel
65a09c67a0
Bugfix: proc_run hadn't worked anymore due to the priority changes
2016-08-08 07:14:40 +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
Michael Vogel
0411eb289e
Lower the priority for stale processes
2016-08-04 15:41:32 +02:00
Michael Vogel
074ae59f49
Reschedule killed processes at the beginning of the queue.
2016-08-04 15:33:15 +02:00
Michael Vogel
dad74e9650
pubsubpublish is now split into separate calls per entry.
2016-08-04 15:15:43 +02:00
rabuzarus
8ad345c434
notifications - remove TAB (clean up)
2016-08-04 11:46:57 +02:00
Michael Vogel
0cba02a805
Added priority to some forgotten proc_run calls
2016-08-03 18:24:22 +02:00
Michael Vogel
7157ca3809
Fastlane is now working with any priority level
2016-08-03 15:59:25 +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
Michael Vogel
ff430640c0
Small variable type fixed, removed unused includes
2016-08-03 10:19:46 +02:00
Michael Vogel
d673f44c5b
Split cron jobs in cronjobs, introduce fastlane for high priority tasks
2016-08-03 10:03:05 +02:00
fabrixxm
87fb0b7b26
Quick fix to PR #2682
2016-08-02 12:24:07 +02:00
Michael Vogel
13c285d61d
Updated documentation
2016-08-02 10:19:10 +02:00
Michael Vogel
b9dbb0ace1
Split cronhook call to several single calls
2016-08-02 06:28:34 +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
Tobias Diekershoff
c6f7952f37
Merge pull request #2696 from annando/1608-performance
...
Small performance improvements
2016-08-01 08:21:36 +02:00
Michael Vogel
d8c4fceef8
Merge remote-tracking branch 'upstream/develop' into 1608-performance
2016-08-01 08:04: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
Michael Vogel
84e84a0689
Small performance improvements
2016-08-01 07:22:54 +02:00
trebor
52f641904b
notifications.php: reduce code duplication
2016-07-30 10:51:21 +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
Michael Vogel
0deea97cf2
Merge pull request #2686 from rabuzarus/2107-contact_edit
...
frio: templates for contact_edit and crepair
2016-07-26 09:33:37 +02:00
rabuzarus
768d10536f
frio: templates for contact_edit and crepair
2016-07-26 09:09:40 +02:00
rabuzarus
e4bef09717
dbm.php - is_result should be a static function
...
there was a notice in php.out - `Non-static method dbm::is_result() should not be called statically`
This should fix it.
2016-07-25 11:46:14 +02:00
Michael Vogel
5e81c105e0
We now work with the "priority" field - that's better
2016-07-24 20:25:11 +02:00
Michael Vogel
747dc934f7
Avoid warning because $a isn't called by reference
2016-07-24 13:53:26 +02:00
Michael Vogel
4be7e5a581
"Fast lane" mechanism to reserve one queue for priority processes
2016-07-24 11:22:44 +02:00
Michael Vogel
7580c8ed11
Processing of high priority processes
2016-07-23 22:57:22 +02:00
Michael Vogel
fb447e84ee
Some more information about the current queue status of the worker
2016-07-22 18:07:04 +02:00
Michael Vogel
8bf7db06db
New indexes for the API
2016-07-19 08:43:57 +02:00
Michael Vogel
4f07dfb35a
Optimized queries
2016-07-18 15:25:42 +02:00
Michael Vogel
838f976715
Some more improvements to xml.php, code cleanup
2016-07-17 23:59:35 +02:00
Michael Vogel
d7f093cb2e
Enhanced XML creation, and so on.
2016-07-17 19:42:30 +02:00
Michael Vogel
bc2c565060
Work in progress: API XML output without templates
2016-07-16 12:32:08 +02:00
Michael Vogel
de6f48365b
Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml
2016-07-15 20:12:46 +02:00
Tobias Diekershoff
0a49b7dc77
Merge pull request #2681 from annando/bugfix-diaspora
...
Bugfix: There was an SQL error when adding new entries in the fcontac…
2016-07-15 17:35:50 +02:00
Michael Vogel
1603aa41ef
Bugfix: There was an SQL error when adding new entries in the fcontact table
2016-07-15 17:25:30 +02:00
Michael Vogel
a64b7704d8
Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml
2016-07-15 17:19:16 +02:00
Michael Vogel
1130f11037
Merge pull request #2680 from fabrixxm/feature-api-update
...
API: fix plaintext of reshared attachment
2016-07-15 16:58:59 +02:00
fabrixxm
ec22b6086a
API: fix plaintext of reshared attachment
...
When replacing `[attachment]` element, text after it wasn't restored.
`[share]` element can contain `[attachment]`, the closing `[/share]` was elided,
then the `[share]` element was shown in plaintext instead of recycle symbol
2016-07-15 16:53:30 +02:00
Michael Vogel
4e25d08a77
Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml
2016-07-15 16:15:20 +02:00
Michael Vogel
6ebfbc5993
API: Use a generic function to create the XML
2016-07-15 15:37:51 +02:00
Tobias Diekershoff
334db69d5d
Merge pull request #2678 from fabrixxm/feature-api-update
...
api updates
2016-07-15 15:08:55 +02:00
fabrixxm
d68c09e428
API: use diaspora::is_reshare()
2016-07-15 12:22:35 +02:00
fabrixxm
43699646d6
API: use doxygen todo style
2016-07-15 11:46:19 +02:00
fabrixxm
66199c9861
API: rework retweeted_status
...
`api_share_as_retweet()` now returns a copy of the item with
fields updated to shared content, instead of modify the item itself.
The new item array is used to build 'retweeted_status'.
2016-07-14 16:39:40 +02:00
fabrixxm
c7876d0c38
API: add docs to api_item_get_user()
...
and remove commented out lines
2016-07-14 13:36:15 +02:00
fabrixxm
18bd7f5eb7
API: use regex instead of SimpleXMLElement
...
It's easier with exotic chars.
And the editor replaced all leading spaces with tabs.
2016-07-14 13:32:31 +02:00
Michael Vogel
2c5fb55725
Diaspora: Link to protocol description added. Support for creation date of comments
2016-07-14 07:20:20 +02:00
fabrixxm
ce2f765d28
API: rework share as retweet
...
new shared status xml template.
<retweeted_status> element in xml.
parent status keeps his body and author, 'retweeted_status'
get body, author and plink from share bbcode.
2016-07-13 22:29:07 +02:00
fabrixxm
3cd2ed54eb
api: item owner and activities details
...
return new fileld for items 'friendica_owner'.
'user' is always the author of the item.
Items activitites now returns array of contacts details: {'name','url'}
2016-07-13 19:58:38 +02:00
Michael Vogel
4b29937a74
Worker: New value for cooldown time after each function call
2016-07-13 19:43:16 +02:00
fabrixxm
95b7de6313
API: Fix api_array_to_xml()
2016-07-13 19:11:10 +02:00
Michael Vogel
fdd679636b
Bugfix: Avoid a warning if "theme_info" isn't an array
2016-07-12 12:59:34 +02:00
rabuzarus
4e4580f326
Merge pull request #2669 from annando/1607-new-probe
...
New probing mechanism
2016-07-11 21:42:48 +02:00
Michael Vogel
a64db18731
Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
2016-07-11 20:45:56 +02:00
Michael Vogel
0a46a3d10e
Bugfix: Avatar pictures of mail contacts weren't displayed correctly
2016-07-11 20:42:18 +02:00
Michael Vogel
ee7f10f130
Some more little documentation
2016-07-11 19:48:37 +02:00
rabuzarus
15471f3835
add possibility to load custom page templates + none.php pagetemplate is part of core now
2016-07-11 10:33:39 +02:00
Michael Vogel
aad3fb2d32
Some more documentation
2016-07-10 18:44:48 +02:00
Michael Vogel
230bfcebea
Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
2016-07-10 14:03:10 +02:00
Tobias Diekershoff
26098fa263
Merge pull request #2671 from annando/1607-diaspora-soapbox-connect
...
Bugfix: Diaspora connect requests to soapbox account work now
2016-07-10 13:55:56 +02:00
Michael Vogel
9ac26802ce
Diaspora: Send the profile data after a successful connect
2016-07-10 13:11:09 +02:00
Michael Vogel
19377f2a9c
Just make the bugfix a little bit simpler
2016-07-10 12:18:10 +02:00
Michael Vogel
84aa01b377
Bugfix: Diaspora connects to a Soapbox account weren't established correctly
2016-07-10 12:09:58 +02:00
Michael Vogel
8a11a60932
Small text correction
2016-07-10 09:29:43 +02:00
Michael Vogel
b9da831138
Fallback for empty names
2016-07-10 09:27:40 +02:00
Michael Vogel
f27bc00464
Remove obsolote functions
2016-07-09 20:09:09 +02:00
Michael Vogel
058c93a64c
Changed documentation
2016-07-08 22:55:39 +02:00
Michael Vogel
f86dac652f
OStatus now has "location" and "about", probing for urls added
2016-07-08 22:31:11 +02:00
Michael Vogel
0ccb171449
Probing now has a Twitter detection.
2016-07-08 21:15:20 +02:00
Michael Vogel
e43a90252c
Diaspora: Relayed retraction hadn't worked.
2016-07-08 20:39:14 +02:00
Michael Vogel
b954714464
If the nick is missing then take the first part of the name
2016-07-08 20:37:10 +02:00
Michael Vogel
edfee710fe
To-Do added
2016-07-07 23:35:44 +02:00
Michael Vogel
db1d8caaf2
Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
2016-07-07 23:35:14 +02:00
Michael Vogel
a65547c578
Added documentation
2016-07-07 23:04:30 +02:00
Michael Vogel
c625b6aba8
If a page contains a feed url then follow it.
2016-07-07 22:37:16 +02:00
Tobias Diekershoff
b4b2a6d5b8
Merge pull request #2666 from annando/1607-more-logging
...
Logging for feeds improved, new "process id" for logging
2016-07-07 22:36:20 +02:00
Michael Vogel
2e37234a41
Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
2016-07-07 21:57:10 +02:00
Michael Vogel
fc25e605cb
Logging for feeds improved, new "process id" for logging
2016-07-07 20:32:13 +02:00
Tobias Diekershoff
5b03db4a1b
adjust the rand bounderies to be within the allowed max value
2016-07-05 15:45:39 +02:00
Michael Vogel
585c893456
You can now prove with an uid (important for mails)
2016-07-04 22:34:35 +02:00
Michael Vogel
4e5d335492
Removed the legacy function calls, removed unused functions
2016-07-04 08:05:30 +02:00
Michael Vogel
e1c0b4fe03
Warnings removed
2016-07-04 00:49:38 +02:00
Michael Vogel
f5593b1981
Removed old code
2016-07-04 00:14:08 +02:00
Michael Vogel
b124b94288
Support for noscrape when probing.
2016-07-03 23:11:21 +02:00
Michael Vogel
99f94edc9c
New class to probe urls
2016-07-03 22:27:16 +02:00
Tobias Diekershoff
ce64955fe0
Merge pull request #2659 from annando/1607-bugfix-scrape-diaspora
...
Bugfix: The notify value for Diaspora wasn't assigned
2016-07-02 22:07:41 +02:00
Tobias Diekershoff
598a9f76a6
Merge pull request #2658 from annando/1607-maxload
...
Central Backend/Frontend detection when checking for overload
2016-07-02 21:52:48 +02:00
Michael Vogel
34475ad262
Bugfix: The notify value for Diaspora wasn't assigned
2016-07-02 21:14:21 +02:00
Tobias Diekershoff
7cda169f24
Merge pull request #2657 from annando/1607-share-contact
...
Only use the profile data in shares if there is data
2016-07-02 20:06:20 +02:00
Michael Vogel
f1af0fe360
Obly use the profile data in shares if there is data
2016-07-02 17:51:16 +02:00
Michael Vogel
c7f10bacb5
Merge remote-tracking branch 'upstream/develop' into 1607-is-result2
2016-07-02 14:01:52 +02:00
Michael Vogel
e4c6cfd2d8
Moves the function "is_result" from dba to dbm.
2016-07-02 14:00:42 +02:00
Tobias Diekershoff
b580a338f6
Merge pull request #2654 from annando/1607-thumb-micro
...
use thumb avatar size instead of micro size in the contact list
2016-07-02 13:53:35 +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
e67554924a
use thumb avatar size instead of micro size in the contact list
2016-07-02 09:32:42 +02:00
Michael Vogel
c549ae939c
Added the new function to the poller.
2016-07-02 09:31:28 +02:00
Michael Vogel
c1ce7059b6
If it doesn't work with the new method, try the old one
2016-06-30 22:58:56 +02:00
Michael Vogel
e5dd67121f
Some logging added.
2016-06-30 22:42:46 +02:00
Michael Vogel
97abbe83f4
Diaspora: Support for reading the /fetch/post/ functionality
2016-06-30 22:18:48 +02:00
Michael Vogel
24e0fffa2e
Small bugfix
2016-06-30 07:56:06 +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
2d72e2d932
Diaspora: Support for new fetch functionality (replacement for /p/)
2016-06-29 22:50:30 +02:00
Michael Vogel
230a645307
Diaspora: Another Bugfix for the new protocol
2016-06-29 20:37:04 +02:00
Michael Vogel
152efdaec5
Diaspora: Incompatibilities with signature check solved
2016-06-29 10:33:43 +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
fd72f36ffe
move html from function micropro() to own templates
2016-06-25 18:46:47 +02:00
Michael Vogel
ad6b3f8815
Merge pull request #2636 from rabuzarus/2506_frio_strings
...
add missing strings for frio
2016-06-25 14:03:34 +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
Michael Vogel
e2023b6667
Store the guid value as well.
2016-06-25 11:52:52 +02:00
Michael Vogel
ec5b3109e4
Support for the case when the guid and public key will vanish from webfinger
2016-06-25 00:38:47 +02:00
Tobias Diekershoff
f8a20a15d3
Merge pull request #2633 from annando/1606-author-id-update
...
author-id/owner-id: Post update function/added database documentation
2016-06-24 07:03:46 +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
Michael Vogel
c7373dcec4
author-id/owner-id: Post update function/added database documentation
2016-06-23 21:15:54 +02:00
rabuzarus
e352458ef0
pub calendar - permission clean up and docu
2016-06-23 10:07:13 +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
49c19a3c00
Merge pull request #2628 from rabuzarus/1906-event-test
...
move the cal addon (exporting calendars) to core
2016-06-21 22:48:31 +02:00
Michael Vogel
266fea3874
Merge remote-tracking branch 'upstream/develop' into 1606-contact-id
2016-06-21 00:10:24 +02:00
rabuzarus
71c9f562ae
move the cal addon (exporting calendars) to core
2016-06-20 23:31:49 +02:00
Michael Vogel
a657377616
Diaspora: Try to fetch the uri if we already received the message
2016-06-20 22:48:55 +02:00
Michael Vogel
40a44f1571
Some manual revert ...
2016-06-20 22:48:09 +02:00
Michael Vogel
467176fa65
Diaspora: Ensure that we always store the correct URI
2016-06-20 22:43:14 +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
0adff6f6b8
Fix for author-thumb/owner-thumb - DFRN: Relocate stuff
2016-06-19 20:01:25 +02:00
Michael Vogel
91db7a549c
Optimised the amount of function for the item query
2016-06-19 08:32:38 +02:00
Michael Vogel
c3ed6f7d01
Improved default value handling
2016-06-19 01:22:32 +02:00
Michael Vogel
e512a83ecc
Massively updated avatar handling
2016-06-19 01:07:20 +02:00
Michael Vogel
bf2e23c205
Merge pull request #2616 from rabuzarus/1206-events-template
...
use standard templates in events + frio templates for events
2016-06-18 15:01:00 +02:00
rabuzarus
b977efc95c
code highlight - some spacing for readability
2016-06-17 15:29:01 +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
4313982e02
frio - event - code clean up + docu
2016-06-17 14:27:33 +02:00
rabuzarus
8b4c416713
frio: events - split event form in different sections
2016-06-16 20:16:16 +02:00
rabuzarus
0167a2bd61
port of Hubzillas code highlight feature
2016-06-16 11:38:12 +02:00
Michael Vogel
8762fb671f
Merge remote-tracking branch 'upstream/develop' into 1606-contact-id
2016-06-16 10:48:52 +02:00
Michael Vogel
3c9a80a31c
dfrn relocate: addr field added, gcontact update added
2016-06-15 21:23:22 +02:00