Commit graph

13625 commits

Author SHA1 Message Date
jeroenpraat
03361acce5 2 more schemas in new format 2015-06-03 15:45:50 +02:00
jeroenpraat
83d42710df Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-03 13:58:18 +02:00
jeroenpraat
76d7278c0a empty php schema back 2015-06-03 13:57:10 +02:00
redmatrix
86ff31f500 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-02 17:46:47 -07:00
redmatrix
b2fde73952 asjld work 2015-06-02 17:46:22 -07:00
jeroenpraat
89fbd5c0f6 First schema completely to the new format. git-marijus: Can you please quickly check if I'm doing it right? 2015-06-02 23:22:12 +02:00
Mario Vavti
6277fb76dd update help link 2015-06-02 11:09:57 +02:00
Mario Vavti
12408ba181 update comanche doco 2015-06-02 10:59:57 +02:00
redmatrix
e3606ec56f move the photo and attachment permission syncing past the tag replacement so that attachments get the correct permissions when private mentions are used. 2015-06-01 16:26:12 -07:00
redmatrix
c1e139a550 error in directory bbcode image filter 2015-05-31 22:22:37 -07:00
redmatrix
84c085dcd7 bare bones ASLD 2015-05-31 22:16:14 -07:00
redmatrix
5cc5e0fafd some basic background work for activitystreams-json-ld-2.0 conversions 2015-05-31 18:35:35 -07:00
Habeas Codice
0df0fb4b46 fix unable to crop profile pic on postgres 2015-05-30 19:49:32 -07:00
redmatrix
cd3284d081 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-30 15:04:11 -07:00
redmatrix
edd228decb strip images from directory text entries 2015-05-30 15:03:44 -07:00
Mario Vavti
5040506184 should not redefine $var in the function call 2015-05-29 17:59:31 +02:00
Mario Vavti
2514af6524 fix menu render for menu item edit - menu preview 2015-05-29 17:51:50 +02:00
Mario Vavti
8516b3259f whitespace 2015-05-29 16:14:54 +02:00
Mario Vavti
d11d130021 add some yes/no labels and minor template fixes 2015-05-29 15:23:51 +02:00
Mario Vavti
b8d3280763 some fixes to make menu sharing work and expose it in the ui. 2015-05-29 13:08:01 +02:00
Mario Vavti
5f1ae2930b show created/edited dates for menus 2015-05-29 11:07:57 +02:00
redmatrix
3a9139f76e there was a reason we included that file 2015-05-28 22:06:22 -07:00
redmatrix
9ff988e3d7 parse error 2015-05-28 21:27:48 -07:00
redmatrix
07203c1de3 another case of committing with unsaved changes in a second window 2015-05-28 20:54:57 -07:00
redmatrix
3c82156d63 untested menu element import, be aware that the menu api does not over-write on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links. 2015-05-28 20:50:29 -07:00
redmatrix
df5223fe98 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-28 17:00:30 -07:00
redmatrix
0f09a4499b add menu_created, menu_edited fields to DB 2015-05-28 16:59:56 -07:00
redmatrix
f5a4e7ef7b Merge pull request #341 from solstag/ptbrupdate
update pt_BR translation
2015-05-29 09:33:45 +10:00
Alexandre Hannud Abdo
af46587f3c update pt_BR translation 2015-05-28 16:18:58 -03:00
redmatrix
1a86e3321b catch a window that wasn't yet saved when the last checkin occurred 2015-05-27 21:46:36 -07:00
redmatrix
12c17f1265 menu encoding for sharing/exchange 2015-05-27 21:09:21 -07:00
redmatrix
2dd02cc166 missing row in sql query which is used further down 2015-05-27 19:26:42 -07:00
redmatrix
11301d51a5 some high-level stuff we may need for shareable menus. Also make the client register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks. 2015-05-27 17:30:36 -07:00
redmatrix
5a889558aa Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-27 16:02:16 -07:00
redmatrix
3ecc9efd8d fix for forked thread on diaspora 2015-05-27 16:01:51 -07:00
Mario Vavti
33a7f76ebc Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-27 15:26:12 +02:00
Mario Vavti
3d79d4f577 define some custom attributes and html5 elements for htmlpurifier 2015-05-27 15:25:45 +02:00
Mario Vavti
5ccc9e1b8d make it possible to include menus in blocks - this will only work in html blocks of course 2015-05-27 15:21:30 +02:00
redmatrix
3fdf1ac458 revert for now 2015-05-27 01:49:47 -07:00
redmatrix
07e8fe1b1c Comments need to have some kind of routing instructions. 2015-05-26 21:00:27 -07:00
jeroenpraat
ae69bf54a6 Update api.php
one comma to much
2015-05-26 22:20:45 +02: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
redmatrix
06eae98e53 placeholder for dynamic rego 2015-05-25 22:50:36 -07:00
redmatrix
1780ebafd3 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-25 22:50:19 -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
9e6e41c6cb slow but forward progress on dynamic client registration 2015-05-25 21:31:23 -07:00
redmatrix
9a0264f5d2 some work on issue #329 2015-05-25 19:17:35 -07:00
redmatrix
29a8d580be Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-25 16:57:47 -07:00
redmatrix
23abfb0a5b add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle the censor flag from that page. 2015-05-25 16:56:28 -07:00
Mario Vavti
d9b9faaa89 add this to better support mobile devices out of the box in zen template 2015-05-25 21:27:33 +02:00