Commit graph

13033 commits

Author SHA1 Message Date
friendica
7ad425bbda failure to auto update comments if it's your own. 2015-02-14 21:57:47 -08:00
marijus
884dc5973d Merge branch 'master' of https://github.com/friendica/red 2015-02-14 22:19:33 +01:00
marijus
db7b4ea2bf update justifiedGallery to version 3.5.4 and add ignoreElement option which will hopefully be accepted upstream 2015-02-14 22:18:50 +01:00
Einer von Vielen
6ed8fb30b8 Changed bb code [toc] to make it more flexible
This usage is know closer to the original usage of
http://ndabas.github.io/toc/

Changed:
- jquery.toc.js: Do not check for empty headings
- bbcode.php: Added processing of [toc] with parameters
- main.js: Use the default params for jquery.toc.js
- bbcode.html: Added more help for [toc] and corrected some html
2015-02-14 20:33:51 +01:00
jeroenpraat
1cfb25a50f Note to myself: don't forget to remove the patch files from the repo. 2015-02-14 18:19:52 +01:00
jeroenpraat
05c2c50170 Patches from Thomas regarding offline status off whogotzot.com 2015-02-14 18:17:42 +01:00
friendica
59828593c1 some ratings fixes 2015-02-13 14:25:04 -08:00
friendica
46eda6e723 Merge https://github.com/friendica/red into pending_merge 2015-02-13 13:05:14 -08:00
friendica
7bb2e25ea0 missing param 2015-02-13 13:04:31 -08:00
marijus
f0fe81df79 Merge branch 'master' of https://github.com/friendica/red 2015-02-13 12:37:34 +01:00
marijus
7c45f23f8f some shifting to make button groups render properly 2015-02-13 12:37:05 +01:00
Habeas Codice
46964a8a88 make sql work on both db types 2015-02-13 02:57:28 -08:00
marijus
b340fd5095 Merge branch 'master' of https://github.com/friendica/red 2015-02-13 10:41:19 +01:00
marijus
4616c13f3b yet another icon change 2015-02-13 10:40:52 +01:00
RedMatrix
39b7faca9a Merge pull request #897 from solstag/tagfix
Fixes tag delivery regex for when multiple tags are present
2015-02-13 20:28:07 +11:00
Alexandre Hannud Abdo
8696795ce6 Fixes tag delivery regex for when multiple tags are present
Previous regex would cause matches to span several tags
when present, thus never recognizing the mention.
2015-02-13 07:10:29 -02:00
marijus
fb198b8a05 item_unseen update 2015-02-13 10:01:26 +01:00
friendica
4b513d3322 issue #896 2015-02-12 19:22:07 -08:00
friendica
084ca3f4a1 typo 2015-02-12 18:49:42 -08:00
friendica
da2349bb6a provide relief to sites that are severely impacted by the slow ITEM_UNSEEN searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief. 2015-02-12 17:45:25 -08:00
friendica
94a9aa9610 possibly better icons, possibly not. There is no [x]. 2015-02-12 14:54:53 -08:00
friendica
4ec099e7d8 Merge https://github.com/friendica/red into pending_merge 2015-02-12 14:49:54 -08:00
friendica
8c4a526961 revup 2015-02-12 13:45:09 -08:00
RedMatrix
9ae2fc8910 Merge pull request #895 from solstag/sigfix
Dot not trim body in order to avoid issues with signature checks
2015-02-12 20:06:38 +11:00
Alexandre Hannud Abdo
6ec44793b3 Dot not trim body in order to avoid issues with signature checks 2015-02-12 05:44:24 -02:00
friendica
2b2fa5a973 issue #843 2015-02-11 20:38:06 -08:00
friendica
78b8754856 Merge https://github.com/friendica/red into pending_merge 2015-02-11 16:12:47 -08:00
friendica
c62d605608 well that was certainly fun. And the reason why likes and other acitivity deletions weren't propagating. Hopefully this is the last reason and there aren't more lurking further down the chain. 2015-02-11 16:11:21 -08:00
friendica
8c061f143f more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete. 2015-02-11 15:26:35 -08:00
marijus
b86ed864aa to get the correct total count we should probably only count the arrays with count key set 2015-02-11 12:09:04 +01:00
marijus
4d7b65c234 Merge branch 'master' of https://github.com/friendica/red 2015-02-11 10:55:48 +01:00
marijus
499841a722 typo agree->disagree 2015-02-11 10:54:43 +01:00
friendica
3f76cbf40b cut/paste typo 2015-02-11 01:53:17 -08:00
friendica
e8bdf2b8d7 more permissions tweaking 2015-02-10 21:21:18 -08:00
friendica
583af02f71 fix permissions 2015-02-10 20:43:04 -08:00
friendica
149a588b11 ensure we have permission before displaying buttons 2015-02-10 20:21:54 -08:00
friendica
d010712517 wrong icons in list mode 2015-02-10 19:32:12 -08:00
friendica
79223b6b3d item voting tools 2015-02-10 19:10:18 -08:00
friendica
79da33dafd improvements in duplicate like detection, especially w/r/t event participation 2015-02-10 17:49:46 -08:00
friendica
9a773b45e4 Merge https://github.com/friendica/red into pending_merge 2015-02-10 14:50:19 -08:00
friendica
4632d30a78 more attendance 2015-02-10 14:47:09 -08:00
RedMatrix
14d3aa02ff Merge pull request #893 from zzottel/master
make update 1133 work in PHP < 5.5
2015-02-10 20:49:33 +11:00
friendica
268691ffb4 correct the object type if it isn't stored/linked to an item yet 2015-02-10 01:05:49 -08:00
zottel
9dda248b94 make update 1133 work in PHP < 5.5 2015-02-10 09:49:26 +01:00
friendica
f7cce63447 cleanup event attendance - make sure it works in list mode. 2015-02-10 00:44:34 -08:00
friendica
81e7b47b76 more progress on event confirmations 2015-02-10 00:11:37 -08:00
friendica
c694945245 like formatting for extended consensus items 2015-02-09 21:18:50 -08:00
friendica
55c3c54ef6 apply max_import_size to Diaspora posts 2015-02-09 19:54:48 -08:00
friendica
fce51876c9 bring some styling back to the colorbox and improve the event preview ability 2015-02-09 18:58:43 -08:00
friendica
ad731b7c7b make preview button larger 2015-02-09 16:00:46 -08:00