harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,488 Commits 6 Branches 36 Tags
ca8d252ad75306e6d3cd066d5c593e94de1dfbdd
Commit Graph
24488 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 b381ec5734 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/impel.php
 2015-05-27 19:27:38 -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 675aa96f22 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-25 17:01:02 -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
redmatrix dfa4984089 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-24 20:21:30 -07:00
redmatrix 1828771557 timezone setting not saved issue #336 2015-05-24 18:09:41 -07:00
redmatrix d537fc854b typo and update to rfc7033 (webfinger) as well as webfinger diagnostic page 2015-05-24 17:59:31 -07:00
redmatrix 27137e48eb Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-24 17:16:12 -07:00
redmatrix d9061fd09e Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-24 15:59:03 -07:00
redmatrix 52e38d7c24 search result heading not translatable 2015-05-24 15:57:59 -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
Habeas Codice 1354616787 one more 2015-05-24 09:30:31 -07:00
Habeas Codice b15a68f05d avoid db compatibility issues 2015-05-24 09:26:12 -07:00
Mario Vavti 57d520e69f logic has changed - this is not needed anymore 2015-05-24 15:09:30 +02:00
Mario Vavti 125cd5e32b should not call prepare text here anymore 2015-05-24 14:57:01 +02:00
redmatrix a332dfcf6b Merge pull request #331 from solstag/jqueryprop 
Fix accepting contacts by using correct jquery calls.
 2015-05-24 12:50:43 +10:00
redmatrix 08b00f0f5e Merge pull request #333 from dawnbreak/docu 
Add PHP's xml module check and upload limits to setup.
 2015-05-24 12:35:49 +10:00
Klaus 1ce3d01bb8 Merge pull request #332 from solstag/zotfeedcleanup 
Import security only when necessary, use correct variable in log
 2015-05-24 03:12:25 +02:00
Klaus Weidenbach e90c331bf6 Add PHP's xml module check and upload limits to setup. 
And some documentation.
 2015-05-24 02:58:52 +02:00
redmatrix 7f9e4d6add federation problem from diaspora comments relayed through red channels due to typo 2015-05-23 15:24:16 -07:00
redmatrix 11861949bb add channel_id to local_dir_update hook 2015-05-23 15:19:50 -07:00
redmatrix 45259fed14 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-05-23 15:10:18 -07:00
redmatrix ee14657863 add local_dir_update hook 2015-05-23 15:07:24 -07:00
Mario Vavti f575ef551d use $a->data instead of $a->page for $content and ad another library for use with webpages - foundation 2015-05-23 22:19:02 +02:00
Alexandre Hannud Abdo 760f17b173 Import security only when necessary, use correct variable in log 
Just some cleanup, seemed like the intent of previous changes was so
 2015-05-22 10:27:17 -03:00
Alexandre Hannud Abdo d37c51ef2e Fix accepting contacts by using correct jquery calls. 
Not sure what the operation on disabled is supposed to do, but
it also seemed to requier prop instead of attr.

See for reference:
http://api.jquery.com/prop/
"""
The checked attribute value does not change with the state of the checkbox,
 while the checked property does.
"""
 2015-05-22 10:15:29 -03:00
redmatrix 5795e2a58b more migration of page types 2015-05-21 22:17:17 -07:00
redmatrix 25bd332aab Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-21 20:39:10 -07:00
redmatrix 81d94dae2c preserve lock on edited comments 2015-05-21 02:03:44 -07:00
redmatrix 3763f74a10 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	include/text.php
	mod/item.php
	view/nl/messages.po
 2015-05-20 20:49:06 -07:00
redmatrix c10a4ca9c7 re-arrange the html cache a bit 2015-05-20 20:28:16 -07:00