harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,876 Commits 6 Branches 36 Tags 152 MiB
CAPTHA
Commit Graph

2672 Commits

Author SHA1 Message Date
Mario Vavti
aa5ac9dc3f only use height: auto for week and day view 2016-06-17 11:57:36 +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
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
Andrew Manning
7fc2b13fe6 Stashing changes. Not a functional state. 2016-06-09 20:06:36 -04: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
Andrew Manning
2af8105b46 Hide page history viewer when viewing sandbox 2016-06-05 21:14:30 -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
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
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
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
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
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
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
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
redmatrix
94accd8a4c remove the old IE html5 hack. 2016-05-08 20:25:10 -07:00
Andrew Manning
d714cd76dd Addon repo is copied to /extend/addon/ when admin presses install. Addon repos can be removed via GUI. 2016-05-08 20:30:00 -04:00
Andrew Manning
174484a51c Custom addon repo name option added. 2016-05-08 09:26:06 -04:00
Treer
e7a65c1f8d improve non-ACL option description in ACL dialog 2016-05-08 20:44:30 +10:00
Andrew Manning
f73a74967e Existing addon repos are listed on plugin page with controls for updating, removing, and switching branches. 2016-05-07 22:12:12 -04:00
Andrew Manning
0746794e81 New plugin repo cloned using new GitRepo class. Readme and info displayed in wide modal dialog. 2016-05-07 18:39:19 -04:00
Andrew Manning
284d86ad76 Merge remote-tracking branch 'upstream/dev' into plugin-repo 2016-05-07 16:22:35 -04:00
Andrew Manning
6950100ff4 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into plugin-repo 2016-05-06 13:42:22 -04:00
Treer
e9e2159b3b update 2 fontawesome icons 2016-05-06 23:37:12 +10:00
Mario Vavti
b08fc746d8 use section-content-info-wrapper class for info text 2016-05-06 10:55:11 +02:00
Mario Vavti
4a36834d3f use darker background colour only for searchbar 2016-05-06 10:42:38 +02:00
Andrew Manning
6ce939491b Merge remote-tracking branch 'upstream/dev' into plugin-repo 2016-05-05 05:35:00 -04:00
redmatrix
566667a263 provide a tag cloud for app categories and allow filtering apps from this 2016-05-04 18:27:46 -07:00
Andrew Manning
8cb06e7af8 Merge remote-tracking branch 'upstream/dev' into plugin-repo 2016-05-04 21:26:52 -04: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
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
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
Andrew Manning
e4a2aacd1d Merge remote-tracking branch 'upstream/dev' into plugin-repo 2016-05-03 21:50:34 -04:00
Andrew Manning
5686ee13b4 Increased PHPGit timeout to 120 seconds for large repos. Retrieve Readme.md and render on plugins page. 2016-05-03 21:49:52 -04: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
Andrew Manning
2db86b950e Merge remote-tracking branch 'upstream/dev' into plugin-repo 2016-05-03 06:33:11 -04:00
Andrew Manning
9619d02be9 AJAX and spinner for add repo form submission. Repo info will be displayed below the form. 2016-05-03 06:30:46 -04:00
redmatrix
b371c028ad more security stuff 2016-05-02 22:28:27 -07:00
redmatrix
a10fe5f13e a couple of bugfixes from earlier checkins and implementation of source tags 2016-05-01 22:45:38 -07:00
Andrew Manning
4ed5d6573c Merge remote-tracking branch 'upstream/dev' into plugin-repo 2016-05-01 22:31:02 -04:00
Andrew Manning
c2d15e6c3b New plugin repo is cloned to /store/pluginrepos/REPONAME for analysis 2016-05-01 22:29:51 -04: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
Andrew Manning
95b9669213 Create form on admin/plugins page to add plugin git repo using PHPGit 2016-05-01 21:20:49 -04:00
Mario Vavti
b4bf71dd06 fix mime-type icons in /cloud 2016-05-01 16:34:55 +02:00
Mario Vavti
fa80a5c113 make weblink and attach button hideable and some minor fixes 2016-05-01 15:45:42 +02: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
36fe2ac87e css fix 2016-04-30 23:38:25 +02:00
Treer
17dba9542a update icon names in view/ 2016-05-01 05:59:02 +10:00
Treer
8f16e9ad33 update icon names in include/ 2016-05-01 04:39:57 +10:00
Mario Vavti
931a4fafe3 get rid of the unused ispublic variable 2016-04-29 21:38:36 +02:00
Mario Vavti
b797528b78 some work on making mod editpost use status_editor() - if you find anything related to jot broken please revert this commit 2016-04-29 13:18:42 +02:00
redmatrix
30a6ae3daa This setting isn't implemented so remove the UI until it is. 2016-04-28 20:17:05 -07:00
Mario Vavti
b664af748e provide help button in context help popup 2016-04-28 13:08:41 +02:00
Mario Vavti
a6baa5a6da some refinements on jot 2016-04-27 11:36:02 +02:00
Mario Vavti
f34dcffbd9 hopefully fix jot dropdown visibility issue 2016-04-26 13:45:39 +02:00
Mario Vavti
a9d926886e make it more obvious what is behind the dropdowns 2016-04-25 10:00:50 +02:00
Mario Vavti
78bf4564f2 make the link to /help in dropdown conditional to the use of context help 2016-04-23 17:22:39 +02:00
Mario Vavti
57110cbe76 pull-right is not needed here 2016-04-23 16:52:02 +02:00
Mario Vavti
b0a2e5d3f7 simplify context help js and move it to main.js where all the nav related js resides, do not close the context help if we click outside of it - members might want to work on something while help is open, move the link to /help to dropdown-menu. 2016-04-23 16:39:56 +02:00
Mario Vavti
0463df62f0 only display help button in collapsed panel if context help is enabled 2016-04-23 13:21:25 +02:00
Mario Vavti
d66f6c8e8c make it icon-question-sign for contextual and icon-question for normal help instead of adding a caret-down 2016-04-22 09:16:17 +02:00
redmatrix
5a427dcee3 No idea how long RSD (Really Simple Discovery) has been broken. I had no idea it was even here. 2016-04-21 20:14:55 -07:00
Mario Vavti
bd11b1d61a indicate if we will be displayed contextual help or default help 2016-04-21 23:55:38 +02:00
Mario Vavti
96d19c09f3 fix help button for collapsed state 2016-04-21 23:19:17 +02:00
Mario Vavti
d7f4bfedd5 some fixes for contextual help and disable transition animation for now - it looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now. 2016-04-21 23:03:09 +02:00
Andrew Manning
82de68c3d3 Added admin/site setting that toggles context help panel. If disabled, original help menu button behavior is restored. 2016-04-21 06:41:55 -04:00
Andrew Manning
7594796ee1 Try toggling context help using onclick attribute 2016-04-19 05:52:16 -04:00
Andrew Manning
d7fe48d1b6 New help panel that slides in from the top and pushes the content down so it is not covered. Panel toggles with help button. Still some bugs with small screen viewing. 2016-04-17 07:09:42 -04:00
Mario Vavti
2cb04ccb8f nav: move js and css out of template, provide a help button in the panel on small screens and lots of whitespace cleanup 2016-04-15 12:39:22 +02:00
Mario Vavti
fe9df64fc2 fix some slight crossbrowser rendering issues with jot 2016-04-15 09:52:40 +02:00
redmatrix
9a0b61e4af refactor the js detection into a checkjs class which is only enabled on demand (currently only the channel and display pages). Will probably require a bit more work to hide/disable the cover photo when js is disabled. Have not actually tested without js to discover any other potential page issues. Have only confirmed that the detection class works and redirects to set a jsdisabled cookie and reload the page with that cookie+variable set if called from the channel page. 2016-04-13 16:31:06 -07:00
redmatrix
91cc365143 reverse the logic of the jsenabled setting so that sessions without js are performance penalised instead of regular sessions. 2016-04-12 22:55:26 -07:00
redmatrix
b788b38edf remove obsolete jotVideoURL() and jotAudioURL() 2016-04-11 21:40:03 -07:00
redmatrix
0269825bc0 localise the opensearch link 2016-04-10 21:56:16 -07:00
Mario Vavti
e2b4d33627 some work on comanche autocomplete 2016-04-09 12:16:42 +02:00
redmatrix
ec41170121 Merge pull request #338 from anaqreon/contextual-help 
Contextual help
 2016-04-05 22:43:15 +10:00
