|
|
2c40d78940
|
Merge pull request #1269 from fabrixxm/api/favorites
api: add support to star/unstar items
|
2014-12-31 12:43:40 +01:00 |
|
|
|
32400f5127
|
FR IT update to the strings
|
2014-12-31 12:41:00 +01:00 |
|
fabrixxm
|
5d91e5418b
|
api: add support to star/unstar items
|
2014-12-31 12:34:32 +01:00 |
|
|
|
e24f97de43
|
FR update to the strings
|
2014-12-30 09:04:35 +01:00 |
|
|
|
997df904c6
|
Merge pull request #1267 from fabrixxm/feature-hook-emailer_send
Fix syntax error in include/Emailer.php
|
2014-12-29 17:41:50 +01:00 |
|
fabrixxm
|
d66fda2eab
|
Fix syntax error in include/Emailer.php
|
2014-12-29 16:40:04 +01:00 |
|
|
|
384e5f15ff
|
Merge pull request #1266 from fabrixxm/feature-hook-emailer_send
Adds 'emailer_send_prepare' and 'emailer_send' hooks
|
2014-12-29 16:22:56 +01:00 |
|
fabrixxm
|
917ce5b411
|
Adds optional parameter 'uid' to Emailer::send()
that is the user id of the recipient of the mail.
Make enotify pass it to Emailer::send()
|
2014-12-29 16:04:51 +01:00 |
|
Fabio Comuni
|
a659b34117
|
Adds 'emailer_send_prepare' and 'emailer_send' hooks
Adds relative documentation in doc/Plugins
|
2014-12-29 15:44:30 +01:00 |
|
|
|
c3ec68a520
|
Merge pull request #1264 from tugelbend/develop
Develop
|
2014-12-28 19:29:09 +01:00 |
|
|
|
c29ad105fa
|
Merge pull request #1263 from silke/documentation
Documentation
|
2014-12-28 18:14:00 +01:00 |
|
Silke Meyer
|
06d807e4a9
|
added some info on vagrant to the help for devs
|
2014-12-28 16:58:49 +01:00 |
|
Silke Meyer
|
a57971c0c9
|
added a getting started file for developers
|
2014-12-28 16:40:07 +01:00 |
|
Silke Meyer
|
9c2e7a0c5c
|
renamed general dev documentation to github documentation
|
2014-12-28 16:39:19 +01:00 |
|
Silke Meyer
|
aa309ef063
|
updated help's table of content
|
2014-12-28 16:38:19 +01:00 |
|
hauke
|
a72d60f481
|
Added h-card and functionality for IndieAuth/Web-sign-in
|
2014-12-28 15:48:24 +01:00 |
|
Silke Meyer
|
0b0c574385
|
Fixed a small typo
|
2014-12-28 14:50:43 +01:00 |
|
hauke
|
395be3dcde
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2014-12-27 12:50:24 +01:00 |
|
fabrixxm
|
ce12ec3054
|
Merge pull request #1259 from rabuzarus/issue_1258
Fix issue #1258 : photo albums are not complely themeable with photo_album.tpl
|
2014-12-26 19:52:57 +01:00 |
|
Michael Vogel
|
a357ebd101
|
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
|
2014-12-26 18:07:37 +01:00 |
|
Rabuzarus
|
5939a8cea5
|
revert last commit f59e574, remove some html code
|
2014-12-26 14:44:48 +01:00 |
|
Rabuzarus
|
f59e574068
|
removed Pagination
|
2014-12-26 12:54:23 +01:00 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
dcd78603d3
|
Merge pull request #1243 from tobiasd/20141212
RO and FR: update to the core strings
|
2014-12-14 07:56:18 +01:00 |
|
