Commit graph

12208 commits

Author SHA1 Message Date
friendica
b840c27995 Merge https://github.com/friendica/red into pending_merge 2014-12-21 14:45:46 -08:00
RedMatrix
c732b72a0d Merge pull request #757 from git-marijus/master
files: make mod/filestorage.php load via ajax and some design work. work...
2014-12-22 09:45:33 +11:00
RedMatrix
ca56123a16 Merge pull request #756 from encyclomundi/master
change address book to connections
2014-12-22 09:45:18 +11:00
RedMatrix
e789cbf2e7 Merge pull request #755 from pafcu/docfix
Fix issue #752
2014-12-22 09:45:06 +11:00
RedMatrix
d00d60d08d Merge pull request #754 from pafcu/categoryinput
Fancy categories input in editor
2014-12-22 09:44:23 +11:00
RedMatrix
143cb8ed3b Merge pull request #753 from pafcu/autocomplete
Correct domain for smily requests
2014-12-22 09:43:57 +11:00
friendica
2b3cc585a2 fix double encoding of homepage in profile activity - not as straight-forward as it looked 2014-12-21 14:43:06 -08:00
marijus
be1891c058 fix button visibility 2014-12-21 21:48:10 +01:00
marijus
02328bfdbe forgot to git add files 2014-12-21 20:27:43 +01:00
marijus
27d786c979 files: make mod/filestorage.php load via ajax and some design work. work in progress... 2014-12-21 20:11:30 +01:00
Stefan Parviainen
af28b33214 Fix whitespace disappearing at the beginning of completed smily 2014-12-21 14:36:46 +01:00
Charles
8475e8a9ec change address book to connections 2014-12-21 05:21:22 -08:00
Stefan Parviainen
99823d2c31 Fix issue #752 2014-12-21 13:07:34 +01:00
Stefan Parviainen
b8081624c5 Add bootstrap-tagsinput library 2014-12-21 12:44:57 +01:00
Stefan Parviainen
aa73259a47 Fancy categories input with bootstrap-tagsinput 2014-12-21 12:42:07 +01:00
Stefan Parviainen
c2b84f7385 Correct domain for smily requests 2014-12-21 10:49:45 +01:00
RedMatrix
0c98cacbcf Merge pull request #751 from pafcu/autocomplete
Autocomplete smilies
2014-12-21 20:32:12 +11:00
Stefan Parviainen
4e51186502 Merge remote-tracking branch 'upstream/master' into autocomplete 2014-12-21 09:50:47 +01:00
friendica
148f0eb4ae Merge https://github.com/friendica/red into pending_merge 2014-12-20 15:42:44 -08:00
friendica
ce032531dc rev update 2014-12-20 15:42:28 -08:00
RedMatrix
9684d682ae Merge pull request #749 from pafcu/hijackingdocfix
protect_tag_hijacking (incorrect) -> prevent_tag_hijacking in docs (corr...
2014-12-21 10:39:47 +11:00
RedMatrix
aa7fac3266 Merge pull request #748 from pafcu/smilyjson
Access list of smilies over JSON
2014-12-21 10:39:30 +11:00
RedMatrix
e075c600d0 Merge pull request #747 from pafcu/autocomplete
Better contact autocomplete based on jquery-textcomplete
2014-12-21 10:39:16 +11:00
Thomas Willingham
508bd08503 Oopsie in German 2014-12-20 21:43:07 +00:00
Thomas Willingham
3cca54140b Doco - fix some tags. 2014-12-20 21:16:57 +00:00
Stefan Parviainen
9d11b8025e protect_tag_hijacking (incorrect) -> prevent_tag_hijacking in docs (correct) 2014-12-20 17:41:02 +01:00
Stefan Parviainen
fe80dbb3a7 Access list of smilies over JSON 2014-12-20 17:33:35 +01:00
Stefan Parviainen
d1f5351192 Autocomplete smilies 2014-12-20 17:32:50 +01:00
Stefan Parviainen
92a46c34c7 Remove unnecessary logging 2014-12-20 15:23:12 +01:00
Stefan Parviainen
c78fb89f62 Better autocomplete based on jquery-textcomplete 2014-12-20 15:21:31 +01:00
Thomas Willingham
b0da38c09a Merge branch 'master' of https://github.com/friendica/red 2014-12-20 13:37:46 +00:00
Thomas Willingham
49a4ca9182 More FAQ 2014-12-20 13:37:18 +00:00
friendica
6d8214f96b provide link to help for channel permission roles when creating a channel 2014-12-19 01:48:47 -08:00
friendica
26105b53d4 doc updates 2014-12-19 00:29:10 -08:00
friendica
9c445e9817 incorrect check for sys ownership 2014-12-19 00:28:36 -08:00
friendica
be9143447d Merge https://github.com/friendica/red into pending_merge 2014-12-18 19:49:08 -08:00
friendica
ab2d11b37e mod/import: try ten times to create a unique webbie if the chosen one is in use. 2014-12-18 19:48:23 -08:00
Thomas Willingham
5dcf3aced3 My links are also out of date. 2014-12-18 17:45:28 +00:00
Oliver
daccc71469 deleted a dead link 2014-12-18 09:31:25 +01:00
friendica
faf1f672df make the size of directory photos fixed so that the screen doesn't jump around when loading. 2014-12-17 19:17:33 -08:00
friendica
0f0f12a453 allow a variety of latitude/longitude delimiters since nobody can agree on them. 2014-12-17 16:11:21 -08:00
friendica
538fc739a7 This needs a lot more cleanup but at least it's a bit more complete now. 2014-12-17 15:51:53 -08:00
friendica
29f24e9731 minor clarifications on a few settings 2014-12-17 14:32:25 -08:00
friendica
3cb810b8b5 Merge https://github.com/friendica/red into pending_merge 2014-12-17 14:15:15 -08:00
friendica
cc0df5bc24 ability to generate arbitrary map with [ map=lat/lon] and also free form location using [ map]somewhere[/map] but the second one currently has no plugins available to generate it. 2014-12-17 14:12:19 -08:00
Thomas Willingham
8712b9d37f Doco - another handful of configs 2014-12-17 21:46:08 +00:00
friendica
c293b64d60 Merge https://github.com/friendica/red into pending_merge 2014-12-17 12:00:32 -08:00
friendica
b9dc23844c make unique hub filter more robust and straight-forward so it's easier to understand and debug since it's such a critical piece of the delivery chain 2014-12-17 11:57:16 -08:00
Jeroen
6c8551fb2b update nl 2014-12-17 18:57:46 +00:00
friendica
4e1dbc13d4 Merge https://github.com/friendica/red into pending_merge 2014-12-17 01:56:17 -08:00