Mario Vavti
1c9f773900 Merge branch 'master' into dev 2016-04-04 17:13:10 +02:00
Mario Vavti
ec651f219e a simple autocomplete for bbcode or comanche - partly implemented 2016-04-04 17:12:23 +02:00
Mario Vavti
ee8a9384d5 Merge branch 'master' into dev 2016-04-04 10:37:20 +02:00
Mario Vavti
bba34a7a8e do not use dropdown class if there is nothing to dropdown 2016-04-04 10:37:07 +02:00
Mario Vavti
dfa12b2919 Merge branch 'master' into dev 2016-04-04 10:13:30 +02:00
Mario Vavti
9b9f29a0b2 whitespace 2016-04-04 10:10:19 +02:00
Mario Vavti
4a9aad2a33 whitespace 2016-04-04 10:09:46 +02:00
Mario Vavti
69617b5c34 fullscreen mode for photo albums view 2016-04-04 10:09:13 +02:00
Andrew Manning
0523b4b2f1 Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help 2016-04-03 21:36:29 -04:00
redmatrix
a703835b5c Bug: "remember me" doesn't 2016-04-03 17:38:17 -07:00
Mario Vavti
f13096a6f3 various fixes 2016-04-03 18:00:03 +02:00
Mario Vavti
53311a30ad reduce chat-item-title fontsize to match wall-item-ago 2016-04-03 15:27:10 +02:00
Mario Vavti
db4e9aeaad fullscreen mode for events 2016-04-03 12:19:49 +02:00
Mario Vavti
b8d8be7013 show chat expiration time in overview and minor fixes 2016-04-03 11:34:07 +02:00
Mario Vavti
3edd4ce78f ease transition between fullscreen and inline view for small screens 2016-04-03 00:04:05 +02:00
Mario Vavti
5b55726a93 on update only jump to bottom if we actually got a new message 2016-04-01 11:13:04 +02:00
Mario Vavti
bbe93d0e1d scroll chat to bottom on fullscreen toggle 2016-04-01 10:29:58 +02:00
Mario Vavti
a564f495a7 improve scroll to bottom in chat 2016-04-01 10:20:10 +02:00
Mario Vavti
c6d9100649 missing template 2016-04-01 08:36:02 +02:00
Mario Vavti
50d9b29347 slightly change the way fullscreen works and bring it to mod mail 2016-04-01 00:16:39 +02:00
Mario Vavti
90a5ba01a3 make fullscreen mode available for other modules and some cleanup 2016-03-31 23:13:40 +02:00
Mario Vavti
6c2673ae2a various fixes regarding mod chat 2016-03-31 22:42:28 +02:00
Mario Vavti
3fdd110e07 mod chat rework continued 2016-03-31 13:21:48 +02:00
Mario Vavti
df891f4ad2 more work on mod chat 2016-03-31 00:37:40 +02:00
Mario Vavti
08461c7049 more on mod chat 2016-03-30 14:44:03 +02:00
Mario Vavti
5462453bf2 some work on mod chat 2016-03-30 14:31:55 +02:00
Mario Vavti
ba0812c447 highlight table row on hover 2016-03-27 22:37:07 +02:00
Mario Vavti
97eef2b88c removed link to connected apps by accident 2016-03-26 19:34:38 +01:00
Andrew Manning
661b0084f3 Added help for post permissions 2016-03-26 14:17:53 -04:00
Mario Vavti
f714e97d63 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-03-26 18:46:07 +01:00
Mario Vavti
a507063174 move link to /locs to settings menu if we have more than one location and some template work on locs 2016-03-26 18:43:38 +01:00
Andrew Manning
59827b6dfd Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help 2016-03-23 21:17:23 -04:00
redmatrix
a8ac0ed549 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-03-22 19:59:47 -07:00
redmatrix
6f2ba0c619 rewrite the webfinger discovery logic 2016-03-22 19:58:59 -07:00
Mario Vavti
c6b89b99b9 Add a link to /locs to channel manager 2016-03-22 10:29:17 +01:00
Mario Vavti
97e1a6dfde whip mod manage into shape 2016-03-22 02:06:19 +01:00
Andrew Manning
56c86b6567 Override navbar help button to open contextual help panel. Contextual help for mail written. 2016-03-21 06:33:02 -04:00
redmatrix
fea532af4d rework salmon - important, update addons also if you have enabled gnusoc addon 2016-03-20 19:55:53 -07:00
Mario Vavti
f7ff48f806 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-03-20 01:46:13 +01:00
Mario Vavti
30cf56bdb5 make >>indicate group members<< in acl selector work again on group > show or group > dont show is selected 2016-03-20 01:45:56 +01:00
redmatrix
77094f8d2b make the admin side menu extensible and provide a hook for a channel "move" operation that federation plugins might use to re-establish connections after a channel move. 2016-03-19 16:17:19 -07:00
Mario Vavti
51cd4e8519 missing return false for map link 2016-03-19 02:20:59 +01:00
Mario Vavti
bd249b276d add use as cover photo link to photos view 2016-03-18 17:49:31 +01:00
Mario Vavti
40162cd6b7 some work on profile listing 2016-03-17 12:56:55 +01:00
Mario Vavti
a41a05e6c0 bring more structure to profiles edit 2016-03-17 11:50:53 +01:00
Mario Vavti
2165733ddc move buttons to dropdown menu and some cleanup 2016-03-16 23:07:29 +01:00
Mario Vavti
d22b21c56f still more janitor work on profiles 2016-03-16 13:45:24 +01:00
Mario Vavti
d98d7003ed even more janitor work on profiles 2016-03-15 21:38:03 +01:00
redmatrix
e8d19659c0 some heavy lifting porting the old salmon code 2016-03-15 00:50:03 -07:00
Mario Vavti
38beabb508 fix spacing 2016-03-13 21:27:29 +01:00
Mario Vavti
370a007ee2 more janitor work on profiles 2016-03-13 21:19:15 +01:00
Mario Vavti
2d8deb6082 some janitor work on profiles 2016-03-12 22:13:46 +01:00
redmatrix
cf4dc2caa8 move "generator" to HttpMeta 2016-03-08 16:21:35 -08:00
Mario Vavti
d59268a5d8 removed id by mistake - add it again 2016-03-08 11:47:17 +01:00
Mario Vavti
f364343b55 add generic-content-wrapper and setction-content-wrapper to profile_edit.tpl 2016-03-08 11:43:21 +01:00
redmatrix
32e903e956 a bit of page cleanup for edit profiles 2016-03-07 18:49:17 -08:00
redmatrix
1a77fb4c1d Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-03-07 15:12:09 -08:00
redmatrix
d5db25808a Facebook scraper "OpenGraph" support; modules will need to set the required fields (type, image, url) as well as any desired optional or type specific fields. We will set the title during pagebuild. 2016-03-07 15:03:53 -08:00
Mario Vavti
b2216f8203 prevent page jumping if the narrow navbar setting is used 2016-03-07 21:47:52 +01:00
jeroenpraat
7162403292 Also make it clear with (mouse) hover text that you must click on the cover photo to show the channel/more 2016-03-06 17:02:58 +01:00
Mario Vavti
25ebac8d0b show cover-photo upload link only for the default profile 2016-03-04 16:07:41 +01:00
Mario Vavti
edf6da7189 add cover photo upload link to edit profile 2016-03-04 15:44:33 +01:00
Mario Vavti
d3491c9165 fix jot form 2016-03-03 13:46:08 +01:00
Mario Vavti
8ca877bdd3 slide up cover on click 2016-03-03 12:31:49 +01:00
Mario Vavti
b704f977da Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-03-03 12:08:21 +01:00
Mario Vavti
59e04aed1b move cover-photo to template, add the ability to define a title and subtitle (defaults to channel name and addres), move js from redbasic.js to template. 2016-03-03 12:07:58 +01:00
redmatrix
6f4c45a489 UI cleanup for admin profile field management page 2016-03-02 15:36:14 -08:00
redmatrix
428b4dbad6 sort out the with and howlong dependencies 2016-03-01 22:47:07 -08:00
redmatrix
548bf884a4 profile field admin page (functional only: still needs a lot of HTML/CSS cleanup) 2016-03-01 21:06:27 -08:00
redmatrix
a0baa480e3 Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-03-01 15:01:48 -08:00
redmatrix
765dd5569b Allow configuration of the display order of profile fields. This is an important piece of a more general profile configuration framework which will eventually be accessible via the admin page. 2016-03-01 14:55:04 -08:00
Mario Vavti
966d1586c0 fix js error and add id to field input block 2016-03-01 20:40:11 +01:00
Mario Vavti
492609d20b do not show empty buttons if not logged in 2016-03-01 14:41:14 +01:00
Mario Vavti
141f3e21b2 move preview content outside of editor space 2016-03-01 13:40:19 +01:00
Mario Vavti
0ebce75c7d css fixes to make jot look better with background colors or images 2016-03-01 13:09:04 +01:00
Mario Vavti
d27a627c4f simplify profile edit button(s) and make it useful for multiple profiles 2016-02-29 22:01:13 +01:00
Mario Vavti
58cf9d832c make attach_delete() return and comment out album rename functionality since this is not supported by the backend at the moment. 2016-02-27 12:31:07 +01:00
Mario Vavti
df57c90d2d several photo item template fixes 2016-02-26 14:25:18 +01:00
Mario Vavti
b2474334a7 provide an edit button for the profile page 2016-02-25 22:50:16 +01:00
Mario Vavti
be27fb5644 we have got a button for events in the nav. no need for it in the tabs if we are local. 2016-02-25 13:40:15 +01:00
redmatrix
c95d7c69eb issue #216 - calendar sharing 2016-02-24 18:54:52 -08:00
redmatrix
7e6febe2a6 add 'requires' field to plugin info to list other dependent plugins/addons and disable if dependencies are not installed/enabled 2016-02-24 15:19:28 -08:00
Mario Vavti
dd6e3d873d some work on mod/register 2016-02-22 13:04:48 +01:00
jeroenpraat
0c5a2925ad Pimped the pubsites page. I tried to get this into a .tpl-file, but it was to complicated for me. Pubsites page is now more narrow (fits on most devices) and location is not taking a complete column (location is almost never used). Also a fix on the auto-create-channel part on the register page. 2016-02-21 19:31:11 +01:00
Mario Vavti
22f172d697 grid->network, whitespace and bootstrapify create button 2016-02-20 14:01:20 +01:00
Mario Vavti
fbc6c60805 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-02-19 22:28:57 +01:00
Mario Vavti
02e82e496e pimp up mod new_channel 2016-02-19 22:28:21 +01:00
redmatrix
8e586008dd issue #287 require old password to change password 2016-02-19 13:18:51 -08:00
jeroenpraat
33c34984e6 h1>h2 (thanks to Mario) and help text below label on register page (like on new channel). 2016-02-18 19:48:11 +01:00
jeroenpraat
fe392a3144 Removed export temporary from UNO. Removed 'Remove Channel' from UNO, cause a UNO member has only 1 channel, so it's logical to remove the acccount (by experience on UNO hub). Styling oauth settings. 2016-02-18 16:53:04 +01:00
Mario Vavti
ddbe3c7426 make always preload images before rendering the page a display setting 2016-02-17 12:32:12 +01:00
jeroenpraat
f738902107 @hubdomain also for auto-create-channel + adding css wrapper (ongoing work) 2016-02-16 21:46:24 +01:00
redmatrix
4f285911f0 form cleanup (profile_photo and cover_photo), admin 'user_approve' not found, missing close div in mood_content.tpl 2016-02-14 16:15:55 -08:00
phellmes
97be144913 [invite module] update UI template 2016-02-09 14:07:54 +01:00
redmatrix
f984502499 need to re-arrange a few things for a short vcard 2016-02-08 19:33:25 -08:00
redmatrix
315ce6d880 lots more zcard tweaks 2016-02-08 18:16:42 -08:00
redmatrix
00ae6bdac6 a few tweaks to uno settings page to allow a default ACL to be created 2016-02-07 21:06:17 -08:00
redmatrix
ec950de205 block public was still referenced in admin/site template 2016-02-07 15:44:42 -08:00
redmatrix
62e7fa6a23 update UI template for 'mood' module 2016-02-07 15:38:54 -08:00
redmatrix
a5c111ef4f uno stuff 2016-02-05 23:13:33 -08:00
redmatrix
bfeb89075f comment buttons hook 2016-02-04 19:06:11 -08:00
redmatrix
d586f64e40 update the poke page layout and UI 2016-02-04 18:35:40 -08:00
redmatrix
c75f76f740 heavy lifting on admin security page 2016-02-03 20:24:46 -08:00
redmatrix
28386d7471 admin security page for configuring white and black lists and other security options. 2016-02-03 15:23:24 -08:00
redmatrix
06dcaaa821 some zcard cleanup - still eneds a lot more work 2016-02-02 17:14:07 -08:00
redmatrix
5f5342c0d3 adjust for folks that still have 175px profile photos 2016-02-01 21:21:22 -08:00
redmatrix
15e003f030 missing template 2016-02-01 21:14:36 -08:00
redmatrix
723a49ccee add photos to the profile "likes this" dropdowns 2016-02-01 17:42:53 -08:00
Mario Vavti
722d7ff38d lower caution level from danger to warning for ignore button 2016-01-27 09:46:18 +01:00
redmatrix
5d6657f77a provide an icon to make 'add privacy group' stand out from the list of groups. Please revert if you think it's too messy. 2016-01-27 00:11:15 -08:00
redmatrix
9b08051703 bring back the ability to ignore a pending connection request without deleting it and without always having it in your face and without jumping through hoops. 2016-01-26 16:57:36 -08:00
jeroenpraat
68030d12cf Linking new connection notification to pending connections (see Channel 1) and improved email notifications about new connections. Could not find a way to do this also for the generic notifications. Added hub domain of channel address on the new channel page. A few people on my hub didn't understood. This example will make it more clear. Some minor bits. 2016-01-27 00:24:05 +01:00
redmatrix
9081ddb455 don't provide notification icons on manage page for delegated channels 2016-01-24 18:36:38 -08:00
redmatrix
2be515e7bb set the actual value of the password input field to a single space on remove channel and remove account because firefox does not honour 'autocomplete="off"' and insists on filling in the password, which completely defeats the purpose of password protecting this function. We want to ensure it can only be executed by somebody who knows the password and not somebody who happens upon an unattended browser session. This space is annoying and must be removed to enter the password correctly but this appears to be the only way to provide the necessary safety for that page. Setting autocomplete to a random string as suggested by the firefox doco doesn't appear to do anything useful, as autocomplete is still performed. 2016-01-21 14:32:41 -08:00
Mario Vavti
b711c050db make contact block look widget alike 2016-01-21 11:48:10 +01:00
Mario Vavti
928f1bfa7b css cleanup 2016-01-21 10:58:38 +01:00
Mario Vavti
97ebf9021c bootstrapify rating and connect buttons. position the connect button more prominent right under the profile image 2016-01-21 10:42:20 +01:00
redmatrix
be83855acf generalise the site icon 2016-01-17 16:50:37 -08:00
Mario Vavti
0d5daea93d move dir total ratings button to the left to prevent the connect button beeing shifted on channels with ratings 2016-01-16 21:30:57 +01:00
Mario Vavti
2498df68c7 change button order for consistency 2016-01-15 13:20:45 +01:00
Mario Vavti
d36aa4fc89 provide a recent activity link in /connections 2016-01-15 12:08:04 +01:00
Mario Vavti
f4e1b2123a add an approve button to /connections and get rid of the modal popup in /connedit. for quick approval (default collection and perms etc.) we now can use the approve button in /connections else click the edit button and make changes and approval from /connedit. hope thats any better... 2016-01-15 11:28:05 +01:00
Mario Vavti
63ee0daac5 provide more contact infos and update some protocol type definitions 2016-01-15 10:42:44 +01:00
Mario Vavti
614dcb8bce since the perms will be reset on approval better do not provide the perms tool before we approved a connection 2016-01-14 23:38:00 +01:00
Mario Vavti
588d022fbb provide some info about our contacts - status (archived, hidden, etc.), public forum (like in directory) and show since when we are connected 2016-01-14 23:23:12 +01:00
Mario Vavti
e2b79c34bc some work on connections 2016-01-14 13:50:47 +01:00
Mario Vavti
69573c6afe some template work on follow widget 2016-01-14 10:36:45 +01:00
redmatrix
e500a08f15 more progress on cover photo cropping and storage 2016-01-13 20:26:27 -08:00
redmatrix
9584ca080c some initial work on uploading and cropping cover photos 2016-01-13 17:32:09 -08:00
redmatrix
3bf9dc9f18 more work on auto channel creation during register 2016-01-13 01:17:02 -08:00
redmatrix
66c8658898 plugin version compatibility checking. To use, set MinVersion, MaxVersion or MinPHPversion in the plugin header block. Case is not important. We check the project versions against STD_VERSION, which should be rolled to a new y of x.x.y if the plugin interface or project code changes in an incompatible way. 2016-01-11 16:34:12 -08:00
jeroenpraat
e51035ba9a String update es-es and nl. Plus some extra bits, incl .gitignore update with pageheader.html 2016-01-10 20:45:39 +01:00
redmatrix
93565ea768 features management page for hubmins 2016-01-06 13:01:28 -08:00
jeroenpraat
9e6f43e3ff added some real examples for the default-permission-role in de docu. also updated comanche template redable and another css class to tpl file 2016-01-03 21:56:39 +01:00
redmatrix
5b0a17359d Provide the ability for a hub admin to specify a default permissions role for the first channel created by a new account. This simplifies channel creation by restricting the available options at registration time. The restriction is not applied to any additional channels created under the same account; and in any event can be changed immediately after channel creation, if desired. 2016-01-02 23:39:57 -08:00
jeroenpraat
1ad90b8662 Update es+nl strings and added title on hover for items (needed to view titles that are cut-off) 2016-01-02 15:14:30 +01:00
redmatrix
c38edfcb32 issue #241 (redmatrix issue 405) 2016-01-01 16:12:43 -08:00
Andrew Manning
3d6359f2e7 Removed defunct URL from old auto-update idea 2015-12-26 16:20:56 -05:00
redmatrix
a085f4df7f regression: default inherited permission was not being set for a connection if the permission was 'inherited'. We need to set these so that if somebody changes the top level permissions they don't have to go back and manually edit every connection to allow/deny what used to be an automatic inherited setting. 2015-12-25 14:25:58 -08:00
redmatrix
36717e5f32 start on refactor of plugin/theme/widget info block parsing 2015-12-22 19:53:00 -08:00
redmatrix
f23e8f8d41 merge hell 2015-12-20 14:55:43 -08:00
Haakon Meland Eriksen
628e565a6c Merge remote-tracking branch 'upstream/master' 2015-12-18 16:04:07 +01:00
Mario Vavti
f78e9001f3 fix search item attachment rendering 2015-12-17 19:39:26 +01:00
jeroenpraat
5a59cd9b8c Invitation only added to the admin site page. Plus css wrapper class to docu search. 2015-12-15 21:00:40 +01:00
Haakon Meland Eriksen
3b1ab5e79c Merge remote-tracking branch 'upstream/master' 2015-12-14 18:55:43 +01:00
Haakon Meland Eriksen
565126a888 Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version 2015-12-12 10:00:15 +01:00
Haakon Meland Eriksen
e7d9863432 Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version 2015-12-11 19:40:09 +01:00
Haakon Meland Eriksen
b9af0645c2 Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version 2015-12-11 19:34:29 +01:00
Haakon Meland Eriksen
d86bc0b6cf Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version 2015-12-10 20:43:32 +01:00
Haakon Meland Eriksen
e01d4f289b Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version 2015-12-10 07:27:42 +01:00
Haakon Meland Eriksen
6a3995014e Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version 2015-12-09 07:38:58 +01:00
Haakon Meland Eriksen
534a537319 Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version 2015-12-09 07:31:18 +01:00
Haakon Meland Eriksen
10eefc4eed Hubzilla textbox - promoting Hubzilla features in jot.tpl - second version 2015-12-09 07:28:55 +01:00
Haakon Meland Eriksen
3d4b3b6a92 Hubzilla textbox - promoting Hubzilla features in jot.tpl 2015-12-09 07:19:31 +01:00
redmatrix
29ac533cc9 remove some unused stuff 2015-12-08 16:32:06 -08:00
redmatrix
b9f5076cfc move the diaspora templates out of core (except for diaspora_vcard, which is still stuck here for the present time) 2015-12-07 19:17:40 -08:00
Mario Vavti
69c9f4588c make justify gallery work with more than one albums per page (eg album widget) 2015-12-07 12:13:51 +01:00
Mario Vavti
78a70fed2f fix css issue in directory 2015-12-06 16:37:57 +01:00
Mario Vavti
593423434c fix attachment rendering for mail 2015-12-02 09:44:25 +01:00
Mario Vavti
7db86a4e05 css fixes 2015-11-28 14:47:17 +01:00
Mario Vavti
122d7281f7 fix tpl if clause 2015-11-28 11:04:33 +01:00
Mario Vavti
fce1dc083b add templates 2015-11-27 22:53:36 +01:00
Mario Vavti
bcfa72ed31 move events tools to aside widget 2015-11-27 22:45:28 +01:00
Mario Vavti
e569f5d6eb unset does not work in webkit browsers 2015-11-27 14:00:37 +01:00
Mario Vavti
ee153f64d4 add spinner to events 2015-11-27 13:32:20 +01:00
Mario Vavti
a73c385831 lost calendar icon 2015-11-26 23:29:49 +01:00
Mario Vavti
91b35c5349 various css fixes 2015-11-26 23:19:06 +01:00
Mario Vavti
056db37c66 beautify event item code 2015-11-26 22:14:20 +01:00
Mario Vavti
5cb71fa5da default timepicker to 15 min steps. abbr -> span 2015-11-26 21:00:04 +01:00
Mario Vavti
8a269823d2 improve event rendering 2015-11-26 20:53:42 +01:00
Mario Vavti
c407e72dcc add location 2015-11-26 16:40:40 +01:00
Mario Vavti
8e3b796a2f fix event rendering 2015-11-26 16:38:14 +01:00
Mario Vavti
c7cbd41c16 first iteration on the event item 2015-11-26 12:26:27 +01:00
Mario Vavti
3ea84d7eab some basic event styling 2015-11-25 22:55:07 +01:00
Mario Vavti
a80c45940e add a if clause for the case we do not have a finish date 2015-11-25 19:02:48 +01:00
Mario Vavti
ab71e33d83 note to self: do not make things more complicated than they need to be. 2015-11-25 17:28:26 +01:00
Mario Vavti
fe57e7059b events: make sure default finish date is one hour after start date and shift the finishdate if startdate is shifted 2015-11-25 15:05:21 +01:00
Mario Vavti
1767a07f4d efent form template fixes 2015-11-24 19:18:26 +01:00
Mario Vavti
f520cd92d0 open form on dbl-click 2015-11-24 14:33:23 +01:00
Mario Vavti
987619130b some event heavy lifting - please test and report issues 2015-11-24 14:15:28 +01:00
redmatrix
34b804e9dc Merge pull request #182 from anaqreon/url-selected 
Place link around selected text
 2015-11-24 09:41:55 +11:00
