Andrej Stieben
4d7a6aaed2
Moved div#pause from index.php to view/default.php
...
This closes #2320 .
2016-02-09 15:54:35 +01:00
Fabrixxm
04dceb9551
Merge branch 'develop' into api_ping
2016-02-09 14:06:57 +01:00
rabuzarus
743f2e0391
Merge develop into 0602_contact_profile
...
Conflicts:
mod/contacts.php
2016-02-09 13:44:30 +01:00
fabrixxm
b5100b3154
Merge pull request #2332 from annando/1602-no-guid
...
Get rid of the "guid" table. We don't need it anymore.
2016-02-09 13:40:05 +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
Fabrixxm
c28109ca94
Update HTMLPurifier to v4.7.0
2016-02-09 11:06:17 +01:00
Michael Vogel
2932ebfbc8
Merge pull request #2331 from fabrixxm/revert_pr2319
...
Revert "Merge pull request #2319 from stieben/develop"
2016-02-09 10:52:46 +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
Fabrixxm
5250fed447
Revert "Merge pull request #2319 from stieben/develop"
...
This reverts commit 9330a6994c
, reversing
changes made to ecfb6ec924
.
But it keeps changes to doc/Plugins.md and doc/de/Plugins.md
2016-02-09 09:39:29 +01:00
3c97a6703c
Merge pull request #2329 from annando/1602-poller-db
...
Poller: Check the number of used database connections
2016-02-09 07:36:39 +01:00
Michael Vogel
804c04a06f
Merge pull request #2326 from fabrixxm/revert_db949bb8
...
Revert "Updated modules to allow for partial overrides without errors"
2016-02-09 06:55:49 +01:00
Michael Vogel
7af3dd01d8
Poller: Check the number of used database connections
2016-02-09 06:42:00 +01:00
7001a231e4
Merge pull request #2327 from annando/1602-dfrn-poke
...
DFRN: Sending pokes does work now again
2016-02-09 06:27:09 +01:00
rabuzarus
c1c21ada0a
contactedit-actions-button: remove contact tabs which aren't needed anymore
2016-02-08 23:51:51 +01:00
rabuzarus
2e04a00d30
contactedit-actions-button: some adjustment for vier dark scheme
2016-02-08 23:25:48 +01:00
rabuzarus
0c764684bb
Merge develop into 0602_contact_profile
2016-02-08 23:16:02 +01:00
rabuzarus
0b5d7b300e
contactedit-actions-button: adjust the themes and template polishing
2016-02-08 23:15:20 +01:00
Michael Vogel
981aad46d3
DFRN: Sending pokes does work now again
2016-02-08 22:37:29 +01:00
Andrej Stieben
909bca90e8
Merge pull request #1 from friendica/develop
...
Merge upstream/develop
2016-02-08 22:23:01 +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
rabuzarus
cc18fd7ad9
contactedit-actions-button: doing some availability checks for the actions
2016-02-08 15:00:53 +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
a283691149
api docs: fix indentation
2016-02-08 10:34:27 +01:00
Fabrixxm
870d2f844d
Update API docs
...
Add `friendica/notification` and `friendica/notification/seen` endpoints
Fix some list rendering issues
Move all `friendica/*` endpoints under "Implemented API calls (not compatible with other APIs)" section
Add info about permitted HTTP methods and required auth
2016-02-08 10:22:12 +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
rabuzarus
991cbd604a
contact-edit-actions-button: initial commit
2016-02-08 01:56:15 +01:00
fabrixxm
b202e02fbf
Revert "Updated modules to allow for partial overrides without errors"
...
This reverts commit db949bb802
.
2016-02-07 15:11:34 +01:00
fabrixxm
102c06a41f
fix error in template in notifications page
2016-02-07 14:29:07 +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
d6cf791677
Merge pull request #2324 from rabuzarus/0502_vier_dark
...
vier: some consistency fixes for the dark scheme
2016-02-07 09:53:24 +01:00
fabrixxm
9330a6994c
Merge pull request #2319 from stieben/develop
...
Added the possibility for themes to override core module functions
2016-02-07 09:52:20 +01:00
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
rabuzarus
95819684c2
Merge develop into 0502_vier_dark
...
Conflicts:
view/theme/vier/dark.css
2016-02-06 13:09:41 +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
99c3db98a7
Merge pull request #2322 from rabuzarus/0502_vier_smiley
...
vier: display smiley-preview as inline-block - needs addons update
2016-02-06 07:27:33 +01:00
rabuzarus
4896517385
datetime.php: little more docu
2016-02-06 01:08:10 +01:00
rabuzarus
0bccfea596
vier: some consistency fixes for the dark scheme
2016-02-06 00:54:50 +01:00
Michael Vogel
9e3f849e89
Added documentation
2016-02-05 22:12:54 +01:00
Andrej Stieben
db949bb802
Updated modules to allow for partial overrides without errors
...
Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.
2016-02-05 21:52:39 +01:00
rabuzarus
bcf1020635
vier smileybutton: dark.css insert new line at the end of the file
2016-02-05 21:38:55 +01:00
Michael Vogel
1c82e9f209
Bugfix for OStatus to prevent sending messages from wrong senders
2016-02-05 21:31:11 +01:00