Commit graph

2639 commits

Author SHA1 Message Date
friendica
90b22bff38 Merge pull request #144 from omigeot/master
Changed CSS class "selected" to "active" in navbar...
2013-09-18 03:21:28 -07:00
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