 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 |
|
|
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 |
|
 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 |
|
|
redmatrix
|
1447499776
|
don't log the mundane - especially at normal levels.
|
2015-08-31 22:41:48 -07:00 |
|
|
redmatrix
|
417da13353
|
this is a bit harder than anticipated.
|
2015-08-31 21:12:37 -07:00 |
|
|
redmatrix
|
69dc1b03c3
|
typo in sql
|
2015-08-31 21:01:47 -07:00 |
|
|
redmatrix
|
d7089ab471
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
install/update.php
util/messages.po
view/nl/messages.po
|
2015-08-31 21:00:28 -07:00 |
|
|
redmatrix
|
039f56f390
|
mostly doc tweaks, some import/export work
|
2015-08-31 20:58:05 -07:00 |
|
|
redmatrix
|
d7cae1ce2a
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-08-31 20:56:22 -07:00 |
|
|
redmatrix
|
d7cf7316be
|
change the likes db structure to make it more easily importable/exportable
|
2015-08-31 20:55:25 -07:00 |
|
|
redmatrix
|
b4cbb3aeb1
|
update history
|
2015-08-31 17:45:01 -07:00 |
|
|
redmatrix
|
de3012ccf1
|
documentation re-org
|
2015-08-31 17:08:09 -07:00 |
|
|
redmatrix
|
53a0920f20
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-08-31 16:27:17 -07:00 |
|
|
redmatrix
|
5fe9021375
|
rename 'register_account' hook to 'create_identity'.
|
2015-08-31 16:26:29 -07:00 |
|
|
jeroenpraat
|
fd28550ad2
|
Changed favicon to new one (based on new Hubzilla arrow). Please revert when it's not okay. Also added a new optional default profile photo, in the same style.
|
2015-08-31 20:26:26 +02:00 |
|
|
redmatrix
|
c0cb21a07c
|
unclosed link tags
|
2015-08-30 23:01:39 -07:00 |
|
|
redmatrix
|
c865f17dc0
|
schedule a doco update once weekly
|
2015-08-30 22:46:00 -07:00 |
|
|
redmatrix
|
e23f86faa9
|
more work on doco search
|
2015-08-30 22:39:33 -07:00 |
|
|
redmatrix
|
7ba1217a13
|
improvements to documentation search
|
2015-08-30 20:47:15 -07:00 |
|