harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,671 Commits 6 Branches 36 Tags 152 MiB
695c60c3fe
Commit Graph

6958 Commits

Author SHA1 Message Date
Max Kostikov
b5ed1de31e New russian translations hmessages.po 
(cherry picked from commit ff53da5b0a)
 2018-10-05 14:54:53 +02:00
Max Kostikov
5cf156f698 New russian translations hstrings.php 
(cherry picked from commit 9520123f6d)
 2018-10-05 14:54:22 +02:00
Mario Vavti
1eaf6df842 fix issues with bs accordions 2018-10-04 22:21:20 +02:00
Mario Vavti
d4af745fc8 move *_divmore_height setting to the module extra_settings, and fix issue where feature settings were not synced if rpath was provided 2018-10-04 21:38:39 +02:00
Mario Vavti
6e03104e3e move *_list_mode to features 2018-10-04 20:48:22 +02:00
Mario
e89a84608f Merge branch 'patch-1' into 'dev' 
Incorrect block wrapping fixed

See merge request hubzilla/core!1306
 2018-10-04 14:57:03 +02:00
Max Kostikov
1dbd83a582 Update settings.tpl 2018-10-04 14:35:32 +02:00
Mario
c1002557cf Merge branch 'patch-1' into 'dev' 
button sticking fixed

See merge request hubzilla/core!1305
 2018-10-04 13:53:00 +02:00
Mario Vavti
d0605e8d5f uexport app 2018-10-04 11:50:38 +02:00
Max Kostikov
05b6c33a2c button sticking fixed 2018-10-03 21:19:13 +02:00
Mario
5e7c9b9d4a jot: show settings icon only to local profile owner 2018-10-03 15:21:20 +02:00
Mario Vavti
7dadf387e5 indicate locked features 2018-10-01 11:01:56 +02:00
M. Dent
5f992ffe15 Remove servicelevel logic 2018-09-29 00:17:55 +02:00
M.Dent
fe8b723622 Hide form when at or over service_class['limit_identities'] 2018-09-27 22:43:36 -04:00
Mario
c15de3b68b more checks 2018-09-27 22:45:43 +02:00
Mario Vavti
6b23c3e179 implement conversation tools (settings/conversation), remove additional features from the settings menu and get rid of skill levels 2018-09-27 14:56:47 +02:00
Mario Vavti
bdf6289b32 tokens: add css file and fix argc and argv values 2018-09-26 22:32:06 +02:00
Mario Vavti
e3c04b1fd0 guest access app 2018-09-26 22:24:36 +02:00
Mario Vavti
a7948d7bfe permcats app 2018-09-26 22:02:50 +02:00
Mario Vavti
aab97adb23 oauth and oauth2 apps manager 2018-09-26 16:22:34 +02:00
Mario Vavti
91502b4104 change wording 2018-09-26 15:13:19 +02:00
Mario Vavti
9bc76b4259 appification of the pdl editor and move advanced_theming to theme settings where it belongs 2018-09-26 15:02:20 +02:00
Mario Vavti
9bb0f1d18e move advanced_theming switch to settings/display for now 2018-09-25 12:02:00 +02:00
Mario Vavti
39866b7463 move start_menu switch to settings/display for now 2018-09-25 11:37:22 +02:00
Mario Vavti
c748230b35 revert nav settings opacity 2018-09-24 11:51:20 +02:00
Mario Vavti
c3aa15cc16 appification of notes 2018-09-24 11:46:18 +02:00
Mario
4a7c678213 fade in nav settings button 2018-09-24 09:46:19 +02:00
Mario
e735220691 only explain how to select a channel if there are channels to select 2018-09-23 20:54:36 +02:00
Mario
9b7c6e96f7 only show nav settings icon when hovering over nav 2018-09-23 20:41:01 +02:00
Mario
d83fe9d417 minor cleanup 2018-09-23 20:02:28 +02:00
Mario Vavti
6f99ca1d31 opacity for jot settings/reset buttons 2018-09-21 20:59:31 +02:00
Mario Vavti
8efa103041 provide editor settings 2018-09-21 20:57:01 +02:00
Mario Vavti
9638bf2b1e provide a return path from settings pages 2018-09-21 20:23:31 +02:00
Mario Vavti
18a9ebdb1e add missing check 2018-09-21 14:07:30 +02:00
Mario
604142af93 Merge branch 'patch-5' into 'dev' 
save admin page values

