harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,504 Commits 6 Branches 36 Tags 152 MiB
9619d02be9
Commit Graph

596 Commits

Author SHA1 Message Date
redmatrix
ae6612025d Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	util/messages.po
 2015-06-21 20:51:07 -07:00
Klaus Weidenbach
c3fa0a3ca7 Compatible update for .htaccess. 
This should hopefully work in Apache 2.2 and 2.4.
 2015-06-22 00:45:29 +02:00
redmatrix
6bd90816dd very early attempt diaspora import from diaspora export file. Currently the json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later. 2015-06-19 16:39:03 -07:00
redmatrix
d01fbe521f weekly string update 2015-06-13 15:00:22 -07:00
jeroenpraat
93237f8d0a Added translatable strings to the Display Settings page and refreshed util/messages.po. 2015-06-06 19:49:30 +02:00
redmatrix
b832444dc2 string/version update 2015-06-06 00:06:26 -07:00
redmatrix
f3b95f591a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-31 19:26:00 -07:00
redmatrix
edd228decb strip images from directory text entries 2015-05-30 15:03:44 -07:00
redmatrix
b381ec5734 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/impel.php
 2015-05-27 19:27:38 -07:00
Habeas Codice
bd25f8577f add ability to change existing channel/account service class with 
util/service_class
add link from main doc
 2015-05-26 00:21:08 -07:00
Habeas Codice
f7731d7e8f Add docs about current service class system, tiny util to make updates a 
little easier than the standard config util
 2015-05-25 22:40:04 -07:00
redmatrix
851f2f64df Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	index.php
	mod/setup.php
 2015-05-24 15:50:05 -07:00
redmatrix
ee14657863 add local_dir_update hook 2015-05-23 15:07:24 -07:00
redmatrix
4c319a98a8 fix some merge errors 2015-05-18 17:20:59 -07:00
redmatrix
71a2f2d773 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-18 17:00:04 -07:00
redmatrix
0340639cb1 fix po2php to handle projectname variables correctly 2015-05-18 16:30:00 -07:00
redmatrix
76558df966 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/bb2diaspora.php
	include/diaspora.php
	include/enotify.php
	mod/admin.php
	mod/cloud.php
	mod/dav.php
	mod/home.php
	mod/invite.php
	mod/like.php
	mod/mitem.php
	mod/p.php
	mod/pubsites.php
	mod/setup.php
	mod/siteinfo.php
	util/messages.po
 2015-05-17 19:48:57 -07:00
redmatrix
3b859aa9ef Implement permission checking for OAuth clients using the xperm table. Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied. 2015-05-17 18:14:50 -07:00
redmatrix
9a67ec8bd4 new string file - isolating the projectname from translated strings so that translation files will work across multiple projects. 2015-05-17 16:33:43 -07:00
redmatrix
91d7b0f7eb more work isolating the projectname from core. 2015-05-17 16:28:16 -07:00
redmatrix
4ca06ebd79 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-12 21:57:06 -07:00
redmatrix
19a2bdeb91 cut/paste error 2015-05-12 21:40:49 -07:00
redmatrix
a67ada15f3 repo updaters 2015-05-12 21:35:30 -07:00
redmatrix
0a644a2f41 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/mitem.php
	view/de/messages.po
	view/de/strings.php
 2015-05-10 13:26:44 -07:00
redmatrix
3140650b8f rev update 2015-05-10 13:17:41 -07:00
redmatrix
75b8bfc07a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-06 18:39:12 -07:00
redmatrix
f559c91b7a turn consensus items into diaspora polls for that network 2015-05-05 19:23:21 -07:00
redmatrix
5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
redmatrix
a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
friendica
b3ac1cd993 mod/branchtopic - move an off-topic comment to its own thread as a fresh wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains. 2015-04-24 00:56:06 -07:00
friendica
3d99a6b5c4 hide event share button when editing an event 2015-04-17 17:20:24 -07:00
friendica
e64de798b5 rev update, string update 2015-04-11 00:34:39 -07:00
friendica
f18621c6db strings update 2015-04-03 17:14:09 -07:00
Klaus Weidenbach
d0361582b0 Correcting reported Doxygen syntax warnings. 
Fixed wrong Doxygen syntax and add some of the available FIXME to
Doxygen documentation.
Updated Doxygen configuration to add also all capital letter tags.
Adding some more Doxygen documentation.
 2015-03-29 22:23:00 +02:00
