1
0
Fork 0
Commit graph

12993 commits

Author SHA1 Message Date
Michael Vogel
80efc422bf Added documentation 2016-10-25 05:44:57 +00: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
cfea3cce77 Merge pull request #2860 from annando/1610-duplicate-check
Check for duplicated postings from connectors
2016-10-24 09:04:52 +02: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
2ca7953471 Merge pull request #2871 from Hypolite/issue/#2803-alt
Fix Issue #2803 - Hovercard view profile link and public directory link
2016-10-23 10:27:58 +02: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
5201bbac7e Merge pull request #2870 from rabuzarus/2210-frio_event_profile_name
frio: line-break for event-owner names in event modals
2016-10-22 16:11:30 +02:00
rabuzarus
3a7062af43 frio: line-break for event-owner names in event modals 2016-10-22 15:44:06 +02:00
rabuzarus
5205f14aee Merge pull request #2869 from Hypolite/fix-frio-calendar-strings
Fix frio calendar strings
2016-10-22 13:15:29 +02: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
Michael Vogel
bc324c3ef4 Setting for the callstack in the database query added 2016-10-21 23:42:45 +00:00
Michael Vogel
fd3cf1cd02 Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-21 23:06:37 +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
4c5a7fac83 Some stuff to make Hypolite happy :) 2016-10-21 21:32:27 +00:00
Michael Vogel
b56bdf06ed Merge remote-tracking branch 'upstream/develop' into 1610-duplicate-check 2016-10-21 21:17:58 +00:00
Michael Vogel
501c45def5 Some more improved queries 2016-10-21 18:25:21 +00:00
Hypolite Petovan
71e93d9eb9 Remove debug and extra new lines 2016-10-21 14:24:43 -04:00
Hypolite Petovan
c340d590f7 Fix calendar strings escape
- Fix base event_head.tpl file
- Fix the rest of frio strings
2016-10-21 14:14:20 -04:00
Hypolite Petovan
3358b55433 [frio] Fix unescaped calendar Javascript strings
In French, “today” is “aujourd’hui”, which breaks the current calendar
Javascript strings quoted declaration.

This PR adds quote escaping to the i18n strings.
2016-10-21 11:29:23 -04:00
Hypolite Petovan
b4e9eb823b Merge remote-tracking branch 'friendica/develop' into develop 2016-10-21 11:27:13 -04:00
d8f5f517c9 Merge pull request #2868 from Hypolite/issue/#2865
Fix Issue #2865 - reshared posts and additional text
2016-10-21 07:54:39 +02:00
Hypolite Petovan
b0a0cf94e4 Fix Issue #2865 - reshared posts and additional text
😉
2016-10-20 21:41:17 -04: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
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
Michael Vogel
1218e2f885 Merge pull request #2863 from rabuzarus/0510-update_fullcalendar
frio: some improvements for displaying events
2016-10-18 00:37:45 +02:00
rabuzarus
b317f811e7 frio: better handling of event location in event hover cards 2016-10-17 22:58:30 +02:00
rabuzarus
967c3b3deb frio: events - don't show author name if there is no author name 2016-10-17 22:51:51 +02:00
rabuzarus
430ffb792e frio: stop the custom cal rendering (if no author-name exist) only for the modes agendaWeek and agendaDay 2016-10-17 22:14:12 +02:00
Michael Vogel
e2d35bd851 New database version 2016-10-17 20:09:48 +00:00
Michael Vogel
356414846b Check for duplicated postings from connectors 2016-10-17 19:17:11 +00:00
Michael Vogel
3e5cf5290e Improved queries, more uncommitted queries 2016-10-17 18:38:51 +00:00
fabrixxm
b50769b6d0 Merge pull request #2859 from rabuzarus/0510-update_fullcalendar
quattro: fix events_reminder
2016-10-17 20:14:01 +02:00
rabuzarus
88f1affb2f quattro: fix events_reminder 2016-10-17 18:57:21 +02:00
Michael Vogel
e4bc81d877 Merge pull request #2857 from Hypolite/frio-code-pre
[frio] Fix code block display
2016-10-17 09:08:01 +02:00
Hypolite Petovan
5efab810f5 [frio] Fix code block display 2016-10-16 23:57:34 -04: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