See merge request hubzilla/core!1282
 2018-09-21 13:55:47 +02:00
Max Kostikov
2d83868ed9 Update admin_account_edit.tpl 2018-09-21 13:50:50 +02:00
Max Kostikov
73195a0215 Update admin_account_edit.tpl 2018-09-21 13:48:44 +02:00
Max Kostikov
13d05549f8 Update admin_accounts.tpl 2018-09-21 13:48:40 +02:00
Max Kostikov
0143bc734c Update admin_channels.tpl 2018-09-21 13:48:35 +02:00
Max Kostikov
ff860a3310 Update admin_logs.tpl 2018-09-21 13:48:27 +02:00
Max Kostikov
ed0044aeab Update admin_profiles.tpl 2018-09-21 13:48:22 +02:00
Max Kostikov
1a6d290d71 Update admin_security.tpl 2018-09-21 13:48:12 +02:00
Max Kostikov
dbb7245e22 Update admin_site.tpl 2018-09-21 13:48:07 +02:00
Mario
0f9802a47c Merge branch 'patch-5' into 'dev' 
Admin forms buttons design unification

See merge request hubzilla/core!1281
 2018-09-21 13:24:29 +02:00
Mario Vavti
4dd1521677 fix position of nav settings icon 2018-09-21 12:16:36 +02:00
Mario Vavti
32fba39915 fix typo 2018-09-21 11:22:11 +02:00
Mario Vavti
c1697ce96b fix can not enter text in notes widget 2018-09-21 11:15:18 +02:00
Max Kostikov
21ff570c4d Update admin_account_edit.tpl 2018-09-20 23:40:09 +02:00
Max Kostikov
f2e4cf3a92 Update admin_security.tpl 2018-09-20 23:39:46 +02:00
Max Kostikov
7123de66f9 Update admin_profiles.tpl 2018-09-20 23:39:18 +02:00
Max Kostikov
e4fe202fc6 Update admin_site.tpl 2018-09-20 23:38:48 +02:00
Max Kostikov
bde6caf167 Update admin_accounts.tpl 2018-09-20 23:38:19 +02:00
Max Kostikov
96f45b5fbe Update admin_channels.tpl 2018-09-20 23:36:35 +02:00
Max Kostikov
4352afeeb0 Update admin_logs.tpl 2018-09-20 23:32:13 +02:00
Mario Vavti
1ca558f011 move connection filtering setting from network to connections, provide a link to settings in the navbar if present for a module and some code optimisation 2018-09-20 13:22:41 +02:00
Mario Vavti
34fec995f7 allow a second url in apd files for settings, hide pin and star buttons in edit mode and use strpos() instead of strstr() in some places 2018-09-19 15:00:06 +02:00
zotlabs
98bc1ed600 this was needed 2018-09-18 23:18:59 -07:00
zotlabs
7756773683 missing autocomplete (e.g. mentions) in mod_photos comments 2018-09-18 19:52:10 -07:00
Mario Vavti
a9853e6033 seperate settings for mod network 2018-09-17 11:36:11 +02:00
Mario Vavti
f9d43479f2 css issues 2018-09-13 15:14:46 +02:00
Mario Vavti
4bb16b18ed cover photo: mior issue and more cleanup 2018-09-10 12:12:05 +02:00
Mario Vavti
4cc413cdaf cover photo: some code cleanup and fix height issue when photo was not cached 2018-09-10 11:12:15 +02:00
Mario Vavti
677ad71b96 fix some issues with latest notification improvements 2018-09-09 19:44:27 +02:00
Mario Vavti
54fa28441c install bootstrap via composer 2018-09-07 11:26:02 +02:00
Mario Vavti
bb42ec2bfc apps: change page title to available/installed, display install action label in button and use different icons for installable and updateable apps 2018-09-07 10:39:15 +02:00
Mario Vavti
d31251c54e overflow should be auto not visible 2018-09-07 10:07:29 +02:00
Mario Vavti
6a338e28b2 -1 has issues in some browsers 2018-09-06 14:27:56 +02:00
Mario Vavti
5135f236c2 improve cover-photo handling 2018-09-06 11:30:50 +02:00
Mario Vavti
78c847ef7d improve notification handling on small screens 2018-09-06 11:14:08 +02:00
Mario Vavti
673a2f67f1 sticky-kit: improve handling 2018-09-06 10:08:55 +02:00
Mario Vavti
4f82428a20 hide cover photo by default and show it only if conditions are met 2018-09-05 14:31:34 +02:00
Mario Vavti
e494a76b33 revert "Add bottom margin on aside elements and main to allow for viewport footer." 
This reverts commit 1d7d604016.
 2018-09-05 12:34:30 +02:00
