Commit graph

12379 commits

Author SHA1 Message Date
friendica
b171ea23e4 cleanup bb2diaspora - was getting crufty 2014-12-23 14:18:27 -08:00
friendica
8db34ac826 diaspora formatting improvements (getting too many xx-large posts) 2014-12-22 20:54:22 -08:00
friendica
ee89ff5124 some improvements in api direct messages 2014-12-22 18:26:11 -08:00
friendica
f66df5e137 direct messages in api have some issues, not properly ported from friendica originally. Here's a start.
I think at best they may return encrypted gibberish currently, but let's work through them one at a time.
2014-12-22 18:05:34 -08:00
friendica
63ae4b5150 Merge https://github.com/friendica/red into pending_merge 2014-12-22 16:33:41 -08:00
RedMatrix
1049adeff6 Merge pull request #760 from pafcu/apps
Some apps changes
2014-12-23 11:33:11 +11:00
friendica
9544dffaf3 add example to script 2014-12-22 16:32:11 -08:00
friendica
c85702aeb6 basic ical parser 2014-12-22 16:28:30 -08:00
friendica
046299139a Merge https://github.com/friendica/red into pending_merge 2014-12-22 14:32:06 -08:00
friendica
b8d16bc9db revup 2014-12-22 14:31:50 -08:00
Stefan Parviainen
fa65d31f3f Move app icon centering to style.css 2014-12-22 23:09:10 +01:00
Stefan Parviainen
83eb7a10e2 Option to check that a random profile works before returning it 2014-12-22 22:57:58 +01:00
RedMatrix
8cf57f95a5 Merge pull request #759 from pafcu/apps
Fix feature check in apps (missing parenthesis), allow multiple requires...
2014-12-23 08:48:22 +11:00
RedMatrix
3f6e9a37db Merge pull request #758 from pafcu/autocomplete
Show autocomplete taggable with special color
2014-12-23 08:48:11 +11:00
Stefan Parviainen
c819c276f0 Remove unused apps.tpl 2014-12-22 19:05:16 +01:00
Stefan Parviainen
37534d110c Center app names 2014-12-22 18:53:13 +01:00
Stefan Parviainen
36f30d1ca1 Rename some apps, fix webpages requires 2014-12-22 18:52:04 +01:00
Stefan Parviainen
bd2be2b10c Fix feature check in apps (missing parenthesis), allow multiple requires (comma separated) 2014-12-22 17:52:30 +01:00
Thomas Willingham
5fd26eceb4 Pass sitename to apps 2014-12-22 15:39:04 +00:00
Stefan Parviainen
b6bbb8e4ad Show autocomplete taggable with special color 2014-12-22 16:35:21 +01:00
friendica
d3830aea96 provide last successful poll run time (using relative time) in siteinfo so that we can tell folks that have no idea what we're talking about that their poller definitely isn't running and this is probably why nothing works correctly. 2014-12-21 18:40:25 -08:00
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