Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-22 21:15:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14780 commits 7 branches 31 tags 160 MiB
Commit graph

14780 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Haakon Meland Eriksen
adfc748bfa Merge remote-tracking branch 'upstream/master' 2015-09-03 18:12:02 +02:00
zottel
5cef672f9a fix update 1148 2015-09-03 13:55:47 +02:00
zottel
015c7243b9 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	include/zot.php
 2015-09-03 12:51:08 +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
zottel
d376d2a590 really fix post filtering 2015-09-02 15:46:31 +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
redmatrix
3c29b46c42 use different obj export output format for hubzilla compatibility 2015-09-01 20:57:53 -07:00
redmatrix
f2397c942c Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-01 20:21:43 -07:00
redmatrix
eb2df761d5 cert updates 2015-09-01 20:20:45 -07:00
redmatrix
1ce8ce896b provide consistent ui for things 2015-09-01 19:27:41 -07:00
redmatrix
85daf26eb1 more work on objs/things 2015-09-01 19:01:19 -07:00
redmatrix
286be43963 issue #31 2015-09-01 17:16:10 -07:00
redmatrix
d951534d8f Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-01 17:09:59 -07:00
redmatrix
515f3bf111 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/identity.php
	install/update.php
 2015-09-01 17:08:59 -07:00
redmatrix
3852b5ce7f separate objs/things from taxonomy 2015-09-01 17:06:58 -07:00
redmatrix
d753ae4cf1 dummy update placeholder 2015-09-01 16:25:10 -07:00
Haakon Meland Eriksen
2ce1e3678a Merge remote-tracking branch 'upstream/master' 2015-09-01 20:46:29 +02:00
Haakon Meland Eriksen
365d690d7d Fix filename 2015-09-01 20:46:14 +02:00
jeroenpraat
e75616517d Updated all 300px default profile photos to 300px. Most using the SVG source, some enlarged using the Gimp. 2015-09-01 20:40:36 +02:00
Haakon Meland Eriksen
5cb2fa5981 Fixed deploy script 2015-09-01 19:25:41 +02:00
Haakon Meland Eriksen
e854562803 Merge remote-tracking branch 'upstream/master' 2015-09-01 18:45:06 +02:00
Haakon Meland Eriksen
fad9594b31 Added openshift-hubzilla-deploy to .openshift/action_hooks/deploy 2015-09-01 18:44:37 +02:00