harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • e5d1e20ff5 Merge branch 'master' of https://github.com/friendica/red Michael Meer 2014-01-30 10:21:21 +01:00
  • 3d43553b20 Merge branch 'master' of https://github.com/friendica/red marijus 2014-01-30 10:15:36 +01:00
  • 6c6a9b963a a bit more ajax work on chat and chatsvc and some fiddling with layouts friendica 2014-01-30 01:00:46 -08:00
  • 91e9e3be91 Merge branch 'master' of https://github.com/friendica/red marijus 2014-01-30 09:57:31 +01:00
  • 080928f214 chatroom management front-end stuff friendica 2014-01-29 21:29:48 -08:00
  • 7b60978262 back-end for changing online status and keeping presence refreshed friendica 2014-01-29 20:40:37 -08:00
  • 9fdee53c9a start on the ajax bits friendica 2014-01-29 20:14:18 -08:00
  • 838ebbcb62 apply service class limits (at the account level) to chatroom creation as chat has the potential to adversely affect system performance. In the future we may also want to service_class restrict the number of participants in a room. friendica 2014-01-29 18:29:03 -08:00
  • c24aa824fe chat is a members only feature, there is no "guest" access. friendica 2014-01-29 18:19:19 -08:00
  • 0d326dfb45 mod/chatsvc - ajax backend for chat friendica 2014-01-29 18:02:51 -08:00
  • b8fb6a4373 more chat infrastructure friendica 2014-01-29 17:09:20 -08:00
  • 677f5f641e more testing of chatroom interfaces, also corrected a function call that should have been a class instantiation in reddav friendica 2014-01-29 16:02:02 -08:00
  • 5e952e3738 Merge branch 'master' of https://github.com/friendica/red marijus 2014-01-30 00:33:46 +01:00
  • eb02e6605c Merge branch 'master' of https://github.com/friendica/red marijus 2014-01-30 00:30:55 +01:00
  • 1915add7c1 Merge pull request #290 from git-marijus/master friendica 2014-01-29 15:28:09 -08:00
  • 777d4e1ddb Merge pull request #289 from beardy-unixer/master friendica 2014-01-29 15:27:41 -08:00
  • 9df2082b84 Merge pull request #291 from toclimb/smilies-fix friendica 2014-01-29 15:26:51 -08:00
  • 75022367e5 minor whitespace cleanup marijus 2014-01-30 00:15:13 +01:00
  • 4d23902d48 oups marijus 2014-01-30 00:11:17 +01:00
  • a58239b9a8 Merge branch 'upstream' marijus 2014-01-30 00:08:40 +01:00
  • fe2b6f3dfb add image floating to bbcode marijus 2014-01-30 00:01:19 +01:00
  • 4c28939488 Don't look for emoticons inside the matching angle brackets of HTML tags (seriously) toclimb 2014-01-29 23:56:05 +01:00
  • 5a5973982f Really fix attachments in Firefox Thomas Willingham 2014-01-29 22:11:36 +00:00
  • c48c7a64c7 Doco - add KDE/Gnome/Davfs2 instructions Thomas Willingham 2014-01-29 21:42:12 +00:00
  • 34b7b544cd Doco - add KDE/Gnome/Davfs2 instructions Thomas Willingham 2014-01-29 21:38:48 +00:00
  • 5c54880ce8 Make Firefox behave if an attachment points to a file with a space in it. Thomas Willingham 2014-01-29 20:38:32 +00:00
  • 286dca84a1 Merge pull request #288 from tuscanhobbit/master Paolo T 2014-01-29 07:48:50 -08:00
  • 6d1c203eee Updated Italian translation Paolo Tacconi 2014-01-29 16:46:10 +01:00
  • 25acd60f63 Updated Italian translation Paolo Tacconi 2014-01-29 16:44:17 +01:00
  • ef97a454bb ping gives us now a reply. But the reply doesnt contains useful data, requires still some investigations Michael Meer 2014-01-29 15:45:35 +01:00
  • ac8d481a32 Merge branch 'master' of https://github.com/friendica/red Michael Meer 2014-01-29 14:07:25 +01:00
  • a1e7c65d51 chatroom permissions enforcement friendica 2014-01-29 03:39:32 -08:00
  • 6a9d43bcbe debug chatroom_list widget friendica 2014-01-29 03:16:07 -08:00
  • c95f65e092 prevent runaway presence indication friendica 2014-01-29 02:36:01 -08:00
  • 10b51a9471 issues uncovered whilst testing the chatroom API friendica 2014-01-29 02:25:21 -08:00
  • f84ba95e87 add template for chatroomlist widget friendica 2014-01-29 01:53:15 -08:00
  • 9f54675702 chatroom list widget backend friendica 2014-01-29 01:52:23 -08:00
  • 9261a170eb basic chatroom management backend friendica 2014-01-29 00:08:29 -08:00
  • 0013e59086 chatpresence timing out too quickly friendica 2014-01-28 20:19:16 -08:00
  • 2822e6e70a missing file in checkin friendica 2014-01-28 20:15:57 -08:00
  • d970c69f91 online indication to the directory popup friendica 2014-01-28 19:49:56 -08:00
  • cc11535e34 online indication on profile sidebar friendica 2014-01-28 17:07:25 -08:00
  • 3dfd38021f SECURITY: remove style and class bbcodes friendica 2014-01-28 16:35:10 -08:00
  • d79a2e3b55 undo pull request #287 friendica 2014-01-28 16:32:47 -08:00
  • 22cbfdce1d Merge pull request #287 from toclimb/testing friendica 2014-01-28 16:21:36 -08:00
  • 8efac0cfd6 fix sql query and provide setting to hide online status friendica 2014-01-28 16:16:55 -08:00
  • 6e22aa25cc basic presence indication friendica 2014-01-28 15:52:54 -08:00
  • 3cab53a7ef Don't look for text emoticons inside the matching angle brackets of a HTML tag toclimb 2014-01-29 00:43:54 +01:00
  • 8c8be2a05e add client field to chatpresence - which will give us a place to put IP addresses for webRTC. Might as well allow for that since we'll (soon) have presence. Then we wouldn't need SIP and folks can "just" p2p each other using any mechanism they wish if they have permission to do so. friendica 2014-01-28 15:05:44 -08:00
  • aa285b83c1 to make visible what I try, ping still won't work, but I'm confused about get_channel Michael Meer 2014-01-28 10:58:31 +01:00
  • 8ddee71c2b Merge branch 'master' of https://github.com/friendica/red Michael Meer 2014-01-28 09:49:09 +01:00
  • f104b4dc27 preserve expiration when editing friendica 2014-01-27 23:49:42 -08:00
  • 8c80589b5a chat data structures friendica 2014-01-27 21:02:57 -08:00
  • eb21bbdd55 Ajaxchat package has way too many incompatible assumptions - after a lot of review, we can't work with it without re-writing huge chunks. Think I'll just start fresh. Ajax chat isn't that hard and we can do stuff with it that you just can't do with other chat clients because - well we've got zot. friendica 2014-01-27 18:37:06 -08:00
  • 3100b5d93e photo tagging still broken - but at least don't create a new linked item every time a photo is edited. friendica 2014-01-27 18:06:09 -08:00
  • d9794b981d In order to provide ajax chat accessible by remote visitors (xchans), we need to remove any core assumptions that userID is an int (which is a common centralised site assumption). Additionally we won't be able to provide guest logins, as this also assumes integer ID's; so that ability needs to be disabled by configuration. friendica 2014-01-27 15:55:08 -08:00
  • 24bac92acd after rposting - if there's no remote_return, go to your matrix page rather than leave you on a blank rpost page. friendica 2014-01-27 15:25:04 -08:00
  • 9551f6b404 Merge https://github.com/friendica/red into zpull friendica 2014-01-27 14:47:58 -08:00
  • d6a9497e4a cleanup include/menu in preparation for the next phase of bookmarking friendica 2014-01-27 14:46:39 -08:00
  • 904db593df add a temporary logger command at remote server side Michael Meer 2014-01-27 12:01:53 +01:00
  • b39475db86 Merge branch 'master' of https://github.com/friendica/red marijus 2014-01-27 10:57:46 +01:00
  • a3bf272753 Merge branch 'master' of https://github.com/MicMee/red Michael Meer 2014-01-27 10:37:15 +01:00
  • d67fdd1299 add davguest param to cut/paste link for directories in mod/filestorage friendica 2014-01-26 14:41:43 -08:00
  • d296b02b0e The final piece of the DAV authentication puzzle. Provide a directory view to an un-auth'd person (without asking for a password) by adding a query parameter 'davguest=1'. This is a bit of a hack, but there was no response on the official forum about how to do this correctly so it will have to do. On the downside, if permission is denied, it won't ask for a password - but we're talking about unauthenticated folks who didn't go through magic auth so chances are even if they authenticate, permission will still be denied. friendica 2014-01-26 14:15:57 -08:00
  • 4ce6335364 Revert "disable feature setting for collections and make feature settings for personal and new tab working." marijus 2014-01-26 14:44:55 +01:00
  • 44658f7b7f Merge branch 'master' of https://github.com/friendica/red marijus 2014-01-26 14:43:07 +01:00
  • 0948c3c3ca allow site defaults for enabled features friendica 2014-01-26 03:27:36 -08:00
  • f90b3b60cb don't prompt guests for a password if they're accessing an embedded public file. friendica 2014-01-26 02:58:03 -08:00
  • 7b52295f8b Merge branch 'master' of https://github.com/friendica/red marijus 2014-01-26 05:04:29 +01:00
  • b5c6db1205 Merge https://github.com/friendica/red into zpull friendica 2014-01-25 15:51:32 -08:00
  • 339a0f69c1 some tweaks to items_fetch for the api friendica 2014-01-25 15:51:10 -08:00
  • 8b399b2fb8 Typo root 2014-01-25 23:06:44 +00:00
  • 6911439f0e Merge pull request #284 from cvogeley/master friendica 2014-01-25 15:03:23 -08:00
  • e68c01cc48 set session['my_address'] to current site in change channel, not primary hub location. Also remove all the old Friendica-style authentication code. friendica 2014-01-25 14:39:09 -08:00
  • a25b8c951b Check user_info['self] in api user_timeline Christian Vogeley 2014-01-25 22:56:15 +01:00
  • ed00301bb6 disable feature setting for collections and make feature settings for personal and new tab working. marijus 2014-01-25 14:50:05 +01:00
  • b71e855c5b remove wall restriction Christian Vogeley 2014-01-25 13:44:31 +01:00
  • f3fd9535a4 Merge https://github.com/friendica/red into zpull friendica 2014-01-25 02:55:17 -08:00
  • 4b66a399e4 get rid of bootstrap's blockqote margin css which is just bloody wrong and can't easily be over-ridden friendica 2014-01-25 02:53:31 -08:00
  • 79f3d46fe8 Merge pull request #285 from tobiasd/de20140125 tobiasd 2014-01-24 22:32:12 -08:00
  • 88f25191e0 DE: update to the strings Tobias Diekershoff 2014-01-25 07:28:30 +01:00
  • c71a1f0796 Merge pull request #283 from beardy-unixer/master friendica 2014-01-24 21:20:00 -08:00
  • 6b3ea9dc14 API My wall posts Christian Vogeley 2014-01-25 03:50:47 +01:00
  • 692822bdf0 Left over line from placeholder. Thomas Willingham 2014-01-25 00:13:29 +00:00
  • d3a0d37b0d Add admin info to admin panel and site info. Thomas Willingham 2014-01-24 23:58:41 +00:00
  • 3869b16298 prettyphoto (js|css) not found friendica 2014-01-24 14:35:32 -08:00
  • 844df11058 Merge branch 'master' of https://github.com/friendica/red Michael Meer 2014-01-24 11:59:15 +01:00
  • 21f6549204 Merge https://github.com/friendica/red into zpull friendica 2014-01-23 23:47:08 -08:00
  • 3490604926 add zid to audio/video (again) friendica 2014-01-23 23:46:43 -08:00
  • ad67d3e483 Ooops, included site specific hack Thomas Willingham 2014-01-24 03:48:54 +00:00
  • d57361ea4a Make share previews a bit longer. We can't go any longer than this without suhosin starting to break things for channels with long names - this limit works with the channel with the longest name in the matrix today, but we may need to make this a pconfig anyway. Thomas Willingham 2014-01-24 03:44:50 +00:00
  • 357ddd1bf7 display a somewhat more pleasant hovertip on qr codes friendica 2014-01-23 15:53:29 -08:00
  • de061efefa Merge https://github.com/friendica/red into zpull friendica 2014-01-23 15:43:59 -08:00
  • ab6b6794b4 fix marital partner linking friendica 2014-01-23 15:43:35 -08:00
  • 108d49e603 Merge pull request #281 from beardy-unixer/master friendica 2014-01-23 14:54:20 -08:00
  • 9402be6cdc Merge https://github.com/friendica/red into zpull friendica 2014-01-23 14:36:55 -08:00
  • 5e4f45c03a mod_profperm migrated friendica 2014-01-23 14:35:59 -08:00
  • a2b07ed281 build url, deleted logger commands Michael Meer 2014-01-23 13:58:14 +01:00
  • f870de31a4 Merge branch 'master' of https://github.com/friendica/red Michael Meer 2014-01-23 12:11:45 +01:00
  • 524fff3a17 preperation for ping, need training in SQL :( Michael Meer 2014-01-23 12:09:35 +01:00