Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 11:15:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14328 commits 7 branches 30 tags 160 MiB
Commit graph

14328 commits

This branch
This branch
All branches
Author SHA1 Message Date
redmatrix
1d09e4b620 use conversation defaults for /public page instead of collapsed list mode, but allow over-ride 2015-09-06 16:42:50 -07:00
jeroenpraat
6ea1cf71b5 Update dav_windows.bb 2015-09-06 23:36:26 +02:00
jeroenpraat
302fe94705 Update dav_nemo.bb 2015-09-06 23:35:35 +02:00
jeroenpraat
38ea8d1d86 Update dav_mount.bb 2015-09-06 23:32:14 +02:00
jeroenpraat
67ed7e40be Update dav_mount.bb 2015-09-06 23:30:25 +02:00
jeroenpraat
20f211b70a Update dav_dolphin.bb 2015-09-06 23:27:55 +02:00
jeroenpraat
ebb07def7e Update dav_nautilus.bb 2015-09-06 23:26:28 +02:00
redmatrix
55ab968edf make js_upload work with hubzilla. It still needs a rewrite. 2015-09-05 17:35:00 -07:00
redmatrix
3f6d6745de syntax 2015-09-05 15:33:09 -07:00
redmatrix
d1daae1b59 Merge pull request #26 from anaqreon/logo-in-readme 
Updating logo icon in Readme file and change markup heading
 2015-09-05 07:18:42 +10:00
redmatrix
350ea2bf28 Merge pull request #35 from redmatrix/jeroenpraat-patch-1 
Fix for PHP Fatal error:  Function name must be a string in /var/www/…
 2015-09-05 07:18:01 +10:00
jeroenpraat
fc804751a2 Fix for PHP Fatal error: Function name must be a string in /var/www/hubzilla/include/items.php on line 3325 
Please review if this is correct?
 2015-09-04 12:39:47 +02:00
redmatrix
b1888afa10 fix typos before pushing 2015-09-03 18:47:03 -07:00
redmatrix
856cc7d6b8 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-03 18:45:00 -07:00
redmatrix
d79e81a069 import and sync chatrooms 2015-09-03 18:44:40 -07:00
redmatrix
f7d9523c7d export chatrooms 2015-09-03 18:43:44 -07:00
redmatrix
d93e1c84ac Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/identity.php
 2015-09-03 17:28:51 -07:00
redmatrix
2a7ff3018b channel export - don't include linked resource items (photos, events). These items will need to be provided with those objects so that they can be re-linked. 2015-09-03 17:21:20 -07:00
redmatrix
c83da012ff profile import error #34 2015-09-03 16:19:59 -07:00
redmatrix
46e9c4299e Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-03 15:48:52 -07:00
redmatrix
e1af81ea55 in this case no results is not an error 2015-09-03 15:48:01 -07:00
redmatrix
99848ab3bb Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-03 13:11:25 -07:00
redmatrix
90d48d60d8 revision update 2015-09-03 13:10:03 -07:00
redmatrix
48c0efd20e Merge pull request #390 from zzottel/master 
fix update 1148
 2015-09-04 06:09:26 +10:00
zottel
5cef672f9a fix update 1148 2015-09-03 13:55:47 +02:00
redmatrix
d1480d9f56 bug reporting doc 2015-09-03 01:55:07 -07:00
redmatrix
f3cb17ac3b app sync 2015-09-02 23:09:51 -07:00
redmatrix
fb2d2c5585 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-02 21:59:44 -07:00
redmatrix
945ba5d788 more adjustment to apps containers 2015-09-02 21:46:19 -07:00
redmatrix
3e7edf504d sort out some app display weirdness 2015-09-02 21:35:49 -07:00
redmatrix
3285c71995 increase height of app-container so edit controls aren't shadowed 2015-09-02 21:17:23 -07:00
redmatrix
669e111118 add timestamps for syncing apps 2015-09-02 21:07:24 -07:00
redmatrix
360fda15e9 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-02 20:54:00 -07:00
redmatrix
2018b88093 dummy update 2015-09-02 20:53:26 -07:00
redmatrix
837b9224cc Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	doc/credits.bb
	mod/thing.php
 2015-09-02 20:33:58 -07:00
redmatrix
c22da3da1c start to modularise the clone import and sync functions 2015-09-02 20:12:40 -07:00
redmatrix
470915a55b sync "things" (obj elements) 2015-09-02 20:07:15 -07:00
redmatrix
d9a67d64b1 Update the credits 2015-09-02 18:04:22 -07:00
redmatrix
2a26c898ca protect from sql injection 2015-09-02 15:52:54 -07:00
redmatrix
69fc10d5ad Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-02 15:49:50 -07:00
redmatrix
3647b74d33 Merge pull request #389 from zzottel/master 
really fix post filtering
 2015-09-03 06:12:54 +10:00
zottel
441946b9d3 really fix post filtering 2015-09-02 15:49:07 +02:00
redmatrix
9328edfdcd obscure mail subject in conversation structure 2015-09-01 22:59:06 -07:00
redmatrix
d105f324af import apps 2015-09-01 22:27:09 -07:00
redmatrix
23213a91ed Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-01 22:27:00 -07:00
redmatrix
184c544a24 export apps 2015-09-01 22:26:21 -07:00
redmatrix
6cc60ba477 initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose. 2015-09-01 22:03:10 -07:00
redmatrix
c5578d7964 match the redmatrix output format for objects (which is the hubzilla table format) 2015-09-01 21:08:02 -07:00
redmatrix
95cf1aafa0 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-01 21:04:57 -07:00
redmatrix
f72a3113f5 add the baseurl so we can easily relocate objects 2015-09-01 21:03:55 -07:00