Michael Vogel
|
b56bdf06ed
|
Merge remote-tracking branch 'upstream/develop' into 1610-duplicate-check
|
2016-10-21 21:17:58 +00: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 |
|
|
|
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 |
|
Michael Vogel
|
6abac720e2
|
Small performance tweaks for "item_store" as well.
|
2016-10-07 06:05:43 +00:00 |
|
Hypolite Petovan
|
b8d6dc5912
|
Fix Issue #2816 - Bump database version
|
2016-10-06 21:01:25 -04:00 |
|
Hypolite Petovan
|
645fd414d5
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into Issue-#2816-2
|
2016-10-06 20:58:28 -04:00 |
|
Michael Vogel
|
f9b9ee6b77
|
Increased performance when storing items
|
2016-10-06 21:24:29 +00:00 |
|
fabrixxm
|
9ecd901e44
|
Merge pull request #2849 from annando/1610-mastodon
Mastodon is now detected as OStatus network
|
2016-10-06 08:28:36 +02:00 |
|
Michael Vogel
|
a81f5859ad
|
Mastodon is now detected as OStatus network
|
2016-10-05 20:54:26 +00:00 |
|
Hypolite Petovan
|
3e46c69bf6
|
Fix wrong database version number in comment
|
2016-10-05 16:40:54 -04:00 |
|
Hypolite Petovan
|
fe17ce2150
|
Add upgrade documentation
|
2016-10-05 16:39:37 -04:00 |
|
|
|
20e10a50c0
|
Merge pull request #2847 from rabuzarus/0510-frio-edit-profile-button
frio: provide a edit profile button for the advanced profile page
|
2016-10-05 18:34:06 +02:00 |
|
Michael Vogel
|
aca6f63985
|
Merge remote-tracking branch 'upstream/develop' into 1610-performance-nodeinfo
|
2016-10-05 16:19:42 +00:00 |
|
Michael Vogel
|
5fb2e47809
|
Increased performance when storing items
|
2016-10-05 16:12:53 +00:00 |
|
rabuzarus
|
88cef50aa2
|
frio: provide a edit profile button for the advanced profile page
|
2016-10-05 18:07:58 +02:00 |
|
|
|
eedeb3d588
|
Merge pull request #2846 from rabuzarus/0410-js-account-type
show/hide page-flags according to the account-type
|
2016-10-05 15:07:14 +02:00 |
|
rabuzarus
|
2a3e235f9a
|
show/hide page-flags according to the account-type
|
2016-10-05 14:45:19 +02:00 |
|
Hypolite Petovan
|
c1611fd3f6
|
Fix Issue #2816 - Add backward compatible server_info support
|
2016-10-04 23:43:44 -04:00 |
|
Michael Vogel
|
95d2a7ae7a
|
Merge pull request #2844 from tobiasd/20161004-de
DE update to the translation
|
2016-10-04 11:29:26 +02:00 |
|
|
|
173bb74522
|
Merge pull request #2843 from annando/1610-gcontact-type
The account type is now distributed via poco as well
|
2016-10-04 09:29:31 +02:00 |
|
|
|
aab6ec0ede
|
DE update to the translation
|
2016-10-04 07:59:35 +02:00 |
|
Michael Vogel
|
87300b2b49
|
When we have the field, we should use it :)
|
2016-10-04 03:58:47 +00:00 |
|
Michael Vogel
|
5f9f3b3570
|
Added the database field to database.sql
|
2016-10-04 03:53:31 +00:00 |
|
Michael Vogel
|
8cde8b375b
|
Merge remote-tracking branch 'upstream/develop' into 1610-gcontact-type
|
2016-10-04 03:52:22 +00:00 |
|
