harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 8042ae9fe8 update German main help file zottel 2015-07-03 11:01:26 +02:00
  • 90a31f4ad5 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-02 22:00:15 -07:00
  • 1a5898bf80 sync abook entries from redmatrix Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-07-02 21:58:28 -07:00
  • 065a50c920 a few clone sync fixes as well as some work on hubzilla clone sync back to redmatrix redmatrix 2015-07-02 21:55:36 -07:00
  • 9369e521bb a bit of cleanup and explanatory text on mod/pconfig redmatrix 2015-07-02 20:57:06 -07:00
  • f6fae2ebd9 web version of util/pconfig redmatrix 2015-07-02 19:54:22 -07:00
  • 54301a9ff5 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-07-01 18:51:47 -07:00
  • 8b2b92fe32 provide compatibility with redmatrix extended item export redmatrix 2015-07-01 18:50:37 -07:00
  • 3f38e52caf provide backward compatibility with hubzilla extended item export redmatrix 2015-07-01 18:49:34 -07:00
  • 75560b0496 turn attached audio/video into audio/video elements as well as providing an attachment link redmatrix 2015-07-01 16:23:25 -07:00
  • e068bdc9d7 Merge pull request #365 from adsfkajlsfdas/master git-marijus 2015-07-01 11:47:17 +02:00
  • f54688a547 since we can now use plain upstream justifiedGallery library - switch to minified version Mario Vavti 2015-07-01 11:42:17 +02:00
  • 9c4e9f8759 update justifiedGallery to versio 3.6.0 Mario Vavti 2015-07-01 11:34:36 +02:00
  • d5c085a3c6 cleanup of import to allow cross-product import going one way. Note - items/content are not yet importable redmatrix 2015-06-30 20:21:09 -07:00
  • 1e3dffc29d Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-30 20:19:50 -07:00
  • 86b12ea750 lots of work on clone/import from redmatrix to hubzilla (won't go back the other way) redmatrix 2015-06-30 20:18:48 -07:00
  • aa41842d24 Clean up Thomas Willingham 2015-06-30 17:49:09 +01:00
  • 22cb09f537 warn if export data file is from an incompatible project or if the DB version differs significantly from the current DB. This is to avoid people cloning a hubzilla channel back to red and potentially stuffing up the works. Hopefully we can migrate upwards someday. Downwards is always going to be an issue. redmatrix 2015-06-29 22:37:18 -07:00
  • 97e8275dc2 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-29 22:19:44 -07:00
  • 0b347ccc14 turn the connection filter into a feature. redmatrix 2015-06-29 20:35:56 -07:00
  • a7135b5ecd fix the postgres schema with all the changes to date redmatrix 2015-06-29 19:58:44 -07:00
  • 6e8ad5089e Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-29 18:01:51 -07:00
  • 2072ea721f Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-29 16:56:45 -07:00
  • 0b012e2995 some prep work redmatrix 2015-06-29 16:56:18 -07:00
  • aad8fc1946 Update NL + 1 revert css, see comment here: 22b9e97ae2 jeroenpraat 2015-06-30 00:26:16 +02:00
  • abb153e711 Probably a ugly hack, but it's the only way I could found that cuts off very long channel names in the admin area. If there's a better alternative, be my guest. jeroenpraat 2015-06-29 23:09:36 +02:00
  • 7ef4397634 fix directory location Mario Vavti 2015-06-29 14:25:04 +02:00
  • 63f2e9b412 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-28 22:33:13 -07:00
  • 090dae46e5 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-28 21:19:28 -07:00
  • de13497333 no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool. redmatrix 2015-06-28 21:16:56 -07:00
  • 8d84472b4c bring single instance file storage to dav and cloud uploaded photos redmatrix 2015-06-27 16:36:30 -07:00
  • bad22498bc Merge pull request #363 from solstag/postnotstatus redmatrix 2015-06-28 07:46:15 +10:00
  • 7fafcbb6ef simply 'post' is a better default term than 'status' Alexandre Hannud Abdo 2015-06-27 18:10:18 -03:00
  • 22b9e97ae2 css fixes Mario Vavti 2015-06-27 22:27:17 +02:00
  • 1ee1b6a334 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-26 16:38:19 -07:00
  • 002be8f9ce project updates redmatrix 2015-06-26 16:37:55 -07:00
  • b43c0bc471 we aren't using the module_aside functions or hooks any more redmatrix 2015-06-25 22:46:25 -07:00
  • 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. redmatrix 2015-06-25 20:07:10 -07:00
  • 70975dda4a remove all QR-code stuff from core - now in qrator addon redmatrix 2015-06-25 19:05:49 -07:00
  • b06b6f798f localise event calendar redmatrix 2015-06-25 18:23:48 -07:00
  • 9406c5a55c Merge branch 'master' of https://github.com/redmatrix/redmatrix Mario Vavti 2015-06-25 12:54:42 +02:00
  • 5f3edabd45 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-24 16:34:52 -07:00
  • e9cc06dc11 directory: only provide connect button if we are not already connected Mario Vavti 2015-06-24 21:12:20 +02:00
  • 364a3cb972 Merge pull request #360 from zzottel/master zzottel 2015-06-24 16:57:25 +02:00
  • 38302051f2 update German help files zottel 2015-06-24 16:54:17 +02:00
  • 50de9325b6 update to German strings zottel 2015-06-24 16:53:46 +02:00
  • 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. Mario Vavti 2015-06-24 13:05:33 +02:00
  • f707f4d49a Merge branch 'master' of https://github.com/redmatrix/redmatrix Mario Vavti 2015-06-24 12:33:53 +02:00
  • 201ba411ba Reflect in directory title if we watch the local or the global directory Mario Vavti 2015-06-24 12:33:37 +02:00
  • 86588bdd6c more work on photos, including os_storage for the size '0' photo and numbering duplicate filenames redmatrix 2015-06-23 22:46:39 -07:00
  • 1a0655f34e more work on mail flags redmatrix 2015-06-23 21:01:59 -07:00
  • cb76fb8b9b item flag fixes discovered after a few merges redmatrix 2015-06-23 19:45:39 -07:00
  • 833098e346 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-23 17:30:35 -07:00
  • 7975bc828f typo redmatrix 2015-06-23 16:22:21 -07:00
  • 30ba2803e7 Merge branch 'master' of https://github.com/redmatrix/redmatrix Mario Vavti 2015-06-23 13:06:40 +02:00
  • b6c4601d8f some work on directory Mario Vavti 2015-06-23 13:06:22 +02:00
  • 45d66657d7 Merge pull request #356 from solstag/signature_edit_fix redmatrix 2015-06-23 14:47:59 +10:00
  • a189fc0872 properly trims edited posts before signing so signature verification works Alexandre Hannud Abdo 2015-06-23 01:08:02 -03:00
  • d46f5467b3 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-22 16:09:36 -07:00
  • 9879cf3c6c ensure we always sign a trimmed item body. redmatrix 2015-06-22 16:09:02 -07:00
  • 0d8fcbe48d discovered a couple of loose ends in the per-member enable diaspora setting redmatrix 2015-06-22 15:03:47 -07:00
  • a4775aab9b Bring /help in line with the rest of the app Mario Vavti 2015-06-22 14:02:14 +02:00
  • ae6612025d Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-21 20:51:07 -07:00
  • 0ad71b3efa import: Improve the descriptive text for this feature redmatrix 2015-06-21 19:11:07 -07:00
  • f59edbb48f Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-21 17:31:09 -07:00
  • 68534fd5dc some diaspora import issues uncovered during dry-run tests redmatrix 2015-06-21 17:30:23 -07:00
  • 1c9a222697 Merge pull request #355 from dawnbreak/master redmatrix 2015-06-22 09:16:33 +10:00
  • c3fa0a3ca7 Compatible update for .htaccess. Klaus Weidenbach 2015-06-21 23:58:19 +02:00
  • b197c7420a Merge pull request #354 from redmatrix/revert-353-master Klaus 2015-06-22 00:35:31 +02:00
  • 26ff848639 Revert "Compatible update for .htaccess." Klaus 2015-06-22 00:33:53 +02:00
  • 9f9dee28ca Merge pull request #353 from dawnbreak/master redmatrix 2015-06-22 08:09:00 +10:00
  • 5a96f3331a Compatible update for .htaccess. Klaus Weidenbach 2015-06-21 23:58:19 +02:00
  • c1e0987b88 do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly. Mario Vavti 2015-06-21 17:53:44 +02:00
  • e1caf77480 Merge pull request #352 from solstag/store_update_fix redmatrix 2015-06-21 10:07:58 +10:00
  • 9dfb8a3401 ensure the photo driver is included redmatrix 2015-06-20 16:24:10 -07:00
  • dd950baa82 import_diaspora - incorrect method for importing channel photo, and add duplicate reddress detection/correction redmatrix 2015-06-20 16:21:25 -07:00
  • ec23a94b6d Make item_store_update only affect the data we requested Alexandre Hannud Abdo 2015-06-20 02:21:25 -03:00
  • ddbaabd62d wrong logic redmatrix 2015-06-19 18:08:10 -07:00
  • 94e7a425e6 import_diaspora - a few more atypical settings redmatrix 2015-06-19 18:06:55 -07:00
  • a6b9d1595e automatically gunzip Diaspora export files if we're on a *nix system redmatrix 2015-06-19 17:18:01 -07:00
  • e85d2c4b90 import_diaspora: add all the friends redmatrix 2015-06-19 17:07:31 -07:00
  • 0a9d3b4025 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-19 16:44:16 -07:00
  • 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. redmatrix 2015-06-19 16:39:03 -07:00
  • 8b563951ff more generic-content-wrapper and some css fixes Mario Vavti 2015-06-19 15:49:06 +02:00
  • 1432b1e83f cloud.tpl Mario Vavti 2015-06-19 12:45:18 +02:00
  • de84f48e2f bring some more generic-content-wrappers and fix some of them Mario Vavti 2015-06-19 12:44:11 +02:00
  • 33c9d8e06b all file attachments are now stored natively, still have photos-0 to store natively redmatrix 2015-06-18 22:12:26 -07:00
  • 6aa159e2ac Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-18 19:15:01 -07:00
  • 25e134dd9c set return url from apps page redmatrix 2015-06-18 17:53:26 -07:00
  • 7e59580812 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-18 16:36:47 -07:00
  • 1a9c059062 issues with markdownify and escaped HTML redmatrix 2015-06-18 16:35:40 -07:00
  • 2963be60e5 more photos work redmatrix 2015-06-17 18:26:56 -07:00
  • 6ab20eb1b5 lots of work on merging photo and file albums/folders redmatrix 2015-06-17 17:44:31 -07:00
  • c6c17182e5 attach_mkdirp - implement force option to return success if dir exists redmatrix 2015-06-17 01:18:55 -07:00
  • 4ecee713d5 recursive mkdir (ala mkdir -p) for file and photo storage redmatrix 2015-06-16 22:58:26 -07:00
  • 39309ad45c start work on photo directories redmatrix 2015-06-16 19:05:09 -07:00
  • 65661b7ec3 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-16 18:43:03 -07:00
  • ec54111e6b Merge pull request #349 from git-marijus/master redmatrix 2015-06-17 11:14:18 +10:00
  • d84b3cfc3c remove file/attachments when their associated photos are removed redmatrix 2015-06-16 17:50:15 -07:00
  • 24befa2197 Small fix in siteinfo jeroenpraat 2015-06-16 13:24:10 +02:00