rabuzarus
|
ae905cbd1b
|
Merge develop into 0308-Notifications-restructure
Conflicts:
mod/notifications.php
|
2016-08-03 12:53:38 +02:00 |
|
rabuzarus
|
ce3188d5c6
|
notifications - move intros to NotificationsManager & make json output work
|
2016-08-03 12:44:04 +02:00 |
|
rabuzarus
|
6d3c15fe91
|
notifications - add attendance notifications
|
2016-08-02 00:01:43 +02:00 |
|
rabuzarus
|
bcee356f66
|
notifications - add docu & pagination
|
2016-08-01 23:04:41 +02:00 |
|
rabuzarus
|
7a4be1cead
|
notifications.php: move more code to NotificationsManager
|
2016-08-01 18:18:11 +02:00 |
|
Michael Vogel
|
02b5f6a34d
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2016-08-01 08:02:26 +02:00 |
|
Michael Vogel
|
668da905e2
|
"proc_run" is now called with priority.
|
2016-08-01 07:48:43 +02:00 |
|
Tobias Diekershoff
|
75be187216
|
Merge pull request #2682 from annando/1607-api-generic-xml
API: XML is now generated without templates
|
2016-08-01 07:25:24 +02:00 |
|
Tobias Diekershoff
|
a684a1c519
|
Merge pull request #2691 from rabuzarus/2607-contact_confirm
frio: intro templates + some restructure of core notifications.php
|
2016-08-01 07:15:24 +02:00 |
|
rabuzarus
|
f7fa5f166b
|
notifications.php: unify label strings
|
2016-07-30 11:03:21 +02:00 |
|
trebor
|
52f641904b
|
notifications.php: reduce code duplication
|
2016-07-30 10:51:21 +02:00 |
|
rabuzarus
|
f09cd57165
|
notifications.php - move duplicated code in an own function
|
2016-07-28 11:39:09 +02:00 |
|
rabuzarus
|
819b374401
|
notifications.php - move some template creation to the end of the file
|
2016-07-27 21:07:54 +02:00 |
|
rabuzarus
|
320751660d
|
frio: intro notifications + some restructuring in core for notifications
|
2016-07-27 19:53:22 +02:00 |
|
Michael Vogel
|
287c9cfbdd
|
Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml
|
2016-07-26 22:15:49 +02:00 |
|
Tobias Diekershoff
|
18a35e9ceb
|
Merge pull request #2688 from rabuzarus/2607-drop
frio: provide confirm modal
|
2016-07-26 10:45:52 +02:00 |
|
rabuzarus
|
694637f9c3
|
frio: provide confirm modal
|
2016-07-26 10:36:34 +02:00 |
|
rabuzarus
|
768d10536f
|
frio: templates for contact_edit and crepair
|
2016-07-26 09:09:40 +02:00 |
|
Michael Vogel
|
8bf7db06db
|
New indexes for the API
|
2016-07-19 08:43:57 +02:00 |
|
Michael Vogel
|
f27bc00464
|
Remove obsolote functions
|
2016-07-09 20:09:09 +02:00 |
|
Michael Vogel
|
4e5d335492
|
Removed the legacy function calls, removed unused functions
|
2016-07-04 08:05:30 +02:00 |
|
Michael Vogel
|
e4c6cfd2d8
|
Moves the function "is_result" from dba to dbm.
|
2016-07-02 14:00:42 +02:00 |
|
Michael Vogel
|
7d531afd00
|
Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced
Conflicts:
boot.php
|
2016-07-02 13:38:23 +02:00 |
|
Michael Vogel
|
a7ee8a8bc9
|
Avoid redirection loops at /fetch/ and /p/
|
2016-06-30 12:02:35 +02:00 |
|
Michael Vogel
|
6f203b0a75
|
urlencode is better
|
2016-06-30 08:58:36 +02:00 |
|
Michael Vogel
|
5341223617
|
Do a redirect when the post doesn't come from our system but we know where it comes from.
|
2016-06-30 08:55:26 +02:00 |
|
Michael Vogel
|
d125939888
|
Just some more centralised functionality
|
2016-06-30 07:46:00 +02:00 |
|
Michael Vogel
|
99f0746660
|
Cleaned up the code
|
2016-06-30 07:32:07 +02:00 |
|
Michael Vogel
|
2c7fd1cb3c
|
It should be now valid
|
2016-06-30 01:18:44 +02:00 |
|
Michael Vogel
|
c0669d365b
|
The key_id was added
|
2016-06-30 00:22:42 +02:00 |
|
Michael Vogel
|
2d72e2d932
|
Diaspora: Support for new fetch functionality (replacement for /p/)
|
2016-06-29 22:50:30 +02:00 |
|
rabuzarus
|
1f50db2b2a
|
viewcontacts - fix: tabmenu was not returned
|
2016-06-28 12:32:09 +02:00 |
|
rabuzarus
|
60b767168a
|
hovercard.php - fix tags for hovercard
|
2016-06-27 11:57:47 +02:00 |
|
Tobias Diekershoff
|
773517a734
|
Merge pull request #2638 from annando/1606-avatar-handling
Imrpoved avatar handling when storing them/partly use of "micro"
|
2016-06-25 19:51:00 +02:00 |
|
rabuzarus
|
06959d745e
|
viewcontacts - make the tabbar available even if hide-friends is active
|
2016-06-25 16:20:44 +02:00 |
|
Michael Vogel
|
0b1188b7fe
|
Imrpoved avatar handling when storing them/partly use of "micro"
|
2016-06-25 13:56:55 +02:00 |
|
rabuzarus
|
073f520cee
|
add missing strings for frio
|
2016-06-25 12:21:13 +02:00 |
|
Tobias Diekershoff
|
782e31c5cf
|
Merge pull request #2634 from rabuzarus/2306_Update_Network
network.php - raw && update mode don't need the network tabs
|
2016-06-24 06:59:35 +02:00 |
|
rabuzarus
|
cf696f6d1f
|
network.php - raw && update mode don't need the network tabs
|
2016-06-24 00:33:31 +02:00 |
|
Michael Vogel
|
eabf8734a8
|
Merge pull request #2631 from rabuzarus/1906-event-test
cal export && public calendar - fix permissions
|
2016-06-23 23:24:27 +02:00 |
|
rabuzarus
|
55205e344f
|
Merge pull request #2632 from annando/1606-parse-title
Always parse the first title element
|
2016-06-23 10:18:58 +02:00 |
|
rabuzarus
|
e352458ef0
|
pub calendar - permission clean up and docu
|
2016-06-23 10:07:13 +02:00 |
|
Michael Vogel
|
8cabcda5e0
|
Always parse the first title element
|
2016-06-22 21:00:58 +02:00 |
|
rabuzarus
|
111f77ac64
|
pub calendar - add sql perms to the query (I forgot to do this)
|
2016-06-22 15:06:14 +02:00 |
|
rabuzarus
|
cd92a0dc34
|
Merge pull request #2624 from annando/1606-contact-id
Item: New fields for author id and owner id - avatar improvement with relocation
|
2016-06-22 14:26:39 +02:00 |
|
rabuzarus
|
2cac69ca86
|
cal export && public calendar - even better permissions testing
|
2016-06-22 13:50:47 +02:00 |
|
rabuzarus
|
8cc5dd35e8
|
cal export && public calendar - fix permissions
|
2016-06-22 00:39:52 +02:00 |
|
Michael Vogel
|
9a7653a4fe
|
Store the author-id and owner-id in mod/item.php as well
|
2016-06-21 07:54:45 +02:00 |
|
rabuzarus
|
d076f61a4a
|
cal export - little fix for json
|
2016-06-20 23:38:34 +02:00 |
|
rabuzarus
|
71c9f562ae
|
move the cal addon (exporting calendars) to core
|
2016-06-20 23:31:49 +02:00 |
|