friendica
0aba609ad4 issue #941 2015-03-28 14:53:00 -07:00
Klaus Weidenbach
91f7da6f01 Extend Doxygen configuration a bit to display more. 
Add view of \license information in Doxygen information and add an
overview page for \fixme which is used in source code.
We have Bug List, Fixme List, Todo List and Deprecated List. Do we have
some other tags we use that we could collect and display?
 2015-03-21 01:56:20 +01:00
friendica
01716dea3d config to hide version tag from siteinfo - on my site it's meaningless. 2015-03-20 16:46:07 -07:00
friendica
ce33eca4b2 update to-do list 2015-03-13 01:22:32 -07:00
friendica
73891dc582 reverse smilie storage also 2015-03-06 03:04:04 -08:00
friendica
9bbf509ede should be -ne 2015-03-05 15:07:05 -08:00
Klaus Weidenbach
da6eecd031 remove Doxygen API Documentation from repository. 
This removes around 14MB and can get easily generate locally by
doxygen util/Doxyfile when needed.
Restructured .gitignore a bit and some additions like zotshrc, etc.
Fixed a typo in doc/main.bb
 2015-03-04 11:38:35 +01:00
friendica
2b44c5fc72 Fix a couple of places where we weren't checking for dead hublocs. Add a function to mark a hubloc dead. 2015-02-27 13:43:12 -08:00
friendica
2264ad5c6e provide ability to link new themes/addons 2015-02-23 19:10:34 -08:00
friendica
835b259455 minor issues with arg passing 2015-02-20 14:07:24 -08:00
friendica
8eedc9d576 updated install doc 2015-02-20 13:18:44 -08:00
friendica
ccf1a131f1 doc update 2015-02-20 00:15:03 -08:00
friendica
7926ed079a git update scripts for external repositories 2015-02-19 21:11:02 -08:00
friendica
eeec826eda update the install doc for addons - the procedure is a bit different now (although it shouldn't break anything on existing sites.) 2015-02-19 20:53:24 -08:00
friendica
436a82d74e Scripts to add external theme and addon repositories. 
Example:
    util/add_theme_repo https://github.com/deadsuperhero/redmatrix-themes deadsuperhero

The final argument is a nickname on this system. The repository will be placed under extend/theme/deadsuperhero and the themes from that repository linked to your redmatrix theme directory.

You can do the same with addons. We'll have to come up with some "pull" scripts to keep updated but the clever folks will already know how to do this.
 2015-02-19 19:48:07 -08:00
friendica
8d6e3f5390 add zotsh to util 2015-02-15 16:29:12 -08:00
friendica
7bb2e25ea0 missing param 2015-02-13 13:04:31 -08:00
friendica
7edab47658 get_rel_link broken - also weekly doc updates 2015-02-06 02:07:10 -08:00
friendica
ab0706521e let zot_refresh continue without a primary hub if one cannot be found. also weekly doc updates 2015-01-30 13:45:28 -08:00
friendica
a496036066 local_user => local_channel 2015-01-28 20:56:04 -08:00
friendica
0cdcc4bc50 doc updates 2015-01-23 03:25:17 -08:00
friendica
2372d9b42a make typo.php descend into include/RedDAV 2015-01-18 19:28:32 -08:00
friendica
8f8700ddd2 mod_prep usability enhancements, doc updates 2015-01-16 00:53:04 -08:00
friendica
c75cdbd304 doc updates 2015-01-10 13:04:43 -08:00
friendica
ed2917118d doc updates 2015-01-02 17:26:57 -08:00
Erik Lundin
d029d3a9f9 Don't trim escaped quotes 2014-12-29 17:24:53 +01:00
friendica
7ba92feabf doc update 2014-12-26 00:13:22 -08:00
friendica
26105b53d4 doc updates 2014-12-19 00:29:10 -08:00
friendica
452d275b5e don't import to sys channel from self-censored authors 2014-12-12 00:26:07 -08:00
friendica
58067c24fc block adult channels from inclusion in public content feeds 2014-12-10 16:24:31 -08:00
friendica
123a778ae1 update mozilla cacert.pem 2014-11-28 18:48:10 -08:00
friendica
b16f938830 random block widget 2014-11-22 12:26:04 -08:00
friendica
f299922df3 minor changes to support forum mode 2014-11-15 14:03:41 -08:00
friendica
26343b8856 rev update 2014-11-07 05:15:28 -08:00
friendica
7f0bd5a6e5 doc updates 2014-10-31 05:05:31 -07:00
friendica
59e19a1f45 moved post_to_red to its own project ( https://github.com/friendica/wptored ), which I was planning to do anyway since it's kind of lost in the util folder, but also because having it there may present licensing issues, as it's GPL. 2014-10-25 01:03:36 -07:00
friendica
1d8aa7d817 string update 2014-10-24 04:17:35 -07:00
Jeroen
0950f90e66 New util/messages.po 2014-10-17 14:19:38 +00:00
friendica
cde244ef74 improvement in source route checking when handling complex *upstream* delivery chains, which were not adequately accounted for in the earlier checkin. 2014-10-10 00:13:46 -07:00
friendica
2bd4b36238 rev update 2014-10-03 03:35:01 -07:00
friendica
1e7fbac6c1 doc updates, clean up buttons on PM edit template to match other edit buttons 2014-09-26 01:52:30 -07:00
friendica
083b5da967 doc updates 2014-09-19 02:22:12 -07:00
friendica
ab7f2db4d7 doc updates and a couple of issues spotted in the logs (diaspora likes, feed author import) 2014-09-12 00:59:23 -07:00
friendica
a0b3ddca40 doc updates 2014-09-05 01:58:12 -07:00
Jeroen
3e8f9e8b62 update nl + Friendica>RedMatrix in two text files 2014-08-30 14:07:38 +00:00
friendica
345d170236 doc update 2014-08-29 17:31:29 -07:00
friendica
9dbfed64be rev update 2014-08-22 15:51:36 -07:00
friendica
a6829f7dcb move Friendica photo migrator to addons, bring back a few XML scraping functions that we're going to require (unfortunately) 2014-08-20 17:15:13 -07:00
tonnerkiller
bac1ed2214 Added "if(!function_exists('xpost_to_html2bbcode'))" 
This function name is also used by post to friendica plugin
Both functions seem to be identical. If you have both plugins installed
you get an error because of the identical function name
This will avoid the attempt to load the function a second time in case
it was already loaded by the post to friendica plugin
 2014-08-16 15:48:44 +02:00
friendica
41aa9e13cf doc update 2014-08-15 06:05:52 -07:00
Jeroen
c1b89b413a Added some missing translation strings. Fixed to scalable for a few font sizes. 2014-08-14 20:02:05 +00:00
friendica
eb38f3f474 support title and description (and dates which were done earlier) for friendica photo import 2014-08-13 16:34:36 -07:00
friendica
041aff36b7 provide a way to preserve photo timestamps when importing (rather than uploading) 2014-08-12 21:51:32 -07:00
friendica
40667e72ad couple of frphoto fixes to work better with the dreamhost process reaper 2014-08-12 20:39:57 -07:00
friendica
50da5bd389 Friendica photo import tool. This will bring in all your photos from the chosen Friendica account and import them into Red. Note that profile photos will also be imported, but will not be scaled for profiles, nor will they be attached to any profiles. They will appear however in your Profile Photos album. Photos that had any access restrictions in Friendica will be made private to only you. Comments and likes, captions, and tags are not transferred, only the actual photos. You will only be able to do this once. If something goes wrong but any photos were imported, a pconfig called frphotos.complete will be set and you'll have to remove it to start over. If you should remove this to start over, we also check each photo and will not over-write a photo you already brought over. 2014-08-12 18:08:31 -07:00
Jeroen
bec565cdc3 Some more buttons. Not ready yet. Changed in private message -submit- to -send-. Confusing in other language(s). 2014-08-09 01:18:31 +00:00
friendica
02b17fd27e rev update 2014-08-08 15:27:07 -07:00
friendica
1f415d9830 add en-gb and en-au ('en-us' aka 'en' is the default language now so watch out for words like colour and centralise and please use the US variants in translatable strings) 2014-08-05 20:09:01 -07:00
Jeroen
32f09b5fc2 Update nl. Added a link from the edit profile page to the edit visibility page. 2014-08-01 17:45:18 +00:00
friendica
ff8351437e make the profile minimal by default. Use features to enable the advanced form. 2014-08-01 01:24:03 -07:00
friendica
52fa84135c wrong label on icon 2014-07-25 01:13:08 -07:00
friendica
1a6973a670 cherry pick pull request #544 2014-07-24 19:07:04 -07:00
friendica
f65890091e add more control to auth paranoia setting 2014-07-20 00:24:12 -07:00
friendica
996914616c doc updates 2014-07-13 16:02:48 -07:00
friendica
c74fd78993 move smarty compiled files to store/[data]/smarty3 - which puts all writeable areas of the server except the config file and logs under the "store" directory. We'll do logs at a future time. 2014-07-10 21:34:52 -07:00
friendica
ee3a4902de when deleting items, delete linked events and photos during stage1 2014-07-04 20:34:54 -07:00
jeroenpraat
1cbec39af8 Red Matrix default instead of global default. Is more clear. Update nl to 99%. Update util/messages.po 2014-07-02 13:26:44 +00:00
jeroenpraat
f5a1c39cdd updated util/messages.po 2014-07-01 23:13:47 +00:00
friendica
0074ef0bf3 rule of snakes #1, kill the snake. 
tinymce is gone. if you want a visual editor, figure out what you want and make it happen.
If you don't want a visual editor, do nothing.
This is in the community's hands. I don't need a visual editor.
 2014-06-28 05:05:34 -07:00
friendica
893c9419f4 fix bad translation of blockquote in wordpress ("post_to_red") plugin 2014-06-25 19:17:51 -07:00
friendica
5968bc7f86 moods not working in other languages + doc updates 2014-06-21 16:04:00 -07:00
friendica
14a6a27213 limited progress in providing a POST option to shredder, back to auth signature mismatches again, likely a quoting issue 2014-06-19 21:52:49 -07:00
friendica
00904d4994 cleanup 2014-06-19 16:09:02 -07:00
friendica
c012c648e0 wherein I revive some of my 30+year old shell scripting skills so that we can process arbitrary api endpoints which generate arbitrary json and be able to crunch all of these on the command line. Getting the arbitrary query arguments into a form where they could be signed as part of the oauth packet was a challenge. (It still might be - I haven't tried querying any Chinese photo album names yet). 
But you can now do something like
	for a in `util/shredder/shredder -c red/photos -q album=2013 | jshon -e photos -a -e src` ; do wget $a; done
and download all the photos in your 2013 album
 2014-06-18 22:33:28 -07:00
friendica
ecbbd66e8f You'll need these to build jshon - warning these are typically blocked by .gitignore 2014-06-18 17:19:44 -07:00
friendica
dd042f4f09 Turns out Linux has a shred command in /usr/bin and its purpose is to over-write files so we don't want to invoke it accidentally. So as not to cause confusion and issues we will rename ours to "shredder". Aussies are of course allowed to alias this to "shredda". 2014-06-18 17:04:19 -07:00
friendica
c16b403cf7 oh this is nice... http://kmkeen.com/jshon - this is what we need to make shred -- well "shred". I also had to change the photos album list API a bit to fix any imagined and/or real parsing issues and also fixed shred so it can find its auxiliary files. 2014-06-18 16:26:27 -07:00
jeroenpraat
349e5d45ec Cleaned out/updated images dir. So that we don't mix the old colour red with the new colour with. / Updated util/messages.po 2014-06-16 18:14:05 +00:00
friendica
b5ea259666 try to force the update mode to fix the "starting up browser, quickly loads page 2 at the beginning" bug 2014-06-13 05:38:00 -07:00
friendica
376a51f8d8 doc updates 2014-06-06 23:56:52 -07:00
jeroenpraat
5869836180 expand/collapse is also used for comments, so removing 'post'. 2014-06-03 15:42:13 +00:00
jeroenpraat
ad378cbe07 Updated strings for show entire post and show less to expand and collapse. See last few comments from me and Mario at https://redmatrix.nl/channel/jeroenpraat/?f=&mid=5138fdee2ade50a7ef7a5a59e01a7dc91012c125e712d1ce483be6e31543dffe@redmatrix.nl 2014-06-03 12:14:51 +00:00
jeroenpraat
b4e7d7f7c0 Updated to [+] show more, [+] show more comments, etc. See https://redmatrix.nl/channel/jeroenpraat/?f=&mid=5138fdee2ade50a7ef7a5a59e01a7dc91012c125e712d1ce483be6e31543dffe@redmatrix.nl 2014-06-03 05:12:00 +00:00
friendica
c886d6e707 update strings 2014-06-02 18:01:00 -07:00
friendica
c37ee6f06f doc updates 2014-05-30 02:52:29 -07:00
friendica
b4fe14982f string update 2014-05-29 22:22:11 -07:00
friendica
626eab99f8 add profile photo app because it is sometimes hard to find. Also doc updates 2014-05-23 14:52:55 -07:00
Alexandre Hannud Abdo
d15e3776f3 Allow translation context with plural. Use that in Likes/Dislikes. 2014-05-21 05:39:35 -03:00
Alexandre Hannud Abdo
72a633dc51 Make translation contexts effective. 2014-05-21 04:48:22 -03:00
friendica
71f5908e21 add optional context to translations 2014-05-20 20:22:38 -07:00
friendica
6ac50faaa2 doc updates 2014-05-16 02:13:27 -07:00
friendica
71ded9388b missing paren 2014-05-13 02:17:17 -07:00
friendica
8c948f4bbe forbid redefinition of language plural_select function 2014-05-13 02:10:06 -07:00
friendica
3eae3fd496 a bit more progress on using shred to pick through API results. Commented out because the array storage is kindof weird so the first try (assuming simple arrays) didn't work out. I'll have to rethink how to index these things and may have to rewrite the js() function to do the kinds of things I want. 2014-05-11 18:36:00 -07:00
friendica
6d56c9b603 better button theming on oauth connected apps page 2014-05-09 01:53:03 -07:00
friendica
d3b5509b33 shred: ability to execute somewhat arbitrary API functions and echo results 2014-05-08 22:44:12 -07:00
friendica
e22e94cd97 ok *now* shred works with alternate config files 2014-05-07 20:31:21 -07:00
friendica
b26edefe3e shred: perhaps alternate configs will work now - unable to test at the moment. Was a typo in FriendicaOAuth.sh so it's unlikely anybody has been using this recently. We'll probably need it for apps. 2014-05-07 17:42:58 -07:00
friendica
cdf5e08eb9 weekly update 2014-05-02 17:28:46 -07:00
friendica
a7a44cb2fb missed the string update on an earlier checkin 2014-04-25 16:25:02 -07:00
friendica
ae1f9bf1c4 move create a new collection below the actual collection list again. failed experiment. 2014-04-18 15:31:15 -07:00
friendica
e10509e2bd soft revert 9bb7811 until we can look at it more closely. 2014-04-11 14:01:33 -07:00
friendica
f832e59585 doc updates, plus back-end work for rpost to let you post to a different channel than your current logged-in channel. Need the same for rbmark back-end. Then we "just" need a selector widget on the editor forms. 2014-04-04 15:25:18 -07:00
friendica
3c23d1f9fe doc update 2014-03-28 01:12:36 -07:00
friendica
78f003e4a5 doc update 2014-03-21 01:14:35 -07:00
friendica
074d2839c0 doc update 2014-03-16 14:56:04 -07:00
friendica
16c2aa042f doc update 2014-03-07 14:30:24 -08:00
friendica
46f0de7120 try to fix youtube mixed content warnings 2014-02-28 00:57:35 -08:00
friendica
9e2ea6b5d4 strings/version update 2014-02-21 23:51:57 -08:00
tony baldwin
9715176a56 s/View remote profiles as webpages/Do not view remote profiles in 
frames/g
 2014-02-19 22:56:52 -05:00
friendica
eadf5121d0 rev update and a minor fix (missing param) to force_refresh 2014-02-14 12:39:15 -08:00
friendica
14fd940e08 To be listed as a public site, you need to be an https site with a valid cert. If you don't make the cut, you will either not be listed as a public site or you will be de-listed. Period. This is non-negotiable. 2014-02-07 00:50:04 -08:00
friendica
bd691300a7 provide some interesting new options to channel sources 2014-01-31 20:02:59 -08:00
friendica
3869b16298 prettyphoto (js|css) not found 2014-01-24 14:35:32 -08:00
friendica
5e4f45c03a mod_profperm migrated 2014-01-23 14:35:59 -08:00
friendica
55e4a53e01 push new messages.po 2014-01-21 18:11:44 -08:00