Commit graph

1172 commits

Author SHA1 Message Date
marijus
adad1b75cd use placeholder for profile-jot-text and some minor alignment 2013-11-23 01:10:54 +01:00
marijus
72e0bd6b28 missing input type and use same font for password and text input 2013-11-22 21:19:41 +01:00
friendica
ed129f19b0 fix plugin and them toggles for the colourblind, add theme info block and recent screenshot to redbasic 2013-11-18 18:37:38 -08:00
friendica
dc6cd8a701 admin/users - add expiration date to table and ability to sort by reverse expiration and also filter by service class through url options 2013-11-18 15:38:02 -08:00
friendica
bec85f1494 implement admin remove account 2013-11-17 13:54:43 -08:00
friendica
0b8c9654ea allow rpost to set source app 2013-11-15 03:10:00 -08:00
friendica
2fe6aef8bc fix default cipher for comments and set it at the conversation level rather than the item level. 2013-11-14 22:54:16 -08:00
friendica
592c24e162 e2ee in comments and a bit of cleanup so not every theme has to define how to insert bbcode, only if they're doing something special (e.g. this is how to implement a javascript plugin :-)), and I got rid of the predefined http:// in the bbcode for urls. You're almost always pasting a url which already has that bit and it just creates an extra step. 2013-11-14 15:41:25 -08:00
friendica
ee629534d5 E2EE on private mail (also fixed autocomplete results dropdown for recipient which was positioned below the navbar instead of next to the recipient input box) 2013-11-13 23:10:29 -08:00
friendica
251ba6db30 fix photo permissions on encrypted posts 2013-11-13 03:15:07 -08:00
friendica
a1b8f6e4ec fix chanview 2013-11-12 23:45:04 -08:00
friendica
be7e732391 fix forbidden photos and vcard photo template 2013-11-12 19:25:23 -08:00
friendica
b26989bb65 removeme sort of works for a single channel - lots of loose ends to deal with but it's a start 2013-11-12 18:27:36 -08:00
friendica
8eaab0642f very crude zid support for e2ee content and move bbcode converter to main.js so it's available when not logged in (though we might ultimately want to force people to get a matrix account to use our encryption). 2013-11-12 15:44:49 -08:00
friendica
34ee8de821 basic linking of audio/video tags in encrypted bbcode 2013-11-11 20:20:31 -08:00
friendica
a7c53d470b ability to use other ciphers 2013-11-11 18:42:49 -08:00
friendica
54438be7c2 make e2ee work on tinymce 2013-11-11 17:50:36 -08:00
friendica
d9013f4311 provide real barebones XSS protection on e2ee contents and implement a few bbcode tags we're likely to see a lot of. Still need to write a js zid() function to properly implement zrl and zmg but at least they will be linked now. 2013-11-11 16:47:49 -08:00
friendica
4a3191cd19 localise js ui strings for e2ee 2013-11-11 15:20:30 -08:00
marijus
f8a34c737d change spacing to fit other widgets 2013-11-11 16:50:43 +01:00
friendica
b5bc04799c turn safemode into a proper widget 2013-11-11 01:18:09 -08:00
friendica
435e2dae0e display encrypted text inline 2013-11-11 00:21:00 -08:00
friendica
ca4103debe e2ee 2013-11-10 23:19:44 -08:00
friendica
c392004290 some more doco for how to finish it. 2013-11-10 20:34:10 -08:00
friendica
effb1a0534 provide zid in js so we can use it from client 2013-11-10 18:57:24 -08:00
Thomas Willingham
7b29400c6c Bring safe search to the UI 2013-11-09 18:43:40 +00:00
friendica
cb37c0ce14 make PM expiry UI match the main post editor, e.g. JS input triggered by an icon rather than a scary looking text field 2013-11-07 15:30:59 -08:00
friendica
7381326b7a provide expire feature on post and comments as well as private messages. This requires a feature setting and is currently unmaskable - if the author says it's gone, there's not a lot you can do to stop it or try and save it. It's gone. 2013-11-07 00:47:50 -08:00
friendica
6162de142c allow private mail sender to set an expiration on their messages. Once expired the message is destroyed at both ends (subject to the granularity of the polling interval) and is gone. Officially it takes some form of language independent string like 2013/11/22, but English speakers can use anything that strtotime() understands, like "+30 minutes" or "next Tuesday". 2013-11-06 18:28:36 -08:00
friendica
f4cb145f3c redbasic - allow changing icon colours 2013-11-05 16:21:38 -08:00
friendica
cea11c9498 make date order the default for the directory 2013-11-03 15:20:40 -08:00
friendica
4d470f2d70 add sloppy photo setting and fix default navbar hide setting 2013-11-03 14:57:29 -08:00
friendica
09ca39fd08 provide an html src converter 2013-10-31 22:08:10 -07:00
friendica
a5693df07f issue #189 - show post edited time on relative date hovertip 2013-10-30 17:33:10 -07:00
friendica
7b7ef56b54 replace text links with icons on design pages 2013-10-23 19:35:51 -07:00
friendica
d54b6099d2 remove "via wall-To-Wall" text as it's soooo Facebook and is out of place in derived/sourced channels. It's now just "$author via $xyz". 2013-10-19 01:48:43 -07:00
friendica
f3fcffb29d We really don't need the category delete links on each category in each post with categories, as we can now change the categories by editing the post. So take out the delete links. 2013-10-14 15:38:05 -07:00
friendica
9787872778 linkify post categories 2013-10-14 15:34:47 -07:00
marijus
43289103ee i guess we should use .active class for all selected links. 2013-10-14 18:13:02 +02:00
friendica
4f2c056d6d template and icons for categories and "file as" 2013-10-14 04:49:28 -07:00
friendica
db42e4d2f9 attachment icons revisited 2013-10-13 21:14:04 -07:00
friendica
bae7f4e078 directory sort links on sidebar 2013-10-13 19:49:40 -07:00
friendica
3c3c13c630 Merge https://github.com/friendica/red into zpull 2013-10-13 15:52:53 -07:00
friendica
1354702d69 remove the disabled flag on individual permissions and improve the text to show that settings may be inherited. The reason for this change is that we want the individual settings to be stored regardless of the inherited settings, because if somebody changes the higher precedence privacy settings it could leave all their existing contacts with no permissions and this could be a support nightmare.
So this way if somebody starts off with "anybody on the network can send me their stream and posts" and later changes it to "only specific connections can send me their stream and posts", the individual setting will already be set for all their connections. The previous behaviour is that this setting would have been disabled so none of their existing connections will have this specific permission. Old-timers who were here and made lots of connections before this commit - will have to edit all their connections if they change their privacy settings from lesser restrictive to be more restrictive.
2013-10-13 15:42:30 -07:00
marijus
2d23fcfe5a reorder items in private-mail - the delete button is on the right side everywhere else... 2013-10-13 22:24:33 +02:00
Christian Vogeley
77db6e087a New icons in private mails section 2013-10-13 00:59:04 +02:00
friendica
c459228dca show private message conversant in sidebar because without a reply you may not remember who it is/was. 2013-10-12 00:57:00 -07:00
friendica
1c8a36f9ca mail recall 2013-10-11 23:12:10 -07:00
friendica
7e850e0687 more icons 2013-10-11 22:30:11 -07:00
friendica
c52db29ff5 set the colour of the active nav element so it doesn't get washed out 2013-10-10 20:17:41 -07:00
friendica
3985aa07b4 more icon tweaks - this could be going on for some time; try to get icon code (and all theme stuff) out of main code and into templates, but on the short term provide both so nothing breaks. 2013-10-10 02:15:44 -07:00
friendica
87f1c6b8ec more icon conversions - savedsearch listings need more work. The drop icon should be hidden unless the entry is being hovered. 2013-10-09 20:19:02 -07:00
friendica
1fdc82e0a1 delete icons 2013-10-09 18:43:49 -07:00
friendica
1aa69604fc more redbasic icon work 2013-10-09 18:33:33 -07:00
marijus
e7f9d603be pimp up the searchbar a little and hoping it is the right way to do
it
2013-10-09 21:44:22 +02:00
friendica
1e7034c4da nav icons 2013-10-09 03:26:24 -07:00
friendica
95f29743f1 move verified indicator 2013-10-08 21:38:41 -07:00
friendica
0e793dea9b replace a bunch of graphic icons with vector icons 2013-10-08 21:17:11 -07:00
friendica
f8d34a2aaf First visit http://fontawesome.io/cheatsheet/, then it's your turn. Please don't leave this for me to fix, because you'll hate it. There are a few icons we'll have to map to something appropriate - such as "matrix"; though there are some interesting options - and you can always dip into unicode if you don't find something appropriate here; though I would suggest that *if* you do this to create an icon-xyz class wrapper to the HTML "i" tag so that it's handled exactly the same. 2013-10-08 17:31:49 -07:00
friendica
78a8d176ac post signatures 2013-10-02 21:04:48 -07:00
friendica
bd0b4d8487 remove the "Similar Interests" link until somebody makes it work 2013-09-29 18:34:41 -07:00
friendica
a26e48b013 sources management page 2013-09-29 18:18:05 -07:00
Thomas Willingham
9212fd0ecc Issue #117 2013-09-29 16:40:15 +01:00
Thomas Willingham
dc692cd748 Actually, lets add a content wrapper while we're in there. 2013-09-27 03:11:28 +01:00
Thomas Willingham
b838585e27 Issue #131 2013-09-27 03:03:37 +01:00
Thomas Willingham
d6607f2093 Minor theme stuff - make the pages toolbar a toolbar, get rid of a naughty center tag, and stop very long tags overlapping the directory. 2013-09-27 02:44:28 +01:00
Michael Meer
a37986cdc0 added new smarty template admin_hubloc.tpl 2013-09-24 09:33:52 +02:00
friendica
cdfb5f9dc7 adult channel setting 2013-09-22 20:38:24 -07:00
Thomas Willingham
8542127274 Filestorage perms (no ACL), fix nav for browsers that can't handle PCSS, put content wrapper back now JS is fixed for features page. 2013-09-18 02:45:49 +01:00
Michael Meer
d330df05f2 extend admin page for hubloc / server key management 2013-09-17 10:11:22 +02:00
Thomas Willingham
3554bab83a Content wrapper breaks feature settings. Get rid of it as a quick fix until I get a chance to work out why it works everywhere except there. 2013-09-16 05:01:25 +01:00
Christian Vogeley
4132d1cd8e Upstream merge 2013-09-15 03:21:19 +02:00
Christian Vogeley
496f869157 Search by date
Search by date (archive) works a bit now
2013-09-15 03:18:18 +02:00
friendica
a36cc949a1 this might fix "find channels" but I can't test the keyword search until this is running on a production site. 2013-09-14 16:11:15 -07:00
Thomas Willingham
dfd91889ad Admin templates. 2013-09-10 20:15:09 +01:00
Thomas Willingham
d2b4ba7be6 Quick and dirty file storage module. 2013-09-09 02:06:21 +01:00
Christian Vogeley
e70c9b3613 Merge service class
//service class configure in .htconfig.php:
$a->config['system']['default_service_class']='standard';  // this is
the default service class that is attached to every new account
$a->config['service_class']['standard'] =
array('photo_upload_limit'=>20000000, // total photo storage limit per
channel (here 20MB)
 'total_identities' =>5, // number of channels an account can create
'total_items' =>2000, // number of top level posts a channel can
create. Applies only to top level posts of the user, other posts and
comments are unaffected
'total_pages' =>10, // number of pages a channel can create
 'total_channels' =>500, // number of channels the user can add, other
users can still add this channel, even if the limit is reached
 'attach_upload_limit' =>20000000); // total attachment storage limit