redmatrix
a7e4553ea7 delivery report tweaks 2015-11-22 17:12:30 -08:00
Mario Vavti
d726c921eb make calendar week start (sun or mon) configurable 2015-11-21 15:33:57 +01:00
Andrew Manning
fee8503093 Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected 2015-11-20 21:57:10 -05:00
Andrew Manning
6083cd2559 If text is selected in profile-jot-text when the link button is pressed, the input URL is applied around the text. Otherwise, the normal link data fetch occurs. 2015-11-20 21:55:13 -05:00
Mario Vavti
a3e47d26f6 make calendar language aware 2015-11-20 16:39:55 +01:00
jeroenpraat
c7652fc29c Had to switch these 2. Sorry. 2015-11-20 00:50:54 +01:00
Mario Vavti
ba52af786e move today button from aside to section title 2015-11-19 11:38:34 +01:00
Mario Vavti
b23284cba2 move moment.min.js and remove unneeded files 2015-11-18 23:56:25 +01:00
Mario Vavti
e4145deeb7 some events refacturing 2015-11-18 23:50:42 +01:00
Mario Vavti
6fa0807550 more css fixes 2015-11-17 23:01:24 +01:00
Mario Vavti
b531486dab show jotnets toggle button only if there are jotnets and whitespace fixes 2015-11-17 10:46:38 +01:00
jeroenpraat
def5edf93c nl+es and some other bits 2015-11-14 20:43:34 +01:00
redmatrix
93e5449c08 really basic photo album widget for content regions 2015-11-12 20:22:36 -08:00
redmatrix
7d5acef20a remove list bullets from extended like list 2015-11-09 15:18:26 -08:00
jeroenpraat
b99b6b5ae9 This is better 2015-11-09 16:37:22 +01:00
jeroenpraat
cda81e35db Using bootstrap classes, so other themes/schemas also work. Plus margin when collapsed. 2015-11-09 15:08:50 +01:00
redmatrix
4e1c308162 make jotnets modal 2015-11-08 17:48:43 -08:00
Tobias Luther
8639eda70f Quick fix: Moved Twitter select box to the top of ACL selector 2015-11-08 12:20:58 +01:00
jeroenpraat
0db5a8673d Firefox share (that seems now the official name) button added to misc. settings. 2015-11-05 16:20:56 +01:00
jeroenpraat
1c0fe89368 Chat page improved (I think). Works now better with diff. resolutions, font sizes and languages. Fixed follow field on conn. page. Small schemas updates. 2015-11-04 22:52:40 +01:00
redmatrix
e09b49288f provide admin setting to change directory server 2015-11-03 18:34:16 -08:00
Mario Vavti
43d8090182 timeago() works best with iso format. fix #118 2015-11-03 11:19:22 +01:00
redmatrix
d3183467e0 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-11-01 15:52:35 -08:00
redmatrix
b62614bbd4 improve /locs page with some field notes and the ability to do a forced sync 2015-11-01 15:51:45 -08:00
jeroenpraat
618155e6ab More Bluegrid fine tuning and generic-content-wrapper-styled added to some tpl-files and 2 php files, cause they dont have a tpl file. 2015-11-01 22:59:32 +01:00
Mario Vavti
0353b0e04f Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-11-01 11:17:04 +01:00
jeroenpraat
3262d819de update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema. 2015-10-31 22:34:59 +01:00
Mario Vavti
5920a96da7 make attachments appear in a dropdown in wall-item-tools-left 2015-10-31 00:38:01 +01:00
redmatrix
96402a2354 This may take a few iterations to discover the best way to present the information, but we need a way for members to know what alternate locations are available for a channel during times of server issues - and as recently discovered if there aren't any hublocs at all; without digging around the database and probing channels and other messy stuff. 2015-10-29 01:23:56 -07:00
jeroenpraat
605381f83d More fine tuning bluegrid schema. Extra generic-wrapper-styled. 2015-10-27 22:52:54 +01:00
Mario Vavti
71f70b4377 css fixes 2015-10-27 12:52:21 +01:00
jeroenpraat
02527552fd Better -styled. 2015-10-27 01:23:30 +01:00
jeroenpraat
ac5b9f2382 Another .generic-content-wrapper 2015-10-27 01:20:48 +01:00
jeroenpraat
35857931ef 2 more tpl files with generic-content-wrapper-styled 2015-10-26 22:47:47 +01:00
Mario Vavti
4fb9571136 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-10-26 14:20:06 +01:00
Mario Vavti
e70bb371d9 bring back item transparency 2015-10-26 14:19:46 +01:00
jeroenpraat
2099ac0615 Revert this one. This was hub specific. 2015-10-26 14:16:05 +01:00
jeroenpraat
5e28b1216e Added a few generic-content-wrapper-styled classes and a button position fixed for lostpass. mod/search probably needs a .tpl in the future, but I don't know how to that. 2015-10-26 14:05:45 +01:00
jeroenpraat
e858ee811b Fixed connection page. Page was overcrowded on systems with larger fonts. 2015-10-26 13:57:12 +01:00
redmatrix
a498fc8e72 looks like there may be issues with the datetime picker if the local timezone isn't the same as your settings. 2015-10-25 21:17:02 -07:00
redmatrix
917d0ced4a new feature: delayed posting 2015-10-25 16:54:18 -07:00
Mario Vavti
ab8b4d5c36 another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload 2015-10-24 21:44:25 +02:00
Mario Vavti
9ae215291f fix app.tpl missing </div> tag if not authenticated 2015-10-23 10:20:01 +02:00
Mario Vavti
ed6629002f photo object fixes 2015-10-22 13:01:33 +02:00
Mario Vavti
bcb4ac7aae experiment: put the photo-item photo on top of the post 2015-10-22 12:58:11 +02:00
Mario Vavti
6f8d29ad80 move photo object stuff from itemObject to prepare_body() so we can do more stuff with it 2015-10-22 10:52:10 +02:00
Mario Vavti
232742a5e6 warn if quota exceeds 90% of storage limit 2015-10-21 12:52:03 +02:00
Mario Vavti
a33ddf373b move file storage quota display to upload section. add a warning if remaining space is less than 100MB and fix % calculation 2015-10-21 12:40:09 +02:00
redmatrix
38816d7e41 move quota display to where it's visible on a tablet 2015-10-20 18:48:14 -07:00
Mario Vavti
f7601756e9 create photo object if feature large photos is enabled and display those slightly different 2015-10-20 09:36:15 +02:00
Paolo Tacconi
8da8e02dc8 Replaced some old redmatrix branding 2015-10-19 10:51:33 +02:00
redmatrix
1d2797dc1f bring back chat expiration setting and adjust chat size for our now smaller content region 2015-10-17 14:54:27 -07:00
Mario Vavti
1593ebec1f update conv_list.tpl 2015-10-15 11:49:33 +02:00
Mario Vavti
2413968021 double up default photo sizes - even the mos simple camera can now do images > 1024px 2015-10-15 11:20:56 +02:00
Mario Vavti
2848f5dab4 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-10-15 09:36:51 +02:00
redmatrix
de697a4267 issue #86 - like/dislike in photos not working 2015-10-14 14:16:16 -07:00
Mario Vavti
b4e83b6537 allow photo-items to appear full width if large photos feature is enabled. in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes. 2015-10-14 22:14:19 +02:00
Mario Vavti
c963aa98e8 some conv-item restructuring to allow full width elements 2015-10-11 22:32:06 +02:00
Mario Vavti
05050381d3 bring our bbcode tools to private mail 2015-10-05 12:26:04 +02:00
Mario Vavti
2e45b41902 do not show delete conversation in single message view 2015-10-04 19:58:20 +02:00
Mario Vavti
7776c56c6c bring single message view to inbox/outbox view 2015-10-04 19:51:23 +02:00
Mario Vavti
4decceea76 add anchors to messages and links 2015-10-04 14:07:05 +02:00
Mario Vavti
26b97722c6 remove check mail - it just reloads the page. we get a notification in the panel if we get new mail 2015-10-04 13:43:16 +02:00
Mario Vavti
5ba39fef9a private mail compositor changes 2015-10-02 17:51:37 +02:00
Mario Vavti
9b8aa8d09e whitespace 2015-10-02 12:26:12 +02:00
Mario Vavti
3bed94f4ad move mail item buttons/menu to dropdown 2015-10-02 12:20:33 +02:00
Mario Vavti
a895a0d79e private mail template and css fixes 2015-10-02 11:41:37 +02:00
redmatrix
e7131bc8f8 this is an even better fix for issue #61 2015-09-30 22:10:26 -07:00
redmatrix
1df1c15e48 issue #61 - provide un-useable icons as placeholders for location setting options on deleted hublocs 2015-09-30 21:59:33 -07:00
redmatrix
526bc36b40 update the opensearch template 2015-09-30 19:31:25 -07:00
redmatrix
9bdb7bef5d add delivery reports to mail (not backported to redmatrix) 2015-09-30 19:27:53 -07:00
Mario Vavti
6368b09337 a clear is needed after floating 2015-09-28 21:51:04 +02:00
Mario Vavti
b97102da01 private mail: bring additional inbox/outbox views and ajaxify single message drop 2015-09-28 17:40:38 +02:00
Mario Vavti
d6293730fc private mail: some work on conversations view 2015-09-25 23:26:28 +02:00
redmatrix
ba94f824b9 deliveries per process ui for setting 2015-09-25 01:31:58 -07:00
redmatrix
2fe3d16bbe Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-24 16:58:32 -07:00
redmatrix
2844f276b9 Document the additional content export options 2015-09-24 16:57:17 -07:00
Mario Vavti
b9723aa85b some heavy private mail restructuring - work in progress 2015-09-24 14:07:44 +02:00
redmatrix
2869ccfe39 delivery reports - crude but mostly functional at least for zot deliveries 2015-09-22 04:04:51 -07:00
redmatrix
9baaa6fa56 issue #51 2015-09-21 20:05:54 -07:00
redmatrix
d2565d0f61 looks like chat has been neglected a bit recently 2015-09-20 21:37:18 -07:00
redmatrix
f2fefb91d5 change photo permissions when attach permissions are changed through mod/filestorage, and fix lockview for photos. 2015-09-18 01:53:04 -07:00
Mario Vavti
c6c18261a0 missing refernce to array 2015-09-17 19:33:44 +02:00
Mario Vavti
1cf404177d quickfix for private messages - needs a lot more work 2015-09-17 19:25:13 +02:00
Mario Vavti
6cd5826d21 Revert "moved submit button to the bottom in settings.tpl" 
This reverts commit 1500691cc2.
 2015-09-17 15:05:40 +02:00
redmatrix
30af694e30 Merge pull request #44 from mrjive/move_submit_button 
moved submit button to the bottom in settings.tpl
 2015-09-17 10:19:43 +10:00
mrjive
1500691cc2 moved submit button to the bottom in settings.tpl 2015-09-16 04:46:47 -07:00
mrjive
fae5ea749a added toggle_select 2015-09-16 02:25:44 -07:00
redmatrix
63a1d8d0db make sure we've got a doc type 2015-09-15 01:39:38 -07:00
jeroenpraat
dfd4115f7a Update siteinfo.tpl 2015-09-14 16:45:15 +02:00
redmatrix
03e3281beb mod_locs - put the primary into a (non-functioning) button for visual consistency. 2015-09-13 20:15:33 -07:00
redmatrix
db58b62235 don't auto-open the editor in forum mode. Save the forum selection text until we open it. 2015-09-09 19:54:16 -07:00
redmatrix
2f52b6c164 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	util/messages.po
 2015-09-07 04:06:27 -07:00
Mario Vavti
ee21d87d1b uexport template fixes 2015-09-04 09:33:34 +02:00
redmatrix
fb2d2c5585 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-02 21:59:44 -07:00
redmatrix
3e7edf504d sort out some app display weirdness 2015-09-02 21:35:49 -07:00
redmatrix
1ce8ce896b provide consistent ui for things 2015-09-01 19:27:41 -07:00
redmatrix
3852b5ce7f separate objs/things from taxonomy 2015-09-01 17:06:58 -07:00
redmatrix
2d471e39dc this is weird 2015-08-25 19:23:21 -07:00
redmatrix
2a59392ba8 change name of module 2015-08-22 19:31:39 -07:00
redmatrix
6590ca02de some event related fixes and some base work for implementing native tasks (to-do lists); which should already be importable and exportable. 2015-08-20 16:49:13 -07:00
redmatrix
abe362bdd4 issues encountered whilst testing import_items module using yearly dump files 2015-08-17 21:56:55 -07:00
redmatrix
1a4a921528 provide module for importing yearly content dumps 2015-08-17 21:40:40 -07:00
redmatrix
30fd17c58d Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	view/nl/messages.po
 2015-08-17 16:14:15 -07:00
redmatrix
98eeff7538 commit 631eb4b broke the checkboxes in admin/site, so separate normal checkboxes from bulk edit checkboxes in the css 2015-08-17 16:11:10 -07:00
redmatrix
b737e224b1 more work separating Diaspora from core 2015-08-03 16:52:51 -07:00
redmatrix
c1a953f960 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	util/messages.po
 2015-07-31 15:45:13 -07:00
redmatrix
5e985ef34f consistency of event form 2015-07-31 15:42:52 -07:00
redmatrix
cbb6d37b6c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-27 20:59:37 -07:00
redmatrix
52ccbd6b64 align buttons on event calendar 2015-07-27 20:58:25 -07:00
redmatrix
3269d4632f Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	util/messages.po
 2015-07-27 18:01:20 -07:00
redmatrix
85f546e691 crude but more or less functional event import from thunderbird ics files 2015-07-26 22:44:49 -07:00
redmatrix
3880b485cb Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/connedit.php
	view/pt-br/messages.po
	view/pt-br/strings.php
 2015-07-26 16:50:33 -07:00
Mario Vavti
f6142d18c4 Provide connection status if status is "a-normal" 2015-07-26 20:54:09 +02:00
redmatrix
c90f14c066 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	doc/to_do_code.bb
 2015-07-21 17:13:48 -07:00
Mario Vavti
4d45bc9da1 Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format. 2015-07-20 21:01:11 +02:00
Mario Vavti
464625cd91 show icons instead of disabled checkboxes 2015-07-20 15:03:55 +02:00
redmatrix
15b6e8faa4 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/identity.php
	include/widgets.php
	util/messages.po
	view/it/messages.po
	view/it/strings.php
 2015-07-19 21:08:34 -07:00
Mario Vavti
39a09eb525 fix missing div and a regression introduced in ec23a94b6d which broke tag removal for photos 2015-07-16 22:04:52 +02:00
redmatrix
6046fe9c9e Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-15 17:50:24 -07:00
Mario Vavti
0c77a127f2 show inherited state in Connection Default Permissions 2015-07-15 14:03:34 +02:00
redmatrix
e8f19c1e15 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/connedit.php
 2015-07-14 17:10:13 -07:00
Mario Vavti
104cbcab72 make strings translateable 2015-07-14 21:32:18 +02:00
Mario Vavti
4fe64179c8 disable the inherited checkboxes for notself 2015-07-14 19:29:49 +02:00
Mario Vavti
cc1764989f fix mod_connedit.js after cleanup 2015-07-14 17:37:33 +02:00
Mario Vavti
f267bd55d6 revert this until further investigation 2015-07-14 14:20:23 +02:00
Mario Vavti
7f71297383 cleanup connedit 2015-07-14 12:46:40 +02:00
redmatrix
6916c1076c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-13 17:43:10 -07:00
Mario Vavti
f81874ca49 fix sys channel menu in a morre standard way 2015-07-12 01:04:57 +02:00
Mario Vavti
d8f03450e7 make menu creation for sys channel work 2015-07-12 00:40:12 +02:00
redmatrix
a497d8ee66 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/editpost.php
	util/messages.po
	view/nl/messages.po
	view/nl/strings.php
 2015-07-10 14:27:41 -07:00
Mario Vavti
fee607db56 more webpages - generic-content-wrapper fixes 2015-07-10 13:16:45 +02:00
Mario Vavti
1554b5a2ee add generic content wrapper to post/webpage editor and make editpost render correctly 2015-07-10 12:46:20 +02:00
Mario Vavti
115c18353e move profile image up and refine the aside width 2015-07-09 14:44:24 +02:00
Mario Vavti
efa55437d4 increase width of the aside area and make default profile image size 300x300 2015-07-09 13:59:16 +02:00
redmatrix
6b41074396 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-07 16:50:25 -07:00
Mario Vavti
f6cf992aee fix sorting of channel suggestions 2015-07-07 22:48:01 +02:00
Mario Vavti
f67d9d59af rename function get_directory_settings => get_directory_setting and move sort options to directory title bar 2015-07-07 22:29:27 +02:00
Mario Vavti
adfb4072e8 various css fixes 2015-07-07 12:13:15 +02:00
Mario Vavti
807471d2a5 move if clause outside of the div 2015-07-07 09:56:30 +02:00
Mario Vavti
ee01e67fa7 use default style for default webpage 2015-07-07 09:41:27 +02:00
redmatrix
97e8275dc2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-29 22:19:44 -07:00
redmatrix
0b347ccc14 turn the connection filter into a feature. 2015-06-29 20:35:56 -07:00
redmatrix
6e8ad5089e Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-06-29 18:01:51 -07:00
Mario Vavti
7ef4397634 fix directory location 2015-06-29 14:25:04 +02:00
redmatrix
63f2e9b412 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/zot.php
	mod/connedit.php
	util/messages.po
 2015-06-28 22:33:13 -07:00
redmatrix
de13497333 no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool. 2015-06-28 21:16:56 -07:00
redmatrix
b06b6f798f localise event calendar 2015-06-25 18:23:48 -07:00
Mario Vavti
e9cc06dc11 directory: only provide connect button if we are not already connected 2015-06-24 21:12:20 +02:00
redmatrix
833098e346 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	mod/item.php
 2015-06-23 17:30:35 -07:00
Mario Vavti
b6c4601d8f some work on directory 2015-06-23 13:06:22 +02:00
Mario Vavti
a4775aab9b Bring /help in line with the rest of the app 2015-06-22 14:02:14 +02:00
redmatrix
ae6612025d Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	util/messages.po
 2015-06-21 20:51:07 -07:00
redmatrix
68534fd5dc some diaspora import issues uncovered during dry-run tests 2015-06-21 17:30:23 -07:00
Mario Vavti
c1e0987b88 do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly. 2015-06-21 17:53:44 +02:00
Mario Vavti
8b563951ff more generic-content-wrapper and some css fixes 2015-06-19 15:49:06 +02:00
Mario Vavti
1432b1e83f cloud.tpl 2015-06-19 12:45:18 +02:00
Mario Vavti
de84f48e2f bring some more generic-content-wrappers and fix some of them 2015-06-19 12:44:11 +02:00
redmatrix
2963be60e5 more photos work 2015-06-17 18:26:56 -07:00
redmatrix
6ab20eb1b5 lots of work on merging photo and file albums/folders 2015-06-17 17:44:31 -07:00
redmatrix
8c7472c6c3 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
 2015-06-15 17:30:08 -07:00
Mario Vavti
905cd1da5b do not allow/show acl button on photo edit if not owner 2015-06-15 13:04:16 +02:00
redmatrix
5733491ac8 more work on items 
and

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
	view/it/messages.po
	view/it/strings.php
 2015-06-11 17:56:56 -07:00
Mario Vavti
c8fe408a62 fix rendering of affinity slider 2015-06-11 11:35:21 +02:00
redmatrix
eb6a1f8387 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-09 19:39:21 -07:00
redmatrix
9592f7f3e6 put mirror_frontpage setting into admin/site 2015-06-09 19:37:12 -07:00
redmatrix
d08c43d80c toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled. 2015-06-09 18:50:11 -07:00
redmatrix
03357481f7 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	install/schema_mysql.sql
	mod/home.php
	mod/page.php
	view/nl/messages.po
	view/nl/strings.php
 2015-06-09 16:52:00 -07:00
redmatrix
3c5a5a9ebf more frontpage tweaks 2015-06-07 18:59:14 -07:00
redmatrix
60cfea5d1f reverse logic of homepage login setting 2015-06-07 18:27:05 -07:00
redmatrix
0537ff1e4a frontpage tweaks 2015-06-07 18:15:26 -07:00
redmatrix
ec1dcb8f2e Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	util/messages.po
 2015-06-06 17:31:22 -07:00
