Michael Vogel
d27ed6e9d8
Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content
2016-02-23 08:03:30 +01:00
Michael Vogel
148c89a20d
Added documentation
2016-02-23 07:56:49 +01:00
Michael Vogel
bc283a5316
The "abstract" has moved after the "nobb" part in bbcode.
2016-02-23 07:21:40 +01:00
Michael Vogel
8ec833f808
New BBCode element "abstract" for network depending messages.
2016-02-22 23:20:59 +01:00
Michael Vogel
d10eee45b9
Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content
2016-02-19 11:55:57 +01:00
Michael Vogel
8a3de7b186
Issue 2367: The data for the gserver table is now sanitized.
2016-02-19 07:30:28 +01:00
Michael Vogel
2eb461ed2c
Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content
2016-02-18 08:15:58 +01:00
Tobias Diekershoff
26463d92da
Merge pull request #2366 from annando/1602-array_merge
...
Avoid "array_merge" warning.
2016-02-18 07:50:43 +01:00
Michael Vogel
9619829b4a
Avoid "array_merge" warning.
2016-02-18 07:41:08 +01:00
Michael Vogel
f9e2543133
Merge pull request #2354 from fabrixxm/issues/api-errors
...
api: throw HTTPException instead of calling api_error directly
2016-02-18 07:26:33 +01:00
Michael Vogel
7d4c99ebbc
"get_baseurl" and "z_root" are disappearing ...
2016-02-17 23:47:32 +01:00
Michael Vogel
c770b00d6d
Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content
2016-02-17 12:18:46 +01:00
Michael Vogel
c5b724828a
Just some more removed baseurls ...
2016-02-17 08:08:28 +01:00
Michael Vogel
f7537c9e90
Remove the baseurl where possible to avoid mixed content
2016-02-17 00:01:24 +01:00
Michael Vogel
a18fde458c
Added documentation.
2016-02-16 08:06:55 +01:00
Michael Vogel
ade5ef7065
Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie
2016-02-16 07:58:01 +01:00
Tobias Diekershoff
e9fe220116
Merge pull request #2356 from annando/1602-redmatrix-name
...
We now show the correct platform (redmatrix or hubzilla)
2016-02-15 07:38:16 +01:00
Michael Vogel
ec1bfe3d22
Merge remote-tracking branch 'upstream/develop' into 1602-redmatrix-name
2016-02-14 21:03:57 +01:00
Michael Vogel
88018b6e73
Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie
2016-02-14 20:57:57 +01:00
Michael Vogel
b0548018d8
Simplepie is removed since we don't use it anymore
2016-02-14 19:50:59 +01:00
Michael Vogel
21fc3c60d4
We now show the correct platform (redmatrix or hubzilla)
2016-02-14 15:05:43 +01:00
Michael Vogel
ec57b61f01
The feed function has now a simulation mode
2016-02-14 15:02:59 +01:00
Michael Vogel
922186bdd1
Small bugfix for the keyword bug in the gcontact table
2016-02-14 12:39:57 +01:00
Michael Vogel
5d35974c19
"addr" and "server_url" are now generated directly in "update_gcontact" if not given.
2016-02-14 11:56:23 +01:00
fabrixxm
3f5f1351b9
api: throw HTTPException instead of calling api_error directly
...
there was some places where api_error() was called instead of throwing
correct subclass of HTTPException. This was causing php errors.
Dogygen comment of api_error() is updated as well
2016-02-14 11:24:51 +01:00
Michael Vogel
b9e1792076
The shadow contact (contact with uid=0) will be updated now as well.
2016-02-14 07:31:57 +01:00
Michael Vogel
5086b8b2a7
DFRN Bugfix: The poco data wasn't sent
2016-02-14 00:14:03 +01:00
Michael Vogel
15296b8036
Avoid errors when noscrape data can't be fetched.
2016-02-13 22:20:00 +01:00
Michael Vogel
f496af08bb
OStatus: The gcontact table will now be updated from the conversation as well
2016-02-13 21:35:05 +01:00
Michael Vogel
9261154eab
Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup
2016-02-13 20:12:31 +01:00
Tobias Diekershoff
d0b5c16a20
Merge pull request #2351 from annando/1602-performance-unread-group
...
Optimized query for unread group postings
2016-02-13 19:43:33 +01:00
Michael Vogel
bf7dedb03b
Optimized query for unread group postings
2016-02-13 18:15:24 +01:00
Michael Vogel
a4da9fb55d
Update the gcontact entry when the contact entry is checked for updates
2016-02-13 14:09:08 +01:00
Michael Vogel
253ba45c1a
Added a to-do
2016-02-13 13:30:53 +01:00
Tobias Diekershoff
4ee15cc682
Merge pull request #2334 from fabrixxm/feature_autoloader
...
Autoloader
2016-02-13 12:27:24 +01:00
Michael Vogel
2ca6cdf6b6
Improvements how gcontact entries are updated
2016-02-13 12:26:58 +01:00
Michael Vogel
acb09d3a3d
Database connections: When we now check for user values we check the system values as well
2016-02-12 11:04:25 +01:00
Tobias Diekershoff
8451397857
Merge pull request #2346 from annando/1602-poller-user-limits
...
Poller: Now the user limits can be detected automatically as well
2016-02-12 08:17:30 +01:00
Michael Vogel
b5c5471748
Added some documentation
2016-02-12 07:39:08 +01:00
Michael Vogel
4dad744c35
DFRN-Bugfix: Forums should work now
2016-02-11 22:35:06 +01:00
Michael Vogel
5027fbf733
Poller: Now the user limits can be detected automatically as well
2016-02-11 21:39:34 +01:00
Michael Vogel
4af77b60ce
Poller: Use the processlist when the number of maximum database connections was provided manually
2016-02-11 11:33:45 +01:00
Tobias Diekershoff
a4804a25ee
Merge pull request #2343 from fabrixxm/api_ping
...
fix missing html2plain() function declaration
2016-02-11 09:34:47 +01:00
fabrixxm
e20aad4347
fix missing html2plain() function declaration
2016-02-11 09:05:00 +01:00
Tobias Diekershoff
f48a639537
Merge pull request #2341 from annando/1602-contact-bugfix
...
Bugfix: The "keywords" field in the gcontact table wasn't set correctly
2016-02-11 07:35:32 +01:00
Michael Vogel
ef0f826fd0
Merge pull request #2325 from fabrixxm/api_ping
...
Api for notifications
2016-02-10 23:47:11 +01:00
Michael Vogel
20d7d18379
Bugfix: The "keywords" field in the gcontact table wasn't set correctly
2016-02-10 23:39:18 +01:00
Michael Vogel
211be5bfc5
Poller: The maximum number of connections can now be configured
2016-02-09 23:28:33 +01:00
Fabrixxm
04dceb9551
Merge branch 'develop' into api_ping
2016-02-09 14:06:57 +01:00
Fabrixxm
d2a9aa1972
add some doxygen comments
2016-02-09 11:10:00 +01:00
Fabrixxm
aec8a1883e
let autoloader include files for HTMLPurifier
2016-02-09 11:08:26 +01:00
Fabrixxm
c6514d58db
add composer-derived autoloader
2016-02-09 11:07:37 +01:00
Michael Vogel
7b2fadcf43
Get rid of the "guid" table. We don't need it anymore.
2016-02-09 10:21:10 +01:00
Michael Vogel
7af3dd01d8
Poller: Check the number of used database connections
2016-02-09 06:42:00 +01:00
Michael Vogel
981aad46d3
DFRN: Sending pokes does work now again
2016-02-08 22:37:29 +01:00
fabrixxm
0c67c89715
Merge pull request #2323 from annando/1601-dfrn-import
...
Complete rewrite of DFRN import
2016-02-08 15:48:16 +01:00
Michael Vogel
b3f7e8d388
Now the public static functions are public static functions
2016-02-08 15:26:24 +01:00
Fabrixxm
2a016e7685
add missing query backticks
2016-02-08 14:35:41 +01:00
Fabrixxm
9ff0fc92dd
NotificationsManager: add backtick to queries
2016-02-08 13:42:06 +01:00
Fabrixxm
756b90a4e0
add docs, rewrite part of the notification api
...
list notifications and set note as seen functionalities are now
splitted in two functions, with correct http method requirement.
Fixed returned value from `notification/seen`
2016-02-08 09:47:59 +01:00
Michael Vogel
4d21671f75
Merge pull request #2314 from rabuzarus/0302_datetime_cleanup
...
datetime.php cleanup
2016-02-08 03:33:25 +01:00
rabuzarus
e267630c54
datetime.php: cleanup - delete some dots which shouldn't be there
2016-02-08 01:59:05 +01:00
fabrixxm
44592611e1
new api for notifications
...
/api/friendica/notification
returns first 50 notifications for current user
/api/friendica¬ification/<id>
set note <id> as seen and return item object if possible
new class NotificationsManager to query for notifications and set seen
state
2016-02-07 14:27:13 +01:00
fabrixxm
ecfb6ec924
Merge pull request #2313 from rabuzarus/0302_forum_class
...
forums.php is now ForumManager.php and providing class ForumManager
2016-02-07 09:28:50 +01:00
Michael Vogel
af219ac9ec
Just some more code cleanup and documentation.
2016-02-06 21:44:10 +01:00
Michael Vogel
8ea4659031
The code was rearranged to improve readability
2016-02-06 17:48:03 +01:00
Michael Vogel
3890415767
Receiving pokes work now
2016-02-06 11:16:00 +01:00
Michael Vogel
bd3e10b132
Bugfix in the poke function / added documentation.
2016-02-06 10:16:16 +01:00
rabuzarus
4896517385
datetime.php: little more docu
2016-02-06 01:08:10 +01:00
Michael Vogel
9e3f849e89
Added documentation
2016-02-05 22:12:54 +01:00
Michael Vogel
1c82e9f209
Bugfix for OStatus to prevent sending messages from wrong senders
2016-02-05 21:31:11 +01:00
Michael Vogel
d408cea871
DFRN import has now gone live
2016-02-05 21:25:20 +01:00
Michael Vogel
e2a8146307
Added some to-do points
2016-02-05 09:03:17 +01:00
Michael Vogel
2bd36e5628
Feed should work now as well
2016-02-04 23:52:06 +01:00
Michael Vogel
92a31344b5
Events do work now.
2016-02-04 20:34:18 +01:00
Michael Vogel
0390001d4e
Added some more logging
2016-02-04 15:53:22 +01:00
rabuzarus
52dbb0b4a2
Forum class - rename Class CamelCase and rename some methods
2016-02-04 14:51:54 +01:00
rabuzarus
9a54afa629
Forum class - rename Class CamelCase and rename some methods
2016-02-04 14:47:20 +01:00
Michael Vogel
3a649047df
DFRN: Contact-id is now stored depending on the author/Some more bugfixes
2016-02-04 12:51:34 +01:00
Michael Vogel
5f6ba00408
Added documentation, fixed some bug
2016-02-04 10:19:13 +01:00
Michael Vogel
2d0c2990ea
Differences fixed between old and new code
2016-02-03 23:04:52 +01:00
rabuzarus
811ed4e1c0
datetime.php cleanup
2016-02-03 19:48:09 +01:00
rabuzarus
c1070e4655
forums.php is now forum.php and providing class forum
2016-02-03 18:05:26 +01:00
Fabrixxm
9fcd74f470
Pass App class instace to all templates via "$APP" variable
2016-02-03 14:01:37 +01:00
Michael Vogel
d9b5d6d5f5
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import
2016-02-03 08:34:11 +01:00
Tobias Diekershoff
ada4fbdfb9
Merge pull request #2309 from annando/1602-new-guid
...
New method to create a guid if none was given
2016-02-03 07:07:13 +01:00
Michael Vogel
47d2e3b142
Added some documentation
2016-02-03 05:00:26 +01:00
Michael Vogel
f604f13d7d
New method to create a guid if none was given
2016-02-02 20:57:19 +01:00
Michael Vogel
1aa225b03b
Code beautification
2016-02-01 23:52:37 +01:00
Michael Vogel
8a9862c9ce
Entry import could work but need clean up
2016-02-01 00:09:03 +01:00
Michael Vogel
d04e1bdf69
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import
2016-01-30 16:38:06 +01:00
Michael Vogel
3ea5706d16
Resolved namespace trouble
2016-01-30 16:37:18 +01:00
Michael Vogel
eb17fe7324
Some missing parts added
2016-01-30 14:13:58 +01:00
rabuzarus
088b075bba
event_form: use [map] tag to embedd a map
2016-01-30 05:12:27 +01:00
Michael Vogel
4e513d3885
DFRN: Deletions should work now as well
2016-01-30 03:17:46 +01:00
Michael Vogel
69457a4a5b
DFRN import seems to work. Improvements are possible :-)
2016-01-30 02:57:40 +01:00
rabuzarus
8e0f04026c
vier: some fixes for mobile view
2016-01-30 01:53:21 +01:00
Michael Vogel
cd1f3cde00
DFRN Deletions should now work too
2016-01-30 01:20:43 +01:00
Michael Vogel
decaac6c31
DFRN-Import is now nearly complete, changed namespace constants
2016-01-29 23:14:01 +01:00
Michael Vogel
1cdcb9fc2e
DFRN: Entry import could work now, first steps for mails
2016-01-29 17:42:38 +01:00
Tobias Diekershoff
