Hypolite Petovan
9ef63efa1c
Leave formatting alone
2016-10-24 16:16:49 -04:00
Hypolite Petovan
fb75394766
Some more formatting reverts
2016-10-24 12:43:38 -04:00
Hypolite Petovan
8787587011
Fix undiscriminate spaces=>tabs replace
2016-10-24 12:34:10 -04:00
Hypolite Petovan
789e1f4275
Revert some more unwarranted formatting
2016-10-24 12:27:27 -04:00
Hypolite Petovan
8da5a23267
Improved doc formatting
2016-10-24 11:57:25 -04:00
Hypolite Petovan
d0b95e642f
Reverted changes to config
2016-10-24 11:57:17 -04:00
dedf6373b1
Merge pull request #2873 from rabuzarus/2410_fix_comment_nav_php
...
function nav_info(): insert lost comment
2016-10-24 14:21:00 +02:00
rabuzarus
b0d6c244c5
function nav_info(): insert lost comment
2016-10-24 14:02:38 +02: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
Hypolite Petovan
2ecd1f5d09
Update settings documentation
2016-10-23 07:57:40 -04: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
Hypolite Petovan
2741726402
Reverting too extensive formatting changes
2016-10-22 21:33:54 -04:00
Hypolite Petovan
b806f87874
Formatting changes to make @annando happy
2016-10-22 13:54:30 -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
Hypolite Petovan
f9d713b228
Settings save: Switch from strict to fuzzy comparison
2016-10-21 23:23:44 -04:00
Hypolite Petovan
9a59878190
Standards enforcing
2016-10-21 23:08:42 -04:00
Hypolite Petovan
44d5dec06f
Improve logger performance
...
- Reorder condition to prevent constant lookup (one-time ~3,500 substr)
- Enforce coding standards
2016-10-21 23:00:05 -04:00
Hypolite Petovan
74ce4c2710
Makes save_timestamp conditional
...
- Add a .htconfig check to save_timestamp to prevent systematic
profiling
- Removes unused `mark_timestamp()` function including deleted code
comment
2016-10-21 22:50:58 -04: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
