Fabio Comuni
|
d87323c2bb
|
Merge branch 'master' into develop
|
2014-12-26 11:00:01 +01:00 |
|
Fabio Comuni
|
d10c8ddf57
|
Update version in boot.php
|
2014-12-26 10:46:10 +01:00 |
|
Fabio Comuni
|
fdf3163d29
|
merge changelist.txt into CHANGELOG
|
2014-12-26 10:44:23 +01:00 |
|
Rabuzarus
|
cb47fdfcb9
|
minor change: rel should not be part of the PHP
|
2014-12-26 03:32:21 +01:00 |
|
Rabuzarus
|
432cf6f2ce
|
insert new line at the end
|
2014-12-25 16:31:52 +01:00 |
|
Rabuzarus
|
73f9d06e3e
|
move some html code from photos.php to photo_album.tpl
|
2014-12-25 16:20:55 +01:00 |
|
Fabio Comuni
|
709022ddee
|
Merge branch 'release-3.3.2'
|
2014-12-24 10:17:50 +01:00 |
|
Michael Vogel
|
c15b7d8d04
|
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
|
2014-12-23 07:41:47 +01:00 |
|
tobiasd
|
c14fcf09d4
|
Merge pull request #1256 from annando/issue-1234
Issue 1234: Add the account name to the notification mails
|
2014-12-23 06:56:36 +01:00 |
|
Michael Vogel
|
dc47ef65f9
|
Issue 1234: Add the account name to the notification mails.
|
2014-12-23 00:55:36 +01:00 |
|
Michael Vogel
|
41014735f1
|
Feeds are never public so the posts can never be duplicated.
|
2014-12-22 07:32:04 +01:00 |
|
Michael Vogel
|
2ab38de59c
|
Additional check if the duplicated entry isn't from a hidden or blocked contact.
|
2014-12-21 23:47:19 +01:00 |
|
Michael Vogel
|
043c406091
|
Update function for creating the shadow entries.
|
2014-12-21 21:19:37 +01:00 |
|
Michael Vogel
|
d054ac8d9c
|
redone the changes I accidentally overwrote ... Me and GIT will never be in love ...
|
2014-12-21 11:02:31 +01:00 |
|
Michael Vogel
|
32926bc803
|
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
|
2014-12-21 10:59:56 +01:00 |
|
Michael Vogel
|
4757bf5331
|
Applied a change to the community query that was already done in another branch.
|
2014-12-21 10:55:15 +01:00 |
|
tobiasd
|
546e2809e9
|
Merge pull request #1253 from annando/1412-performance-improvement
Performance improvements when polling contacts
|
2014-12-21 10:19:55 +01:00 |
|
Michael Vogel
|
2c5281cbf1
|
reverted a change that wasn't intended to be published yet/Delete thread was missing at Diaspora items.
|
2014-12-21 02:10:49 +01:00 |
|
Michael Vogel
|
4fb059095f
|
Performance stuff: Caching for getsiteinfo function, check before running onepoll.php
|
2014-12-21 02:03:06 +01:00 |
|
Michael Vogel
|
2ac42036fb
|
Fix for error in delete function, improved query for community.
|
2014-12-21 01:59:38 +01:00 |
|
Michael Vogel
|
1a0a80c310
|
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
|
2014-12-20 09:37:33 +01:00 |
|
tobiasd
|
c86edd696f
|
Merge pull request #1250 from annando/1412-preview-picture-from-feed-enclosure
Generate preview pictures from enclosed data from feeds
|
2014-12-17 22:21:14 +01:00 |
|
Michael Vogel
|
15f43d8ca3
|
Generate preview pictures from enclosed data from feeds.
|
2014-12-17 21:57:38 +01:00 |
|
fabrixxm
|
6109c666ab
|
Merge pull request #1248 from kououken/patch-1
Changed typo in install.md
|
2014-12-16 12:25:10 +01:00 |
|
Daniel Dupriest
|
45f593070a
|
Changed typo(?) in install.md
I think you mean to say 'chmod' here to change permissions on smarty3 without changing ownership.
|
2014-12-16 20:23:48 +09:00 |
|
tobiasd
|
7fc501d6dc
|
Merge pull request #1247 from annando/issue-1191-youtube
Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active
|
2014-12-14 13:15:13 +01:00 |
|
Michael Vogel
|
bc5c470cac
|
Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active
|
2014-12-14 12:47:16 +01:00 |
|
tobiasd
|
dcd78603d3
|
Merge pull request #1243 from tobiasd/20141212
RO and FR: update to the core strings
|
2014-12-14 07:56:18 +01:00 |
|
tobiasd
|
e730b6f261
|
Merge pull request #1246 from annando/1412-vier-new-style
New style for "vier"
|
2014-12-14 07:55:50 +01:00 |
|
tobiasd
|
fb11e047ba
|
Merge pull request #1245 from annando/1412-horizontal-ruler-libertree
empty line before horizontal ruler
|
2014-12-14 07:55:26 +01:00 |
|
Michael Vogel
|
8b433c2d11
|
Vier: New style "dark"
|
2014-12-13 23:13:34 +01:00 |
|
Michael Vogel
|
3d26e1d233
|
When converting bbcode for Libertree then an empty line has to be before a honrizontal ruler.
|
2014-12-13 23:07:15 +01:00 |
|
tobiasd
|
cce534d25b
|
Merge pull request #1244 from annando/1412-hidewall-clarification
Clarification for the hidewall property
|
2014-12-13 08:06:42 +01:00 |
|
Michael Vogel
|
086b3e30c6
|
Clarification for the hidewall property.
|
2014-12-12 23:03:23 +01:00 |
|
Tobias Diekershoff
|
f02435408c
|
RO and FR: update to the core strings
|
2014-12-12 19:01:08 +01:00 |
|
fabrixxm
|
039e09dd5e
|
Update CHANGELOG
|
2014-12-10 13:41:36 +01:00 |
|
fabrixxm
|
999ea5a79f
|
Merge branch 'develop' into release-3.3.2
|
2014-12-10 13:33:44 +01:00 |
|
tobiasd
|
15d5e6cd45
|
Merge pull request #1242 from annando/1412-stale-gprobe
Bugfix for stale gprobe.php
|
2014-12-10 06:16:35 +01:00 |
|
Michael Vogel
|
04106ff6f5
|
Moving the clean up code to a central place.
|
2014-12-08 22:37:49 +01:00 |
|
Michael Vogel
|
620ee6be0b
|
Cleanup the HTML before parsing it.
|
2014-12-08 14:26:44 +01:00 |
|
Michael Vogel
|
c398974918
|
Logging to analyse the stale gprobe processes
|
2014-12-08 11:02:03 +01:00 |
|
tobiasd
|
f2d0baae84
|
Merge pull request #1236 from annando/1412-make-preview-picture-smaller
When a post contains a picture then a picture in the added information is displayed only as a small preview picture
|
2014-12-07 10:43:32 +01:00 |
|
tobiasd
|
e218c2470a
|
Merge pull request #1235 from annando/1412-some-more-tracker-removed
1412 some more tracker removed
|
2014-12-07 10:42:42 +01:00 |
|
tobiasd
|
d0ddf00efe
|
Merge pull request #1237 from annando/1412-added-hashtags-for-diaspora
When exporting shared posts to diaspora now removed hashtags will be added again
|
2014-12-07 10:42:00 +01:00 |
|
tobiasd
|
3bf7c9c7a1
|
Merge pull request #1238 from annando/1412-prevent-span-problem
1412 prevent span problem
|
2014-12-07 10:41:14 +01:00 |
|
tobiasd
|
c29ff719ec
|
Merge pull request #1239 from annando/1412-prevent-parsing-problems
1412 prevent parsing problems
|
2014-12-07 10:39:28 +01:00 |
|
Michael Vogel
|
a321da8511
|
Merge pull request #1240 from silke/breathe
Use a sans-serif font-family in breathe
|
2014-12-06 20:22:45 +01:00 |
|
Silke Meyer
|
f493252ac8
|
Use a sans-serif font-family in breathe
|
2014-12-06 20:05:30 +01:00 |
|
Michael Vogel
|
0bfe57bb48
|
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
|
2014-12-01 23:32:23 +01:00 |
|
Michael Vogel
|
8b5412068e
|
When selecting forums there was an added "span" html element.
|
2014-12-01 22:56:41 +01:00 |
|