redmatrix
6046fe9c9e
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-15 17:50:24 -07:00
zottel
ba7acf88ad
also change the update_ scripts
2015-07-15 15:40:23 +02:00
zottel
f4a1ca0692
change sh to bash in shebang to make scripts work
2015-07-15 15:29:08 +02:00
redmatrix
ae6541cf74
revision update
2015-07-10 14:20:08 -07:00
redmatrix
f20933e1e0
more work on db storage of doco
2015-07-05 19:52:41 -07:00
redmatrix
a74631b554
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
boot.php
include/items.php
util/messages.po
2015-07-03 15:03:56 -07:00
redmatrix
0b9332fde9
in hubzilla we're going to convert doco to items. define it here so that an accidental import/export doesn't chuck a wobbly.
2015-07-03 14:30:42 -07:00
redmatrix
90a31f4ad5
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
2015-07-02 22:00:15 -07:00
redmatrix
065a50c920
a few clone sync fixes as well as some work on hubzilla clone sync back to redmatrix
2015-07-02 21:55:36 -07:00
redmatrix
002be8f9ce
project updates
2015-06-26 16:37:55 -07:00
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
