Mario Vavti
|
aa5ac9dc3f
|
only use height: auto for week and day view
|
2016-06-17 11:57:36 +02:00 |
|
Mario Vavti
|
5b479d63d6
|
Merge branch 'dev' into sabre32
|
2016-06-16 12:22:32 +02:00 |
|
Mario Vavti
|
8924f94d05
|
show month view in full height in fullscreen view
|
2016-06-16 12:21:59 +02:00 |
|
Mario Vavti
|
a873b7b6e8
|
mrge branch 'dev' into sabre32
|
2016-06-16 11:37:16 +02:00 |
|
Mario Vavti
|
7baa20d559
|
fix scrollbars
|
2016-06-16 11:36:51 +02:00 |
|
Mario Vavti
|
28a7458e48
|
Merge branch 'dev' into sabre32
|
2016-06-16 10:26:47 +02:00 |
|
hubzilla
|
e0b705fd54
|
Merge pull request #422 from anaqreon/wiki
Wiki rename page feature added. Bug fixes related to git commits.
|
2016-06-16 13:01:49 +10:00 |
|
redmatrix
|
fa48de33c2
|
provide syntax based [colour] highlighting on code blocks for popular languages. I'm not happy with the line height on the list elements but couldn't see where this was defaulted. This uses the syntax [code=xxx]some code snippet[/code], where xxx represents a code/language style - with about 18 builtins.
|
2016-06-15 19:44:15 -07:00 |
|
jeroenpraat
|
b0476be36f
|
All languages up to date as far as they are updated. Added Hebrew (I saw no RTL on my browser, but maybe that's a locale setting or else it's not yet implemented in HZ). Removed Esperanto and Czech (they where old ones from Friendica and are not on Transifex (yet)).
|
2016-06-15 17:26:44 +02:00 |
|
Andrew Manning
|
688171d016
|
Rename page feature added. Fixed bug in git commit function and other minor fixes.
|
2016-06-15 06:25:31 -04:00 |
|
phellmes
|
a16dcc877c
|
Update DE translation strings
|
2016-06-15 12:12:18 +02:00 |
|
Mario Vavti
|
24569a18db
|
css fix
|
2016-06-14 23:21:26 +02:00 |
|
Mario Vavti
|
b6d425838f
|
css fixes
|
2016-06-13 17:19:49 +02:00 |
|
Mario Vavti
|
e963714ad6
|
Merge branch 'dev' into sabre32
|
2016-06-13 09:18:39 +02:00 |
|
Andrew Manning
|
71d4f65cb2
|
Move javascript functions back to jot-header.tpl
|
2016-06-12 20:10:37 -04:00 |
|
Andrew Manning
|
b5933e9d44
|
Photo embed button with album browser works in new post editor.
|
2016-06-12 19:41:37 -04:00 |
|
Andrew Manning
|
a1183bf09a
|
Merge remote-tracking branch 'upstream/dev' into embedphotos
|
2016-06-12 14:38:48 -04:00 |
|
Mario Vavti
|
ef95c68b4f
|
Merge branch 'dev' into sabre32
|
2016-06-11 20:33:03 +02:00 |
|
Mario Vavti
|
0cada39c8a
|
css fixes
|
2016-06-11 20:31:37 +02:00 |
|
jeroenpraat
|
a1241daa41
|
es_ES and NL string for 1.8RC. Hopefully I'm doing it right.
|
2016-06-11 17:58:37 +02:00 |
|
Mario Vavti
|
86985b454f
|
Merge branch 'dev' into sabre32
|
2016-06-10 12:22:01 +02:00 |
|
Mario Vavti
|
9d5d3a9468
|
Merge branch 'dev' into sabre32
|
2016-06-10 10:45:09 +02:00 |
|
Andrew Manning
|
7a242f829f
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-09 20:07:09 -04:00 |
|
Andrew Manning
|
7fc2b13fe6
|
Stashing changes. Not a functional state.
|
2016-06-09 20:06:36 -04:00 |
|
redmatrix
|
ee5372784e
|
remove the automatic ajax page load on pgdn key; it can load content much faster than you can page and potentially lead to memory exhaustion.
|
2016-06-09 16:45:53 -07:00 |
|
Mario Vavti
|
85e82e919e
|
more style work
|
2016-06-09 22:05:52 +02:00 |
|
Andrew Manning
|
e86e666c22
|
Javascript only allows saving a page if the content has changed.
|
2016-06-07 20:58:14 -04:00 |
|
Andrew Manning
|
cf180f6142
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-07 20:43:49 -04:00 |
|
redmatrix
|
037cd74e8e
|
rename admin/users to admin/accounts, provide sortable columns in account and channel summaries - issue #255
|
2016-06-06 19:44:22 -07:00 |
|
redmatrix
|
c0d80a5828
|
adjust the autocomplete regex slightly to account for emoji names
|
2016-06-05 22:38:44 -07:00 |
|
Andrew Manning
|
2af8105b46
|
Hide page history viewer when viewing sandbox
|
2016-06-05 21:14:30 -04:00 |
|
Andrew Manning
|
d2a7f83bb5
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-05 20:31:34 -04:00 |
|
Andrew Manning
|
b8b50bdb5a
|
Custom commit message available. Improved history viewer and feedback from revert buttons.
|
2016-06-05 20:30:45 -04:00 |
|
jeroenpraat
|
e2245446a3
|
Updating NL + es_ES strings
|
2016-06-06 01:18:18 +02:00 |
|
Andrew Manning
|
08a9553ccc
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-05 16:52:02 -04:00 |
|
Andrew Manning
|
0a3fbdd128
|
Basic page reversion implemented. The revert button on the history view replaces the editor text but does not save the page.
|
2016-06-05 16:32:03 -04:00 |
|
redmatrix
|
dd6718c2cd
|
provide a hover class for smiley emojis which renders them slightly larger on compatible devices when you single them out for inspection
|
2016-06-04 18:10:42 -07:00 |
|
Andrew Manning
|
4bc4fd5b7e
|
Page deletion implemented. Hide the delete button and disallow for Home page.
|
2016-06-04 18:00:32 -04:00 |
|
Andrew Manning
|
344c293424
|
Wiki and page filenames are abstracted from their displayed names. Special characters do not seem to break things.
|
2016-06-04 15:12:04 -04:00 |
|
Andrew Manning
|
c08f428b5e
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-04 05:45:53 -04:00 |
|
redmatrix
|
a7e5e3d574
|
allow any (current) emoji to be displayed on any site, and provide a default list of reactions that can be over-ridden via configuration if a site doesn't like our choices or perhaps the ordering of our choices.
|
2016-06-03 18:13:21 -07:00 |
|
redmatrix
|
e81ac9e063
|
turn emoji ability into a feature so that either a member or the site admin can disable it. Default is enabled.
|
2016-06-03 16:04:54 -07:00 |
|
Mario Vavti
|
29a0a11b7e
|
some theming for emoji button
|
2016-06-03 11:03:01 +02:00 |
|
redmatrix
|
f8949ed5d1
|
restrict emoji reactions to the top level for now.
|
2016-06-02 22:12:56 -07:00 |
|
redmatrix
|
7ae376b6cd
|
menu entries for basic emoji support. I could use a bit of help theming this. It may also be better rendered as a panel of buttons than a dropdown menu. Eventually we should probably allow the system admin to configure the emojis they want; as there are a large number. I only brought in a small collection that I thought would be most useful as post reactions.
|
2016-06-02 22:06:19 -07:00 |
|
Andrew Manning
|
b93e398674
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-02 22:32:50 -04:00 |
|
Andrew Manning
|
b70c680964
|
Major corrections to access control and page construction.
|
2016-06-02 22:27:26 -04:00 |
|
redmatrix
|
b1259876bf
|
more db column renames
|
2016-05-31 21:45:33 -07:00 |
|
redmatrix
|
dfb6255f59
|
more removal of reserved words from DB schemas
|
2016-05-31 17:50:47 -07:00 |
|
Andrew Manning
|
8d284bab47
|
Created page history widget to dynamically fetch and display the git commit history for wiki pages.
|
2016-05-30 20:59:54 -04:00 |
|
Andrew Manning
|
a52cdcb241
|
Replaced wiki item record object field with ActivityStreams information. Wiki git repo path is stored in iconfig instead.
|
2016-05-30 14:59:33 -04:00 |
|
Mario Vavti
|
d1efb59fcd
|
render code bbcode inline if there are no linebreaks in the text.
|
2016-05-30 16:12:48 +02:00 |
|
Andrew Manning
|
4b350b9090
|
Fixed bug in access control. Hide new wiki/page buttons if not channel owner.
|
2016-05-29 21:23:56 -04:00 |
|
Andrew Manning
|
00d32f6b94
|
Only show wiki delete control if channel owner
|
2016-05-29 20:39:19 -04:00 |
|
Andrew Manning
|
3e6af5c876
|
Hacked Parsedown and Markdown to add class inline-code to <code> blocks for proper inline code rendering. Stopped using Parsedown even though Markdown is slower, hence extra delay when previewing pages.
|
2016-05-29 17:06:45 -04:00 |
|
Andrew Manning
|
df7772e301
|
Home page create with new wiki. URL redirects here when no page given. Fixed bug with author in wiki item table record.
|
2016-05-29 13:33:52 -04:00 |
|
Andrew Manning
|
ab54bf5149
|
Wiki pages can be saved.
|
2016-05-28 15:11:19 -04:00 |
|
Andrew Manning
|
819683a073
|
Show page content by default. Hide page controls where appropriate. Fix sandbox text format.
|
2016-05-28 14:11:36 -04:00 |
|
Andrew Manning
|
7393dccde8
|
Page content is loaded from the file on disk
|
2016-05-28 12:33:07 -04:00 |
|
Andrew Manning
|
ae94e8a855
|
Wiki page list links work. File content is not yet loaded into the editor. Removed some logger calls.
|
2016-05-28 07:42:18 -04:00 |
|
Andrew Manning
|
f884fa6678
|
Wiki page list is fetched and the page widget is updated
|
2016-05-28 07:17:42 -04:00 |
|
Andrew Manning
|
4691c3ec01
|
Add new page to wiki and redirect to editor page.
|
2016-05-27 22:19:05 -04:00 |
|
Andrew Manning
|
97e6b7c4ba
|
Wiki deletion works
|
2016-05-27 20:20:33 -04:00 |
|
Andrew Manning
|
d554681174
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-05-27 06:35:15 -04:00 |
|
redmatrix
|
096fdfc61b
|
consolidate all the sys_boot functionality that is common between the web server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so.
|
2016-05-26 16:33:01 -07:00 |
|
redmatrix
|
2f64684299
|
some event fixes, also change jquery-textcomplete to un-minified since the minified version appears to require a mapping file and causes a lot of server fetch errors trying to load it.
|
2016-05-25 20:06:21 -07:00 |
|
redmatrix
|
66b6f8c0ff
|
app rendering issues, typo in class name and could not find icon 'fa-arrow-circle-o-down-alt'; using 'fa-arrow-circle-o-down' instead
|
2016-05-25 17:30:15 -07:00 |
|
Mario Vavti
|
9908a7193a
|
remove the add others button for now - after some research it turned out not beeing so useful
|
2016-05-25 14:31:58 +02:00 |
|
redmatrix
|
80f2ba640e
|
code cleanup
|
2016-05-24 20:49:23 -07:00 |
|
Andrew Manning
|
e00b8a7082
|
Delete wiki (in progress)
|
2016-05-24 06:15:42 -04:00 |
|
jeroenpraat
|
b4e5d303b5
|
Update NL + ES_ES
|
2016-05-22 23:17:06 +02:00 |
|
Andrew Manning
|
a36bef7979
|
List of wikis populates with links according to observer permissions.
|
2016-05-21 21:55:09 -04:00 |
|
Andrew Manning
|
049147a9d7
|
Successful new wiki git repo and item table record
|
2016-05-21 19:02:23 -04:00 |
|
Andrew Manning
|
5f2baa59f5
|
Forgot some templates
|
2016-05-21 15:07:27 -04:00 |
|
Andrew Manning
|
c6aa42773a
|
Trying to fix wiki branch starting fresh from dev
|
2016-05-21 14:56:42 -04:00 |
|
phellmes
|
ef9b42aeb3
|
Update DE translation strings
|
2016-05-21 16:20:19 +02:00 |
|
Mario Vavti
|
9480e9b68b
|
possible fix for #385
|
2016-05-21 14:34:01 +02:00 |
|
Mario Vavti
|
c7cad6ab60
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2016-05-19 23:35:48 +02:00 |
|
Mario Vavti
|
0f5eb65210
|
provide an acl select option for only me
|
2016-05-19 23:35:19 +02:00 |
|
Andrew Manning
|
d5ca889cf5
|
Replace text strings for translation support
|
2016-05-19 07:09:13 -04:00 |
|
Andrew Manning
|
b55e2776cc
|
Improved plugin repo management UI in admin/plugins
|
2016-05-19 07:03:42 -04:00 |
|
hubzilla
|
de1527eba8
|
Merge pull request #388 from phellmes/de20160516
Update DE translation strings
|
2016-05-17 10:29:53 +10:00 |
|
jeroenpraat
|
9f77180af8
|
Dutch and Spanish Spanish strings, and some schema-bits
|
2016-05-16 16:43:14 +02:00 |
|
phellmes
|
0bd4939695
|
Update DE translations strings
|
2016-05-16 15:11:53 +02:00 |
|
Andrew Manning
|
0baab50191
|
Enable options for chat notifications, with optional audio. Notify for member entering room and incoming messages.
|
2016-05-13 21:47:37 -04:00 |
|
Mario Vavti
|
1e00fa79b3
|
change wording restricted -> custom selection and add a label to the select
|
2016-05-13 17:38:50 +02:00 |
|
Mario Vavti
|
573dea42d0
|
instead of radio buttons use select to choose between public and restricted acl. if restricted is selected acl is set to default. if there is no default acl will be set to self. if public is selected acl-list will be hidden and acl-info is visible.
|
2016-05-13 16:22:43 +02:00 |
|
Andrew Manning
|
913d07a4a7
|
Merge remote-tracking branch 'upstream/dev' into chat-notify
|
2016-05-11 20:08:54 -04:00 |
|
Andrew Manning
|
b40d8070f3
|
Browser notification issued when member enters chat room
|
2016-05-11 20:02:19 -04:00 |
|
redmatrix
|
1fb21b781f
|
Merge pull request #376 from anaqreon/plugin-repo
Check if target directories are writable when adding, updating, or removing plugin repos
|
2016-05-12 08:57:22 +10:00 |
|
Mario Vavti
|
25df2080ea
|
more whitespace
|
2016-05-11 22:31:05 +02:00 |
|
Mario Vavti
|
5632022d79
|
whitespace
|
2016-05-11 22:23:13 +02:00 |
|
Andrew Manning
|
d968fc51ea
|
Merge remote-tracking branch 'upstream/dev' into plugin-repo
|
2016-05-11 05:54:20 -04:00 |
|
Andrew Manning
|
c7698e4dc3
|
Check if target directories are writable when adding, updating, or removing plugin repos
|
2016-05-11 05:53:23 -04:00 |
|
redmatrix
|
4dd3839c41
|
provide repository versions on admin summary page and an upgrade message if you're behind master
|
2016-05-10 21:46:04 -07:00 |
|
Andrew Manning
|
78b40e6363
|
Delete existing repo if the new one has a different URL. Fixed bug that could cause repeated installation.
|
2016-05-10 06:28:00 -04:00 |
|
Andrew Manning
|
0b8a7f1bd0
|
Merge remote-tracking branch 'upstream/dev' into plugin-repo
|
2016-05-09 22:00:21 -04:00 |
|
Andrew Manning
|
9c8cf7d433
|
Fixed some bugs with empty repo name and improved the interface a bit.
|
2016-05-09 21:59:27 -04:00 |
|
Andrew Manning
|
180731c162
|
copy-paste error
|
2016-05-09 21:17:47 -04:00 |
|
Mario Vavti
|
7aeff7505b
|
remove unused code and whitespace
|
2016-05-09 12:09:04 +02:00 |
|