jeroenpraat
93237f8d0a Added translatable strings to the Display Settings page and refreshed util/messages.po. 2015-06-06 19:49:30 +02:00
redmatrix
f3b95f591a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-31 19:26:00 -07:00
Mario Vavti
d11d130021 add some yes/no labels and minor template fixes 2015-05-29 15:23:51 +02:00
Mario Vavti
b8d3280763 some fixes to make menu sharing work and expose it in the ui. 2015-05-29 13:08:01 +02:00
Mario Vavti
5f1ae2930b show created/edited dates for menus 2015-05-29 11:07:57 +02:00
redmatrix
675aa96f22 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-25 17:01:02 -07:00
redmatrix
23abfb0a5b add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle the censor flag from that page. 2015-05-25 16:56:28 -07:00
redmatrix
3763f74a10 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	include/text.php
	mod/item.php
	view/nl/messages.po
 2015-05-20 20:49:06 -07:00
redmatrix
6466774b6e PRIVACY: possible privacy leakage under a defined set of circumstances 2015-05-20 18:46:23 -07:00
redmatrix
0a644a2f41 Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	mod/mitem.php
	view/de/messages.po
	view/de/strings.php
 2015-05-10 13:26:44 -07:00
Mario Vavti
ca36fce9a7 provide drop down submenu suggestions in edit mode 2015-05-10 21:17:37 +02:00
Mario Vavti
fad37eb6d0 copy/paste typo 2015-05-10 15:08:18 +02:00
Mario Vavti
616338c17e provide ability to create submenus 2015-05-10 15:00:18 +02:00
redmatrix
37a63365f1 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-07 16:44:28 -07:00
Mario Vavti
cd8ecb8649 provide wrap variable for comanche menus 2015-05-07 23:02:14 +02:00
redmatrix
90591bcbc9 missed one... 2015-05-06 22:56:08 -07:00
redmatrix
c186e6ed96 change notification colour 2015-05-06 21:25:59 -07:00
redmatrix
75b8bfc07a Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-05-06 18:39:12 -07:00
redmatrix
f559c91b7a turn consensus items into diaspora polls for that network 2015-05-05 19:23:21 -07:00
redmatrix
5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
redmatrix
a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
Mario Vavti
2376d2140a fix block view 2015-04-29 21:43:41 +02:00
friendica
8711c223f3 version update 2015-04-28 13:14:15 -07:00
Mario Vavti
31b5b06e42 Provide webpage layout description 2015-04-25 22:35:24 +02:00
Mario Vavti
b7f6cceaea provide block titles in blocklist 2015-04-24 22:37:22 +02:00
Mario Vavti
c6a75f407d webpages layout fixes 2015-04-24 11:36:49 +02:00
Mario Vavti
c696860cc5 webpages blocks fixes 2015-04-23 21:04:01 +02:00
Mario Vavti
b4dff3a9ff provide headings for blocks and layouts 2015-04-22 10:31:36 +02:00
Mario Vavti
09096811ca missing class 2015-04-21 23:30:12 +02:00
Mario Vavti
c52682c68f missing dropdown class 2015-04-21 23:21:09 +02:00
Mario Vavti
e58e8f3f75 bring lockstate to webpages 2015-04-21 23:08:54 +02:00
Mario Vavti
21704ecb93 bring lockview to menu items, slightly change the way /lockview is called 2015-04-21 22:45:54 +02:00
Mario Vavti
0bd9fe0b11 rework and hopefully improve webpage menu creation workflow 2015-04-21 10:05:26 +02:00
friendica
6bc2766d79 issue #162 2015-04-20 20:49:55 -07:00
Mario Vavti
71117628bc attach an id to menues, allow $menu_title to be empty, if no custom menu class is provided use default redbasic classes 2015-04-19 15:22:50 +02:00
Mario Vavti
dd5b97639e Introduce wrap variable in comanche blocks (if set to none the block will not be wrapped in a div), fix menu item permissions (it was not possible to set them visible for everybody) and a typo 2015-04-19 13:25:05 +02:00
friendica
9f35971860 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-04-17 17:21:10 -07:00
friendica
3d99a6b5c4 hide event share button when editing an event 2015-04-17 17:20:24 -07:00
Mario Vavti
61e4ee753d allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes 2015-04-17 11:20:22 +02:00
Mario Vavti
9addc4581e provide a separate input field for rpost attachments 2015-04-16 23:26:11 +02:00
Mario Vavti
86ac9c0d6b move share webpage element from editwebpage to webpages and make it shareable with rpost 2015-04-16 10:43:14 +02:00
Mario Vavti
834044b15b title=>name 2015-04-15 09:20:27 +02:00
Mario Vavti
953819e7da css fixes and remove expert mode for block page content type 2015-04-14 12:52:31 +02:00
Mario Vavti
865b602cf8 webpages appearence 2015-04-13 23:38:36 +02:00
Mario Vavti
05f018e509 add bs classes to design tools menu 2015-04-13 17:24:37 +02:00
Mario Vavti
aeb162e963 remove superfluous view/preview buttons 2015-04-13 16:49:08 +02:00
Mario Vavti
22c3202f22 remove widget class from webpage blocks and make titles h2 to match the rest of the matrix 2015-04-13 16:17:10 +02:00
Michael Johnston
6e633924bd only add the h3 tag to the page if there is a title 2015-04-12 17:24:32 -04:00
Mario Vavti
c6873529f4 bring ajax delete to files 2015-04-12 15:01:06 +02:00
Mario Vavti
70b109702e make dropItem more universal and move delete up in the dropdown menu 2015-04-12 14:30:33 +02:00
Mario Vavti
7c8b9397ae reverse file activity logic 2015-04-12 13:13:22 +02:00
Mario Vavti
a3b18adbcb bring ajax item delete to conv list 2015-04-10 09:30:43 +02:00
friendica
3fd2e4b716 program the affinity slider labels 2015-04-09 19:51:58 -07:00
Mario Vavti
a73dbb3073 delete conv items on the fly in background 2015-04-08 14:10:38 +02:00
friendica
5bc7c0e798 add endless scroll to viewconnections module 2015-04-06 22:36:46 -07:00
friendica
3a3563a4b1 commit 59828593c broke some important poco stuff, looks like the cat might have climbed over the keyboard and deleted something that wasn't intended to be deleted. 2015-04-06 19:00:13 -07:00
friendica
04c993ff2a now add back the navsearch param 2015-04-06 16:18:35 -07:00
Klaus Weidenbach
754ac2cff7 Fix Design Tool navigation for sys channel. 
Fix creating menu for sys channel.
 2015-04-06 23:52:13 +02:00
friendica
6199af6a79 revert iconic change to collection list widget 2015-04-01 01:07:38 -07:00
friendica
cff7696e98 change "create new collection" to iconic, document the account table 2015-03-30 00:51:03 -07:00
friendica
c29d3fc08a mod_connections ajax failure see http://stackoverflow.com/questions/14347611/jquery-client-side-template-syntax-error-unrecognized-expression 2015-03-29 18:42:05 -07:00
Mario Vavti
b59e2870ab Move bootstrap dependencies (tagsinput) to theme redbasic (we only have it there). Comment out some most probably deprecated js includes. Some css cleanup. 2015-03-27 11:52:59 +01:00
friendica
47292c612c provide ways to over-ride the datetime pickers 2015-03-26 18:03:39 -07:00
friendica
75f3f4a808 admin config for default expiration 2015-03-25 17:43:02 -07:00
Mario Vavti
d6ad74c649 indicate new or updated items 2015-03-23 10:59:54 +01:00
Mario Vavti
9980645ab8 fix acl for if we have an cid in /network and make $bang better visible 2015-03-21 13:37:55 +01:00
Mario Vavti
ead45292e1 some tabs title statuseditor restructuring 2015-03-21 00:06:18 +01:00
Mario Vavti
ad9f5079cd do not destroy page layout if feature_encrypt is not enabled 2015-03-19 12:40:04 +01:00
friendica
7a9aca6ecb fix the map embed issue by keeping the map visible but moving it far off the screen. 2015-03-17 18:45:56 -07:00
Mario Vavti
8d89dde908 update templates 2015-03-17 15:12:21 +01:00
friendica
bc22df9057 display a map for photos if allowed. Note: there is a bug in that if the map div starts with display:none one needs to reload the frame or zoom in or they end up at minimum resolution. Still trying to sort this out. 2015-03-16 22:06:03 -07:00
friendica
841f94ce2a regression: visual feedback that page/content is loading when affinity slider value changed went missing 2015-03-16 18:10:14 -07:00
friendica
2bd3dc6101 Merge https://github.com/friendica/red into pending_merge 2015-03-16 15:50:27 -07:00
friendica
52374bcd6e phase one of the great file storage unification - use one button for uploads of any type (image or attachment). We'll sort out which one it is and deal with it appropriately. 2015-03-16 15:33:08 -07:00
Mario Vavti
4146f9d3da show generic submit button only if plugin name is provided 2015-03-16 21:19:27 +01:00
friendica
f507a5cd5a prepare for demise of google code 2015-03-12 16:05:56 -07:00
Klaus Weidenbach
c6162c4c88 Fix JavaScript problems on channels where you are not allowed to upload photos. 
Add some try...catch blocks around JavaScript that throws errors.
This commit should fix the current problems that were introduced by an
earlier commit.
 2015-03-12 22:57:00 +01:00
Mario Vavti
d11bec6f58 add generic_addon_settings template and minor fixes 2015-03-12 22:22:52 +01:00
Mario Vavti
8113ee1c4a some work on feature/addon settings 2015-03-12 10:19:56 +01:00
friendica
b3a9a6c802 remove the now redundant audio/video buttons and label the editor text style buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links. 2015-03-11 18:56:28 -07:00
friendica
5b35f1e6c4 Change logic of "don't create a status post for this photo upload" and turn it into a bona-fide on/off toggle. This takes up one more vertical line, but we have it to spare, and the single button (while concise visually) provided no feedback of the current state, or indicate whether a second click toggled it. Some addons use this setting so addons will need to be pulled when this is pulled in order to remain in sync. 2015-03-10 15:43:15 -07:00
Klaus Weidenbach
946beb6191 View upload photo button only if you have permission. 
Check if post_photos permission is available otherwise hide the photo
upload button.
Or should we show the button and just disable it with a title, about
missing permission to upload photos?
In comments we use the same icon, but just add [img] bb-code. Should we
provide this if no permission to upload photos. Do we need different
icons for [img] and photo upload buttons?
 2015-03-10 21:51:14 +01:00
Mario Vavti
637f0eba4f collapse jot tools to submenu on small and extra small screens 2015-03-10 13:20:10 +01:00
friendica
98dffd77ef channel delegation 2015-03-10 02:23:14 -07:00
friendica
4237e8052e buttons for admin_accounts + admin_channels 2015-03-09 20:40:02 -07:00
friendica
b2e33435f7 increase the cell padding (any jokes about padded cells will be ignored) 2015-03-09 20:00:20 -07:00
friendica
0134a41015 more work on queue optimisations 2015-03-09 19:57:35 -07:00
friendica
c3d20cfba9 Bring simple editor formatting functions back to the main editor (bold, italic, underline, quote, code) so as to maintain parity and consistency with comments. Currently this will make the editor toolbar seem a bit cluttered but be aware that the second button group (attach and link tools) will be reduced to two buttons (attach and link) when the next phase of this work is completed. The third group of tools are optional features and will only be presented based on personal choice. Visual editors may need to disable, relocate, or redefine these buttons. 2015-03-09 18:32:51 -07:00
friendica
26a414fe4b make network page default options work more or less universally instead of just from the navbar, and fix some saved-search weirdness related to the delete-term icon 2015-03-09 16:27:12 -07:00
habeascodice
f7d1fb9c5a Merge pull request #920 from dawnbreak/master 
Add alert to admin page about old PHP version. Fixing (un)blocking accounts in admin.
 2015-03-08 16:51:42 -07:00
Klaus Weidenbach
c6d45858bb Fixing (un)blocking accounts in /admin/users. 
When I look at the instructions in sql_conventions about setting bit
flags I don't understand how this could have worked before. Changed the
behavior for (un)blocking so that it should work now.
 2015-03-08 22:22:45 +01:00
Klaus Weidenbach
23ea974615 Add alert to admin page about old PHP version. 
Add an alert message to admin summary page when a PHP version < 5.4 was
detected as this has reached EOL and will not be supported with the new
SabreDAV library.
Some styleguide optimisation.
Add NULL_DATE example to doc/sql_conventions.bb.
Display a "0" when no plugins active in summary page.
Added some more numbers to summary admin page, expired accounts,
channels. Hope I interpreted them right. I have no idea how to get
blocked accounts.
 2015-03-08 17:51:58 +01:00
friendica
480dac1af2 add reddress to profile - but all is not as it seems. Copy to clipboard is blocked because it isn't really a reddress and won't work if you copy it and try and use it somewhere. We should really convert the symbol back to '@' on copy and allow it to be copied, but this isn't as easy as it sounds and is left as an exercise for the community. If we just allow it to be copied we'll get a lot of bugs that making friends doesn't work. It does, but that isn't a legitimate reddress and even if we made allowances for it, Diaspora and Friendica and other webfinger based services wouldn't and would just say it can't be found or it's an illegal address. So if we block copy we'll just get bugs that it can't be copied. Eventually somebody will see this checkin and take it on themselves to figure out how to fix the address when copied to clipboard and then allow it to be copied. And there will be joy. 2015-03-07 23:35:56 -08:00
friendica
f6da235a7d major cleanup of directory options 2015-03-05 23:31:01 -08:00
friendica
22391a2437 straighten out some directory stuff, which required some Comanche structural changes 2015-03-05 18:24:49 -08:00
friendica
ec5c989352 make destructive queue management functions an expert option 2015-03-05 15:53:25 -08:00
Mario Vavti
ce229d73f8 whitespace and minor restructuring 2015-03-05 19:08:32 +01:00
Mario Vavti
688ef34d98 only show theme settings if we have any themes 2015-03-05 18:16:43 +01:00
Mario Vavti
44b74365dd restructure display settings 2015-03-05 17:12:27 +01:00
Mario Vavti
c62e4bcdca can not use element id more than once 2015-03-05 13:03:58 +01:00
Mario Vavti
3fa4123161 only allow theme selection forms if there are any themes to select 2015-03-05 12:47:18 +01:00
Mario Vavti
61f398e055 fix theme preview disappearing 2015-03-05 12:38:51 +01:00
Mario Vavti
beace0f57a more yes/no labels 2015-03-05 10:20:49 +01:00
friendica
068699ae31 missed removing a test case 2015-03-04 20:14:47 -08:00
friendica
2ea162136e the link icon on comments now calls the link parsing tool (just like the main editor window). Eventually the link specific icons (image, link, audio, video) will all be handled by inserting a link using the link icon (here and in the main editor window) and the separate buttons will go away. We also need to tie this to oembed so that there's one place to insert a link - no matter what kind of link it is, and we'll try to find the best way to render that as content. Similarly upload will upload content, no matter what kind of content; and we'll likewise try and figure out the best way to present whatever content was uploaded (img, file, audio, video, whatever). 2015-03-04 20:00:54 -08:00
friendica
ddaf5c067d cleanup mail buttons 2015-03-04 14:00:36 -08:00
Mario Vavti
e5e96dfbff cleanup removeaccount 2015-03-04 11:11:36 +01:00
Mario Vavti
431a462d60 cleanup removeme 2015-03-04 11:01:16 +01:00
Mario Vavti
eceafd5777 fix wording 2015-03-04 10:26:25 +01:00
Mario Vavti
4b08ccd873 clean up account settings 2015-03-04 10:11:48 +01:00
Mario Vavti
6d30abe4bf Accordionize feature settings 2015-03-04 09:54:33 +01:00
friendica
df90677f90 add the tag hijacking preference to Diaspora settings 2015-03-03 17:43:13 -08:00
friendica
52f42e7d81 Merge https://github.com/friendica/red into pending_merge 2015-03-03 14:39:03 -08:00
friendica
44b714d0eb group/collection edit page cleanup 2015-03-03 14:38:34 -08:00
Mario Vavti
6e0b5b742c login adjustment 2015-03-03 11:32:54 +01:00
Mario Vavti
74c1b61689 make remove channel button work again 2015-03-03 09:18:04 +01:00
Mario Vavti
6b467974a3 some more work on settings 2015-03-02 20:51:32 +01:00
friendica
bc1afbc762 Merge https://github.com/friendica/red into pending_merge 2015-03-01 15:57:56 -08:00
friendica
ba7bdd79b7 queue management actions. Still needs further work such as indication of last successful connection or indication that the hub was marked offline, but these are potentially expensive queries. 2015-03-01 15:55:27 -08:00
Mario Vavti
e8e6231a4e settings: missing /form and whitespace 2015-03-01 21:51:44 +01:00
Mario Vavti
ea6e86fecc more settings work 2015-03-01 21:45:49 +01:00
Mario Vavti
b4a2f764ab fix login 2015-03-01 16:21:32 +01:00
Mario Vavti
6e64f9af54 first pile of work on settings 2015-03-01 15:22:23 +01:00
friendica
a00c072f02 high level queue inspector - needs a lot more, like the ability to dump certain destinations and indicating known dead sites, but this is a start 2015-02-26 20:00:47 -08:00
friendica
5d57df2694 per Randal overheard on a foreign network - tab in post/comment edit window goes to submit instead of the next button. 2015-02-26 17:18:09 -08:00
friendica
dce0bb0ef8 finish converting "delete" to trash icons for consistency. The 'x' was left in a couple of places like the group list widget and saved search term widget and ignoring friend suggestions where it was more appropriate to leave it. 2015-02-26 16:41:38 -08:00
friendica
86aefe0e01 new session functions 2015-02-22 15:27:45 -08:00
friendica
e00be4de23 The Diaspora communications policies allow comments to public posts literally from anybody. Allow this policy model by default for commenters from that network. This policy decision can be set or disabled on the addon/features settings page. 2015-02-17 19:47:36 -08:00
friendica
533f39debe bring back like/dislike summaries on photos 2015-02-16 17:01:13 -08:00
friendica
1c4b919980 force site_url to be lowercase when stored. Otherwise rating hubs on postgres could get real messy. 2015-02-15 23:45:22 -08:00
friendica
8774089005 preparatory work for site ratings 2015-02-15 21:22:05 -08:00
friendica
0249fbb7e6 lost ability to delete events 2015-02-15 16:04:59 -08:00
marijus
7c45f23f8f some shifting to make button groups render properly 2015-02-13 12:37:05 +01:00
marijus
4616c13f3b yet another icon change 2015-02-13 10:40:52 +01:00
friendica
94a9aa9610 possibly better icons, possibly not. There is no [x]. 2015-02-12 14:54:53 -08:00
friendica
e8bdf2b8d7 more permissions tweaking 2015-02-10 21:21:18 -08:00
friendica
d010712517 wrong icons in list mode 2015-02-10 19:32:12 -08:00
friendica
79223b6b3d item voting tools 2015-02-10 19:10:18 -08:00
friendica
4632d30a78 more attendance 2015-02-10 14:47:09 -08:00
friendica
f7cce63447 cleanup event attendance - make sure it works in list mode. 2015-02-10 00:44:34 -08:00
friendica
81e7b47b76 more progress on event confirmations 2015-02-10 00:11:37 -08:00
friendica
c694945245 like formatting for extended consensus items 2015-02-09 21:18:50 -08:00
friendica
fce51876c9 bring some styling back to the colorbox and improve the event preview ability 2015-02-09 18:58:43 -08:00
friendica
ad731b7c7b make preview button larger 2015-02-09 16:00:46 -08:00
friendica
ed810a360f event form - provide map ability for location field and add preview ability 2015-02-09 15:57:22 -08:00
friendica
69894e28c4 we still need an event preview but this looks a lot better. 2015-02-08 20:23:02 -08:00
friendica
a1d84f96b6 first cut at putting editor tools in event form 2015-02-08 19:25:35 -08:00
friendica
e7a68eaef0 style the checkboxes in the event form 2015-02-05 21:01:02 -08:00
friendica
abcc70722c event form cleanup backported from trinidad - still need to style the checkboxes 2015-02-05 19:37:55 -08:00
friendica
68978ad1c0 collapse overly-verbose ratings 2015-02-05 15:28:46 -08:00
friendica
1b5bd1d808 increase size of rating value to make it stand out a bit. 2015-02-05 15:11:51 -08:00
friendica
561bab4ece remote rating and addition of rate-me to channel profile sidebar 2015-02-04 17:32:29 -08:00
friendica
3988948516 first cut at rating widget. The flaw is that it is limited because it requires local_channel() (formerly local_user()). We need to extend this to take you home like rpost does if you're logged in as remote_channel() - and/or we need zot to send the rating message to the source channel and target in addition to the directories. 2015-02-04 15:48:39 -08:00
friendica
127bf82187 probably enough for now - couldn't get the censorship filter in today, I think that's the only bit missing. 2015-02-03 23:30:07 -08:00
friendica
4ead2cd79d final cleanup on ratings feature 2015-02-03 21:19:29 -08:00
friendica
17ffe122b3 ratings - mopping up, most everything but directory sync implemented 2015-02-03 18:10:55 -08:00
friendica
5cb2f55dbb rating form work 2015-02-03 16:52:09 -08:00
friendica
c417a43338 styling for the directory page when it comes to ratings 2015-02-03 15:50:12 -08:00
friendica
df632c4232 run ratingsearch on the server 2015-02-03 15:06:16 -08:00
friendica
6067274b51 start to tie ratings to the directory page 2015-02-02 23:58:44 -08:00
marijus
c29483b88c respect parent dir permissions 2015-02-02 15:18:44 +01:00
RedMatrix
b381579959 Merge pull request #881 from cvogeley/master 
Add allowed and not allowed emails to the UI in the
 2015-01-30 18:14:10 +11:00