Mario Vavti
1753e40466 Revert "Fix jumpy sidebars" 
This reverts commit 79eb6d3942.
 2018-09-05 12:32:53 +02:00
Mario Vavti
a821682c8c instead of not displaying the cover-photo at all after first page load, load the page with the cover slided up. change pointer to n-resize if cover is not slid. 2018-09-05 12:17:32 +02:00
Mario
4c1944a08d Merge branch 'extend-convitems-dropdown' into 'dev' 
Extend cog dropdown & temp fix for feed display of corrupt mids

See merge request hubzilla/core!1265
 2018-08-27 10:02:58 +02:00
M.Dent
a0c2bbac9d Add hook to extend conv_item cog dropdown menu 2018-08-26 23:26:10 -04:00
Max Kostikov
f5f6ec3d71 Update wiki.tpl 2018-08-25 21:34:58 +02:00
Max Kostikov
44f639f371 Revert "Update wiki.tpl" 
This reverts commit c16fda1cb6
 2018-08-25 21:31:47 +02:00
Max Kostikov
6767ff5434 Revert "Update wiki.tpl" 
This reverts commit ff1a0d217f
 2018-08-25 21:30:58 +02:00
Max Kostikov
ff1a0d217f Update wiki.tpl 2018-08-25 21:29:25 +02:00
Max Kostikov
732ce25d7f Update nwiki_page_history.tpl 2018-08-25 21:17:25 +02:00
Max Kostikov
c16fda1cb6 Update wiki.tpl 2018-08-25 21:16:05 +02:00
Mario Vavti
f036c25dca Merge remote-tracking branch 'mike/master' into dev 2018-08-24 14:44:45 +02:00
zotlabs
6ecd31a715 tweak archive widget for articles 2018-08-22 13:30:16 -07:00
Max Kostikov
456bc2ef86 Update hstrings.php 2018-08-22 15:13:01 +02:00
Max Kostikov
e071cd4635 Update hmessages.po 2018-08-22 15:12:09 +02:00
Mario Vavti
cc03e1ceef Merge remote-tracking branch 'mike/master' into dev 2018-08-22 10:47:40 +02:00
Mario
e4d08fc5d7 Merge branch 'redbasic-addroomforfooter' into 'dev' 
Fix jumpy sidebars

See merge request hubzilla/core!1261
 2018-08-22 10:46:02 +02:00
zotlabs
b25192332b profile likes - liker image was a bit large and didn't make a very pleasant looking dropdown, may have been overlooked when other related things were changed to menu-img-1 class 2018-08-21 23:39:49 -07:00
M.Dent
79eb6d3942 Fix jumpy sidebars 2018-08-21 13:18:42 -04:00
Mario
218029ee57 Merge branch 'redbasic-addroomforfooter' into 'dev' 
Add bottom margin on aside elements and main to allow for viewport footer.

