 zottel
|
0314624aeb
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-05-05 20:47:15 +02:00 |
|
 redmatrix
|
8ffdc4859b
|
replace app tagcloud with more traditional categories widget. One can always change this in the PDL
|
2016-05-05 00:45:38 -07:00 |
|
|
redmatrix
|
9b19a51fc6
|
Allow follow to work with a pasted webbie from the profile page (where we've replaced the '@' sign with a UTF-8 look-alike)
|
2016-05-04 20:24:47 -07:00 |
|
|
redmatrix
|
9eac9ef2b9
|
isolate all the tagadelic core code into a class and reuse it
|
2016-05-04 19:39:39 -07:00 |
|
|
redmatrix
|
566667a263
|
provide a tag cloud for app categories and allow filtering apps from this
|
2016-05-04 18:27:46 -07:00 |
|
|
redmatrix
|
1b6bc5394b
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-04 17:36:13 -07:00 |
|
|
redmatrix
|
50fb525b28
|
add categories to apps (wip)
|
2016-05-04 17:35:27 -07:00 |
|
|
redmatrix
|
8c9a773a90
|
Merge pull request #366 from Treer/permissions
Refining the Permission settings dialog
|
2016-05-05 06:29:30 +10:00 |
|
 Treer
|
e1e56936c9
|
add help to some permissions dialogs
|
2016-05-05 02:09:47 +10:00 |
|
|
Treer
|
33a8d845c1
|
Refine permissions dialog UI
|
2016-05-04 23:55:32 +10:00 |
|
 Mario Vavti
|
9fe33bb67d
|
whitespace
|
2016-05-04 11:53:38 +02:00 |
|
|
Mario Vavti
|
0db8d3f6c6
|
whitespace
|
2016-05-04 11:49:29 +02:00 |
|
|
redmatrix
|
7c57da3a28
|
Sync the current list of system apps with the built-in name translation table. Some of the names were changed in the past without the translation table being updated to reflect it.
|
2016-05-03 22:12:09 -07:00 |
|
|
redmatrix
|
1685548a4c
|
ensure that important system fields are passed through the appman editor
|
2016-05-03 21:59:26 -07:00 |
|
|
redmatrix
|
191298ec93
|
more background work for app management - give every member a copy of all the system apps so that they can edit and delete them to taste/preference. This needs further work to pick up changes in system apps (additions, edits, deletions, etc.). Currently this is done once and never attempted again.
|
2016-05-03 20:37:05 -07:00 |
|
|
redmatrix
|
45c7a03a0d
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-03 18:42:06 -07:00 |
|
|
redmatrix
|
3df0bb5522
|
some preliminary structural work for app organisation
|
2016-05-03 18:41:16 -07:00 |
|
|
git-marijus
|
7fe697d896
|
Merge pull request #365 from Treer/fontawesome
another font-awesome icon
|
2016-05-03 20:51:16 +02:00 |
|
|
Treer
|
0bdcaff00f
|
another font-awesome icon
|
2016-05-04 00:32:08 +10:00 |
|
|
zottel
|
8088185a43
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-05-03 15:14:13 +02:00 |
|
|
redmatrix
|
dccdeedb75
|
add the new hook
|
2016-05-02 22:30:57 -07:00 |
|
|
redmatrix
|
b371c028ad
|
more security stuff
|
2016-05-02 22:28:27 -07:00 |
|
|
redmatrix
|
b017f8f2ab
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-02 13:32:04 -07:00 |
|
|
redmatrix
|
2b7b26f4c0
|
a bit more oembed security - and document the shortcomings of this approach
|
2016-05-02 13:31:14 -07:00 |
|
|
redmatrix
|
ae39217a7e
|
Merge pull request #364 from mjfriaza/dev
Contextual help in Spanish
|
2016-05-03 06:03:15 +10:00 |
|
 Manuel Jiménez Friaza
|
78e42a75f1
|
Contextual help in Spanish
|
2016-05-02 14:00:13 +02:00 |
|
|
zottel
|
e0e76ce82c
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-05-02 11:02:03 +02:00 |
|
|
redmatrix
|
559ed3f0a8
|
sort out the rest of the source categories
|
2016-05-02 01:18:18 -07:00 |
|
|
redmatrix
|
a10fe5f13e
|
a couple of bugfixes from earlier checkins and implementation of source tags
|
2016-05-01 22:45:38 -07:00 |
|
|
redmatrix
|
bd2f11ed8b
|
db schema change to add tags to content sources
|
2016-05-01 21:00:02 -07:00 |
|
|
redmatrix
|
5e458491f1
|
sort addons based on the internal display name instead of the filename
|
2016-05-01 20:43:57 -07:00 |
|
|
redmatrix
|
f284558007
|
use only the std_version
|
2016-05-01 19:29:30 -07:00 |
|
|
redmatrix
|
23bb4e8e15
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-05-01 19:20:09 -07:00 |
|
|
redmatrix
|
cd518625bf
|
some much needed work on oembed security
|
2016-05-01 19:19:17 -07:00 |
|
|
Mario Vavti
|
b4bf71dd06
|
fix mime-type icons in /cloud
|
2016-05-01 16:34:55 +02:00 |
|
|
Mario Vavti
|
b35e69273d
|
tweak dl bbcode in expanded autocomplete a bit more
|
2016-05-01 16:17:34 +02:00 |
|
|
git-marijus
|
4560298b98
|
Merge pull request #363 from Treer/bbcode
tweak dl bbcode in expanded autocomplete
|
2016-05-01 15:50:11 +02:00 |
|
|
Mario Vavti
|
d892a47ac9
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-05-01 15:45:57 +02:00 |
|
|
Mario Vavti
|
fa80a5c113
|
make weblink and attach button hideable and some minor fixes
|
2016-05-01 15:45:42 +02:00 |
|
|
Mario Vavti
|
7fac859fbd
|
css fix
|
2016-05-01 12:16:42 +02:00 |
|
|
Treer
|
02d8363019
|
tweak dl bbcode in expanded autocomplete
|
2016-05-01 16:03:36 +10:00 |
|
|
redmatrix
|
84d93cca6e
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-04-30 15:02:45 -07:00 |
|
|
redmatrix
|
9446d0cbb4
|
Merge pull request #362 from Treer/fontawesome
Update Font-Awesome to 4.6.1
|
2016-05-01 08:02:03 +10:00 |
|
|
Mario Vavti
|
8a41e2a011
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-04-30 23:38:40 +02:00 |
|
|
Mario Vavti
|
36fe2ac87e
|
css fix
|
2016-04-30 23:38:25 +02:00 |
|
|
Treer
|
3fe8fc0aa8
|
update icon names in library
|
2016-05-01 06:48:18 +10:00 |
|
 jeroenpraat
|
3d9fcee075
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-04-30 22:30:37 +02:00 |
|
|
jeroenpraat
|
917bcb55fd
|
Small fix of Dutch strings
|
2016-04-30 22:29:59 +02:00 |
|
|
Mario Vavti
|
026787fc73
|
whitespace
|
2016-04-30 22:26:45 +02:00 |
|
|
Mario Vavti
|
d43c7603bf
|
more work on layout editors
|
2016-04-30 22:21:00 +02:00 |
|