1
0
Fork 0
Commit graph

3192 commits

Author SHA1 Message Date
Michael Vogel
1bfdc216d0 Only close the session if it had been opened. 2016-08-16 21:35:12 +02:00
rabuzarus
2d0c503bf1 frio: fix - permissions string was missing 2016-08-13 18:58:49 +02:00
rabuzarus
826a13eb23 fix: own calendar is now always exportable for local_user() 2016-08-13 13:59:55 +02:00
Michael Vogel
1c31526d6e HTML entities in Notifications aren't a problem anymore 2016-08-11 19:59:07 +02:00
Michael Vogel
b6dec53ec1 Bugfix: A parameter in xml::from_array was missing. 2016-08-11 08:44:03 +02:00
Michael Vogel
0ea9af3d7d Ping is now using a standard routine to generate the xml. 2016-08-10 22:51:03 +02:00
Michael Vogel
61e3a8ca3a Merge pull request #2702 from rabuzarus/0308-Notifications-restructure
notifications restructure
2016-08-08 07:41:48 +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
78514db6e8 now the installer checks for iconv module as well #2506 2016-08-06 08:54:41 +02:00
rabuzarus
3921113e5c photos - include paginate into the templates - provide a photo_album.tpl for frio 2016-08-04 21:53:22 +02:00
Michael Vogel
2d63f9deb6 Worker fastlane can now be activated from the admin interface 2016-08-04 08:51:34 +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
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
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
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
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
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
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