See merge request hubzilla/core!1259
 2018-08-21 13:17:14 +02:00
fadelkon
af31bbeba1 Update catalan translations for sstrings up to 18th July 2018 2018-08-20 22:50:46 +02:00
M.Dent
1d7d604016 Add bottom margin on aside elements and main to allow for viewport footer. 2018-08-20 00:15:34 -04:00
zotlabs
f230c07ba5 possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar 2018-08-15 17:00:37 -07:00
Mario Vavti
759a18685b Merge remote-tracking branch 'mike/master' into dev 2018-08-12 14:07:16 +02:00
Mario
e07ab65d73 Merge branch 'oauth2-ui-pr' into 'dev' 
Oauth2 ui pr

See merge request hubzilla/core!1255
 2018-08-12 14:06:24 +02:00
zotlabs
5afe779ffc prevent json-ld bombing, turn off browser autocomplete on channel sources creation 2018-08-11 16:16:54 -07:00
M.Dent
af042ccf07 OAuth2 UI and settings updates 2018-08-10 13:54:26 -04:00
Manuel Jiménez Friaza
edf834188d Update Spanish translation 2018-07-30 12:03:03 +02:00
Max Kostikov
06b0dbdfba Update hstrings.php 2018-07-26 12:21:33 +02:00
Max Kostikov
48fb3d3653 Update hmessages.po 2018-07-26 12:20:53 +02:00
Max Kostikov
baa5fd9739 Update passchanged_eml.tpl 2018-07-26 12:19:59 +02:00
Max Kostikov
e01c277c56 Update lostpass_eml.tpl 2018-07-26 12:18:54 +02:00
kostikov
3342fc2244 Update hstrings.php 2018-07-23 12:15:10 +02:00
kostikov
87857fe5d9 Update hmessages.po 2018-07-23 12:14:33 +02:00
Mario
a68934f498 Merge branch 'patch-2' into 'dev' 
New russian templates

See merge request hubzilla/core!1233
 2018-07-21 11:29:09 +02:00
Mario
5be0743751 Merge branch 'dev' into 'dev' 
Update russian translation for 3.6

See merge request hubzilla/core!1230
 2018-07-21 11:26:43 +02:00
kostikov
8fc7f2aca1 Update update_fail_eml.tpl 2018-07-20 19:28:45 +02:00
kostikov
4db4ab9798 Create register_verify_member.tpl 2018-07-20 19:28:13 +02:00
kostikov
b6c2c8117e Update register_verify_eml.tpl 2018-07-20 19:27:29 +02:00
kostikov
86a42aad16 Update register_open_eml.tpl 2018-07-20 19:26:54 +02:00
kostikov
8e2e09bb16 Update passchanged_eml.tpl 2018-07-20 19:26:24 +02:00
kostikov
3713aa210f Update lostpass_eml.tpl 2018-07-20 19:25:46 +02:00
kostikov
a65c23546b Add new file 2018-07-20 19:21:58 +02:00
Mario Vavti
f6de91bf0f prevent double file uploads when dropping files into jot 2018-07-20 16:44:43 +02:00
Mario Vavti
c72f6e6ea8 fix jot drag and drop 2018-07-20 10:42:16 +02:00
kostikov
790a9155d4 Update hstrings.php 2018-07-20 10:25:03 +02:00
kostikov
f141b845fd Update hmessages.po 2018-07-20 10:24:23 +02:00
kostikov
67cbeaa3d4 Update hmessages.po 
(cherry picked from commit cbab7d2150)
 2018-07-18 08:28:18 +02:00
kostikov
23f3d554b8 Fix wrong plural function logic 
(cherry picked from commit 4284088611)
 2018-07-18 08:27:53 +02:00
