harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,898 Commits 6 Branches 36 Tags 152 MiB
1a5898bf80
Commit Graph

13898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
redmatrix
1a5898bf80 sync abook entries from redmatrix 
Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
 2015-07-02 21:58:28 -07:00
redmatrix
54301a9ff5 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-07-01 18:51:47 -07:00
redmatrix
8b2b92fe32 provide compatibility with redmatrix extended item export 2015-07-01 18:50:37 -07:00
redmatrix
3f38e52caf provide backward compatibility with hubzilla extended item export 2015-07-01 18:49:34 -07:00
redmatrix
75560b0496 turn attached audio/video into audio/video elements as well as providing an attachment link 2015-07-01 16:23:25 -07:00
git-marijus
e068bdc9d7 Merge pull request #365 from adsfkajlsfdas/master 
Clean up
 2015-07-01 11:47:17 +02:00
Mario Vavti
f54688a547 since we can now use plain upstream justifiedGallery library - switch to minified version 2015-07-01 11:42:17 +02:00
Mario Vavti
9c4e9f8759 update justifiedGallery to versio 3.6.0 2015-07-01 11:34:36 +02:00
redmatrix
d5c085a3c6 cleanup of import to allow cross-product import going one way. Note - items/content are not yet importable 2015-06-30 20:21:09 -07:00
redmatrix
1e3dffc29d Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-30 20:19:50 -07:00
redmatrix
86b12ea750 lots of work on clone/import from redmatrix to hubzilla (won't go back the other way) 2015-06-30 20:18:48 -07:00
Thomas Willingham
aa41842d24 Clean up 2015-06-30 17:49:09 +01:00
redmatrix
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. 2015-06-29 22:37:18 -07:00
redmatrix
97e8275dc2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-29 22:19:44 -07:00
redmatrix
0b347ccc14 turn the connection filter into a feature. 2015-06-29 20:35:56 -07:00
redmatrix
a7135b5ecd fix the postgres schema with all the changes to date 2015-06-29 19:58:44 -07:00
redmatrix
6e8ad5089e Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-06-29 18:01:51 -07:00
redmatrix
2072ea721f Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-29 16:56:45 -07:00
redmatrix
0b012e2995 some prep work 2015-06-29 16:56:18 -07:00
jeroenpraat
aad8fc1946 Update NL + 1 revert css, see comment here: 22b9e97ae2 2015-06-30 00:26:16 +02:00
jeroenpraat
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. 2015-06-29 23:09:36 +02:00
Mario Vavti
7ef4397634 fix directory location 2015-06-29 14:25:04 +02:00
redmatrix
63f2e9b412 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/zot.php
	mod/connedit.php
	util/messages.po
 2015-06-28 22:33:13 -07:00
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