Commit graph

2688 commits

Author SHA1 Message Date
friendica
91aa5d73e7 Merge pull request #138 from pixelroot/master
modified:   view/ru/messages.po
2013-09-18 03:20:58 -07:00
Olivier Migeot
98e87b2149 Changed CSS class "selected" to "active" in navbar, according to https://abcentric.net/display/f17b319c6d4b616a0d0a639e177969c6ae084248f1ee2bec9d8147c9291bf495@abcentric.net 2013-09-18 12:11:46 +02: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
pixelroot
88ea4f80bc modified: view/ru/messages.po 2013-09-16 08:46:15 +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
05c8a08ee5 Merge https://github.com/friendica/red into zpull 2013-09-14 16:12:05 -07: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
Olaf Conradi
1dd2a65210 Merge pull request #132 from pixelroot/master
modified:   view/ru/messages.po
2013-09-14 14:52:17 -07:00
pixelroot
b824552e13 modified: view/ru/messages.po 2013-09-13 12:06:08 +02: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
Thomas Willingham
1ff6f4a43c Redbasic - some more CSS we don't use. 2013-09-06 02:14:17 +01:00
Thomas Willingham
37c9686107 Redbasic - clean up nav. 2013-09-06 01:29:18 +01:00
friendica
c6df954fc0 make displaying the language selector configurable 2013-09-03 18:48:01 -07:00
friendica
c646388cd9 fix mod/search_ac (sort of) 2013-09-02 20:51:04 -07:00
friendica
615bf23733 add a layout selector 2013-09-02 20:25:33 -07:00
Thomas Willingham
df057de745 Merge pull request #109 from tuscanhobbit/master
complete and updated Italian translation
2013-09-02 08:22:29 -07:00
tuscanhobbit
c2a88c3e48 complete and updated Italian translation 2013-09-02 15:24:02 +02: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
b4bd518e40 silence some warnings at php E_ALL levels 2013-08-28 21:56:01 -07:00
friendica
e8cd3b7040 bring back mail list and cleanup some issues which popped out with full PHP warnings 2013-08-27 22:30:06 -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
Christian Vogeley
c9fc8efd22 Make footers position fixed, so that its content appears 2013-08-24 14:11:46 +02: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
25fdc269be Merge pull request #101 from tuscanhobbit/master
Italian translation (Thanks!)
2013-08-20 05:07:54 -07:00
p.tacconi
add03b6498 First version of Italian translation 2013-08-20 11:20:16 +02:00
p.tacconi
a53a092b44 First version of Italian translation 2013-08-20 10:13:50 +02:00
friendica
cd5fdbcb48 email attachments (and fix email photos) 2013-08-19 21:19:39 -07:00
friendica
2e14dc242e if changing primary hub during an import operation - remove the old xchan and create a fresh xchan pointing at this instance. Also a minor edit to increase the default photo upload limit for new sites. There aren't many cameras left that will take photos < 800k in size. 2013-08-19 17:18:13 -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
92747366af move js from matrix page 2013-08-15 05:09:19 -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
6da4e41031 ru strings updated 2013-08-14 05:03:18 -07:00
friendica
499241c245 Merge pull request #95 from pixelroot/master
modified:   view/ru/messages.po
2013-08-14 05:06:20 -07: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
pixelroot
b860188f71 modified: view/ru/messages.po 2013-08-12 15:46:01 +02:00
pixelroot
f6ec3b5912 modified: view/ru/messages.po 2013-08-12 14:46:08 +02: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
d8d45dab76 fix string horkage 2013-08-09 04:08:01 -07:00
friendica
b1dc5b827b Merge pull request #92 from pixelroot/master
modified:   view/ru/messages.po
2013-08-09 03:57:57 -07:00
pixelroot
ae82c09424 modified: view/ru/messages.po 2013-08-09 12:06:20 +02: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
085eec4869 malformed ru string file 2013-08-08 03:28:42 -07:00
friendica
6b7c720673 Merge pull request #91 from pixelroot/master
modified:   view/ru/messages.po
2013-08-08 03:16:26 -07:00
pixelroot
0335e0fffc modified: view/ru/messages.po 2013-08-08 11:54:03 +02: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
5d7a36649e wee bit of css cleanup 2013-08-06 18:26: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
687ea0ca24 ru string update 2013-08-06 16:10:37 -07:00
friendica
026c93ddf2 Merge pull request #89 from pixelroot/master
modified:   view/ru/messages.po
2013-08-06 16:12:16 -07:00
pixelroot
fa297b8d6e modified: view/ru/messages.po 2013-08-06 14:37:55 +02:00
pixelroot
9f649b4d95 modified: view/ru/messages.po 2013-08-06 13:53:09 +02: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
9b8e3e41f1 get rid of ugly article wrapper 2013-07-21 20:19:05 -07:00
friendica
168d7ae9fc getElementById returns null on failure 2013-07-21 18:44:24 -07:00
friendica
400f3baee9 fix error updating pagetitle with notify count if not logged in locally (no notify count available) 2013-07-21 18:34:15 -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
d9701d4606 position the visage timestamp 2013-07-17 22:13:13 -07:00
friendica
8c007ef9b5 fix template syntax 2013-07-17 22:02:03 -07:00
friendica
15a614e158 Merge https://github.com/friendica/red into zpull 2013-07-17 18:16:04 -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
git-marijus
1fd4d0a605 Update style.css
wall-item-arrowphoto-wrapper z-index should not be higher than nav z-index otherwise arrow scroll above the nav area...
2013-07-17 22:19:41 +02:00
friendica
2323e946ee Merge https://github.com/friendica/red into zpull 2013-07-17 02:02:54 -07:00
friendica
d6133c861c configurable theme precedence rules, and passing the page owner to the pcss theme settings. 2013-07-17 02:01:35 -07:00