harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,125 Commits 6 Branches 36 Tags
8ce4814835e10dc579036be9ff4e61077df875ae
Commit Graph
14125 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
redmatrix 090dae46e5 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-28 21:19:28 -07:00
redmatrix de13497333 no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool. 2015-06-28 21:16:56 -07:00
redmatrix 8d84472b4c bring single instance file storage to dav and cloud uploaded photos 2015-06-27 16:36:30 -07:00
redmatrix bad22498bc Merge pull request #363 from solstag/postnotstatus 
simply 'post' is a better default term than 'status'
 2015-06-28 07:46:15 +10:00
Alexandre Hannud Abdo 7fafcbb6ef simply 'post' is a better default term than 'status' 2015-06-27 18:10:18 -03:00
Mario Vavti 22b9e97ae2 css fixes 2015-06-27 22:27:17 +02:00
redmatrix 1ee1b6a334 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-26 16:38:19 -07:00
redmatrix 002be8f9ce project updates 2015-06-26 16:37:55 -07:00
redmatrix b43c0bc471 we aren't using the module_aside functions or hooks any more 2015-06-25 22:46:25 -07:00
redmatrix a3d7e8456a undo the disabling of browser_prefetch and for the time being revert the HTML cache until we can isolate all the zid and observer calls. Also get rid of youtube and vimeo bbcode tags which we should not be using any more. 2015-06-25 20:07:10 -07:00
redmatrix 70975dda4a remove all QR-code stuff from core - now in qrator addon 2015-06-25 19:05:49 -07:00
redmatrix b06b6f798f localise event calendar 2015-06-25 18:23:48 -07:00
Mario Vavti 9406c5a55c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-25 12:54:42 +02:00
redmatrix 5f3edabd45 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	doc/de/features.bb
	view/de/messages.po
	view/de/strings.php
 2015-06-24 16:34:52 -07:00
Mario Vavti e9cc06dc11 directory: only provide connect button if we are not already connected 2015-06-24 21:12:20 +02:00
zzottel 364a3cb972 Merge pull request #360 from zzottel/master 
update German strings and help files
 2015-06-24 16:57:25 +02:00
zottel 38302051f2 update German help files 2015-06-24 16:54:17 +02:00
zottel 50de9325b6 update to German strings 2015-06-24 16:53:46 +02:00
Mario Vavti 05c7022ff8 Add a new redbasic scheme called focus - It is supposed to focus on the main content by adding a slight shadow and centering the main content on the screen. Also the default width of the content is set to 640px. 2015-06-24 13:05:33 +02:00
Mario Vavti f707f4d49a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-24 12:33:53 +02:00
Mario Vavti 201ba411ba Reflect in directory title if we watch the local or the global directory 2015-06-24 12:33:37 +02:00
redmatrix 86588bdd6c more work on photos, including os_storage for the size '0' photo and numbering duplicate filenames 2015-06-23 22:46:39 -07:00
redmatrix 1a0655f34e more work on mail flags 2015-06-23 21:01:59 -07:00
redmatrix cb76fb8b9b item flag fixes discovered after a few merges 2015-06-23 19:45:39 -07:00
redmatrix 833098e346 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	mod/item.php
 2015-06-23 17:30:35 -07:00
redmatrix 7975bc828f typo 2015-06-23 16:22:21 -07:00
Mario Vavti 30ba2803e7 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-23 13:06:40 +02:00
Mario Vavti b6c4601d8f some work on directory 2015-06-23 13:06:22 +02:00
redmatrix 45d66657d7 Merge pull request #356 from solstag/signature_edit_fix 
properly trims edited posts before signing so signature verification …
 2015-06-23 14:47:59 +10:00
Alexandre Hannud Abdo a189fc0872 properly trims edited posts before signing so signature verification works 2015-06-23 01:08:02 -03:00
redmatrix d46f5467b3 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-22 16:09:36 -07:00
redmatrix 9879cf3c6c ensure we always sign a trimmed item body. 2015-06-22 16:09:02 -07:00
redmatrix 0d8fcbe48d discovered a couple of loose ends in the per-member enable diaspora setting 2015-06-22 15:03:47 -07:00
Mario Vavti a4775aab9b Bring /help in line with the rest of the app 2015-06-22 14:02:14 +02: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
redmatrix 0ad71b3efa import: Improve the descriptive text for this feature 2015-06-21 19:11:07 -07:00
redmatrix f59edbb48f Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-21 17:31:09 -07:00
redmatrix 68534fd5dc some diaspora import issues uncovered during dry-run tests 2015-06-21 17:30:23 -07:00
redmatrix 1c9a222697 Merge pull request #355 from dawnbreak/master 
Compatible update for .htaccess v2.
 2015-06-22 09:16:33 +10: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
Klaus b197c7420a Merge pull request #354 from redmatrix/revert-353-master 
Revert "Compatible update for .htaccess."
 2015-06-22 00:35:31 +02:00
Klaus 26ff848639 Revert "Compatible update for .htaccess." 2015-06-22 00:33:53 +02:00
redmatrix 9f9dee28ca Merge pull request #353 from dawnbreak/master 
Compatible update for .htaccess.
 2015-06-22 08:09:00 +10:00
Klaus Weidenbach 5a96f3331a Compatible update for .htaccess. 
This should hopefully work in Apache 2.2 and 2.4.
 2015-06-21 23:58:19 +02:00
Mario Vavti c1e0987b88 do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly. 2015-06-21 17:53:44 +02:00
redmatrix e1caf77480 Merge pull request #352 from solstag/store_update_fix 
Make item_store_update only affect the data we requested
 2015-06-21 10:07:58 +10:00
redmatrix 9dfb8a3401 ensure the photo driver is included 2015-06-20 16:24:10 -07:00
redmatrix dd950baa82 import_diaspora - incorrect method for importing channel photo, and add duplicate reddress detection/correction 2015-06-20 16:21:25 -07:00
Alexandre Hannud Abdo ec23a94b6d Make item_store_update only affect the data we requested 2015-06-20 02:21:25 -03:00
redmatrix ddbaabd62d wrong logic 2015-06-19 18:08:10 -07:00