friendica
3e22de0be0 how did that stuff merge? grrrr.... 2015-01-29 18:17:24 -08:00
friendica
df6d54c64e Merge branch 'master' into pocorate 2015-01-29 15:21:19 -08:00
Christian Vogeley
f81df92ef8 Add allowed and not allowed emails to the UI in the 
admin menu
 2015-01-29 20:27:35 +01:00
RedSwede
06291c6f42 non-tested fix for issue 847 2015-01-29 16:22:14 +01:00
friendica
fd0b6c967f Merge branch 'master' into pocorate 2015-01-29 00:28:23 -08:00
friendica
a496036066 local_user => local_channel 2015-01-28 20:56:04 -08:00
friendica
da842da683 Merge branch 'master' into pocorate 2015-01-28 16:06:36 -08:00
marijus
f455036905 show shared button only to local user 2015-01-28 09:49:36 +01:00
friendica
f0b900057a first cut at direntry template, right now just provide a mockup with a slider and rating count to look at. 2015-01-27 16:51:13 -08:00
marijus
17c684e123 tpl and css cleanup 2015-01-27 19:33:30 +01:00
marijus
65aa6cf708 move userReadableSize() and getIconFromType() from /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme 2015-01-27 19:00:16 +01:00
friendica
505d530d28 we also don't need a profile selector when editing our default permissions. 2015-01-25 14:32:00 -08:00
friendica
03412e8a58 don't hide the scary stuff when editing self permissions. 2015-01-25 14:28:48 -08:00
friendica
0125e9d288 Hide all the scary decision making stuff that sends intellectually challenged beings into siezures and brain melt-downs and online freak-outs. 2015-01-25 14:06:57 -08:00
friendica
b3370243e8 move connection approval checkbox to top of page (above the sliders) - instead of being in between rating and rating text. 2015-01-25 12:35:57 -08:00
marijus
e874376268 this will require more fixing in include/enotify 2015-01-23 02:09:28 +01:00
friendica
b946ac63a1 couple of hubloc manager issues 2015-01-21 19:09:12 -08:00
marijus
43326a26b7 css fixes - hopefully 2015-01-20 22:19:51 +01:00
marijus
5ee815b2fa satisfy the floated images 2015-01-20 21:10:41 +01:00
marijus
1c2d956d7f basic proof of concept file activity support - will send activity via the filestorage module and via attach_delete() 2015-01-18 14:44:58 +01:00
friendica
dfe31dc3b7 more heavy lifting on poco rep 2015-01-15 19:05:42 -08:00
friendica
597b07e8cc poco rating - add a test module for pulling out ratings 2015-01-15 17:32:41 -08:00
friendica
e7932d97a2 editing stuff for poco reputation 2015-01-15 16:37:47 -08:00
friendica
1c9299ed42 more backend work on poco rating 2015-01-15 14:05:18 -08:00
friendica
e528483d81 hide friends broken, add parameter for item search by verb 2015-01-13 14:42:54 -08:00
friendica
580c30f516 another attempt to explain default permissions on connedit page 2015-01-11 21:18:29 -08:00
Stefan Parviainen
4e3aadc38a Rename some stuff related to autocomplete 2015-01-07 18:57:16 +01:00
Stefan Parviainen
b320b8cbf3 Replace fancybox with colorbox 2015-01-05 19:49:20 +01:00
Stefan Parviainen
128b0008ee Replace jslider with jRange 2015-01-05 18:30:12 +01:00
Stefan Parviainen
c14dc699ae Fix initEditor on non-wall pages 2015-01-05 00:28:42 +01:00
Stefan Parviainen
57809f20a4 Sorting of autocomplete 2015-01-04 14:23:23 +01:00
Stefan Parviainen
386f361855 Autocmplete suggestions for non-local users, also suggest from visited channel's connections 2015-01-04 12:54:23 +01:00
friendica
9433a0ddc8 Merge https://github.com/friendica/red into pending_merge 2015-01-04 00:48:17 -08:00
friendica
028dff44cc remove hard-coded url to caterva.eu from events code. 2015-01-04 00:47:44 -08:00
marijus
0779e3ae53 provide some info for buttons 2015-01-03 13:42:05 +01:00
friendica
31648d65c8 some work on the edit connection workflow explanation and connedit page. This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved. 2015-01-02 19:20:52 -08:00
Stefan Parviainen
42773a1122 Reworked switch to also display text 2015-01-02 18:14:23 +01:00
RedMatrix
e7081db19b Merge pull request #807 from pafcu/dblclicknewevent 
Double click on day in calendar creates new event starting that day
 2015-01-02 12:11:08 +11:00
RedMatrix
817b54688e Merge pull request #805 from pafcu/moretpl 
Move some HTML out to templates
 2015-01-02 12:10:50 +11:00
Stefan Parviainen
1c2dc97a4a Double click on day in calendar creats new event starting that day 2015-01-01 18:19:17 +01:00
Stefan Parviainen
85e76773a0 Use grouped select field for role selection 2015-01-01 15:54:16 +01:00
Stefan Parviainen
686b6ee118 Use grouped select field for timezone selection 2015-01-01 14:44:50 +01:00
Stefan Parviainen
ef94747e5e Add field template for grouped selects 2015-01-01 14:36:17 +01:00
Stefan Parviainen
ef6680f7ad Possibly make switches work on IE8 (untested) 2015-01-01 11:33:00 +01:00
Stefan Parviainen
70f0019905 Checkboxify yesno-fields, but use CSS to show them as switches in Redbasic 2015-01-01 10:08:20 +01:00
RedMatrix
b7d758fed0 Merge pull request #795 from pafcu/tplcleanup 
Remove some old, unused templates
 2014-12-31 10:22:12 +11:00
RedMatrix
4a82967639 Merge pull request #791 from pafcu/notifications 
Improved notifications
 2014-12-31 10:21:38 +11:00
marijus
4edc9a696b design fixes for photos, files and random fixes 2014-12-30 21:04:48 +01:00
Stefan Parviainen
e6a3ea2c95 Make showing wall posts, intros and private messages under Notices optional 2014-12-30 15:27:33 +01:00
Stefan Parviainen
12e6d98659 Remove some old, unused templates 2014-12-30 14:11:27 +01:00
marijus
6cbbe854d5 css fixes 2014-12-30 12:12:55 +01:00
RedMatrix
619733e297 Merge pull request #789 from pafcu/chanman 
Don't show current channel separately in channel manager, highlight it i...
 2014-12-30 08:57:37 +11:00
marijus
f2bfdf0c76 some work on cloud actionspanel and minor cleanup 2014-12-29 22:45:07 +01:00
Stefan Parviainen
e69e59d260 Don't show current channel separately in channel manager, highlight it instead 2014-12-29 22:07:40 +01:00
Thomas Willingham
a70e42edac Remove link to hubloc status in admin panel. This is a potentially useful tool, 
but plain doesn't work at the moment.
 2014-12-29 14:47:41 +00:00
RedMatrix
7b98a6fcb0 Merge pull request #772 from pafcu/chanman 
Some work on the channel manager
 2014-12-29 09:29:12 +11:00
marijus
fa23439b9c more files css fixes 2014-12-28 20:46:16 +01:00
marijus
1ab23061df files css fixes 2014-12-28 20:34:12 +01:00
marijus
801ab709ad more work on files 2014-12-28 18:16:27 +01:00
Stefan Parviainen
40a327b68f Allow quick access to mail and connections from Channel Manager 2014-12-27 14:06:09 +01:00
Stefan Parviainen
6a679d26ce Fix #771, add tooltips to mail and intros count in channel manager, always show counts (even when 0, makes it easier to understand what the icons are) 2014-12-27 13:36:05 +01:00
marijus
0cb0c2b1bf more work on files 2014-12-27 10:10:56 +01:00
Stefan Parviainen
fa65d31f3f Move app icon centering to style.css 2014-12-22 23:09:10 +01:00
Stefan Parviainen
c819c276f0 Remove unused apps.tpl 2014-12-22 19:05:16 +01:00
Stefan Parviainen
37534d110c Center app names 2014-12-22 18:53:13 +01:00
friendica
d3830aea96 provide last successful poll run time (using relative time) in siteinfo so that we can tell folks that have no idea what we're talking about that their poller definitely isn't running and this is probably why nothing works correctly. 2014-12-21 18:40:25 -08:00
RedMatrix
c732b72a0d Merge pull request #757 from git-marijus/master 
files: make mod/filestorage.php load via ajax and some design work. work...
 2014-12-22 09:45:33 +11:00
marijus
be1891c058 fix button visibility 2014-12-21 21:48:10 +01:00
marijus
02328bfdbe forgot to git add files 2014-12-21 20:27:43 +01:00
marijus
27d786c979 files: make mod/filestorage.php load via ajax and some design work. work in progress... 2014-12-21 20:11:30 +01:00
Stefan Parviainen
aa73259a47 Fancy categories input with bootstrap-tagsinput 2014-12-21 12:42:07 +01:00
friendica
6d8214f96b provide link to help for channel permission roles when creating a channel 2014-12-19 01:48:47 -08:00
friendica
f113984d69 essentials for creating a "block-style" list-mode page such as one might have for a pinterest-style layout. Just load view/theme/redbasic/css/blockmode.css after redbasic PCSS - you're done. We may need some other indicator besides the number of comments to indicate "click here to see the rest of the article", but we're a bit short on space so maybe a view icon will work. 2014-12-16 23:40:52 -08:00
friendica
2fcbb9c4b3 fix some directory anomolies 2014-12-16 18:33:16 -08:00
friendica
07e747ed0e add divmore to directory entries 2014-12-16 17:29:16 -08:00
friendica
7bee4e5997 build a channel based thread viewing link when in list_mode and when using the channel module, which will disable list_mode (this was checked in yesterday) for the benefit of viewing threads with the correct identities and comment permissions instead of relying on the semi-random uid chosen by mod/display when viewed by an authenticated remote_user(). 2014-12-16 14:12:40 -08:00
friendica
2e990743e7 Merge https://github.com/friendica/red into pending_merge 2014-12-15 14:37:57 -08:00
friendica
f28103d595 wall tags 2014-12-15 14:37:31 -08:00
Thomas Willingham
c6d0695edf Issue #743 2014-12-15 19:32:28 +00:00
Thomas Willingham
049f08e6ad Merge pull request #744 from pafcu/searchhelp 
Add hint on how to use search box
 2014-12-15 14:53:25 +00:00
Stefan Parviainen
ce88f0ab6a Add hint on how to use search box 2014-12-14 18:40:59 +01:00
Stefan Parviainen
0f169a1427 Add extra class to verified item icon 2014-12-14 12:25:08 +01:00
Thomas Willingham
76fdfb7ef5 Merge pull request #738 from pafcu/moreids 
Add some ids to nav elements
 2014-12-13 16:40:13 +00:00
Thomas Willingham
5fac8e80de Issue #739 2014-12-13 15:00:00 +00:00
Stefan Parviainen
513efc8928 Add some ids to nav elements 2014-12-12 16:27:45 +01:00
marijus
960c35bad3 move profile css to mod_profile and minoor fixes 2014-12-11 11:44:46 +01:00
marijus
b86c4156fc some work on profile page - mostly whitespace 2014-12-10 22:13:44 +01:00
marijus
cc365513ed adjustment to clear browser location button only if use browser location option is set 2014-12-09 15:22:53 +01:00
marijus
242713ebef show clear browser location button only if use browser location option is set and minor css fixes 2014-12-09 15:09:19 +01:00
Stefan Parviainen
e233e386b8 Group comment editor icons 2014-12-08 22:46:30 +01:00
Stefan Parviainen
d65ad03aec Put some spacing between share types and other buttons in jot 2014-12-08 22:37:02 +01:00
Thomas Willingham
934172c2fc Merge pull request #724 from pafcu/suggestionsindir 
Show suggestions in directory
 2014-12-08 13:34:56 +00:00
Thomas Willingham
99b5bef68e Merge pull request #723 from pafcu/diropts 
Directory sorting as a dropdown, forum filter as checkbox, option to sor...
 2014-12-08 13:31:34 +00:00
Stefan Parviainen
c8818d8349 Suggestions in dir redux. Suggestions are now showed in directory if suggest=1 parameter is given to directory. 2014-12-07 13:40:21 +01:00
Stefan Parviainen
83ea120ac9 Revert "Revert "Directory shows channel suggestions by default"" 
This reverts commit bfde28f28e.
 2014-12-07 13:40:21 +01:00
Stefan Parviainen
647311db3e Directory sorting as a dropdown, forum filter as checkbox, option to sort oldest first 2014-12-07 12:31:12 +01:00
Thomas Willingham
460d379e7e Don't allow affinity of 0 in connedit. 2014-12-02 00:59:20 +00:00
friendica
3bb0ef8a82 Make events export track the current calendar. Turn it and 'new event' into buttons 2014-11-24 20:40:00 -08:00
friendica
756abd6678 add event export (this month) to event UI 2014-11-24 02:50:14 -08:00
friendica
79e5c2456b add link to search forums in the directory 2014-11-23 18:54:33 -08:00
friendica
7fec939c23 couple of fixes: 
- significantly increase the content availability on the discover channel
- fix the button group on the blog/list mode which made the border on a single comment button a bit wonky
 2014-11-19 14:41:24 -08:00