per channel (here 20MB)
2013-09-08 18:03:26 +02:00
Thomas Willingham
b88f60b51f More content wrappers. 2013-09-08 03:15:01 +01:00
Christian Vogeley
94fb9c2406 Service class
identity, follow, photo upload, att upload
2013-09-08 00:21:42 +02:00
Michael Johnston
ba980e2c1f filter by category fixes 2013-09-06 21:53:22 -04:00
Thomas Willingham
789536f5a7 Fix new menu link. 2013-09-06 05:05:31 +01:00
Thomas Willingham
fc2ede307f Redbasic - optimise mail list. 2013-09-06 02:43:00 +01:00
friendica
c6df954fc0 make displaying the language selector configurable 2013-09-03 18:48:01 -07:00
friendica
615bf23733 add a layout selector 2013-09-02 20:25:33 -07:00
friendica
8b7757e033 webpage content-type -- needs cleaning up and a security check once all the important bits are in place. 2013-09-02 01:38:17 -07:00
friendica
7bb9289921 Preparatory work for photo conversations (third time). Also take away unused "post new activity" preferences until they actually do something. 2013-08-27 21:06:11 -07:00
friendica
6a2cb837af get rid of ssl_policy - it's implicit in the site url 2013-08-27 02:27:36 -07:00
Thomas Willingham
d88e727719 Typo 2013-08-24 17:08:04 +01:00
Thomas Willingham
cd21468fbf Another one. 2013-08-24 17:06:05 +01:00
Thomas Willingham
c803fb90df Merge remote-tracking branch 'upstream/master' 2013-08-24 17:05:18 +01:00
Thomas Willingham
6999fb586b Generic wrapper classes makes themeing loads easier 2013-08-24 17:01:39 +01:00
friendica
925b046794 premium/restricted channel connections implemented, configure at yoursite/channel/nickname - this basically redirects "follow" requests to a premium channel's sell page if it has one configured. You can still click through and create a connection request (introduction), but this provides a means for the channel owner to state their terms. If you don't abide by the terms, you will likely be blocked or the channel deleted. This facility is extensible in a number of ways. 2013-08-21 22:10:08 -07:00
friendica
6cea04eb44 progress on generic sellpage - is not yet linked from existing connect buttons and editing has not been completed 2013-08-21 20:05:55 -07:00
friendica
cd5fdbcb48 email attachments (and fix email photos) 2013-08-19 21:19:39 -07:00
friendica
b5efa1a63a issue #82, posted order not working - also doc update 2013-08-17 06:30:09 -07:00
friendica
d0951777c0 fix import from file 2013-08-15 19:21:22 -07:00
friendica
7d0b1506a8 Merge pull request #96 from beardy-unixer/master
Webpages
2013-08-14 20:56:49 -07:00
friendica
ac541a7d32 most of expire is now ported from friendica, but the protocol bits to push out the delete notifications for the entire batch to all recipients of the original post are not complete and will take quite a bit more work. As a consequence, expire has been completely disabled until it is fully implmented since it could result in completely un-removable posts reminiscent of the infamous "Bonnie Nadri" incident at Diaspora which we do not wish to re-live. 2013-08-14 20:09:02 -07:00
Thomas Willingham
608e04c65e More progress on pages - extend writepages widget, add pagelist widget 2013-08-14 20:46:48 +01:00
Thomas Willingham
a0dfd44f91 Merge remote-tracking branch 'upstream/master' 2013-08-14 20:44:17 +01:00
friendica
4888ab4d0f primitive cms functionality - provide a custom menu below your profile vcard 2013-08-13 22:14:01 -07:00
friendica
17e405cfa9 helps to include the new templates... 2013-08-13 21:01:34 -07:00
friendica
9508967c73 menu management is now functional with the exception of acl's (and of course a way to display the menus you create, and probably a bit more input sanity checking) 2013-08-13 20:57:03 -07:00
friendica
680baff73d menu management complete (as opposed to menu *content* management, which is not). As usual, this means functionally complete - as theming and presentation have been left for those more suited to the task. 2013-08-13 18:10:03 -07:00
friendica
d6c6a2b144 debugging issue #58 - seems to work but needs (more) theming 2013-08-13 02:29:10 -07:00
friendica
b9a8b73392 untested patch for issue #58 - will require theming if it works 2013-08-13 02:06:05 -07:00
friendica
55cb322489 a bit more work on menus 2013-08-13 01:24:02 -07:00
friendica
95abc1600b theme personal menus so they look more or less like widgets 2013-08-12 01:01:28 -07:00
friendica
6191cfef2a check these in so I can go back and find out why the stylsheet is horked 2013-08-11 19:04:07 -07:00
Thomas Willingham
94335f237f Initial shot at write_pages widget 2013-08-10 22:06:30 +01:00
friendica
2dfd9dce05 Merge pull request #90 from beardy-unixer/master
Add access policy to admin panel.
2013-08-08 22:38:11 -07:00
friendica
4cda133e89 Add public visibility setting to privacy groups (collections). This doesn't yet make them visible, but allows them to be visible (like a Cc: instead of a Bcc:) 2013-08-07 17:51:10 -07:00
Thomas Willingham
81a0683aaf Add access policy to admin panel. 2013-08-07 20:15:18 +01:00
friendica
809a53a2f8 This is an actual arrowhead, the nabla is a math operator. 2013-08-06 20:04:57 -07:00
friendica
99bd0712b6 Add a site access policy (to determine if this is really a public site or just an open site) and add an orphan flag to xchans in case all their hublocs go away. Get rid of a couple of DO NOT EDIT template messages which were still lurking in the tree. 2013-08-06 17:15:41 -07:00
friendica
e265a943c8 js_upload is wretched, but at least fix the HTML in the template so it will work again. 2013-08-04 20:21:50 -07:00
Thomas Willingham
a8409379c3 Template boo-boo 2013-08-04 20:09:57 +01:00
friendica
e6a8bb211c connect link in directory 2013-08-03 16:35:55 -07:00
friendica
7d00f61ceb Merge pull request #86 from beardy-unixer/master
"Can edit my webpages" permissions
2013-08-01 14:31:30 -07:00
Thomas Willingham
f3791d48b0 "Can edit my webpages" permissions 2013-08-01 18:40:50 +01:00
marijus
47de80ead4 make "selected" class work on all navigation menu items 2013-08-01 13:26:57 +02:00
friendica
c59fff945f trying to center the selected channel on the manage page. Dreamhost really botched up my dev site so it's taking 5 minute per page load - and I don't have any more time to waste tweaking one line of CSS, grabbing a cup of coffee, and drinking it, before seeing the CSS changes. It still needs more tweaking but I might have to do that on the production site - which loads promptly. 2013-07-25 21:09:34 -07:00
friendica
19f674c29d remove obsolete notifications 2013-07-21 17:45:36 -07:00
friendica
2455b0c92f remove some unused settings from admin page 2013-07-21 17:33:40 -07:00
friendica
8c007ef9b5 fix template syntax 2013-07-17 22:02:03 -07:00
friendica
e147bb80de usability improvements on abook permissions settings - keep advanced dialogue open, make quick links clear relevant settings before setting each, and don't auto submit. This shows you exactly what happens with the quick settings and allows you to change/correct it if it isn't what you want. 2013-07-17 18:12:50 -07:00
Thomas Willingham
328ebda77a Kill autogenerated warnings, plus a typo. 2013-07-16 18:08:26 +01:00
Thomas Willingham
cc91036350 Whitespace making smarty fart 2013-07-16 16:07:06 +01:00
friendica
d875bbb022 theme the page link title 2013-07-15 23:10:26 -07:00
marijus
b536116791 more spin.js porting 2013-07-15 18:43:34 +02:00
friendica
033c91868d we need to actually include spin.js or it causes issues 2013-07-14 01:33:47 -07:00
friendica
873c1f381e Merge pull request #77 from git-marijus/master
add spin.js a themable js spinner to red
2013-07-14 01:19:24 -07:00
Thomas Willingham
ba5803bebc Give prettyphoto it's own template to make themeing it less annoying. 2013-07-14 02:36:59 +01:00
git-marijus
3ca93a2b9e port jot to spin.js 2013-07-13 23:33:21 +02:00
git-marijus
7e00a1662d port jot to spin.js 2013-07-13 23:31:34 +02:00
git-marijus
e1a1fc9a5e port jot to spin.js 2013-07-13 23:25:31 +02:00
git-marijus
ec0d460dc5 port like button to spin.js 2013-07-13 21:43:50 +02:00
git-marijus
34364fd1ed port like button to spin.js 2013-07-13 21:42:38 +02:00
git-marijus
33d1736228 port like button to spin.js 2013-07-13 21:40:53 +02:00
git-marijus
caa02c28f2 Update conv_frame.tpl 2013-07-13 20:18:30 +02:00
git-marijus
be92ca980f port to spin.js 2013-07-13 19:56:05 +02:00
git-marijus
eccb0ac4d2 port to spin.js 2013-07-13 18:30:30 +02:00
Thomas Willingham
f45efcab78 Small amount of work on webpages. 2013-07-12 23:01:55 +01:00
Thomas Willingham
a4e1b4945a Non-translatable string plus feature enabled check 2013-07-11 01:37:41 +01:00
Thomas Willingham
3f2829a062 Minimum value webpages 2013-07-10 19:36:53 +01:00
Thomas Willingham
085be3a16f Merge remote-tracking branch 'upstream/master' 2013-07-10 19:30:10 +01:00
friendica
6e880cfd49 use current channel photo for favicon where applicable - might be browser dependent but seems to work on FF 2013-07-07 17:22:40 -07:00
friendica
8b9f2f8ef7 input form for profile stuff 2013-07-04 20:35:42 -07:00
friendica
2979a2ee5a more "thing" work 2013-07-04 04:53:03 -07:00
friendica
ec38f1d5db first template 2013-07-03 23:08:56 -07:00
Thomas Willingham
d065135d90 Merge remote-tracking branch 'upstream/master' 2013-07-03 16:10:58 +01:00
friendica
c16b65b5bd multi-profiles work 2013-07-03 02:47:36 -07:00
friendica
8369a8a755 progress on multiple profiles, doing it the old way. I don't think we're going to be able to do it the new way - way too complicated. 2013-07-03 01:50:39 -07:00
friendica
da05b9736e some work on issue #62 (comments collapsing on liveupdate), but still a work in progress
some work on photo consolidated "view/edit", but still a work in progress
2013-07-02 16:37:33 -07:00
Thomas Willingham
33696cc839 Merge remote-tracking branch 'upstream/master' 2013-06-16 14:59:17 +01:00
friendica
a37ac8f2f3 flag taggable connections in acl selector 2013-06-16 00:03:22 -07:00
friendica
2d3a0a6525 feeds are bit more standards compliant and a bit less broken now 2013-06-12 21:12:27 -07:00
Thomas Willingham
4132cab862 Rename newmessage widget (since we'll need to put more stuff in it as we make zotmail look like email), and add a "check mail" button. 2013-06-07 22:53:43 +01:00
Thomas Willingham
466a6d5227 Merge remote-tracking branch 'upstream/master' 2013-06-07 03:46:43 +01:00
friendica
e0c6ee2082 photo album listing widget broken 2013-06-05 23:07:52 -07:00
friendica
21491100f8 fix buggered contact photos 2013-06-03 22:34:35 -07:00
friendica
a258487801 syntax error 2013-06-03 18:20:31 -07:00
friendica
b866cc26fa templatise alt_pager 2013-06-03 18:16:00 -07:00
Thomas Willingham
b02242786c Make a start at making mail look less dreadful. 2013-06-02 03:40:31 +01:00
Thomas Willingham
330ace2cbe Typo 2013-06-02 02:41:43 +01:00
Thomas Willingham
cbd988004e Fix opensearch 2013-06-02 02:37:31 +01:00
Thomas Willingham
620d4f5752 Set a site channel so an admin can use CMS to create home.html and so on, without ever needing to touch HTML again. When I've finished that bit too. 2013-05-31 02:25:42 +01:00
Thomas Willingham
9595c27cc1 Put a stop to "I couldn't find the menu" by adding a nabla - until somebody comes up with something that looks less crap. 2013-05-30 23:32:40 +01:00
Thomas Willingham
7c2aa706f2 Make pages better. 2013-05-28 20:47:46 +01:00
Thomas Willingham
b7270cad2b Prevent showmore covering up the end of posts, plus put likes back where they were pre-threaded comments. 2013-05-27 19:40:14 +01:00
friendica
d72d30fabb more permissions descriptive text to lessen confusion 2013-05-21 17:13:51 -07:00
friendica
ab10db7e34 privacy settings macros - the basics except for toggling "publish in directory" which is rather hard because it's a custom on/off button and not a normal input thingy. 2013-05-20 20:22:26 -07:00
friendica
52acfce84b some auto-friending cleanups 2013-05-19 20:38:53 -07:00
friendica
fe8632ab9d avoid field name conflict - even if disabled 2013-05-15 23:15:15 -07:00
friendica
264e1c0cc6 add port settings to setup 2013-05-15 20:45:35 -07:00
friendica
048983b4be Create a view/tpl/smarty3 folder so that we don't spit out errors from the get-go. 2013-05-15 20:20:22 -07:00
friendica
8a1c8c4a03 It's a red matrix, and matrix is better indicated by # than by ! - and would otherwise be similar to the Diaspora 5-pointed asterisk except that Red's has no center. 2013-05-11 15:37:36 -07:00
friendica
e1c6b776c4 fix timeago on search items, and bring back app display for wall items - which took a bit of re-arranging of a lot of other stuff 2013-05-09 22:04:30 -07:00
fabrixxm
5e1980becf remove "internal" templates, use "tpl/" folder for smarty3 templates,
move smarty3 templates in "tpl/" folder, add util/precompile_smarty.php utility, add precompiled templates
2013-05-08 04:23:17 -04:00
friendica
9f36fd107f smarter handling of js_upload source param 2013-05-02 19:04:19 -07:00
Thomas Willingham
2f43553542 Unbork smarty templates. 2013-04-26 23:00:10 +01:00
Thomas Willingham
60721f4292 Colorbox 2013-04-26 22:31:50 +01:00
friendica
7621bd3bb1 reverting to fancybox for "save to file" selection box until we find a better way - prettyPhoto just isn't working for this and I really need this functionality ATM until we can figure out how to make prettyPhoto work properly here. 2013-04-21 22:12:18 -07:00
Thomas Willingham
dc80dce95e Fix acl 2013-04-16 04:20:29 +01:00
friendica
0ce6955889 template update 2013-04-14 22:30:06 -07:00
friendica
b84d8bfbc9 begin to cut the umbilical 2013-04-14 22:24:47 -07:00
Thomas Willingham
2f24bf2efe New mail_list template. 2013-03-31 21:05:20 +01:00
Thomas Willingham
6803265eba Typo in page_display 2013-03-29 20:38:59 +00:00
Thomas Willingham
8741bb20e8 Make prettyPhoto a feature, add slideshow for albums. 2013-03-29 20:36:39 +00:00
Thomas Willingham
c8852d455e Template clean up. 2013-03-28 21:13:18 +00:00
Thomas Willingham
fb8a0e06c4 Updated build_query for mid 2013-03-25 19:20:12 +00:00
Thomas Willingham
4b6bc77977 Implement prettyPhoto (somewhat). 2013-03-23 21:17:44 +00:00
friendica
0999b88a48 Merge https://github.com/friendica/red into zpull 2013-03-21 18:29:08 -07:00
friendica
ddf5bf8968 rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present. 2013-03-21 18:25:41 -07:00
Michael Johnston
fea2f9ac9b small fixes for events 2013-03-21 21:07:38 -04:00
Thomas Willingham
06c5d0fcc2 Typo 2013-03-21 04:18:03 +00:00
Thomas Willingham
676d35b173 Add register link to nav. 2013-03-21 04:14:19 +00:00
Thomas Willingham
39028d6184 Make the channels profile tab actually do something. 2013-03-20 20:46:43 +00:00
Thomas Willingham
9c4b3b03db Allow admins to specify default mobile/accessibility theme. 2013-03-17 18:51:17 +00:00
Thomas Willingham
b48c481b9c Tidy up 2013-03-15 15:25:39 +00:00
Thomas Willingham
d07971b909 Merge remote-tracking branch 'upstream/master'
Conflicts:
	view/theme/redbasic/css/style.css
2013-03-14 22:50:30 +00:00
Thomas Willingham
ffcba3db81 Fix path in photo_ablums.tpl 2013-03-13 23:56:14 +00:00
Thomas Willingham
fbc5260995 Get admin/users mostly working. Still need to associate channels with accounts. 2013-03-12 02:35:18 +00:00
friendica
952b2ef2ab . 2013-03-10 18:45:58 -07:00
Michael Johnston
41cd10f903 some fixes related to events
- add backticks around column "desc" in sql query
    - fixed query for data passed to showEvent
      - showEvent was picking up on id from item instead of id from event
    - fixed references to author info in template
2013-03-07 02:07:51 -05:00
friendica
863dcda8ee clean up some funky menu interactions 2013-03-06 19:19:56 -08:00
friendica
5a9dae78a2 get rid of html from mod_suggest 2013-03-06 17:52:58 -08:00
friendica
c5d0da43e5 tweaky tweak, plus add share tracking db, and don't show acl for guest postings, and experiment with compressing pcss on the fly 2013-03-06 15:13:54 -08:00
friendica
517874ce1f stray target= which wasn't caught earlier 2013-03-06 00:34:42 -08:00
friendica
4062be2869 basic friend suggestions (but not "new to the network and have no friends at all" suggestions) 2013-03-05 21:00:25 -08:00
friendica
a132af7b6a conflicting class name 2013-03-05 19:13:33 -08:00
friendica
eebb0b323d tweaks 2013-03-05 17:30:03 -08:00
friendica
dd22e1b582 just tinkering and trying a few things - don't get upset. It can all be reverted it it sucks. Freedom's just another word for "nothin' left to lose" and I'm not sure it's possible to create a UI that's hated more than Friendica. So that gives us plenty of artististic license to explore some different directions and see if they lead to anything interesting. 2013-03-05 15:48:56 -08:00
friendica
8d442e6fc1 fix timeago (again), webfinger new spec implemented, some theme work 2013-03-04 20:58:39 -08:00
friendica
5612716cff taking the next step on pages 2013-02-27 17:09:04 -08:00
Michael Johnston
6199e1d5b8 add siteinfo.tpl 2013-02-20 21:56:59 -05:00
friendica
92f94a0fdc contact_template is called from multiple places with different params 2013-02-20 14:17:23 -08:00
friendica
ef360f0a5c dang - this is almost testable. Still have to figure out the best way to deal with the profile photo. Otherwise if you're really brave you could give it a go and see what happens. The worst that could happen is that it destroys the universe. Not a big deal. More likely you could end up with a bunch of imported things that have to be cleaned up. Less likely but entirely possible is that nothing useful will happen at all and it'll white screen. 2013-02-19 19:08:04 -08:00
friendica
488714290f global rename viewcontacts to viewconnections 2013-02-19 03:00:29 -08:00
friendica
2d6027150f viewcontacts update 2013-02-19 00:20:47 -08:00
friendica
65912ec0bf moving on 2013-02-18 15:15:55 -08:00
friendica
c42936e265 we don't need to quote or rename 'default' in mySQL if we just use the original column name 'is_default' 2013-02-15 17:23:02 -08:00
friendica
b2724f2ffd bring mod_common into the modern age 2013-02-13 15:40:24 -08:00
friendica
3ee75a795a Whinging whining stupid fucks. 2013-02-12 02:02:35 -08:00
friendica
32d07c3df7 fix profile selector on profile_photo page (unquoted mysql reserved word 'default') 2013-02-10 19:54:43 -08:00
friendica
99c5f88963 mod_display - no fun. Not working at all. But a bit of progress. 2013-02-10 04:55:29 -08:00
friendica
260a012b02 add soapbox settings 2013-02-10 00:13:34 -08:00
friendica
119ddcd147 finish the abook_edit quicklink mess, get rid of the experimental nav bar opacity. Bad idea. 2013-02-07 17:12:10 -08:00
friendica
65de97b85a auto form submission didn't work - jquery inheritance issue, disabling until we find another way. 2013-02-07 15:25:18 -08:00
friendica
d66825c734 auto-submit connection edit form when quick permissions are applied 2013-02-07 15:02:24 -08:00
friendica
386fa8e26c different background for preview so you know it's a preview 2013-02-04 19:25:24 -08:00
friendica
66b3603178 make preview work again after search/new template change 2013-02-04 18:50:55 -08:00
friendica
845ec4bef6 update search_item.tpl 2013-02-04 17:51:22 -08:00
friendica
da388f4bc5 fix new/search mod on network page, fix the parent queries on network and channel pages - which you probably didn't even notice were all stuffed up because the endless scroll made things right. 2013-02-04 17:46:04 -08:00
friendica
9dcecb6b37 finish up the "mark all xyz seen" for all known values of xyz 2013-02-03 19:07:01 -08:00
friendica
09ece497f7 more work on settings - move template utils to utils and get rid of mods 2013-02-02 16:10:27 -08:00
Thomas Willingham
1633f95db8 Clean up no longer used admin functions, plus fix summary template. 2013-02-02 14:54:40 +00:00
friendica
154ed4151a plugin_settings are now feature_settings 2013-01-31 20:39:14 -08:00
friendica
982034b87d update friends in common tool now that poco is working 2013-01-31 17:55:52 -08:00
friendica
357e71cb44 simplify friendship approval - merge with connection editing 2013-01-27 17:05:32 -08:00
friendica
493f68ca49 smarty update 2013-01-27 01:20:40 -08:00
friendica
28ab6d5bf5 lostpass fixes and login/logout flow if authenticated but no default channel exists 2013-01-27 01:19:24 -08:00
friendica
91126d8dd3 more photo backend stuff 2013-01-26 02:24:07 -08:00
friendica
a8575199af upstream fixes, template regeneration 2013-01-25 13:55:42 -08:00
friendica
50915c4692 add tooltip to toggle full screen mode 2013-01-25 03:58:36 -08:00
friendica
9a4667c77c tweaking z-index on chanview full-page mode so that everything works correctly 2013-01-25 03:52:16 -08:00
friendica
0f67657c44 ability to make chanview iframe full size (covering source window) and shrink it again 2013-01-25 02:53:41 -08:00
friendica
6e6b268e25 auto permissions (such as for forums or whatever) - untested but might just work 2013-01-23 21:15:40 -08:00
friendica
f63997f618 plug potential hole in magic auth, add link to chanview to view in dedicated window 2013-01-23 16:06:01 -08:00
friendica
cf2488e999 clean up the photo storage backend, revamp mod/wall_upload 2013-01-22 17:48:42 -08:00
friendica
d8d8dd5ced directory services cleanup 2013-01-19 01:07:35 -08:00
friendica
9725dcf41d distributed directory search from the navbar 2013-01-19 00:43:05 -08:00
friendica
4fd833b953 fix event notifications 2013-01-16 02:10:56 -08:00
friendica
f1afe68052 typo 2013-01-16 02:01:23 -08:00
friendica
b7d047483f missed adding these files yesterday, they're needed for pages to work 2013-01-15 13:59:52 -08:00
friendica
62b1eb65dc pages sorta working 2013-01-15 01:32:11 -08:00
Zach Prezkuta
690e278d95 add newline at end of header 2013-01-11 10:00:26 -07:00
Zach Prezkuta
34dc11d68e add warning messae about automatically generated templates 2013-01-11 09:57:23 -07:00
friendica
f0a08a05ae fix the "personal" network filter and introduction notifications 2013-01-09 23:07:13 -08:00
friendica
bb21c4bb13 update templates 2013-01-08 14:30:16 -08:00
friendica
948644bd46 minor notification tweaks 2013-01-08 13:38:07 -08:00
friendica
701a8e9925 update smarty templates 2013-01-08 12:05:38 -08:00
friendica
a96d3ac66f The rest of the front end for the new notifications - now only missing "mark all seen" for some types, ajax loader for a couple of types, and perhaps a birthday cake icon if any birthdays today, a bit of css cleanup of duplicated or obsolete stuff 2013-01-08 11:59:29 -08:00
friendica
ba20913c2b lots of notification tweaks 2013-01-08 02:49:08 -08:00
friendica
7f6e1144f6 The notification menu logic actually works. Yay. That means we've finally got an extensible notification system and can load arbitrary notifications of a given type into a popup (on demand), each with its own "view all" and "mark all seen". Now we just have to finish the json backends for the currently supported types and work them into the navbar. Might seem trivial or insignificant but this is a huge step forward. Online notifications are everything in an event driven world. 2013-01-07 23:28:25 -08:00
friendica
da188214c3 events are still buggered and aren't anywhere close to working, but not buggered quite as much as before. 2013-01-07 15:12:16 -08:00
friendica
479541b5f8 more work on notification popup 2013-01-06 22:00:31 -08:00
friendica
3fc6df1000 Merge pull request #13 from fermionic/20130105-smarty3
implement smarty3
2013-01-06 19:25:01 -08:00
Zach Prezkuta
b4a95460e6 fix show-stopping bugs 2013-01-06 19:34:54 -07:00
friendica
8766616e35 get sliders working again 2013-01-06 15:11:31 -08:00
Zach Prezkuta
4281a95cbc rebase and update themes 2013-01-06 16:08:56 -07:00
Zach Prezkuta
a0d19ffb72 implement Smarty3 2013-01-06 15:57:11 -07:00
friendica
7cd014e93c make preview work fix some other nits 2013-01-06 04:07:10 -08:00
friendica
d132d49e79 some work bringing acl_selectors into the modern era 2013-01-05 23:07:17 -08:00
friendica
490867ebf7 port "remember me" from Friendica 2013-01-04 21:34:36 -08:00
friendica
78a65c7c1b remove the country autofill declaration 2013-01-04 19:56:00 -08:00
friendica
b001323390 make the menu consistent and eliminate redundancy - though we need icons for mail and events (sorry Thomas if this breaks your themes in a bad way, but at least the menus make sense now). 2013-01-03 17:36:03 -08:00
friendica
9a8dec5480 place holders for mail and event icons on nav bar 2013-01-03 17:08:36 -08:00
friendica
f8bd476b88 import the toggle_mobile stuff to shut up some warnings 2013-01-03 15:52:05 -08:00
Thomas Willingham
556f38afde Add icons to redbasic, move delete button to the right, and sync nav.tpl 2013-01-01 13:15:45 +00:00
friendica
8d32477bff cleanup boot 2012-12-31 17:18:11 -08:00
friendica
4e23e700f4 requeue failed deliveries 2012-12-30 21:44:59 -08:00
friendica
70153a2274 fix connections page layout 2012-12-28 22:54:56 -08:00
friendica
ba627500d9 simplify, simplify. We don't need a photo menu on the connnections page. Click a person, goto profile edit. We can put all other operations you might wish to perform on that page. 2012-12-28 22:43:31 -08:00
friendica
da5a1be26d fix channel page permissions for public viewing 2012-12-28 19:56:01 -08:00
Thomas Willingham
d7a7679de0 Another diaspora template 2012-12-27 09:37:23 +00:00
Thomas Willingham
85049c860c Pretty sure we don't need Diaspora templates. 2012-12-27 09:24:39 +00:00
friendica
c8292b3cdd remove the private keywords stuff to reduce directory and search complexity 2012-12-26 03:49:50 -08:00
friendica
8d71fe91f6 cleanup editpost 2012-12-21 04:08:48 -08:00
friendica
ad20e1f617 directory page still needs a lot of work, look up locally if local master or standalone, need to put some basic profile info in discovery page and direct to local directory master 2012-12-19 19:51:52 -08:00
friendica
893ba371a9 set_baseurl issue, more cleanup 2012-12-19 16:48:17 -08:00
friendica
a12264193f modularise the notification popups 2012-12-18 16:17:08 -08:00
friendica
e9b5b0f0b4 several small fixes and adjustments 2012-12-16 20:20:29 -08:00
friendica
fa8b4e98b7 some cleanup - Thomas we can put the radius/shadow stuff back later for the hipster kids, it's quite distracting at the moment and makes it hard to get serious work done. Hmmm. Wonder if we could make radius/shadow configurable like colours.... and maybe even screen transparency.... that could be interesting. 2012-12-16 15:49:22 -08:00
friendica
76b289504b add live page loading and and endless scroll to home (mod_channel) 2012-12-16 00:44:38 -08:00
friendica
9d96cb37a0 pass module name to build_cmd, so we can use it elsewhere 2012-12-14 01:02:03 -08:00
friendica
4e192b108d templatise the building of page queries so we can re-use it elsewhere 2012-12-13 04:06:56 -08:00
friendica
c066793554 get rid of more targeted windows and direct all profile view to local site 2012-12-09 20:17:38 -08:00
friendica
f8c33243bf start to whip the permissions into shape, also got rid of the mce drop shadow until we can figure out how to do it without the ugly black bars. I tend to prefer "outy" shadows over "inny" shadows anyway, but maybe that's just me. 2012-12-09 18:07:36 -08:00
friendica
75ea0cfa32 make permission quick links work 2012-12-08 15:14:32 -08:00
friendica
2a39a5feee upstream fixes, revision updated, and mail autocomplete was lost after a recent change I made 2012-12-08 11:59:21 -08:00
friendica
2a7a5b2d01 move 'Connect' button to local chanview page, remove from remote profile pages - still requires some theming love 2012-12-06 19:44:13 -08:00
friendica
435836b224 templatise micropro 2012-12-06 18:17:43 -08:00
friendica
c6b8ab534f fixed several little nit bugs that cropped up during deployment 2012-12-06 00:03:24 -08:00
friendica
68c49322b7 bring back profile edit popup menu, needs some more theming 2012-12-05 21:40:30 -08:00
friendica
e17ba14696 DB: do the mail table again. Mail almost working onsite, still needs to zot though 2012-12-04 18:24:46 -08:00
friendica
c5cace552b most of the basic "make friends" stuff except for email notifications, drop community tab 2012-12-03 19:17:02 -08:00
friendica
a4bae6c29b profile viewer in iframe module, todo - magic auth 2012-12-03 16:14:34 -08:00
friendica
7082d198c2 Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet. 2012-11-29 18:15:13 -08:00
friendica
e138052584 backport features categories and add some new ones like the affinity slider 2012-11-28 19:23:39 -08:00
friendica
05e08cb5d2 trace through the threaded conversation spaghetti to bring back a sane looking network page 2012-11-28 18:45:11 -08:00
friendica
67a7d440d9 usability improvements 2012-11-13 02:57:15 -08:00
friendica
b1042da76c remove obsolete fields from admin template 2012-11-10 02:29:46 -08:00
friendica
593d361d2e profile/channel page view contacts 2012-11-09 00:02:46 -08:00
friendica
517c05700d turn star into a feature 2012-11-08 23:04:34 -08:00
friendica
22841e1566 start implementing zot-id 2012-11-08 19:07:19 -08:00
friendica
f66a3d26be magic auth indicator (link is dead at the moment) 2012-11-08 18:44:33 -08:00
friendica
c1b931549c permissions and contact permissions are now sticky 2012-11-08 17:33:38 -08:00
friendica
3d56ab227d turn multiple profiles into a feature, implement connection flags (block,hide,archive,etc.) 2012-11-07 18:48:31 -08:00
friendica
295b865d06 "follow" now creates an address book entry, which means we can start tying that into the "connections" module - still have to turn the "contact edit" page from a mockup to real code, but it's all starting to flow. 2012-11-06 18:13:47 -08:00
friendica
fe5f511f19 more work on the settings pages 2012-11-05 17:17:21 -08:00
friendica
4f1170b656 change permission settings from radio buttons to select boxes 2012-11-05 15:26:01 -08:00
friendica
152641bf24 that was certainly some fun debugging (not) 2012-11-04 20:53:59 -08:00
friendica
94f737b699 some cleanup of main item template 2012-11-04 16:57:09 -08:00
friendica
aaa5a2638c feature enable 'dislike' - backend 2012-11-03 23:39:38 -07:00
friendica
9d0f94bb73 add template 2012-11-03 21:38:18 -07:00
friendica
f55636aeb6 turn off categories feature by default 2012-11-03 16:51:29 -07:00
friendica
f5b1eee177 mv mod_install to mod_setup, conflict with name of install dir 2012-11-03 14:59:46 -07:00
friendica
9bb1b7e3ed fix default channel 2012-11-02 18:55:40 +11:00
friendica
3bf5677797 settings page channel permissions front-end (needs back-end still) 2012-11-01 19:47:10 -07:00
friendica
1021a4d476 add current selection to channel manager 2012-11-01 17:06:34 -07:00
friendica
9bf4508ffb cleanup channel management 2012-11-01 15:45:02 -07:00
friendica
fb173900a1 more progress on address book 2012-10-30 21:37:58 -07:00
friendica
ffadf260c0 fix channel creation and management after last changes 2012-10-30 16:21:24 -07:00
friendica
dca20f4227 zchannel rename to new_channel 2012-10-29 21:59:49 -07:00
friendica
e138876199 fix updating of bitwise 'unseen' to account for mysql operator precedence 2012-10-28 22:08:08 -07:00
friendica
0baf4bb4d2 fix a couple of things that went wonky when moving to thread objects 2012-10-27 03:05:51 -07:00
friendica
3b394ea43f comments sort of working again but now need to fix the threading which was ported when it was only half working 2012-10-25 18:42:42 -07:00
friendica
ceeb4db6e3 Give the UI a little love after all the backend mods 2012-10-24 19:13:29 -07:00
friendica
f685b67656 new install settings 2012-10-18 18:34:38 -07:00
friendica
846a9813b2 here's where the heavy lifting begins - everything is likely to be broken for quite some time as we add location and db independence to items and conversations and work through the rest of the permissions and how to federate the buggers. 2012-10-01 18:02:11 -07:00
friendica
ba4fe4ff91 allow themes to add to and/or completely over-ride the module sidebar 2012-09-25 21:35:35 -07:00
friendica
fbafd92f7f moving a lot of structure around. 'entity' is now 'channel' 2012-09-25 17:57:20 -07:00
friendica
c8957b36ea permissions responder + upstream merge 2012-09-10 22:00:56 -07:00
friendica
61cca7637a States/Countries now free form 2012-09-09 21:51:54 -07:00
friendica
e4f3e96b65 remove targeted windows 2012-09-09 21:26:36 -07:00
friendica
3ebb4a3dc7 updates 2012-09-09 21:17:06 -07:00
friendica
aff33531ac channel/identity selection manage page 2012-09-02 20:30:47 -07:00
friendica
58ddd2d565 Trying to simplify channels 2012-09-02 02:29:17 -07:00
friendica
4736fa5927 begin channel management (was "manage") page, use term "channel" instead of the vague and hard to explain "identity" 2012-08-30 22:42:51 -07:00
friendica
eac29badb2 start on contacts/profiles 2012-08-30 18:17:38 -07:00
friendica
f6d198ce5d trim a bit of fat 2012-08-29 23:03:03 -07:00
friendica
da49a27aa2 make home redirection and register link work again 2012-08-28 03:25:42 -07:00
friendica
9cd1dabe73 have to do something about that return_url - but let's just plunge forward without it. 2012-08-28 03:02:45 -07:00
friendica
7fad83cea4 Now logging in with Red zaccount/zentity instead of Friendica user. Yay. Most existing Friendica functionality is now stuffed since the Red structures are quite different. 2012-08-27 21:17:46 -07:00
friendica
5ff6e9348b a few minor changes 2012-08-26 23:05:00 -07:00
friendica
2456174cc9 back to identity creation form 2012-08-23 20:00:10 -07:00
friendica
30e86284af upstream 2012-08-21 20:03:25 -07:00
friendica
34e42c4cb3 don't count ignored events in notifications 2012-08-16 23:11:24 -07:00
friendica
a7c1c22a2a new contact edit mockup - verdict: too complicated, must simplify 2012-08-16 21:41:07 -07:00
friendica
57cf80754d invitation cleanup 2012-08-16 05:29:16 -07:00
friendica
adba0bd98a That's better 2012-08-16 01:03:53 -07:00
friendica
eb911443aa more zregister cleanup and theme separation 2012-08-16 00:51:03 -07:00
friendica
f7c6a6ff90 item table rename parent-uri, target-type, object-type (more to come later) 2012-08-15 22:33:37 -07:00
friendica
77b334efbc cleanup of mod_zregister, basic functionality working - new accounts getting stored. 2012-08-15 21:56:04 -07:00
friendica
2a49460c77 improvements in js localisation/translation 2012-08-13 22:12:16 -07:00
friendica
e80d69d25b merge upstream 2012-08-11 18:54:23 -07:00
friendica
cac2d40832 Dr. Theme-instein - It Lives! 2012-08-09 22:48:13 -07:00
friendica
c8fe8f4376 where did that !@#$ "lang" come from? Get rid of it (again). 2012-08-09 20:55:34 -07:00
friendica
f2a7fcf822 more theme modularisation and css/js management 2012-08-09 19:09:55 -07:00
friendica
0292d46e5d merge comment threading, provide plugin/theme functions to handle css/js includes 2012-08-09 16:26:44 -07:00
friendica
dcbc0c0c95 major theme re-org, only duepuntozero and slackr working atm 2012-08-01 05:02:43 -07:00