Mario Vavti
bb70223509 when calling timeago() from mod_mail.js it is called before the translations are applied - move the call to main.js and be more specific with the selector to not trigger calls for other modules (eg network) which is handled elsewhere to not be to much of an performance hog (to many dates at a time) 2018-07-13 11:00:37 +02:00
Mario Vavti
98fb2ec639 let timeago render the date 2018-07-13 10:16:07 +02:00
Mario Vavti
a8cef79b1a let timeago render the date 2018-07-13 10:13:11 +02:00
Mario Vavti
5076e38c1c update jquery.timeago lib 2018-07-13 10:12:11 +02:00
Heiko Förster
b81f1111d1 Update hstrings.php - spelling - Privatsphäre 2018-07-08 16:48:37 +02:00
Mario Vavti
ac8db6479e fix css regression 2018-07-07 08:14:11 +02:00
zotlabs
cc71e507cb don't provide manage apps button when viewing all available 2018-07-05 22:03:41 -07:00
zotlabs
f6e8ce5516 appstore changes 2018-07-04 23:20:35 -07:00
zotlabs
fa6e5e4d75 plugins -> addons 2018-06-28 16:43:22 -07:00
Mario Vavti
cef1c09db6 Merge remote-tracking branch 'mike/master' into dev 2018-06-25 23:49:11 +02:00
Mario Vavti
62610b5ec0 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-06-25 14:29:32 +02:00
Mario Vavti
2594178158 updates justified gallery lib to version 3.7 and minor fixes for full template 2018-06-25 14:29:07 +02:00
zotlabs
4866ed5283 remove the white-space pre-wrap property on code blocks. This should probably be done with the word-break property instead 2018-06-24 21:56:58 -07:00
Mike Macgirvin
e4f15c078a Merge branch 'patch-1' into 'dev' 
NL strings: fix simple error

See merge request hubzilla/core!1221
 2018-06-20 07:49:43 +02:00
zotlabs
48a25b1b85 channel sources: add 'resend' option to discard original author - similar to the Friendica remote_self setting 2018-06-18 20:44:59 -07:00
jeroenpraat
eabbad176d fix simple error 2018-06-18 23:20:35 +02:00
jeroenpraat
e6d7f22ba9 fix simple error 2018-06-18 23:17:29 +02:00
zotlabs
7850ecbd95 remove several unused/unreferenced templates 2018-06-17 20:53:05 -07:00
Mario
28043726e6 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-06-17 17:00:17 +02:00
Mario
9c5df51141 some work on mod group 2018-06-17 16:58:12 +02:00
zotlabs
2f3c3db020 hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider saved default changes 2018-06-15 02:02:03 -07:00
zotlabs
967d4da30a wiki: word-wrap code on any character 2018-06-14 22:46:20 -07:00
zotlabs
8da0f9d356 optionally report total available space when uploading 2018-06-13 21:06:56 -07:00
zotlabs
b5e4a5f51c SECURITY: provide option to disable the cloud 'root' directory and make the cloud module require a target channel nickname. This is a low impact change as there is currently no disclosure of private information. The presence of a file browser for all the channels on the site could be (and is reported to be) a concern to some people and there is no reason why it shouldn't be optional. 2018-06-13 20:27:10 -07:00
zotlabs
a8f179145b Merge branch 'master' of ../hz into dev 2018-06-10 22:16:39 -07:00
zotlabs
912ccb31a1 hubzilla core issue #1218 2018-06-10 19:26:35 -07:00
Mario Vavti
9e29c13678 fix issue #1219 2018-06-09 16:38:15 +02:00
Mario Vavti
e37ccb7a63 move cid filter js to the widget 2018-06-09 13:08:14 +02:00
Mario Vavti
468af29e3e new feature filter network by name 2018-06-08 23:03:05 +02:00
Mario Vavti
dfa48ba17c fixes for search_item.tpl 2018-06-07 23:24:36 +02:00