friendica
3224848bad turn the "adult photo flagging" (which prevents a particularly flagged photo from showing up in your top level albums) into a feature so it doesn't clutter the normal photo edit form. This feature was a quick hack and needs more work; but it could be important to somebody. 2014-11-18 19:02:28 -08:00
friendica
11f0b45a90 blog mode - turn the comment link into a button and group with the likes/dislikes 2014-11-18 16:58:36 -08:00
friendica
38d50cabd4 private mail buttons 2014-11-18 15:13:37 -08:00
RedMatrix
bfde28f28e Revert "Directory shows channel suggestions by default" 2014-11-19 09:15:24 +11:00
RedMatrix
3917880673 Merge pull request #702 from pafcu/master 
Directory shows channel suggestions by default
 2014-11-19 09:06:36 +11:00
Stefan Parviainen
e0ab1e24e4 Directory shows channel suggestions by default 2014-11-18 19:42:13 +01:00
friendica
1d96e165e0 undo disabled submit buttons now that ACL is initialised when page loaded 2014-11-18 00:24:32 -08:00
friendica
db3015e34e allow members to set the per-item "show more" height (separately for network and matrix, display and search are system pages and therefore set at 400) 2014-11-17 23:48:03 -08:00
friendica
064b48fa71 Merge https://github.com/friendica/red into pending_merge 2014-11-17 15:27:18 -08:00
friendica
c0ad4763b3 add unseen count and way to mark unseen to list mode. Also fix automatic mark of unseen so as to work with list mode. 2014-11-17 15:18:06 -08:00
RedMatrix
5aba2e82df Merge pull request #695 from pafcu/master 
Switch to a better datetime picker widget
 2014-11-18 08:33:04 +11:00
Stefan Parviainen
e190adc589 Use new date selector for item expiry 2014-11-17 16:51:46 +01:00
friendica
acc8c69242 when in list mode, make the max height half of the normal height before 'divgrow' kicks in. 2014-11-16 19:33:58 -08:00
friendica
18cedf4def blog/list mode display settings 2014-11-16 16:48:35 -08:00
friendica
cbaee76dd9 "list mode" (forum and blog mode, no comments or comment boxes displayed on the summary page) 2014-11-16 16:19:24 -08:00
friendica
3d55c9da86 buttonify some design elements that had not yet been buttonified 2014-11-13 18:51:30 -08:00
Habeas Codice
ac27db22c1 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	include/dba/dba_driver.php
	include/diaspora.php
	include/follow.php
	include/session.php
	include/zot.php
	mod/photos.php
	mod/ping.php
 2014-11-13 13:06:31 -08:00
