strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
13001 commits 2 branches 55 tags 148 MiB
Commit graph

13001 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael 6601e8c2b7 Prevent a memory Access Violation when the database isn't connected 2016-10-27 20:16:56 +00:00
Michael Vogel 71f9e50014 Merge pull request #2875 from Hypolite/bug/profiler-small-bugfix 
Fix $a to #this in save_timestamp
 2016-10-26 23:10:36 +02:00
Hypolite Petovan 549950d0ae Fix $a to #this in save_timestamp 2016-10-26 07:42:40 -04:00
Michael Vogel 4996003800 Merge pull request #2874 from Hypolite/bug/fix-pgettext-typo 
Fix pgettext function name typo
 2016-10-25 22:31:59 +02:00
Michael Vogel 4fdced1a0a Merge pull request #2862 from Hypolite/settings-save-perf 
Performance improvements: Settings save (alt), profiler, logger
 2016-10-25 07:56:11 +02:00
Michael Vogel 75a996c4e4 Merge pull request #2839 from Hypolite/Issue-#2822 
Issue #2822 - Fix [Embedded content - reload the page to view]
 2016-10-25 07:31:20 +02:00
Hypolite Petovan a9e90d111d Restore newline at end of file 2016-10-24 22:18:22 -04:00
Hypolite Petovan 2fc2a1a228 Fix typo in get_available_languages function name 
- Add Doxygen comment block
- Fix formatting
- Renamed variable for faster understanding
 2016-10-24 22:17:02 -04:00
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
Tobias Diekershoff 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
Tobias Diekershoff cfea3cce77 Merge pull request #2860 from annando/1610-duplicate-check 
Check for duplicated postings from connectors
 2016-10-24 09:04:52 +02: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
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
Tobias Diekershoff 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
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 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
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
Tobias Diekershoff 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
Tobias Diekershoff 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 1218e2f885 Merge pull request #2863 from rabuzarus/0510-update_fullcalendar 
frio: some improvements for displaying events
 2016-10-18 00:37:45 +02:00
Hypolite Petovan a5923bdd4f Wrong whitespaces 2016-10-17 17:00:06 -04:00
rabuzarus b317f811e7 frio: better handling of event location in event hover cards 2016-10-17 22:58:30 +02:00
Hypolite Petovan 62bd32c1ac Improve performance of settings save by not querying the DB if submitted value is the same 2016-10-17 16:54:22 -04:00
Hypolite Petovan c168d7d4ca Enforce coding standards in Config.php and PConfig.php 2016-10-17 16:53:37 -04: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 356414846b Check for duplicated postings from connectors 2016-10-17 19:17:11 +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