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
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
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
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
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
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
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
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
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
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
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
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
78cead6c11
Merge pull request #2855 from annando/1610-worker-passing-slow
...
Worker: Reserve some space for low priority processes
2016-10-11 08:43:00 +02:00
Michael Vogel
a47ae788ba
Improved logging
2016-10-11 06:30:53 +00:00
Michael Vogel
ef6a23caf3
Worker: Reserve some space for low priority processes
2016-10-10 21:01:36 +00:00
9572e12970
Merge pull request #2854 from annando/1610-webfinger-bugfix
...
webfinger_dfrn now work as expected
2016-10-09 16:28:40 +02:00
Michael Vogel
9cdecd8ec8
webfinger_dfrn now work as expected
2016-10-09 10:47:47 +00:00
a53d48f41f
Merge pull request #2853 from annando/1610-bugfix-config
...
The creation of unique keys failed for MariaDB
2016-10-09 11:34:04 +02:00
Michael Vogel
4322b56c0b
Ensure that with multiple entries the newest one will be fetched
2016-10-09 07:18:52 +00:00
Michael Vogel
4404bf1651
The creation of unique keys failed for MariaDB
2016-10-09 07:01:19 +00:00
Hypolite Petovan
a843858654
Merge from develop
2016-10-08 13:45:14 -04:00
a1c63994d2
Merge pull request #2851 from annando/1610-performance-nodeinfo
...
Performance improvements to item storage and nodeinfo
2016-10-08 08:42:50 +02:00
Michael Vogel
b70676d231
Optimized query for nodeinfo and admin user page
2016-10-07 21:07:21 +00:00
Michael Vogel
43df08f860
Merge pull request #2836 from Hypolite/Issue-#2816-2
...
Fix Issue #2816 - Unable to save config items present in .htconfig.php but not in DB
2016-10-07 15:28:19 +02:00
Hypolite Petovan
bb800f2992
Improve comment
2016-10-07 08:33:13 -04:00
Michael Vogel
94f7debb52
Loglines removed
2016-10-07 11:08:36 +00:00