Habeas Codice
1a5a5c7edb PostgreSQL support initial commit 
There were 11 main types of changes:
- UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but
it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just
copied from Friendica. All of these instances, the LIMIT 1 was simply removed.
- Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit
integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice
to boot). Proper explicit boolean conversions were added. New queries should use proper conventions.
- MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_
func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There
were no true toggles (XOR). New queries should refrain from using XOR when not necessary.
- There are several fields which the schema has marked as NOT NULL, but the inserts don't specify
them. The reason this works is because mysql totally ignores the constraint and adds an empty text
default automatically. Again, non-compliant, obviously. In these cases a default of empty text was
added.
- Several statements rely on a non-standard MySQL feature
(http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten
to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run
a zillion times faster, even on MySQL.
- A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG,
UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_
- INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes
around the value -- assist functions added in the dba_
- NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such
thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are
handled in Zot/item packets automagically by quoting all dates with dbescdate().
- char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the
code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works
better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype
for all text fields in the postgres schema. varchar was used in a couple of places where it actually
seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code
actually validates data, new bugs might come out from under the rug.
- postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted.
bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function
was added to handle this transparently.
- postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax.
Statements were updated to be standard.

These changes require corresponding changes in the coding standards. Please review those before
adding any code going forward.

Still on my TODO list:
- remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting
- Rewrite search queries for better results (both MySQL and Postgres)
 2014-11-13 12:21:58 -08:00
friendica
306f5d9cbe let's try this without a timeout 2014-11-13 01:04:26 -08:00
marijus
1ed144b83c make search and advanced search use the same input form 2014-11-12 10:27:13 +01:00
friendica
4b9ec6645b cleanup 2014-11-11 20:44:43 -08:00
friendica
3fa003b5a8 add some subtle delineation to directory entries, remove forced link on homepage element (SECURITY) 2014-11-11 15:13:18 -08:00
marijus
d145ef2021 some work on directory widgets 2014-11-11 23:09:55 +01:00
friendica
0a84b45793 Merge https://github.com/friendica/red into pending_merge 2014-11-10 19:22:23 -08:00
friendica
d432f4ccd5 issue #683 - don't linkify homepage field without validating 2014-11-10 19:20:23 -08:00
RedMatrix
ecdfa0b96d Merge pull request #686 from beardy-unixer/master 
Add a new theme flag - library.  Not directly available to be used itsel...
 2014-11-11 13:40:03 +11:00
friendica
5619902776 indicate public forums in directory results (there will be some [possibly considerable] lag time before existing forums are correctly tagged). 2014-11-10 17:44:02 -08:00
Thomas Willingham
9ddf49c661 Add a new theme flag - library. Not directly available to be used itself but 
installed as a lib for other themes.  Like SDL, or GTK.

Get rid of mobility - it's better done with Comanche and schemas.

Describe themes instead of restricting them.  Mobile themes can be used as
the desktop theme and vice-versa.  This deals with the problem of "but my
device is something inbetween".

Presently not exposed to members.
 2014-11-10 19:34:39 +00:00
friendica
2e695d1da2 menu page cleanup 2014-11-09 17:39:54 -08:00
RedMatrix
3730abb13a Merge pull request #681 from pafcu/master 
New layout for directory
 2014-11-09 16:08:22 +11:00
Stefan Parviainen
28f3d7be5a New layout for directory 2014-11-09 00:18:26 +01:00
friendica
7a8842f443 Merge https://github.com/friendica/red into pending_merge 2014-11-08 13:15:52 -08:00
friendica
adb5cec0d2 add acl loading fix to menu-item edits 2014-11-08 13:14:08 -08:00
marijus
862f0ff29a prevent posting before acl got populated since this will disregard the default acl setting and the post will be visible to the default audience without warning. the chance that this happens is quite small while writing a post but can easily happen on eg editing photos (maybe just tick a checkbox and press submit). the acl and submit buttons are disabled by default and will be activated as soon as acl is populated. 2014-11-08 21:55:44 +01:00
Stefan Parviainen
b5fad9feef Fix merge conflict 2014-11-08 20:53:41 +01:00
Stefan Parviainen
1a8fc73b57 Fix highlighting of login button 2014-11-08 20:06:08 +01:00
marijus
2cfe0f1545 provide lockstate for photo edit 2014-11-07 12:13:38 +01:00
friendica
1fbd1a79c7 Provide a way to mark photos as adult and hide them from the default album view. Still need a button or setting to enable "unsafe viewing". This has no effect anywhere but in the album views. They can still be viewed by flipping through the individual photos with 'prev' and 'next'. We probably need a comprehensive strategy for how to deal with n-s-f-w photos in albums so consider this a band-aid which requires additional work and integration with other facilities which access these photos. It is entirely optional. 2014-11-06 17:27:28 -08:00
friendica
038e7c8923 crude skeleton for location manager and the UI sucks but at least it's on a webpage and you don't have to do it by hand. 2014-11-05 18:39:10 -08:00
RedMatrix
9c9c18b4a6 Merge pull request #674 from pafcu/master 
Fix duplicate element id
 2014-11-06 06:48:06 +11:00
Stefan Parviainen
1a445a17d8 Fix duplicate element id 2014-11-05 17:19:46 +01:00
friendica
1896855c85 minor adjustments to make the form work as designed 2014-11-04 17:38:49 -08:00
friendica
d5d6158973 ok heads up - potentially destabilising change. I've tried to sort out all the default connection permissions for those who don't have a predefined (or therefore have a "custom") permissions role. Unfortunately this includes most people that were using this software more than a month ago. The real changes are that the SELF address book entry no longer holds "auto-permissions" but instead holds your "default permissions" (if you have a pre-defined role, the defaults will be pulled from the role table). 
The auto permissions have moved to a pconfig (uid.system.autoperms). A DB update will move these settings into their new homes.

What used to be the "Auto-permissions settings" page is now the "default permissions settings" page and a checkbox therein decides whether or not to apply the permissions automatically. A link to this page will only be shown when you have the "custom" role selected.

With luck nobody will notice anything wrong. But at least for the next few days, please review permissions that have been assigned to new connections (either automatically or manually) and make sure they make sense (e.g. they aren't "nothing"). You still need to take action when seeing a message "permissions have changed but not yet submitted" as we always let you review and perhaps adjust the settings _before_ a connection is established (unless you have autoperms turned on).
 2014-11-04 17:11:02 -08:00
friendica
ba7f1bb8ee configurable visual alerts/notifications 2014-11-04 15:24:24 -08:00
marijus
73e645fe3d class > id mixup 2014-11-04 09:35:39 +01:00
marijus
ba73b60177 missing </div> 2014-11-04 09:29:11 +01:00
friendica
fdb9b9d52e Merge https://github.com/friendica/red into pending_merge 2014-11-03 14:51:28 -08:00
friendica
a6d8c3193a various UI issues related to having an enormous number of entries in the posted_date selector including years/months that had no posts 2014-11-03 14:49:03 -08:00
marijus
1d923d2b0d one </div> to much and css fixes 2014-11-03 12:54:17 +01:00
marijus
2f85d12a6c if deleting a photo go away to album 2014-11-03 10:46:57 +01:00
marijus
8cfe8a5f25 css fixes 2014-11-02 19:36:28 +01:00
marijus
dc5e05d334 even more photos work 2014-11-01 23:55:36 +01:00
marijus
30281b161c close the eventual open tool if the other opens 2014-11-01 20:30:13 +01:00
marijus
5d151b9886 do not reload page for photo upload 2014-10-31 20:25:43 +01:00
Thomas Willingham
5d1bb1b685 Smarty3 now lives in store 2014-10-31 16:09:46 +00:00
marijus
2982212797 more work on photo upload 2014-10-31 14:33:41 +01:00
marijus
0ff4d9015b some work on photo upload 2014-10-30 14:10:55 +01:00
marijus
ec8bab7784 change the way tagrm works to allow tag removal on the fly 2014-10-28 11:56:00 +01:00
friendica
9cc76cb33d several unrelated things - auto_follow wasn't working for new accounts, error returned in private mention to a collection, and added auto-completion to photo tags; though it only matches people so the hover text is now wrong. Also made the photo edit form XHTML (XML) compliant. 2014-10-27 19:23:40 -07:00
marijus
d192bcad65 do not reload page for edit album and some minor cleanup 2014-10-27 21:31:54 +01:00
friendica
655c3e1b47 put privacy role selector in settings page. Change visibility of various permissions items accordingly. 2014-10-26 19:32:12 -07:00
marijus
f2ccd37c8b wrong vars in template 2014-10-26 21:50:20 +01:00
marijus
6497e78956 some work on photos like/dislike 2014-10-25 15:23:20 +02:00
friendica
1a9b8d4f0c don't offer forum (@name+) completion in comments, since it won't do anything. 2014-10-23 22:00:16 -07:00
RedMatrix
3fb0354a55 Merge pull request #655 from pafcu/master 
Better handling of incorrect info entered in event
 2014-10-22 12:02:22 +11:00
Stefan Parviainen
c8666b9076 If entered event info is not valid, let user try again with the old info still there. Closes friendica/red#648 2014-10-21 18:28:47 +02:00
marijus
a03c3d5480 fix nav double dropdown 2014-10-21 13:43:14 +02:00
marijus
d02162ee83 minor correction and typo 2014-10-20 23:01:58 +02:00
marijus
c080c420ba not quite there yet but getting closer 2014-10-20 22:46:14 +02:00
marijus
11e8fe3085 more work on photos 2014-10-20 15:05:33 +02:00
friendica
e414ed7782 link tag closed prematurely 2014-10-19 21:34:31 -07:00
friendica
bae3029c63 merge madness 2014-10-19 16:12:05 -07:00
friendica
7bbe700f3f mark signature forgeries 2014-10-16 16:19:19 -07:00
Stefan Parviainen
e425def2a2 Merge branch 'master' of https://github.com/pafcu/red 2014-10-16 21:37:14 +02:00
Stefan Parviainen
6867a8a7f6 Login menu 2014-10-16 17:21:37 +02:00
friendica
ae9e1fa688 missing event permissions 2014-10-15 18:35:56 -07:00
marijus
04a254d94a some work on single photo view comments 2014-10-15 22:23:38 +02:00
marijus
a7aa4efc08 Merge branch 'master' of https://github.com/friendica/red 2014-10-13 12:52:41 +02:00
marijus
c41f314302 really fix connedit > collection > checkbox 2014-10-13 12:52:21 +02:00
friendica
7abaccaf7f bring back PM upload functionality and why oh why are we still loading tinymce? 2014-10-13 03:07:36 -07:00
marijus
030175bde6 fix connedit > collection > checkbox position 2014-10-12 14:31:51 +02:00
Thomas Willingham
82232c6916 Show tag in siteinfo. Not useful for us, quite useful for admins. 2014-10-11 17:24:58 +01:00
Thomas Willingham
d196e71962 Also that doesn't work anymore - prettyPhoto relic 2014-10-11 15:48:30 +01:00
Thomas Willingham
2b472b2b48 Give Redbasic the -styled back 2014-10-11 15:45:00 +01:00
Thomas Willingham
d54d62b601 Merge branch 'master' of https://github.com/friendica/red 2014-10-11 15:42:52 +01:00
Thomas Willingham
d132646915 Unbreak webpages 2014-10-11 15:42:31 +01:00
Jeroen
2ddd022540 +1 2014-10-11 14:39:56 +00:00
marijus
f8aabd376b and more missing wrappers 2014-10-10 16:54:12 +02:00
marijus
d5ceb33f6d found more missing wrappers 2014-10-10 16:13:44 +02:00
marijus
4e9bd8b8f0 This is a fix to not interfere the ongoing adding of .generic-content-wrapper with the ongoing styling of redbasic theme. 
adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet.
Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing.
 2014-10-10 15:52:56 +02:00
Jeroen
e06c3e5a91 Added and changed on some places div class generic-content-wrapper. And added to redbasic. Other thems can now also theme backgrounds of a lot of pages. I'm not completely done, but till now - this is it. 2014-10-09 14:54:04 +00:00
marijus
096fbdb31c make nav-pills a bit smaller in height 2014-10-08 13:18:17 +02:00
marijus
289f57f79e template for searchbox and some more work on saved searches 2014-10-08 12:36:26 +02:00
marijus
634c2ef8ce nav pills for apps aside 2014-10-08 10:07:19 +02:00
marijus
e5d346cdc6 css fixes 2014-10-08 08:45:59 +02:00
friendica
fa75d43b81 add "stacked pills" to saved search term list (the delete icon is still a bit funky) 2014-10-07 20:31:15 -07:00
marijus
21eae4df9c porting more widgets to bs nav-pills 2014-10-07 18:11:36 +02:00
marijus
d1dea61b79 take away some boldness, some css fixes and some photo work 2014-10-07 13:09:30 +02:00
Alexandre Hannud Abdo
55a937375d datetimepicker data-format now data-date-format 2014-10-07 02:47:06 -03:00
friendica
e2f45a76b1 remove the privacy macros in settings and connedit now that we have privacy roles attached to the channel. One can still use the advanced permission dialogues, but they shouldn't have a reason to if they created the channel with a suitable channel type - plus it's just a bunch of extra permissions settings to confuse people. 2014-10-03 04:54:27 -07:00
marijus
df70c2c9b6 more work on photos 2014-10-02 21:04:50 +02:00
friendica
5292e3a100 implement a "powered-by" but leave it turned off until somebody with a good eye for layout can figure out where best to put it. 2014-09-29 21:58:35 -07:00
marijus
97c6ba77c7 some more work on photos 2014-09-28 23:14:49 +02:00
marijus
04e460c8f8 upload first but not inside another {{if}} 2014-09-26 19:34:39 +02:00
marijus
a7269e9d6e upload should be first 2014-09-26 19:28:28 +02:00
marijus
f652fbdf74 fix blockquote 2014-09-26 19:17:02 +02:00
marijus
b948ab5955 some more work on photos - work in progress 2014-09-26 12:29:07 +02:00
friendica
1e7fbac6c1 doc updates, clean up buttons on PM edit template to match other edit buttons 2014-09-26 01:52:30 -07:00
friendica
d8c03526ed optionally include wall items (posts) in import/export 2014-09-25 20:21:23 -07:00
friendica
22e6e691ca Navbar notifications: don't show "nothing new here" unless we've checked and there's nothing. Until we know for sure, display "Loading...". 2014-09-20 16:34:48 -07:00
marijus
9feb619bea update jg to latest preview release and try once more to really justify the whole gallery 2014-09-20 15:40:40 +02:00
friendica
cb434818f8 closing tag 2014-09-19 16:50:43 -07:00
friendica
d4759a5883 repeated content collapse on update from display page under rare conditions (when the conversation hasn't changed) 2014-09-18 16:32:05 -07:00
friendica
22aa5aca14 add a spinner or two to the new channel page so folks have a clue that we're doing something in the background - trying to complete the nick field for them (and then check it before they submit). 2014-09-17 21:27:02 -07:00
friendica
51d9f0d97a channel permission roles 2014-09-17 21:16:15 -07:00
Alexandre Hannud Abdo
5bdfc2f647 Fix name attribute of button elements so jquery '.submit()' doesn't break 
According to "Additional notes" in:

http://api.jquery.com/submit/

Not fixing buttons created with 'input' tags.
 2014-09-16 19:00:53 -03:00
Thomas Willingham
b5241c610f Deprecate site channel. The sys channel should be doing this. Will fix 
shortly.
 2014-09-15 00:06:51 +01:00
Jeroen
254dc0ec98 Made link post titles to source optional in display settings. Hopefully I did a right. 2014-09-14 12:39:11 +00:00
RedMatrix
415be29261 Merge pull request #592 from jeroenpraat/master 
Issue #590: Linked conversation titles to source.
 2014-09-13 19:24:01 +10:00
marijus
61ce524a33 define justifiedGalleryActive in head.tpl to not break other pages autoload 2014-09-12 21:32:53 +02:00
jeroenpraat
d4e7a71d1e Issue #590: Linked conversation titles to source. 
If a theme wants to have it different, it can always copy this .tpl file to ../theme/tpl/. I didn't commit this directly, because it's a little bit controversial. But I like it!
 2014-09-12 21:21:16 +02:00
friendica
1b3196862d issue #588 can't add feeds to collections using connedit page group sidebar widget 2014-09-11 02:19:21 -07:00
marijus
3caee72aee another day another concept - hope this works better 2014-09-11 10:41:11 +02:00
marijus
8835f646ae Revert "Revert "Merge pull request #583 from git-marijus/master"" 
This reverts commit 08638f3ec8.
 2014-09-11 10:35:19 +02:00
friendica
5b774e26ca make sure we add the file 2014-09-10 23:09:54 -07:00
friendica
4c8036f530 endless scroll on connections page 2014-09-10 23:08:24 -07:00
friendica
6ab21b3d4f make verify_email the default for new installs (at least English installs), and provide a setting on the admin page for it. 2014-09-10 17:42:13 -07:00
friendica
08638f3ec8 Revert "Merge pull request #583 from git-marijus/master" 
autoload broken - even after clearing cache and retrying.

This reverts commit 13e7a8f123, reversing
changes made to 4712b78e52.
 2014-09-10 16:09:01 -07:00
marijus
c1c2214b47 photo justification 2014-09-10 17:10:39 +02:00
friendica
b1254a71bc wrap photo albums (albums and top level) in a div id=photo-album-contents 2014-09-08 16:28:02 -07:00
friendica
ed847a91f6 add categories to events 2014-09-07 22:14:28 -07:00
friendica
4faeebddb2 Diaspora actually puts the account full name into the "nickname" field of the vcard. They don't put the nickname into the vcard at all. One wonders why even have a nickname field since the fullname is already presented in the next line. This hasn't caused us a problem with Friendica because I'm guessing nobody actually uses this line, though the number of class tags on it makes it seem somewhat important. 2014-09-07 17:13:44 -07:00
friendica
28b75b028d ajax work 2014-09-06 00:37:15 -07:00
friendica
dd7d0c4156 more work on the event edit form 2014-09-05 01:58:27 -07:00
friendica
92e4448993 put a date and time picker on events 2014-09-04 22:30:12 -07:00
friendica
75d0f6329c outbound feed issue 2014-09-03 01:09:28 -07:00
Thomas Willingham
6d7897a955 Don't forget the ifs. Now we just need to write some blurb, find some 
images, add a link, and decide what to do with non-earned badges...basically
all of it.
 2014-09-02 02:37:23 +01:00
Thomas Willingham
ab031664fa Move achievements on, but just a tad. 2014-09-02 02:34:04 +01:00
friendica
5e5c6c9000 consistency: the diaspora post plugin uses "diaspora_enable". The protocol driver uses "diaspora_enabled" with a 'd'. They got mixed up in a couple of places. 2014-08-28 03:33:19 -07:00
friendica
2d210db1b8 ability to create/edit/delete custom profile field definitions - read the source. Currently the created entries aren't added to the allowed fields arrays, but this can be done by hand until that bit is made available. Only choice for input type at the moment is 'text' or a text input, not a textarea. Multiple choice will be added later. 2014-08-27 22:01:02 -07:00
friendica
bbcf0be16a Admin setting for Diaspora Protocol enable. We may want to have this also at a channel level since there are privacy issues and quirks and trade-offs. 2014-08-27 18:19:56 -07:00
RedMatrix
45e8419bce Merge pull request #574 from tuscanhobbit/master 
Notifications links load on the same window(tab)
 2014-08-27 18:15:42 +10:00
tuscanhobbit
c4a2409778 notifications open in the same window(tab) 2014-08-27 09:35:17 +02:00
marijus
2df4c44de5 make vcard and contact block widget look-alike 2014-08-27 00:59:07 +02:00
friendica
c99d89e441 get rid of template "auto generated" warnings 2014-08-25 22:58:30 -07:00
friendica
6e99848043 more diaspora stuff - most of the basic bits are there except queueing and physical delivery (I'm keeping delivery turned off until some of the bugs are fixed so we don't cause inifinite loops or network meltdowns) - now it's just a matter of going through and methodically finding all the bugs 2014-08-25 22:43:44 -07:00
friendica
df634f9853 notifications/system not marking all notifications seen 2014-08-25 20:55:37 -07:00
friendica
72a766432d missing template file 2014-08-21 20:45:15 -07:00
friendica
e524835463 the rest of the diaspora local discovery stuff 2014-08-21 20:31:55 -07:00
friendica
921799b045 make the old personal xrd interface (old webfinger) work again 2014-08-21 17:42:19 -07:00
friendica
831714f0f0 profile edit - missing visibility and drop link on non-default profiles, re-arrange order of replacing red#matrix smilie so it works correctly, accept a post with body content of '0' which was interpreted by x() as nothing (was treated as integer). 2014-08-21 16:46:24 -07:00
friendica
a59a6fbd90 abook-edit-me class lost during some edit - we need this to reset the permission fields 2014-08-21 01:41:15 -07:00
friendica
b4aed12129 extensible profiles - add the input form elements. Still needs styling and we're not yet storing the results. And right now we're ignoring the type and only doing type=string. Oh yeah - and I split off starting the second delivery chain into its own function in tag_deliver since it was largely duplicate code. 2014-08-20 23:01:25 -07:00
friendica
a6829f7dcb move Friendica photo migrator to addons, bring back a few XML scraping functions that we're going to require (unfortunately) 2014-08-20 17:15:13 -07:00
friendica
f7895d322e provide admin option for allowing rss/atom feed connections. Need to do this now before the feature is complete so that public sites don't get borked. We also will need a service class for this. 2014-08-20 16:10:57 -07:00
friendica
b3d450626e provide an overt indication that a post/comment was edited. 2014-08-18 22:44:03 -07:00
friendica
b522ab13cb nav channel selection 2014-08-18 20:03:48 -07:00
Christian Vogeley
54fe09f466 Add account deletion to the UI 2014-08-16 16:28:07 +02:00
RedMatrix
f4229dbc3f Merge pull request #561 from cvogeley/master 
Some work on account deletion
 2014-08-15 09:58:43 +10:00
Christian Vogeley
fc94a638cd Some work on account deletion 2014-08-14 20:17:57 +02:00
friendica
1d6f494936 some work on extended profile fields 2014-08-13 22:22:52 -07:00
marijus
bc85f7d6e3 provide an expert option to opt out from user zoom on mobile devices 2014-08-13 15:32:15 +02:00
friendica
50da5bd389 Friendica photo import tool. This will bring in all your photos from the chosen Friendica account and import them into Red. Note that profile photos will also be imported, but will not be scaled for profiles, nor will they be attached to any profiles. They will appear however in your Profile Photos album. Photos that had any access restrictions in Friendica will be made private to only you. Comments and likes, captions, and tags are not transferred, only the actual photos. You will only be able to do this once. If something goes wrong but any photos were imported, a pconfig called frphotos.complete will be set and you'll have to remove it to start over. If you should remove this to start over, we also check each photo and will not over-write a photo you already brought over. 2014-08-12 18:08:31 -07:00
Jeroen
bec565cdc3 Some more buttons. Not ready yet. Changed in private message -submit- to -send-. Confusing in other language(s). 2014-08-09 01:18:31 +00:00
friendica
a7d95108d0 cleanup some text where we said "public" or "visible to anybody on the internet" when that isn't necessarily true. 2014-08-07 18:22:50 -07:00
Jeroen
d2a7b5babe Reworked the options on the profile edit page. In one words: buttons. Hope you liked it. Revert or fix if not. Also reworked the channels manage page a bit, because channel names where not readable with larger fonts. Not perfect yet, but now readable and I think better aligned. Also revert/fix if not good. 2014-08-06 21:49:30 +00:00
friendica
0b30f08fae minor stuff 2014-08-05 22:08:12 -07:00
friendica
dc98e6c0e9 scrolling directory 2014-08-05 21:48:13 -07:00
friendica
004eaacc73 channel manage page - notification indicators 2014-08-04 17:24:26 -07:00
friendica
00fc23bf4e issue #551 provide import/export of profiles (if this feature is enabled) 2014-08-04 16:48:40 -07:00
friendica
e0d338f102 always provide 'name' on profile edit page (and profile name), regardless of any other allowed fields. 2014-08-03 17:29:23 -07:00
friendica
44ee18b810 Let site admin choose what profile fields to support. 2014-08-02 23:28:51 -07:00
friendica
ae82df4399 Merge https://github.com/friendica/red into pending_merge 2014-08-02 14:57:13 -07:00
friendica
85032a1fa3 db tables for extensible profile fields 2014-08-02 14:56:17 -07:00
Jeroen
32f09b5fc2 Update nl. Added a link from the edit profile page to the edit visibility page. 2014-08-01 17:45:18 +00:00
friendica
ff8351437e make the profile minimal by default. Use features to enable the advanced form. 2014-08-01 01:24:03 -07:00
friendica
60e7837f00 implement the new friend activity post which has been missing for some time now 2014-07-29 19:26:17 -07:00
Jeroen
ca5992fade Stupid Bluefish 2014-07-29 19:14:01 +00:00
Jeroen
994b6b5258 As talked about earlier: set body font size to 0.8rem and post/comment font size to 1.0rem. This respects the user's browser font settings. Please comment if this changes the font sizes to much. There are some other font sizes that need to be changed to a scalable size (like btn-xs), but they don't have a priority. First see if this works. - Also made it possible for users to zoom on smart devices. - Small update to Redable. Aside is now disabled on almost all tablets in portrait mode. 2014-07-29 19:09:07 +00:00
Jeroen
2e6dd91599 14px>12pt as agreed on 075fc67277 - Also fixed empty delete button showing up for channels without edit photo rights. 2014-07-28 12:42:43 +00:00
friendica
1cc83dcaca style the photo like buttons 2014-07-27 19:56:06 -07:00
friendica
34cc4cdc60 clear floats on photo page (footer content appearing on right of page instead of bottom) 2014-07-27 17:24:09 -07:00
Jeroen
075fc67277 Improved photo view page. Added a delete button, stylized other button and rearangend divs a but. I even made a javascript function (copied is the right word). I changed the application (non-posts) font size (temporary) to 14px, same as button (btn) font size. I like to change all font sizes to 1.0rem (posts) and 0.8rem (application) in the near future, but I will test that first on my hub. 2014-07-27 21:44:34 +00:00
friendica
52fa84135c wrong label on icon 2014-07-25 01:13:08 -07:00
friendica
18f5890cb1 make profile edit pencil stand out a bit on darker backgrounds 2014-07-24 22:29:03 -07:00
friendica
5dcd0654d4 always provide a profile edit entry in the nav usermenu 2014-07-24 21:29:07 -07:00
friendica
1a6973a670 cherry pick pull request #544 2014-07-24 19:07:04 -07:00
mycocham
936f596af4 French Translations 2014-07-24 19:23:03 -04:00
friendica
8dc3446be4 when telling somebody that permissions have changed but not yet submitted, give them a submit button *right there* so they don't have to look for it. 2014-07-22 20:20:01 -07:00
friendica
bfe4bdc30b make mod_like interactive if requested 2014-07-17 18:20:12 -07:00
friendica
7c40a41e1b more event display formatting 2014-07-07 01:42:46 -07:00
friendica
0764b78da3 event render improvements 2014-07-06 23:13:17 -07:00
friendica
c7086b77fd move code out of templates - not sure how this even worked. 2014-07-03 00:58:49 -07:00
RedMatrix
bb4ece672a Merge pull request #521 from tuscanhobbit/master 
Changed the lock icon behaviour
 2014-07-01 09:19:08 +10:00
Paolo Tacconi
78c25cf2f0 Changed the lock icon behaviour 2014-06-30 17:10:42 +02:00
RedMatrix
0926c2d849 Merge pull request #516 from dawnbreak/master 
Fixed a wrong timestamp update when adding a file.
 2014-06-30 09:19:52 +10:00
Christian Vogeley
eb41b0ba7c Remove Remove Account link from account settings 
because it doesn’t remove the account. Move channel removal link to
channel page
 2014-06-29 22:19:45 +02:00
Klaus Weidenbach
322091cd12 Fixed some more timestamp bugs in RedDAV. 
Fixed an SQL-query in RedFile::put(), where parameters where in wrong order.
 2014-06-29 17:49:46 +02:00
RedMatrix
e228c2ed32 Merge pull request #513 from dawnbreak/master 
Some documentation for include/reddav.php and a new tpl-file.
 2014-06-29 10:16:51 +10:00
RedMatrix
f29f8a1b40 Merge pull request #514 from tuscanhobbit/master 
Checkboxes were not aligned in connedit, added a table and removed orphaned filestorage.tpl
 2014-06-29 10:15:55 +10:00
Klaus Weidenbach
f49b74c5f6 Some documentation for include/reddav.php and a new tpl-file. 
Documented include/reddav.php a bit more to understand what it is
about to try to clean up some parts. Still a lot to be done here.
I put serveral @todo markers that need to be checked.

Moved some more HTML to template file.

Changed getETag() return format according to documentation. (ETag MUST
be surrounded by double-quotes)
 2014-06-29 01:17:06 +02:00
tuscanhobbit
dfe45342f6 Checkboxes were not aligned in connedit, added a table 2014-06-28 23:14:34 +02:00
Klaus Weidenbach
45dde16f3e Templified cloud's directory listing. 
Moved HTML for the directory listing from include/reddav.php to it's
own template file.
Still need to clean it up bit more, but should be useable already.
 2014-06-26 02:01:53 +02:00
Klaus Weidenbach
a6403905ef Set backlink to the parent folder, not cloud's root. 
If you edit a file and click on the backlink you always returned to
the root folder of your cloud. This patch sets the correct parent
folder as backlink.
Bit messy, but looks like it works.
 2014-06-24 21:05:00 +02:00
tuscanhobbit
cc4001fce7 Fixes to links and forward URLs in filestorage 2014-06-24 12:05:11 +02:00
friendica
0cfcb02311 ability to like things 2014-06-23 05:19:28 -07:00
friendica
c4c1c37bd3 profile likes 2014-06-22 22:16:26 -07:00
friendica
3078eeaa69 give the admin a link to view channels from the channel admin page 2014-06-22 17:33:31 -07:00
Klaus Weidenbach
2504d4c2a2 Add HTML5 datalist to edit photo album field. 
This patch provides a datalist for the edit photo album field.
This makes it easier to move a picture to another existing folder in
the way that it provides a list of all available albums as values for
the album field.
 2014-06-22 01:33:13 +02:00
Klaus
78fd496638 correct a tiny syntax error 
there was a space missing between two values
 2014-06-22 00:58:53 +02:00
friendica
5a0e135679 stylistic improvements to the suggestions page 2014-06-18 18:57:01 -07:00
friendica
8b66329a8f add photo count to photo album list 2014-06-17 20:45:53 -07:00
marijus
0b4e1715de move hide-comments to center and change its appearence a little 2014-06-15 16:00:27 +02:00
marijus
b9256eed30 unclutter menues a little 2014-06-14 15:31:36 +02:00
friendica
13ba9ef003 merge the app menus 2014-06-10 21:21:50 -07:00
friendica
059ccae278 remote install app (untested) 2014-06-10 16:34:21 -07:00
marijus
fed8b6b566 move new comment open/close js functions to core so they can be used by other themes 2014-06-05 17:53:06 +02:00
friendica
424f23858e add an icon to connect actions 2014-06-03 22:30:05 -07:00
friendica
17e575e1eb don't show app editing options to non-authenticated folks 2014-06-01 22:15:21 -07:00
friendica
832cbbec15 testing new event code 2014-05-29 21:25:19 -07:00
friendica
22ed5b1d03 newevent: front end functions 2014-05-29 20:09:21 -07:00
marijus
c0e1139a46 some fixes and cleanup 2014-05-27 16:44:18 +02:00
marijus
83ffad4b9d fix one more bootstrap override regression 2014-05-26 22:34:43 +02:00
23n
88bedec56c divide autodate from item.app 2014-05-26 18:50:54 +02:00
friendica
810515f1a1 auto-highlight app embed code on click 2014-05-25 22:42:07 -07:00
friendica
f7d99ed7ff fix the intermittent theme preview 2014-05-25 18:24:27 -07:00
marijus
2bdecdce17 for some reason this is also needed to make it work reliable in webkit browsers 2014-05-24 19:16:11 +02:00
marijus
5b0db721f8 should be redbasic not red 2014-05-24 18:00:44 +02:00
marijus
bf88720fae possible fix for empty commentbox colapsing on tool-button click 2014-05-24 17:50:09 +02:00
friendica
059b6cd411 add randprof app and do away with the universally hated chanview-iframe mode. It's gone. Please do not try and bring it back. We are not Diaspora and we have no desire to be like them. ("And they're all made out of ticky-tacky and they all look just the same"). Our profiles do not have to look the same and they won't anyway. We don't have to sugar coat the fact that some of the content in the matrix doesn't look like the rest of the content in the matrix. 2014-05-23 15:30:22 -07:00
friendica
751fda9704 more app work 2014-05-21 20:54:09 -07:00
friendica
d17768d4e7 change app dropdown to point to apps module (changes nav template). Important: Plugins using the app-menu hook will no longer be accessible from there and may require re-writing to plug into the system apps page. Also filter apps in items from the language detector to avoid false triggers from the base64 content. 2014-05-21 17:23:34 -07:00
friendica
77ca117218 make it possible to edit/delete apps via /apps/personal/edit 2014-05-21 01:55:32 -07:00
friendica
5d9f924642 more app work 2014-05-20 22:25:36 -07:00
friendica
cad481d94f unfinished work for creating app 2014-05-20 21:22:19 -07:00
friendica
fc0967b84b most of the remaining apps basic infrastructure except a form to create the things. Don't let this fool you - there is still a lot of work, but there isn't a whole lot of work to create a demo; in fact you can demo it now. 2014-05-20 18:08:49 -07:00
marijus
1aa7f3136f the js seems to interfere with something else... comment out for now... 2014-05-20 19:16:05 +02:00
marijus
c530a7a936 some work on comment_item.tpl 2014-05-20 17:33:06 +02:00
friendica
6d01707a72 more app backend work 2014-05-19 16:49:11 -07:00
marijus
89b8bc07ac implement modal for more then 10 likes/dislikes 2014-05-18 09:14:21 +02:00
friendica
659714956c add hover tips - except we need a way to translate the things 2014-05-15 20:58:26 -07:00
friendica
2fdc13e91d some sidebar content (doesn't yet do anything) 2014-05-15 20:20:20 -07:00
friendica
077b97eac4 the app menu takes form 2014-05-15 19:54:37 -07:00
friendica
8b233723c5 clear the jot-nets float 2014-05-14 20:49:33 -07:00
friendica
a4869394f4 allow jgrowl 'close all' message to be translated 2014-05-13 17:59:47 -07:00
friendica
045d23a27c Merge https://github.com/friendica/red into pending_merge 2014-05-11 17:38:22 -07:00
friendica
b5372f8152 button styling mitemlist 2014-05-11 17:37:54 -07:00
root
d1e0479f58 Removed some unnecessary changes. 2014-05-10 11:35:16 -07:00
root
ed5cebd3d6 Made code changes to serve higher resolution images in displays with high pixel density. 2014-05-10 11:15:27 -07:00
root
80796c78f5 Merge branch 'master' of https://github.com/chriswinstead/red 2014-05-10 10:55:50 -07:00
friendica
b854e58a7b issue #452 2014-05-09 15:24:54 -07:00
friendica
6d56c9b603 better button theming on oauth connected apps page 2014-05-09 01:53:03 -07:00
marijus
56eb9e75cc Merge branch 'master' of https://github.com/friendica/red 2014-05-09 07:39:27 +02:00
friendica
831b18cf28 move the event "unknown finish time" checkbox up so it actually precedes entering the finish time. 
TODO: we should probably disable the finish time selector with jquery if this is checked.
 2014-05-08 21:22:07 -07:00
friendica
22b79207f9 event form hard-wired tinymce=on, made selectable 2014-05-08 19:59:26 -07:00
marijus
6e397240a3 add some more bs fu 2014-05-08 13:53:27 +02:00
marijus
8144498803 like indicator rewrite 2014-05-08 13:44:43 +02:00
root
711719ce0c Made some changes to img tags to enforce max-width everywhere, and to the page headers to allow user scaling. 2014-05-07 12:01:12 -07:00
friendica
94b2ac6abb put permissions dialog inside the form element - should fix issue #444 2014-05-05 16:03:38 -07:00
jeroenpraat
d93df86298 Fixed some wrapping problems when the user has set a larger font size. And some UI love for the file permissions page (as requested by Mike ;) and changed the position of the file properties link on the cloud page. 2014-05-05 13:54:56 +00:00
friendica
806f1f0fa1 UI for deleting chatrooms 2014-05-04 20:30:52 -07:00
Christian Vogeley
f7c77c7821 Add link to system notifications page 
to mark notifications seen
 2014-05-04 18:17:11 +02:00
Christian Vogeley
b2e0b6f11d system notifications mark seen link 2014-05-04 17:28:43 +02:00
marijus
4975d5f7c1 fix search_item.tpl 2014-05-03 18:42:02 +02:00
friendica
56125f8c46 shift login box on small screens 2014-05-01 20:14:51 -07:00
friendica
a8322ba1f6 Merge https://github.com/friendica/red into pending_merge 2014-05-01 17:56:03 -07:00
friendica
b666aca5c3 bring the posted-date selector widget up to date. There are no longer two different styles. 2014-05-01 17:54:12 -07:00
Olaf Conradi
cfad83084a Also for notifications. 2014-05-02 02:40:04 +02:00
Olaf Conradi
32a34f76df Fix unwanted GET {0} requests 
Because of image prefetch of browsers the <img src="{0}"> templates cause
unwanted /{0} requests to the webserver. Templates are changed to use a
data-src attribute.
 2014-05-02 02:32:52 +02:00
marijus
daf497cf46 revision/redesign of conv_item.tpl 2014-05-01 12:51:34 +02:00
friendica
14402bdf98 missing permissions block in mod_filestorage 2014-04-30 16:35:50 -07:00
friendica
31fd284b3c clean up the webpage list a bit 2014-04-29 18:28:05 -07:00
friendica
aafbd11a37 Setting to undo/clear auto permissions 2014-04-21 15:41:04 -07:00
friendica
1f93dc054a bring back the toolicon colour 2014-04-20 20:01:23 -07:00
RedMatrix
4b17f74300 Merge pull request #416 from cvogeley/master 
Bootstrapify item tools …
 2014-04-20 12:00:23 +10:00
Christian Vogeley
3b2840a2fe ok we need that div 2014-04-20 02:53:04 +02:00
Christian Vogeley
2ecf3f3395 Add descriptions to drop down 2014-04-20 02:06:24 +02:00
Christian Vogeley
4c950dc38a More work 2014-04-19 04:13:15 +02:00
Christian Vogeley
ea5d3e1774 For the moment restore old delete icon 
because the integrated button in the the bootstrap menu didn’t work on
Firefox
 2014-04-19 03:49:17 +02:00
Christian Vogeley
b9ffc2ef44 Move javascript calls to button tag 
because otherwise it didn’t work in Firefox
 2014-04-19 03:16:26 +02:00
Christian Vogeley
8f1dde701a Bootstrapify item tools 
Only show the like buttons and the delete button permanently hide
everything else in a drop down. This will break non bootstrap themes.
So may be we also want to move this into the red basic folder. It still
a little bit work in progress. Allignment is not 100% correct. May be
we want to add text into the drop down.
 2014-04-19 02:45:44 +02:00
friendica
b886647429 Merge https://github.com/friendica/red into pending_merge 2014-04-18 16:14:13 -07:00
friendica
ae1f9bf1c4 move create a new collection below the actual collection list again. failed experiment. 2014-04-18 15:31:15 -07:00
Thomas Willingham
fdcb6052fc Merge branch 'master' of https://github.com/friendica/red 2014-04-18 16:35:31 +01:00
Thomas Willingham
4e0b85267a We know why third party zids didn't work now, so don't use hacky 
workarounds anymore.
 2014-04-18 16:34:48 +01:00
jeroenpraat
2ac7fb49b6 This should fix the preview allignment permantly. 2014-04-18 15:08:16 +00:00
friendica
8dcf9e78e1 This preserves the alignment work done earlier but provides a more aesthetically pleasing page. 2014-04-17 01:33:44 -07:00
friendica
be498be840 a few more alignment issues 2014-04-16 21:08:43 -07:00
friendica
9be4cd4dcd Lots of positional changes on sidebar menus - reduce indented margins 
Merge branch 'master' into ruler

Conflicts:
	view/css/widgets.css
 2014-04-16 20:28:23 -07:00
friendica
acc70b9deb fixing widgets 2014-04-16 20:09:19 -07:00
friendica
c7712d3b45 bug fixes after widget cleanup 2014-04-16 18:35:37 -07:00
friendica
558e283260 button cleanup directory page 2014-04-16 18:28:36 -07:00
friendica
bf8f5d5b2b directory: make "connect" more prominent, but this ultimately needs more theme work. 2014-04-14 02:37:04 -07:00
friendica
08435e5b1a minor alignment issues 2014-04-13 16:07:47 -07:00
marijus
3197ccbf5e bootstrapify aclselector 2014-04-11 16:06:39 +02:00
friendica
a798dd767d push notes widget updates to channel clones on focusout (final save). Don't do this for the auto-save events (every ten seconds) which could generate superfluous network traffic. 2014-04-10 18:46:22 -07:00
friendica
c97222c2fc improve the appearance of the ACL selector in a hackish way on the short term - 
it really needs to be re-worked for bootstrap but in any event the words "show" and "don't show" make a mess of it. We should probably just use icons (with a bit of padding) that people can select with a touchscreen and reformat the box accordingly.
 2014-04-09 21:49:38 -07:00
friendica
8d8d739242 Merge https://github.com/friendica/red into pending_merge 2014-04-09 21:13:40 -07:00
friendica
795d741713 issue #400 - lock not showing up for previews of private mentions (or 'new/search' item view) 
also reformat the new/search template to pick up recent changes to conv_item.tpl
 2014-04-09 21:11:49 -07:00
marijus
b88a7fc23a use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair editblock and editlayout which still depended on it. 2014-04-09 18:29:22 +02:00
marijus
74bd772a5b replace lock icon with icon-{lock, unlock} 2014-04-09 17:10:07 +02:00
marijus
b52ccaa9e1 whitespace cleanup 2014-04-08 22:37:58 +02:00
marijus
9f621dac85 change the way jot tools are displayed/hidden 2014-04-08 22:07:06 +02:00
friendica
28228f5862 pass the original element title through the element stack so that it we don't lose it in the ajaxuploader. 2014-04-07 17:34:53 -07:00
friendica
7d429b2894 subdue archived connections in mod/connections 2014-04-06 22:21:51 -07:00
friendica
75b6aa235e more work on #395 2014-04-06 21:40:23 -07:00
marijus
f7cb4e0ef0 jot and location style fixes 2014-04-06 21:14:24 +02:00
sasiflo
9f54a8f96b Hope I have repaired the channel admin page. 
Channel blocking and deleting was copied from user actions. This was not
done to an end. Hope what I do is enough to enable channel blocking and
deleting the correct way.

On deletion all entities that belong to the channel are deleted. But the
channel itself is just marked as deleted. Do not really understand why
it is done this way.
 2014-04-06 00:34:52 +02:00
friendica
4901ef8faf provide the ability for rpost to post as another of your channels. This does not yet work, so the functionality has not been enabled. 2014-04-05 02:32:07 -07:00
marijus
3f1a78fa69 some work on jot, remove some deprecated js and some random style fixes 2014-04-03 17:03:32 +02:00
friendica
0a097b8337 snakebite: bring back some of the legacy XML discovery interfaces, update as required. 2014-04-02 14:56:20 -07:00
friendica
6ba32d714d save notes every ten seconds while focused, then save them once more on focusout 2014-04-01 14:52:47 -07:00
friendica
3791cee52b Merge https://github.com/friendica/red into pending_merge 2014-03-30 17:41:53 -07:00
friendica
ac91331c18 notes widget: jquery.live is deprecated, replacing with jquery.on and binding to focusout, as the input and paste callbacks are a bit wasteful - they are presumably called on every character typed, yet some of these events have gone missing (probably due to having a lot of network calls in quick succession) so hopefully a single save of the workspace on focusout should be more reliable. 2014-03-30 17:37:12 -07:00
Thomas Willingham
1093e8d83e Default discover to on. 2014-03-30 22:59:37 +01:00
Alexandre Hannud Abdo
fedd19ec95 Let the site admin choose whether to display the Discover tab. 2014-03-30 00:03:12 -03:00
friendica
5a3903a40c firehose testing (network?f=&fh=1) - some possible security bugs so testing purposes only 2014-03-26 22:05:19 -07:00
friendica
9a3a2819c1 add admin/channels 2014-03-26 17:05:45 -07:00
friendica
bd7be38da5 improve scannability of content with per-item bottom border, but lighten the per-item borders considerably so it isn't in your face. This is an experiment based on sound principles, but I'm not a UI expert. If this uglifies it too much - please revert. 2014-03-25 21:13:04 -07:00
marijus
89b573a6f3 fix lock permissions view and autoload not kicking in on touch devices under certain conditions 2014-03-25 15:27:45 +01:00
friendica
34eb79e6ba provide 'style' option to archive widget to choose between 'select' and 'list' format 2014-03-23 16:20:44 -07:00
Christian Vogeley
c972a94b01 Add color picker to theme settings 2014-03-23 21:35:20 +01:00
friendica
2dda5d6c70 add expire setting, take out unknown mailers and max friend requests per day which aren't implemented 2014-03-19 20:40:35 -07:00
marijus
20d47c4478 bootstrapify common tabs and make show aside/tabs buttons only appear if there is something to show 2014-03-19 09:43:23 +01:00
friendica
254885c5ee Merge https://github.com/friendica/red into zpull 2014-03-13 15:37:29 -07:00
friendica
a8ea919765 remove allowed friend domains and allowed email domains from admin settings - as they are not implemented 2014-03-13 15:36:35 -07:00
marijus
a8de28cc16 Merge branch 'master' of https://github.com/friendica/red 2014-03-13 19:50:28 +01:00
marijus
b32f8f0ba7 move region_1 to off instead of removing it and dont squelch region_2 when region_1 moves in again 2014-03-13 19:50:22 +01:00
Thomas Willingham
031b888e2c Stick help in a template 2014-03-12 17:13:58 +00:00
friendica
c903ff7aab get rid of fancybox for photos upload, not just photo edit 2014-03-11 17:09:02 -07:00
marijus
313240488a fix lock position 2014-03-10 18:08:44 +01:00
marijus
3f20debf5e fixes locations with a link 2014-03-10 17:47:53 +01:00
marijus
34fd387438 this commit is an attempt to make conv items better scalable on smaller screens. also save some horizontal space. 2014-03-10 17:17:49 +01:00
friendica
a79072ce47 update cacert.pem , don't hide url link for rmagic 2014-03-09 13:53:55 -07:00
friendica
80e381176e collapse the advanced directory search so that folks who think they're advanced but really aren't don't whinge about it. 2014-03-08 19:04:07 -08:00
friendica
bef416a2d1 advanced search front-end 2014-03-08 17:39:20 -08:00
friendica
5ec38459dc notify when permissions change and haven't been saved. 2014-03-07 21:55:52 -08:00
marijus
21db60c991 might be needed by not local users aswell 2014-03-07 13:46:45 +01:00
marijus
e8da840eec remove aside on navbar collapse and add button to toggle visibility 2014-03-07 13:36:49 +01:00
friendica
42f184b87c Merge https://github.com/friendica/red into zpull 2014-03-05 14:18:28 -08:00
friendica
40746eae57 add new template 2014-03-05 14:18:06 -08:00
marijus
b1c29e9126 improve navbar collapsed state a little 2014-03-05 20:23:13 +01:00
friendica
61f47cd5ed move language selector to a module 2014-03-05 03:19:20 -08:00
friendica
cdcbc5816e add Comanche help link to pdledit 2014-03-04 21:03:56 -08:00
friendica
efc828bed5 add pdl editor to settings/display 2014-03-04 20:58:12 -08:00
friendica
aa9d25f517 add system PDL editor (lets you change/personalise the layout for any module which has a system PDL file.) 2014-03-04 18:12:27 -08:00
friendica
cdd2e9cd95 layout export to file 2014-03-03 20:05:23 -08:00
friendica
81c439bc7d revert the temporary fix for the missing hdr.tpl and add the ability to provide context sensitive help/documentation by passing the current URL path to the help module as $_REQUEST['cmd']. So we could create a special help page for settings/display or whatever. The only issue is whether this should be presented first with a link to the main help page, or if we put a line at the top of the main help page that says "I need help for settings/display". Also edited the help target window name, as "friendika-help" is a bit dated. 2014-03-03 14:33:49 -08:00
friendica
002a86fb71 Merge https://github.com/friendica/red into zpull 2014-03-03 11:34:15 -08:00
friendica
608c7501fe missing file 2014-03-03 11:33:42 -08:00
Thomas Willingham
c028d9b1d0 Partially revert 895c9411d9 
Not entirely sure why the lines in question were removed, but this is
required as a quick fix for broken notifications.
 2014-03-03 17:16:25 +00:00