Commit graph

3824 commits

Author SHA1 Message Date
p.tacconi
ef534c0172 Italian translation finally reached 100% 2013-10-24 14:57:02 +02:00
friendica
cb84485f7c now that the icons have been softened, the drop-icons stick out like a sore thumb. Soften them as well 2013-10-24 00:51:02 -07:00
23n
c3d0413956 no underlines for hovered icons 2013-10-24 05:59:08 +02:00
friendica
7b7ef56b54 replace text links with icons on design pages 2013-10-23 19:35:51 -07:00
marijus
3f629c817d might be some style enhancement 2013-10-23 14:14:34 +02:00
Christian Vogeley
2db45695e8 Merge upstream 2013-10-20 01:22:51 +02:00
Christian Vogeley
c0789bdb4f redbasic: set width of main section 2013-10-20 01:19:04 +02: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
Thomas Willingham
90fc3c1caf Errant logging. 2013-10-17 02:16:47 +01:00
Thomas Willingham
b860a21fdc Check only for php in schema globs. 2013-10-16 19:05:40 +01:00
Thomas Willingham
30e4a36084 Don't break themes by using functions we don't need.
If you've got a theme that started off copying Redbasic (ie, all of you) need to do this too.
2013-10-16 17:08:19 +01: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
friendica
d5aa7aacbe Merge pull request #178 from cvogeley/master
New icons in private mails section
2013-10-12 22:45:50 -07:00
Christian Vogeley
77db6e087a New icons in private mails section 2013-10-13 00:59:04 +02:00
friendica
7ffe4f6f91 Merge pull request #177 from tuscanhobbit/master
Updated italian translation
2013-10-12 15:02:17 -07:00
tuscanhobbit
944b4761ce updated italian translation 2013-10-12 21:29:35 +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
Thomas Willingham
033b1ed430 Dark schema, and associated fixes. 2013-10-11 17:36:02 +01:00
Thomas Willingham
54ad3a74d4 Typo 2013-10-11 17:25:52 +01:00
p.tacconi
2b57c339c0 Update italian translation 2013-10-11 09:50:20 +02:00
friendica
f07baa9199 more readability improvements 2013-10-10 20:23:38 -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
993e90e974 Easier to load a chosen schema if one has a chosen schema to load... 2013-10-10 17:02:52 -07:00
friendica
8cc87d6448 fix blue lock 2013-10-10 16:29:41 -07:00
friendica
6ac0a84fac Merge https://github.com/friendica/red into zpull 2013-10-10 16:15:54 -07:00
friendica
a92e1c617b Add install instructions for cloning WebDAV component (which I think is best if we make optional). There may be webserver dependencies so let's just call this a plugin of sorts, but different than normal plugins because if it's installed it will be tightly integrated with everything we do. Eventually we may provide a static repository or select a specific sabre-dav version so that we're immune from changes upstream which break stuff we're doing; but for now we'll use the fruux main repository and install using the trunk. 2013-10-10 16:09:26 -07:00
Thomas Willingham
9533ea995c Add "scheme default" button for nav colours. 2013-10-10 22:14:18 +01:00
Thomas Willingham
6d85acc413 *sigh* I swear I DID test this first... 2013-10-10 19:22:28 +01:00
Thomas Willingham
cdf608898a Various schema issues. 2013-10-10 19:18:33 +01:00
Thomas Willingham
d05899fb50 But remember to set the expert flag 2013-10-10 18:42:21 +01:00
Thomas Willingham
41838fdfad Basic schema support - but no actual schemas. 2013-10-10 18:39:28 +01:00
friendica
35db6ffa10 Merge pull request #170 from git-marijus/master
get rid of the clean font because it looks weird in some browsers
2013-10-10 05:08:28 -07:00
Tobias Diekershoff
cdddef8c7b DE: update to the strings (for real) 2013-10-10 14:02:36 +02:00
Tobias Diekershoff
d95a8e123f DE: update to the strings 2013-10-10 13:51:25 +02:00
marijus
3891b605fe get rid of the clean font because it looks weird in some browsers 2013-10-10 12:59:41 +02: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
9fd85bb289 might be better that way 2013-10-09 22:32:28 +02: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
963e0cefbb get rid of pink search bar when not using redbasic "red" 2013-10-03 02:20:09 -07:00
friendica
e1fb45bc4a bring back photo shadows (via theme settings) 2013-10-02 22:59:58 -07:00
friendica
355c427884 Merge https://github.com/friendica/red into zpull 2013-10-02 21:05:23 -07:00
friendica
78a8d176ac post signatures 2013-10-02 21:04:48 -07:00
Thomas Willingham
89c1fc7540 Fix a gotcha in theme defaults. 2013-10-03 02:39:49 +01:00
Thomas Willingham
6224a5e458 Why use 6 lines when you can use 8,000? 2013-10-02 20:39:47 +01:00
Oliver
6b095f7b23 Post = Beitrag 2013-10-02 19:35:22 +02:00
Thomas Willingham
b05b4437e5 Remove some !important that isn't, and add deprecated note to old CSS 2013-10-02 18:31:14 +01:00
tobiasd
60d306f762 Merge pull request #163 from tobiasd/initial_german_translation
DE: Initial Red translation
2013-10-01 22:23:26 -07:00
Tobias Diekershoff
27331160f4 DE: Initial Red translation 2013-10-02 07:20:39 +02:00
friendica
bde20f81e6 Merge https://github.com/friendica/red into zpull 2013-10-01 20:53:56 -07:00
friendica
f3141bed6b That's way too wide for the sidebar 2013-10-01 20:53:25 -07:00
Thomas Willingham
31680f824f Four little typos 2013-10-02 04:31:05 +01:00
friendica
b14d54e60d add republish to quick privacy settings (settings page) 2013-10-01 18:19:55 -07:00
Thomas Willingham
3f850d3462 Do PCSS properly 2013-10-01 23:04:14 +01:00
friendica
dffce63662 implement republish permission for use in sourced channels 2013-09-30 21:49:26 -07:00
friendica
3f79a9581a clean up the default page definition - get rid of right_aside which is illegal 2013-09-29 21:55:40 -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
5a0623299c Prevent toolbar overlapping comanche nav links. 2013-09-28 23:31:30 +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
83a41a5af6 Typo 2013-09-27 03:06:20 +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
3ff9642750 update ru strings 2013-09-22 21:18:15 -07:00
friendica
cdfb5f9dc7 adult channel setting 2013-09-22 20:38:24 -07:00
friendica
df8035344f clean up app management a bit 2013-09-20 21:36:10 -07:00
friendica
e4d2e2200e add "tiered" access policy, add tagcloud to directory pages 2013-09-18 17:47:26 -07:00
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
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
friendica
4c30cddbfc provide a controlling user for theme settings, not necessarily local_user() - can't test on my test site so moving into production and I'll debug it there. 2013-07-16 22:48:05 -07:00
friendica
6d447ace5c define some photo types; primarily profile photos and things, but there is room for others. Also move the "decoration" out of the mod_page.css and into fancy.css - mod_xxx.css should only specify element positions and basic layout, not "decoration". Once we get more positioning stuff moved into module and basic layout files, we can trim down the style.css a lot - as it will theoretically only have decoration. And if we use macro substitution (pcss) we should be able to ultimately change the colour, size or background in one place and be done with it. This will make life easier for theme developers. 2013-07-16 21:56:02 -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
c1739fa879 style updates due to spin.js porting 2013-07-15 19:50:42 +02:00
marijus
b536116791 more spin.js porting 2013-07-15 18:43:34 +02:00
friendica
97df3116ad looks like it actually needs both files. 2013-07-14 01:39:52 -07:00
friendica
92335b2e84 add the jquery version, not the standalone spinner 2013-07-14 01:38:15 -07: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
6abaa37fe3 port jot to spin.js 2013-07-13 23:35:38 +02: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
a0f2d20e20 port like button to spin.js 2013-07-13 21:47:06 +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
8eb18632d1 slight change to #page-spinner 2013-07-13 20:14:42 +02:00
git-marijus
be92ca980f port to spin.js 2013-07-13 19:56:05 +02:00
git-marijus
b590d294bc slight change for #nav-search-spinner 2013-07-13 18:36:46 +02:00
git-marijus
eccb0ac4d2 port to spin.js 2013-07-13 18:30:30 +02:00
Thomas Willingham
380871ccc7 Old theme stuff we don't use anymore. 2013-07-12 23:43:14 +01: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
5a8cda632b remove double tags on search results, updates to install doco to get rid of Friendica name there and clarify Red requirements. 2013-07-09 22:48:34 -07:00
friendica
6e012839c9 more work on bug #59 - hope this doesn't hork everything. Also some tweaking of the theme for the new radius control, which produced some surprising results when expert mode was toggled. 2013-07-08 22:01:57 -07:00
friendica
cd40802229 make corner radius configurable in redbasic expert mode 2013-07-08 19:21:06 -07: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
08023eb099 tag cloud feature (enable the feature, then it will show up on your channel page) 2013-07-02 21:04:46 -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
d1cae2da2a Merge remote-tracking branch 'upstream/master' 2013-07-02 18:36:39 +01:00
friendica
58ac92f4e1 bring back the body tag list - though it really belongs in the templates. It's difficult to debug community tags when you can't see any tags (except those the author typed in). 2013-06-20 20:34:00 -07:00
friendica
99252d65bf reset email templates to English 2013-06-16 16:49:46 -07:00
friendica
47ef689c92 implement taggable in auto-complete popups 2013-06-16 16:31:59 -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
e3a5a8c368 Quick fix for PCSS until the cleaned up version is finished. 2013-06-09 02:17:39 +01: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
ddbe5eedf5 Fix TinyMCE 2013-05-31 00:34:35 +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
3cfde2c177 Add an article to default.php to allow for fixed width themes, without breaking anything we've already got. 2013-05-29 02:20:44 +01:00
Thomas Willingham
151688a129 Oops, remove site specific CSS 2013-05-28 23:17:11 +01:00
Thomas Willingham
5c17a64cde Clean up dark theme 2013-05-28 22:08:44 +01:00
Thomas Willingham
543e4903b2 Use misanthrozot as dark scheme, fix some PCSS bugs 2013-05-28 21:12:31 +01:00
Thomas Willingham
7c2aa706f2 Make pages better. 2013-05-28 20:47:46 +01:00
Thomas Willingham
f041338cd3 mod_page.css 2013-05-28 19:47:07 +01:00
Thomas Willingham
102e13543c Add notification count to titles. 2013-05-28 19:34:32 +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
09b80b2f65 slight privacy tweaks 2013-05-20 21:45:47 -07:00
friendica
2302b285bd add the "publish in directory" setting to the privacy macros 2013-05-20 21:33:29 -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
3f86f44df5 convert all the remaining email templates to smarty 2013-05-16 01:54:57 -07:00
friendica
fe8632ab9d avoid field name conflict - even if disabled 2013-05-15 23:15:15 -07:00
friendica
92c5db0892 update email template to smarty (several more to go) 2013-05-15 23:02:14 -07:00
friendica
b00c900fa2 fix intltext templates - maybe 2013-05-15 21:21:44 -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
friendica
7dfea2c70d get rid of jquery.browser warnings by removing msie hacks in two places, live update and fancybox 2013-05-09 18:24:52 -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
b8569cc27e fix prettyphoto path 2013-05-07 00:41:00 -07:00
friendica
9f36fd107f smarter handling of js_upload source param 2013-05-02 19:04:19 -07:00
Thomas Willingham
9c64427047 Redundant CSS 2013-04-27 19:45:08 +01:00
Thomas Willingham
2f43553542 Unbork smarty templates. 2013-04-26 23:00:10 +01:00
Thomas Willingham
6383203ebc Stupid mistake 2013-04-26 22:45:20 +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
friendica
ba1cb0bb05 move js from module to to module-specific js file 2013-04-17 22:45:22 -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
Olivier Migeot
2941925782 Upgraded jQuery to 1.9.1, including jQuery Migrate (for the sake of keeping old code working) and upgrade Fullcalendar (because Migrate just wasn't enough for him). 2013-04-10 13:16:41 +02: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
43af9b1429 Merge remote-tracking branch 'upstream/master' 2013-03-23 21:19:54 +00:00
Thomas Willingham
4b6bc77977 Implement prettyPhoto (somewhat). 2013-03-23 21:17:44 +00:00
Thomas Willingham
d9b51c6db5 Redbasic - get rid of max-height for images (got lost in the merge last time it was fixed) 2013-03-23 15:58:21 +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
f49dcc0a0c Use load_pconfig in style.php 2013-03-20 22:57:08 +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
friendica
6c9db5a1cf make reshares translateable 2013-03-11 21:29:43 -07: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
f09f2998dc unknown column 2013-03-11 17:42:12 -07:00
friendica
d568f4d029 class def for reshared content 2013-03-11 16:50:24 -07:00
friendica
b86277b0ff dangerous typo that removes all your hublocs, fix reshare formatting 2013-03-11 16:13:09 -07:00
Thomas Willingham
dd45daaad8 Get rid of max-height - no longer breaks newer versions of chrome, but does break showmore. 2013-03-11 02:19:25 +00:00
friendica
952b2ef2ab . 2013-03-10 18:45:58 -07:00
Thomas Willingham
0d504715c1 Smarty template 2013-03-11 01:13:23 +00:00
Thomas Willingham
9834df13c9 Make idiot mode colour schemes work. 2013-03-11 01:12:13 +00:00
Thomas Willingham
f961251176 And another. 2013-03-10 21:12:43 +00:00
Thomas Willingham
635ce018fc Oops, remove erroneously committed files. 2013-03-10 21:10:49 +00:00
Thomas Willingham
5a2970dea1 Redbasic - add stupid mode theme settings. Partial functionality. 2013-03-10 21:01:18 +00: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
b32b0102f7 fix font-size 2013-03-06 16:47:28 -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
f74bdda0be consistency 2013-03-05 23:57:08 -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
fbda9ababc fix selected nav item 2013-03-05 19:30:30 -08:00
friendica
a132af7b6a conflicting class name 2013-03-05 19:13:33 -08:00
friendica
1b41ce8fa7 tweaks 2013-03-05 19:03:22 -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
4cfbdfa6db cleanup affinity tool 2013-03-03 23:38:08 -08:00
friendica
5612716cff taking the next step on pages 2013-02-27 17:09:04 -08:00
Thomas Willingham
fba9d46d44 Redbasic - minor margin changes to prevent overlap with some configurations. 2013-02-23 18:25:31 +00:00
friendica
1e464120eb fix a typo and bring back nav:hover animation for the red scheme 2013-02-21 14:45:56 -08:00
Thomas Willingham
aacb1eab0f Clean up fancy.css a bit 2013-02-21 18:36:20 +00:00
root
5f5f90e58a Redbasic - implement "dark" colours. Intended to make life easier for a theme developer. 2013-02-21 16:20:40 +00:00
Michael Johnston
6199e1d5b8 add siteinfo.tpl 2013-02-20 21:56:59 -05:00
friendica
f01f390a2e Merge pull request #29 from beardy-unixer/master
PCSS Redbasic
2013-02-20 15:20:39 -08:00
friendica
92f94a0fdc contact_template is called from multiple places with different params 2013-02-20 14:17:23 -08:00
Thomas Willingham
21317ee953 Fix font size. That should never have worked in the first place. 2013-02-20 22:09:40 +00:00
Thomas Willingham
ce77a80972 Oh, and you'll be wanting the smarty template 2013-02-20 20:57:41 +00:00
Thomas Willingham
fffaeb09ea Ugh, not enough caffeine. 2013-02-20 20:44:34 +00:00
Thomas Willingham
3964625fa2 typo 2013-02-20 20:41:41 +00:00
Thomas Willingham
f95684c881 PCSS Redbasic 2013-02-20 20:30:47 +00: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
698a372ba1 Sort out registrations requiring approval 2013-02-11 16:43:27 -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
dbc024cdaf perhaps REGISTER_VERIFY will work now. I'll test it and make certain it works some day. But not today. 2013-02-08 03:11:40 -08:00
friendica
9096e4c8e3 make pcss work (really this time) 2013-02-07 19:23:21 -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
0f13ae0ade Merge remote-tracking branch 'upstream/master' 2013-02-02 14:56:17 +00:00
Thomas Willingham
1633f95db8 Clean up no longer used admin functions, plus fix summary template. 2013-02-02 14:54:40 +00:00
friendica
d4a6e5e513 add post_wall to forum permission defaults 2013-02-02 03:54:17 -08: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
b43b6c3549 start on photos rework 2013-01-25 18:13:15 -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
99c40ce388 check comment permissions against observer, unbold email subject links for read messages 2013-01-24 20:05:23 -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
c1a5c88720 don't use the link colour for non-link things 2013-01-23 17:51:44 -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
0b18dd15c5 icon tweaks 2013-01-23 03:50:30 -08:00
friendica
bf98cf8c0a this will probably look like crap, but I really want the links to look normal and we don't have a good designer to sort this out and provide a better option and tell me why it sucks - so that's what I'm going to do. 2013-01-23 00:26:26 -08:00
friendica
cf2488e999 clean up the photo storage backend, revamp mod/wall_upload 2013-01-22 17:48:42 -08:00
friendica
debf7f5f26 more work on magic auth 2013-01-21 15:39:05 -08:00
friendica
6766f7f829 minor theme nits 2013-01-21 00:54:29 -08:00
friendica
060716f172 make lockview work, bring back acl widget theming in redbasic 2013-01-20 18:05:29 -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
71d710c3f7 recover the slider pointers 2013-01-16 03:43:20 -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
Thomas Willingham
261e66a578 Undo stupid events. 2013-01-12 14:15:42 +00:00
Thomas Willingham
73191ad0f3 Fancyred - get likes/dislikes almost, but not quite, right. 2013-01-12 14:13:45 +00:00
friendica
82e0c04d92 add page module 2013-01-12 02:49:17 -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
Zach Prezkuta
1c01cba21e automatic, command-line conversion 2013-01-11 09:42:07 -07:00
Zach Prezkuta
ddb2a8c23a add Smarty templates for international templates 2013-01-10 21:24:10 -07:00
friendica
f0a08a05ae fix the "personal" network filter and introduction notifications 2013-01-09 23:07:13 -08:00
friendica
ef2cb88a92 wrong redirection after follow 2013-01-09 22:18:06 -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
0001cc6fd3 small tweaks 2013-01-06 22:17:47 -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
a8afbec5fe Merge https://github.com/friendica/red into zpull
Conflicts:
	view/theme/redbasic/css/style.css
2013-01-06 15:13:31 -08: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
Thomas Willingham
61b8ea9e1a Fix slider in Redbasic 2013-01-06 13:23:16 +00: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
a07500b527 structural cleanup of mod_message 2013-01-05 21:07:04 -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
Thomas Willingham
bc06f338b5 Fix code boxes. 2013-01-04 23:27:01 +00:00
friendica
bd728e773b small tweaks to icon positions 2013-01-03 20:41:17 -08:00
Thomas Willingham
0f25ebd5c5 Aha, I anticipated that - event and message icons. 2013-01-04 01:51:50 +00: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
2fd0653d6f Redbasic - floating wall-item-content sometimes causes massive top margins. 2013-01-01 16:08:32 +00: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
13b4ca2d4f More fancyred progress 2012-12-28 02:06:45 +00:00
Thomas Willingham
02be8defb3 Move like wrapper. Keep template theme specific while, at least while it's still in flux. 2012-12-27 09:47:44 +00: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
7a6972efb5 provide a default directory configuration (client) 2012-12-26 17:20:57 -08:00
friendica
c8292b3cdd remove the private keywords stuff to reduce directory and search complexity 2012-12-26 03:49:50 -08:00
Thomas Willingham
0e0593cc0b Merge pull request #7 from beardy-unixer/master
Un-mess up the Redbasic CSS
2012-12-24 19:30:29 -08:00
Thomas Willingham
25652348a3 Un-make a mess of Redbasic CSS. 2012-12-25 03:19:27 +00:00
Olaf Conradi
81168a545a Forgot dir separator 2012-12-25 04:00:51 +01:00
Olaf Conradi
85371a526f Fix theme config paths 2012-12-25 03:14:52 +01:00
friendica
f09b9f1e44 add permission controls to "storage" objects such as attachments or other stored files 2012-12-22 03:33:12 -08:00
friendica
8d71fe91f6 cleanup editpost 2012-12-21 04:08:48 -08:00
Thomas Willingham
f7f867f082 Don't need these images anymore - we use opacity for shiny instead. 2012-12-20 20:01:27 +00:00
Thomas Willingham
e31600f24f Merge remote-tracking branch 'upstream/master' 2012-12-20 19:14:54 +00:00
Thomas Willingham
6715c400be Make showmore irritating. 2012-12-20 19:14:23 +00: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
2f48c31082 add mod_profile_photo.css 2012-12-19 16:59:45 -08:00
friendica
893ba371a9 set_baseurl issue, more cleanup 2012-12-19 16:48:17 -08:00
Thomas Willingham
c59cfc13a2 But...git add *all* the files. 2012-12-19 20:23:55 +00:00
Thomas Willingham
de556f43fc Leave Mike's nav.tpl as the default, stick mine in the theme /tpl for now, at least. 2012-12-19 20:20:45 +00:00
Thomas Willingham
a2b30f9411 Merge remote-tracking branch 'upstream/master'
Conflicts:
	view/tpl/nav.tpl
2012-12-19 19:54:18 +00:00
friendica
a12264193f modularise the notification popups 2012-12-18 16:17:08 -08:00
Thomas Willingham
2cfd1a3f08 Ooops, made a shite of that - put redbasic back. Still need to put the mods back. 2012-12-18 17:13:14 +00:00
Thomas Willingham
3bc901b173 Fancyred 2012-12-18 17:01:32 +00:00
Thomas Willingham
d9194fdb5a Merge remote-tracking branch 'upstream/master'
Conflicts:
	view/theme/redbasic/css/style.css
2012-12-18 16:59:08 +00:00
friendica
e9b5b0f0b4 several small fixes and adjustments 2012-12-16 20:20:29 -08:00
Thomas Willingham
2cb2896916 More plodding along with redbasic, notably, adding some icons. 2012-12-17 02:23:01 +00:00
Thomas Willingham
2a9433c8b8 Unplug the lifesupport, the background snake is dead. 2012-12-17 00:27:31 +00: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
Thomas Willingham
605465391f Some more redbasic progress. 2012-12-16 22:53:23 +00:00
Thomas Willingham
b22799549f Un-screw-up misuse of mod_foo.css, add background, opacity based shiny. 2012-12-16 21:17:43 +00: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
Thomas Willingham
de3d8ea8dd Some more CSS into mods. 2012-12-13 18:51:04 +00:00
friendica
2a782597ba Merge https://github.com/friendica/red into zpull 2012-12-13 04:49:18 -08:00
friendica
c360565d0a get rid of undefined $ error by mangling theme specific JS include order 2012-12-13 04:47:06 -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
Thomas Willingham
f5ed128b48 redbasic - some more progress. 2012-12-13 00:06:19 +00:00
Thomas Willingham
8283b12bab Oops, we didn't use that in the end. 2012-12-12 21:15:22 +00:00
Thomas Willingham
53770201d2 Redbasic progression. 2012-12-12 21:14:51 +00:00
Thomas Willingham
84ea78ee16 Start moving CSS into mods 2012-12-12 18:45:50 +00: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
ddedbda966 fix nav-menu border colour 2012-12-08 12:07:16 -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
Thomas Willingham
7458bf945b Since other people are working on this too, add demonstrative placeholder CSS for mods that should probably have their own. 2012-12-08 19:26:46 +00:00
Thomas Willingham
d71a827d84 Templates for theme settings. There is a 99% chance these do not work yet, even if you implement them. 2012-12-08 00:44:30 +00:00
Thomas Willingham
44263d5ac3 Merge remote-tracking branch 'upstream/master' 2012-12-07 22:27:35 +00:00
Thomas Willingham
555226ada4 Make buttons better. 2012-12-07 18:06:05 +00:00
Thomas Willingham
f929ec32b0 Rounder corners, shadowier shadows, wall-item-tools, TinyMCE 2012-12-07 09:51:10 +00: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
7d1610197d move autosubmit up a level where it will actually work 2012-12-06 14:15:40 -08:00
Thomas Willingham
83c18603bf Make Red...red.
Still lots to do.
2012-12-06 21:58:41 +00:00
friendica
c6b8ab534f fixed several little nit bugs that cropped up during deployment 2012-12-06 00:03:24 -08:00
friendica
d715febf7c use all default templates in default theme 2012-12-05 21:43:36 -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
d9917dc8f8 some cleanup of mod-connections to bring it in line with the new architecture 2012-11-10 02:54:29 -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
cc8a11eee2 allow theme selection 2012-11-07 14:09:51 -08:00
friendica
6db8b5bbd2 All the themes except one are horked anway 2012-11-06 20:39:00 -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
90e70d9674 start on the like/dislike activities 2012-11-05 20:42:12 -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
e5df0f9ce9 settings/features page to enable/disable software features 2012-11-03 21:37:19 -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
7915e597ec more theme stuff 2012-11-03 06:32:27 -07:00
friendica
41a43f1282 better icon alignments on posts 2012-11-03 06:06:24 -07:00
friendica
9bb1b7e3ed fix default channel 2012-11-02 18:55:40 +11:00
friendica
f3ade4b8cf can save permissions 2012-11-01 20:23:49 -07: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
4d97432214 theme tweaks cont. 2012-10-27 04:01:05 -07:00
friendica
e29618ee0d contact group is now 'channel group' 2012-10-27 03:54:44 -07:00
friendica
fb8b44f1b2 theming adjustments 2012-10-27 03:40:31 -07:00
friendica
d7079ce5dd update file icon 2012-10-27 21:34:33 +11: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
7e547b230d fix comment lineup 2012-10-26 01:37:34 -07:00
friendica
26774310b1 move things to the newer conversation object, a few minor bugs - will sort it out eventually 2012-10-25 21:58:33 -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
05fd2c758c more ui cleanup 2012-10-24 20:43:04 -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
2cd9994904 use a single language config until all the new options are in place 2012-10-17 18:53:18 -07:00
friendica
b16a40b13e profile in a window for those who think all profiles and all pages on the internet should look exactly like theirs 2012-10-10 21:13:37 -07:00
friendica
059a14fefc relocate register policy setting in language htconfig templates 2012-10-07 10:38:23 +11:00
friendica
7bee460df2 provide auto admin registration as before, but allow the current admin to create other admins 2012-10-04 23:05:45 -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
fb714f9e72 recover frankentheme 2012-08-27 22:27:36 -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
a9dabd8eb9 per module code file for themes 2012-08-22 19:51:08 -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
5c8d854d7d zregister, cont. 2012-08-16 03:37:07 -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
Thomas Willingham
29b8b8f82b Merge remote-tracking branch 'upstream/master' 2012-08-09 01:35:46 +01:00
friendica
5f619d3254 the dynamic "show more" sort of works - but with a nagging delay. But I need to move on to bigger things. We'll leave it for now. 2012-08-06 23:10:37 -07:00
Thomas Willingham
49feb09c98 Port Comix-plain - also needs some CSS-fu, but works. 2012-08-06 21:25:29 +01:00
Thomas Willingham
62795bb544 Port Comix - needs some CSS-fu, but works. 2012-08-06 21:23:47 +01:00
friendica
c673c70c25 updates 2012-08-05 21:41:58 -07:00
Thomas Willingham
0c06cc6188 That's the zeros done. The others need more fiddling with. 2012-08-06 04:41:01 +01:00
Thomas Willingham
4adef099bd Port Greenzero 2012-08-06 04:33:06 +01:00
Thomas Willingham
d907544d20 Port Easterbunny 2012-08-06 04:21:41 +01:00
Thomas Willingham
456ca1f3e1 Kill NS themes 2012-08-06 03:43:40 +01:00
Thomas Willingham
58ef27635a Port darkzero 2012-08-06 03:41:30 +01:00
friendica
dcbc0c0c95 major theme re-org, only duepuntozero and slackr working atm 2012-08-01 05:02:43 -07:00
friendica
02cc436ec7 Added urlify to try and create webbie auto-suggestions out of whatever unicode stuff gets thrown in as a name. Currently this will only work for latin/european/cyrillic/russian, but possible to extend to ideographic forms. 2012-07-30 18:51:44 -07:00
friendica
acfe9e77bf show spinning cursor to let you know a refresh is happening. 2012-07-25 23:03:56 -07:00
friendica
7bdbb8331c picking up the page load times a bit 2012-07-25 22:55:43 -07:00
friendica
21b3dc9c27 tie the main slider to ajax updates and buildCmd 2012-07-25 19:45:45 -07:00
friendica
fc53a7a09e recover existing conversation loading functionality for home,search,community,display,etc. whilst working on the ajax stuff in network 2012-07-25 18:57:04 -07:00
friendica
78b8684ab4 upstream changes, rev update 2012-07-25 16:19:11 -07:00
friendica
0bf8954fbd take out divgrow until I can fix it 2012-07-25 04:15:05 -07:00
friendica
f535554cfa zentity is currently just a screen mockup until the page spec is complete 2012-07-24 21:06:23 -07:00
friendica
ea13ece890 rev update 2012-07-24 21:03:15 -07:00
friendica
4b36e41b09 implement page update modes 2012-07-23 20:49:56 -07:00
friendica
e18417ea47 correct spelling - tread to thread 2012-07-23 18:41:19 -07:00
friendica
d8e79061d6 pass all network page vars to the client to build ajax queries, change timeago variable names so as not to conflict with item timers. 2012-07-23 16:47:35 -07:00
friendica
3decf67e6d realtime updates of "6 minutes ago" with fallback to iso8601 timestamps (available on tooltip) 2012-07-23 04:11:59 -07:00
friendica
eb4d5f4009 registration page form validation 2012-07-22 19:37:15 -07:00
friendica
6d74c2c594 page templating and css management 2012-07-21 23:17:45 -07:00
friendica
c1fe66bec5 breakup css into page layout css, and provide module specific layout css - which should dramatically reduce the size of theme files and reduce load times 2012-07-21 18:03:22 -07:00
friendica
f8107be85b convert password fields from type=text to type=password 2012-07-21 16:47:03 -07:00
friendica
86f55ab0b9 new registration page 2012-07-21 16:43:31 -07:00
friendica
6e08f39820 simplify 2012-07-21 03:48:59 -07:00
friendica
bf38674904 sync 2012-07-19 21:09:40 -07:00
friendica
49c0e0de9b sync changes 2012-07-19 18:53:26 -07:00
friendica
6402fa1170 dynamic load on slider change + delay to settle 2012-07-19 03:59:32 -07:00
friendica
3b1c2ce001 the main slider sort of works for testing now 2012-07-19 01:43:23 -07:00
friendica
f0fd22d01b dynamically building the page query - start simple 2012-07-18 23:11:20 -07:00
friendica
d683df17bd Removing connectors we won't be needing - this is probably going to break some shit. 2012-07-18 04:49:15 -07:00
friendica
59ec671879 json notification popup mostly working in zero 2012-07-17 22:11:24 -07:00
friendica
a10e9d335a front end for alternate profile photos 2012-07-17 17:08:14 -07:00
friendica
d3279a6157 more search cleanup 2012-07-16 21:20:04 -07:00
friendica
945ac38a73 contact edit slider 2012-07-15 22:44:05 -07:00
friendica
a20a637727 merge upstream, slider work, refactor ping module, language selection work 2012-07-13 07:09:29 -07:00
friendica
3f7b93ce65 language detection and sparkle links added to plinks where appropriate 2012-07-12 03:50:05 -07:00
friendica
9ac32c49e2 move saved searches to new taxonomy 2012-07-11 17:54:00 -07:00
friendica
e7957e1448 create fetch_tags function, make search work again, change logo 2012-07-10 19:28:02 -07:00
friendica
1215de575d slider 2012-07-09 23:23:20 -07:00
friendica
5355193b63 theme cleanup 2012-07-09 22:48:51 -07:00
friendica
8855cb9c28 identity address is now a web-id or "webbie" 2012-07-09 06:11:58 -07:00
Vasudev Kamath
ba4db236ec Merge branch 'master' of git://github.com/friendica/friendica 2012-07-06 22:47:27 +05:30
friendica
8b19168999 a bit more colour 2012-07-05 22:20:27 -07:00
friendica
f40b056e3b some initial code and benchmarking for "red" content rendering engine 2012-07-04 20:37:15 -07:00
friendica
fd626022ec add smarty engine, remove some obsolete zot1 stuff 2012-07-03 22:23:08 -07:00
Thomas Willingham
badaa68340 Diabook directory wide variants. 2012-07-04 01:08:50 +01:00
Zvi ben Yaakov (a.k.a rdc)
424797138f Limiting .directory-photo-wrapper styles to <section> so as not to
interfere with .directory-photo-wrapper in <aside>
2012-07-03 21:49:02 +03:00
friendica
f7144e671c fix diabook directory pages (only the normal style - any volunteers for the wide?) 2012-07-02 16:56:37 -07:00
Thomas Willingham
74a819980f Various theme stuff.
Profile group list for testbubble
Screenshot for facepark
Various niggles in darkzero/NS
2012-07-02 03:40:12 +01:00
friendica
696d78d658 Merge pull request #369 from rdc/master
Added more profile data and CSS styling to the /directory page
2012-07-01 16:44:21 -07:00
Martin Schmitt
85c078f862 Esperanto -> 100% 2012-07-01 19:13:24 +02:00
Zvi ben Yaakov (a.k.a rdc)
2214cd74e5 Added more profile data and CSS styling to the /directory page 2012-07-01 14:46:03 +03:00
friendica
31718968c6 advanced profile theming 2012-06-30 01:29:29 -07:00
Fabrixxm
a03e6b96ea quattro: fix Forum widget, hide edit profile link 2012-06-29 05:47:53 -04:00
Fabrixxm
8b18ee49ff quattro: some updates
- add makefile to rebuild both css with single command
- fix icons in Forums widget
- style photos pages
2012-06-29 05:29:58 -04:00
friendica
be658788de maintain page position when hovering on pop-outs 2012-06-28 22:19:12 -07:00
Simon L'nu
ecf9ad9a08 fix item-delete-selected* css
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-28 12:15:32 -04:00
friendica
eb3bbd9081 insidious little parsing bug 2012-06-26 22:32:07 -07:00
friendica
f995a11641 have no idea why the if/endif macro block was getting printed and not processed. 2012-06-26 21:35:03 -07:00
friendica
fa2a8fa9bd highlight js events-reminder on birthday events 2012-06-27 13:49:35 +10:00
friendica
359a98cd22 change event behaviour so that title is required but description is not 2012-06-25 21:20:08 -07:00
friendica
fbaca4b742 event summary/title 2012-06-25 20:55:27 -07:00
Simon L'nu
eb6bf7e7fa fix margin of wall-item-body
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 18:42:18 -04:00
Simon
d944ff7833 Merge pull request #361 from simonlnu/master
cleaned up the css a bit
2012-06-25 14:25:33 -07:00
Simon L'nu
2ed3af55a8 fix delete thingy, and minor clean up
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 17:17:06 -04:00
Zvi ben Yaakov (a.k.a rdc)
51ef8fb7ff Added App::get_cached_avatar_image usage for displaying "Last users"
avatar thumbs in right sidebar
2012-06-25 14:01:16 +03:00
friendica
35a098e0dc service limits for photo uploads 2012-06-25 01:37:44 -07:00
friendica
ad6c82bdea implement "follow" service limits 2012-06-24 22:23:17 -07:00
friendica
c464bc494c add like/dislike to profiles 2012-06-24 21:16:55 -07:00
Simon L'nu
3b1d9d9695 update jquery to 1.7.2; fix some dispy templates to be more in sync with view/
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-23 13:33:58 -04:00
friendica
7614d35cad liking comments backend 2012-06-23 04:44:48 -07:00
Vasudev Kamath
6e4760dd9c Merge branch 'master' of git://github.com/friendica/friendica 2012-06-23 08:11:35 +05:30
Simon L'nu
5cfa7dd041 minor tweaks to some tpl files
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-22 13:07:42 -04:00
Zach Prezkuta
54c76ca822 allow rotation either CW or CCW 2012-06-20 20:51:03 -06:00
Thomas Willingham
75e82dc077 Darkzero-NS fix weeks old BBIcon error 2012-06-21 03:14:41 +01:00
Thomas Willingham
c4df339b92 Darkzero/NS - make the archives font the same colour as the other widgets. 2012-06-21 02:42:38 +01:00
Simon L'nu
0be715d271 icon change; tweak button in toolbar; move site-location
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-20 05:04:04 -04:00
tobiasd
79357ec60d Merge pull request #342 from fabrixxm/master
quattro: auto scroll and flash comment in display page
2012-06-19 10:12:09 -07:00
friendica
8b502bb486 position tweak 2012-06-19 03:34:31 -07:00
Tobias Diekershoff
c2842efd3f [DE] strings 2012-06-19 08:44:11 +02:00
Fabio Comuni
4c6a432130 quattro: in post display page, scroll to and flash selected comment 2012-06-19 06:54:41 +02:00
friendica
d614089582 make subdued elements jump out at you on hover 2012-06-17 22:50:02 -07:00
friendica
40e6d87d08 highlight the lost contact message 2012-06-14 17:41:24 -07:00
friendica
8c94fa23bf Merge https://github.com/friendica/friendica into pull 2012-06-14 17:39:17 -07:00
friendica
be090cc851 better handling of dead contacts 2012-06-14 16:56:46 -07:00
fabrixxm
2f5e891cd1 quattro theme: show uncollapsed comments on display page 2012-06-14 09:25:18 -04:00
friendica
4229debff8 ajax append placeholder, fix some html warnings 2012-06-13 21:40:02 -07:00
friendica
920ea2e1c7 archive widget 2012-06-12 20:46:30 -07:00
Vasudev Kamath
11974b4d94 Merge branch 'master' of git://github.com/friendica/friendica 2012-06-11 20:47:11 +05:30
Simon L'nu
1605bcd901 minor template update
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-09 18:07:19 -04:00
friendica
52d90674ea better events-reminder theming 2012-06-07 18:08:15 -07:00
fabrixxm
1d832618a4 fix a random profile error message 2012-06-07 08:49:33 -04:00
friendica
d2e86bdabc Merge https://github.com/friendica/friendica into pull 2012-06-06 22:29:35 -07:00
friendica
3b49035636 admin page untranslated strings, remove empty list element for update 2012-06-06 22:28:30 -07:00
zottel
6a95d483c7 A few corrections in German translations. 2012-06-07 01:43:32 +02:00
friendica
dd001e32f4 rev update 2012-06-06 16:02:10 -07:00
friendica
ae08d2c49b Merge https://github.com/friendica/friendica into pull 2012-06-05 17:59:49 -07:00
Tobias Diekershoff
c7b1b4b752 DE: update for the strings 2012-06-05 11:42:57 +02:00
Vasudev Kamath
079fdecff1 Merge branch 'master' of git://github.com/friendica/friendica 2012-06-04 19:59:23 +05:30
friendica
fe1dc1bf98 named anchors on display page 2012-06-04 04:28:20 -07:00
Tobias Diekershoff
b13c6ea9ad quattro: added editor buttons to comments 2012-06-04 11:49:16 +02:00
Vasudev Kamath
12474e3c2e Merge branch 'master' of git://github.com/friendica/friendica 2012-06-04 12:04:17 +05:30
Tobias Diekershoff
ca105f1c66 quattro: cleanup the less file 2012-06-04 07:17:23 +02:00
Simon L'nu
34f210bc2d fix mini photo-menu bug
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-03 18:10:04 -04:00
Zach Prezkuta
77962aa79d Fix bugs in the retraction code
Currently, the following seems to be the functional status:
	For a Diaspora top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete for top-level owner
		Diaspora comments show up for non-owner
		Diaspora comments sometimes don't delete for non-owner
			-> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log

		Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora)
		Diaspora likes show up
		Diaspora non-owner can't unlike
			-> Same as comments, seems to be Diaspora's fault

	For a Friendica top-level post:
		Friendica comments show up AND delete
		Diaspora comments show up AND delete

		Friendica likes don't show up in Diaspora sometimes
		Friendica doesn't even message Diaspora for unlikes (sometimes?)
		Diaspora likes and unlikes work
2012-06-03 14:53:30 -06:00
Zach Prezkuta
c0af6dbb1a Implement relaying of relayable_retractions
Also: some whitespace cleanup, fix Diaspora parent DB query
2012-06-03 14:53:29 -06:00
Tobias Diekershoff
959b264c44 quattro: admin panel styling and 1st buttons for addon/theme overview 2012-06-03 22:32:42 +02:00
Tobias Diekershoff
2741ce67f8 privacy settings: make submit button translateable 2012-06-03 17:38:05 +02:00
Tobias Diekershoff
283524d990 DE: update to the strings 2012-06-03 17:33:28 +02:00
Tobias Diekershoff
6fbeafc843 prv messages: make submit translateable 2012-06-03 17:16:29 +02:00
friendica
d27c6de84e add hometown to profiles 2012-06-02 20:58:20 -07:00
friendica
608d424b0b "howlong" added to marital status. 2012-06-02 02:30:26 -07:00
friendica
1180919c89 some zero theming on settings page 2012-05-30 16:30:51 -07:00
friendica
bdcb8d27dd transition to beta for private forums 2012-05-30 15:52:17 -07:00
friendica
88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
friendica
b6fe837a64 hide private group if desired 2012-05-29 18:43:56 -07:00
Simon
43c185ce04 Merge pull request #316 from annando/master
Speed improvements
2012-05-29 13:13:10 -07:00
Simon L'nu
dd666e93d8 fix toolbar. more size dynamicism
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-29 16:09:02 -04:00
Michael Vogel
68757f2504 Merge remote branch 'upstream/master' 2012-05-29 16:09:26 +02:00
friendica
2eafa9a475 ability to only expire contacts, not self 2012-05-29 01:14:53 -07:00
friendica
2dc7e53435 more theme cleanup 2012-05-28 19:17:06 -07:00
Simon L'nu
cb259098dd fixed font-size/line-height stuffs
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-28 19:25:10 -04:00
friendica
6962989e52 slackr - tone down the shadows a smidgin 2012-05-27 23:02:25 -07:00
Michael Vogel
a71e3134bf Merge remote branch 'upstream/master' 2012-05-25 16:19:10 +02:00
friendica
d1345e5054 Merge https://github.com/friendica/friendica into pull 2012-05-25 00:43:09 -07:00
friendica
abb9fecf09 rev update 2012-05-25 00:42:38 -07:00
Tobias Diekershoff
07535692dc DE update to strings and templates 2012-05-25 06:04:33 +02:00
Simon
5bc0cfa067 Merge pull request #313 from fabrixxm/master
install wizard: fix php executable path
2012-05-24 16:30:22 -07:00
Simon L'nu
2a32917e3a update dark a bit. i messed up some buttons
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-24 19:28:12 -04:00
root
60df67b9e3 fix small js error when user not logged in 2012-05-24 04:29:33 -04:00
root
a5b8339a75 install wizard: fix php executable path
- php executable not required
- "check again" button submit form instead of reload page via js
- checks form submit to install module without redirect
2012-05-24 04:21:33 -04:00
friendica
f0ddcb979b slackr: improve interactivity 2012-05-23 23:29:45 -07:00
friendica
6c78d42050 slackr: hide calendar when posting 2012-05-23 18:20:24 -07:00
friendica
5d06e0060d Merge https://github.com/friendica/friendica into pull 2012-05-23 16:58:58 -07:00
friendica
60723702f1 more theme stuff 2012-05-23 16:58:31 -07:00
Simon L'nu
16f9d7fd35 clean up and more fixing
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 19:22:07 -04:00
friendica
19bf0aa283 slackr - better highlighting of current selections 2012-05-23 16:16:59 -07:00
friendica
5b7865f8f9 slackr - knock the sharp edges off the events calendar 2012-05-23 15:55:09 -07:00
Simon
5acd0a1c32 Merge pull request #309 from fabrixxm/master
Update install wizard
2012-05-23 15:10:24 -07:00
Simon L'nu
5198260e3a clean up and make nice the dispy photo edit stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 18:06:49 -04:00
Simon L'nu
789063da39 add a placeholder attribute on search-text; dispy fixes
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-23 15:58:22 -04:00
root
325343a492 Update install wizard
- writable .htconfig.php not required
- add test for working .htaccess/mod_rewrite configuration
- fix last pass: create tables, eventually show config text and print a "What next" section
2012-05-23 07:38:31 -04:00
friendica
61dba985c1 photo rotation 2012-05-23 01:01:04 -07:00
friendica
8ffb65ceef event calendar theming 2012-05-22 22:34:35 -07:00
friendica
86a38cca24 import quattro event reminder 2012-05-22 22:06:52 -07:00
friendica
af495879af mark bubbles unsupported 2012-05-22 21:54:19 -07:00
friendica
3ac7c4e859 keep FB out of private notes 2012-05-22 21:20:31 -07:00
friendica
0da20ec9ef Merge https://github.com/friendica/friendica into pull 2012-05-22 18:06:34 -07:00
friendica
e70573f34c if identity (uid) changes - reload any other open browser windows on next ping. 2012-05-22 16:01:07 -07:00
Thomas Willingham
b962559570 Oops - but lets commit the right revision, sorry. There's a spare line in the last one. 2012-05-22 19:19:36 +01:00
Thomas Willingham
18983bb932 Fix darkzero/ns BB icon background colours. 2012-05-22 19:14:58 +01:00
friendica
f29f861d25 add queue totals to admin summary page 2012-05-22 03:44:03 -07:00
Tobias Diekershoff
be64437b14 DE: update to the strings and some mail templates 2012-05-22 12:17:01 +02:00
Simon L'nu
d466c9ab08 fix (min-)search-text text
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 21:38:53 -04:00
Simon L'nu
bd3c0edf34 updates to dispy family; fix typo in INSTALL.txt
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 21:29:18 -04:00
friendica
9ca3ac6e61 Merge https://github.com/friendica/friendica into pull 2012-05-21 16:43:07 -07:00
friendica
54e2c1ca81 rev update, bug 428, 429, and ability to block globaldir submissions from demo sites 2012-05-21 16:40:11 -07:00
Simon L'nu
627367e1ee more light fixes
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 06:48:08 -04:00
Simon L'nu
cb2702249f fix dumb mistake in light
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 02:47:43 -04:00
Simon L'nu
2ac55c9f21 fix dispy light
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-20 14:37:20 -04:00
Thomas Willingham
c6104fb856 Darkzero-NS + 'Friendicaland' countries. 2012-05-20 01:44:07 +01:00
Michael Vogel
8c80fe0bf5 Performance tests 2012-05-20 00:11:32 +02:00
Thomas Willingham
4484bd0e97 Darkzero, another missing part of "everything" 2012-05-19 17:30:55 +01:00
Thomas Willingham
b1c58511ad Diabook-dark - some more cleaning up 2012-05-19 17:20:27 +01:00
Thomas Willingham
a1b96d11a7 Okay, so maybe not *everything* 2012-05-19 15:17:35 +01:00
Thomas Willingham
d6ca4a1b42 Give Darkzero some loving.
Everything that used to be hidden with light text on light backgrounds is legible now.
2012-05-19 14:51:10 +01:00
Simon L'nu
4a35a51724 fix -desc again
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-19 03:15:35 -04:00
friendica
3821744450 apply max-width to images in posts, duepuntozero 2012-05-18 01:46:02 -07:00
friendica
34b79b4f2b theming for default group selector 2012-05-18 01:38:11 -07:00
friendica
7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
Simon L'nu
331013f281 fix admin links...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 13:33:20 -04:00
Simon L'nu
a8a3732f05 *sigh*. fix dark *again*
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 05:51:29 -04:00
Simon L'nu
7eb73bc600 get rid of the monstrosity for .button. need to find alternate solution
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 05:32:08 -04:00
Simon L'nu
fca09c9d4c slight re-design of wall stuff and css/font cleaning
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-16 01:58:55 -04:00
Tobias Diekershoff
68dc7c3568 DE strings 2012-05-15 10:44:01 +02:00
friendica
0faa0c2ab1 slackr drop shadows extended 2012-05-14 21:45:37 -07:00
Simon L'nu
db5fe14241 finish dipsy light colour fixes
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-14 00:30:25 -04:00
tommy tomson
303856ce01 diabook-theme: small fixes 2012-05-13 20:51:39 +02:00
friendica
eaf028c9fb Merge https://github.com/friendica/friendica into pull 2012-05-12 22:20:03 -07:00
friendica
e7813f22af slackr drop shadows 2012-05-12 22:19:29 -07:00
Simon L'nu
93dc96e2cf css fixes; new screenshots
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-12 18:53:01 -04:00
friendica
72d8e0459d Merge pull request #294 from mschmitt/master
Esperanto at 100% again
2012-05-12 15:01:05 -07:00
Martin Schmitt
ae300bceb9 Ĝisdatigis la esperantlingvan tradukaĵon al 100%. 2012-05-12 16:56:31 +02:00
Vasudev Kamath
3a45d4f9e0 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-12 20:20:26 +05:30
tommy tomson
9699d9cd01 diabook-theme: fix in earthlayers 2012-05-12 16:11:46 +02:00
tommy tomson
2882012e1b diabook-theme: some fixes 2012-05-12 13:50:22 +02:00
Simon L'nu
c6897d0dc4 finished migrating dispy light - maybe
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-12 07:29:36 -04:00
Vasudev Kamath
10db2f00f9 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-12 12:10:09 +05:30
Thomas Willingham
2454028ef6 Darkzero - fixed notifications bar. 2012-05-12 00:32:47 +01:00
tommy tomson
48c48d644f diabook-theme: update mapquery and small fix 2012-05-11 16:41:16 +02:00
tommy tomson
74e79a06a8 diabook-theme: add "population density 2010"-layer to EarthLayers-box 2012-05-11 14:56:59 +02:00
friendica
49cd3f615d Merge https://github.com/friendica/friendica into pull 2012-05-11 04:05:25 -07:00
tommy tomson
f9d5e602ac diabook-theme:small fix 2012-05-11 13:04:25 +02:00
friendica
7600b9b1ee Merge https://github.com/friendica/friendica into pull 2012-05-11 03:42:05 -07:00
friendica
496782e468 moderated comment templates 2012-05-11 03:41:29 -07:00
tommy tomson
e13e5070a7 diabook-theme: small fix 2012-05-11 09:01:58 +02:00
tommy tomson
a81faead6e diabook-theme: include prv_message autocomplete 2012-05-11 08:39:39 +02:00
friendica
8a5dcf64d8 fix PM replies after autocomplete changes 2012-05-10 20:01:13 -07:00
tommy tomson
b2bd25a470 Merge remote-tracking branch 'origin/master' 2012-05-11 02:40:09 +02:00
tommy tomson
ccc825ccbc diabook-theme: small fix 2012-05-11 02:39:54 +02:00
Thomas Willingham
e7b8e839ae Diabook-dark. More touchups. 2012-05-10 17:14:27 +01:00
friendica
c5f6755bdd specified background image does not exist 2012-05-10 05:49:48 -07:00
tommy tomson
3ac5d19b92 diabook-theme: some fixes 2012-05-10 12:19:51 +02:00
friendica
c9bb888611 priv mail autocomplete, improved contrast for darkzero, etc. 2012-05-10 02:01:08 -07:00
friendica
93ae6ee97b Merge https://github.com/friendica/friendica into pull 2012-05-10 01:46:29 -07:00
friendica
774c51cc19 email autocomplete 2012-05-10 01:45:51 -07:00
tommy tomson
7b41c0a555 Merge remote-tracking branch 'origin/master' 2012-05-10 09:54:47 +02:00
tommy tomson
69b43582d0 diabook-theme: some css/bug-fixes 2012-05-10 09:54:16 +02:00
Simon L'nu
a077e63fa5 don't make -desc so obnoxious looking
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-10 02:27:48 -04:00
Thomas Willingham
89d3ce7b5d Diabook-dark - do things the right way instead of the stupid way. 2012-05-09 04:54:17 +01:00
Thomas Willingham
d2bbd92889 Fix TinyMCE, but needs adding to theme.php 2012-05-09 03:42:09 +01:00
Thomas Willingham
8a1f8515ca Fix jquery.fancybox, but still needs adding to theme.php 2012-05-09 03:31:56 +01:00
Thomas Willingham
a0293ae442 Diabook-dark cleaned up a bit. 2012-05-09 03:21:26 +01:00
friendica
a048fd806a don't provide 'show more' on remote friends in common unless there are actually more 2012-05-08 17:40:56 -07:00
Tobias Diekershoff
d2c2063084 DE update for the strings 2012-05-08 09:56:05 +02:00
tommy tomson
88443ed3fb diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie. 2012-05-08 03:29:25 +02:00
friendica
e8b9b8a403 separate poll_interval from delivery_interval - default is the same. 2012-05-07 04:21:54 -07:00
Simon L'nu
e554530430 more css tweaks. nothing major
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-07 01:20:32 -04:00
tommy tomson
e417f083b5 diabook-theme: small fix 2012-05-07 02:49:44 +02:00
tommy tomson
3d0a0b6abf diabook-theme: add "Earth Layers"-box at right_side 2012-05-07 02:24:43 +02:00
tommy tomson
66b9b60792 diabook-theme: twitterbox-bugfix 2012-05-06 23:26:44 +02:00
tommy tomson
f09b3cfbf8 diabook: small fix 2012-05-06 12:25:09 +02:00
tommy tomson
8bdbfdc853 Merge remote-tracking branch 'origin/master' 2012-05-06 12:09:22 +02:00
tommy tomson
abbb4c2f36 diabook-theme: bugfix 2012-05-06 12:08:46 +02:00
Simon L'nu
f32c3d74a4 fixing widths to be more dynamic where possible. font size fixes. add README.md
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-06 06:05:31 -04:00
tommy tomson
e1ab3a93cc diabook-theme: small fix 2012-05-06 00:36:46 +02:00
tommy tomson
c421f35da7 diabook-theme: twitter-box-update at right_aside 2012-05-06 00:10:35 +02:00
tommy tomson
f297751437 diabook-theme: can now set the twitter search term in theme-settings & small fixes 2012-05-05 20:01:38 +02:00
Vasudev Kamath
b5e857c0e7 Merge branch 'master' of git://github.com/friendica/friendica 2012-05-05 20:48:16 +05:30
friendica
8f26e698e6 Merge pull request #289 from cvogeley/master
Option to set theme width added. Minor layout changes
2012-05-05 05:04:05 -07:00
Tobias Diekershoff
f9f62ee7ec DE: new email templates translated 2012-05-05 09:11:25 +02:00
Christian Vogeley
7f061c255c Option to set theme width added. Minor layout changes 2012-05-05 00:45:35 +02:00
Simon L'nu
20ea1b7d4b fix lightbox; finished dark, now on to light
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-04 17:06:17 -04:00
Martin Schmitt
52f4563f30 Esperanto 100% 2012-05-04 12:02:05 +02:00
friendica
9ecd128e5e "show more" friends in common 2012-05-04 01:46:36 -07:00
Tobias Diekershoff
22c8fe46a5 DE strings 2012-05-04 07:30:49 +02:00
friendica
421acee65b implement max load average before queuing/deferring delivery and poller processes 2012-05-03 21:50:48 -07:00
Ludovic Grossard
1f86205ee8 proofreading the mail templates in fr
fixed typo, grammar, spelling…
2012-05-03 22:35:59 +02:00
Simon L'nu
bb081e4bf5 forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv (which it includes)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-03 14:35:21 -04:00
Simon L'nu
1a13c56fef major reworking of dispy dark. light to follow
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-03 14:25:18 -04:00
tommy tomson
d72db2e1aa diabook-theme: small fix 2012-05-03 07:57:40 +02:00
tommy tomson
ff2ddc319d diabook-theme: small fix 2012-05-03 06:25:23 +02:00
tommy tomson
3521e22333 diabook-theme: made boxes at right_aside sortable 2012-05-03 06:05:55 +02:00
Max Weller
f0c11cac4a Moved Meta Viewport from global head.tpl to diabook's header
I mistakenly added this <meta> tag to the global header, but it
causes problems for other themes, as they have other optimal widths.

I also added a style to diabook which makes the jGrowl messages
appear below the header bar, so you can still click the menu items
without having to close messages first.
2012-05-02 16:59:58 +02:00
tommy tomson
6875f54647 diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box 2012-05-02 16:27:01 +02:00
tommy tomson
67471bb534 diabook-theme: tryied to improve performance a bit 2012-05-02 14:33:04 +02:00
tommy tomson
6a9cd8cd4b diabook-theme: fix footer/impressum 2012-05-02 12:40:51 +02:00
friendica
1fab28c413 fix size 2012-05-01 20:38:06 -07:00
friendica
066d69b21c add template 2012-05-01 20:22:59 -07:00
friendica
8bd6e1aef9 first try common friends for visitors 2012-05-01 19:16:18 -07:00
Thomas Willingham
671a10f5d4 More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway. 2012-05-01 21:37:49 +01:00
tommy tomson
ab556857f0 diabook-themes: small fix at "community pages"-box 2012-05-01 16:46:08 +02:00
Simon L'nu
6d3ba2825b lighten bg and darken font on dispy light
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-01 04:02:56 -04:00
Simon L'nu
e245ecddf2 sub-minor change to head.tpl
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-01 01:56:21 -04:00
Simon L'nu
46558e98a8 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  diabook-themes: add "community profiles"-box to right_column
  change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
  make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
  diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
  rev update
  start adding tooltips to tab menus
  fix join group notifications

* master:
2012-05-01 00:49:42 -04:00
tommy tomson
2c577ed90f diabook-themes: add "community profiles"-box to right_column 2012-05-01 06:21:40 +02:00
friendica
a3a55897e5 Merge https://github.com/friendica/friendica into pull 2012-04-30 19:04:28 -07:00
friendica
3c0cf72716 make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
2012-04-30 19:01:41 -07:00
tommy tomson
f35ffa9b60 diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter 2012-05-01 02:33:55 +02:00
Simon L'nu
9b7dac6ce1 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  provide "xxx joined yyy" notifications
  adding META viewport tag for better look on tablets
  Update Esperanto to 100%
  DE update to the strings
  activitystreams schema constants for "join group"
  missed a db field
  typo in profile_selectors, fix remote tagging
  not all profile selector choices have unique or direct translations
  log db error strings in all cases
  admin page to manage failed updates
  improved db error logging
  close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw)

* master:
2012-04-30 06:02:38 -04:00
friendica
9f18c9d664 Merge pull request #277 from mschmitt/master
Update Esperanto to 100%
2012-04-30 01:29:50 -07:00
Max Weller
9d8a0553ac adding META viewport tag for better look on tablets 2012-04-30 09:48:21 +02:00
Martin Schmitt
5b9f01c3ab Update Esperanto to 100% 2012-04-30 09:00:03 +02:00
Tobias Diekershoff
f08dc392df DE update to the strings 2012-04-30 08:39:12 +02:00
friendica
0153d86b7f admin page to manage failed updates 2012-04-29 19:10:07 -07:00
Simon L'nu
34eb843fb4 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  the heart should really be red.
  fix location change notification
  enhanced profile reporting for single values
  add db field for removed account, which will also be the first test of update error checking
  toggle to archive unfriends, though render them useless
  indicate successful updates
  diabook-themes: small fix
  diabook-themes: bug/css-fixes
  some constants for the db update failure possibilities
  bring back the email and logging of update failures, but without the transactions

* master:
2012-04-29 22:06:16 -04:00
tommy tomson
920d40acf4 diabook-themes: small fix 2012-04-29 05:58:23 +02:00
tommy tomson
3d054341ef diabook-themes: bug/css-fixes 2012-04-29 04:12:04 +02:00
friendica
7919d00399 bring back the email and logging of update failures, but without the transactions 2012-04-28 17:50:28 -07:00
Simon L'nu
ecd1dab373 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  a few more continues that should be returns
  small bugfix. sometimes also avatar pics were rescaled

* master:
2012-04-28 20:16:25 -04:00
Christian Vogeley
3f586bb962 small bugfix. sometimes also avatar pics were rescaled 2012-04-28 20:15:10 +02:00
Simon L'nu
c661dc502f Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  break up poller into separate processes
  add tooltip title to common_tabs
  PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
  Diabook-dark update, it's almost useable now (if you're lenient).
  Added "important changes" to admin menu for admins who don't follow the github properly.

* master:
2012-04-28 05:29:03 -04:00
friendica
f163aed66d break up poller into separate processes 2012-04-27 23:17:40 -07:00
friendica
3bb06cc3e4 add tooltip title to common_tabs 2012-04-27 19:47:52 -07:00
Thomas Willingham
4b553de79f Diabook-dark update, it's almost useable now (if you're lenient). 2012-04-28 03:01:27 +01:00
Simon L'nu
3bfa3f2a13 fix #search-text
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 21:02:57 -04:00
Thomas Willingham
adc2fc18a5 Added "important changes" to admin menu for admins who don't follow
the github properly.
2012-04-28 01:25:55 +01:00
friendica
26c53580d1 implement contact archival 2012-04-27 17:17:58 -07:00
Christian Vogeley
731379fa25 another attempt to fix lower tab behaviour on small screens, community back in tab area 2012-04-27 23:48:44 +02:00
Simon L'nu
64f3af49fa remove extra netsearch-box and fix
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 14:33:56 -04:00
Simon L'nu
d0d79196ba fix contact-friend stuff on profile sidebar
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 13:31:06 -04:00
Vasudev Kamath
214ec91a3f Merge branch 'master' of git://github.com/friendica/friendica 2012-04-27 22:43:26 +05:30
friendica
4b92e3543c Merge https://github.com/friendica/friendica into pull 2012-04-27 02:31:37 -07:00
friendica
266eaae439 put community back on the lower tab. It belongs with message streams 2012-04-27 02:30:49 -07:00
Simon L'nu
deae1df3be fix some css errors
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 04:42:38 -04:00
friendica
153534bc70 Merge https://github.com/friendica/friendica into pull 2012-04-27 01:10:33 -07:00
friendica
f06a554e05 fix view contacts 2012-04-27 01:10:09 -07:00
Simon L'nu
b936e3a18a fix 2 issues. contacts img in finder; wall filer title
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-27 02:33:58 -04:00
friendica
a1f94ac59f reset qcomment selector after insert. 2012-04-26 21:53:40 -07:00
friendica
d3992b78e6 put fakelink back in birthday notice 2012-04-26 20:08:57 -07:00
friendica
dee36c1b04 birthday contact link goes to event page instead of remote profile 2012-04-26 20:02:42 -07:00
friendica
dd33599a1d Merge https://github.com/friendica/friendica into pull 2012-04-26 19:56:25 -07:00
friendica
3c6cf1f19c make comment edit icons look more like base theme 2012-04-26 19:55:20 -07:00
Simon L'nu
8834944952 fix s/color/colour/g issue
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 20:13:11 -04:00
friendica
3ee998dbaf Merge pull request #267 from tomtom84/master
add link "remove account" to /mod/settings.php
2012-04-26 15:33:34 -07:00
Simon L'nu
d6116b6979 announced dipsy change. re-tie your boots, we're in for a wee ride ;)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 16:14:42 -04:00
tommy tomson
328568943e diabook-themes: small-fix 2012-04-26 21:07:46 +02:00
friendica
82abb14bf9 Merge pull request #265 from cvogeley/master
cleanzero theme added
2012-04-26 01:35:50 -07:00
Simon L'nu
c1f1974e44 convert stylesheets to less, and compress output css
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-26 02:38:18 -04:00
Thomas Willingham
20a9cdfc90 Diabook-dark more CSS fixes.
Slowly getting there.
2012-04-25 23:40:40 +01:00
Christian Vogeley
43a257f2f6 duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design 2012-04-25 21:30:04 +02:00
Christian Vogeley
28370e320f duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design 2012-04-25 21:28:13 +02:00
Christian Vogeley
c0d4e39052 added BBCODE thing in comments 2012-04-25 21:08:31 +02:00
Christian Vogeley
4c1398c6b1 add cleanzero theme 2012-04-25 19:09:46 +02:00
friendica
37bc00094e this turns out to be harder than I thought 2012-04-25 01:36:22 -07:00
friendica
38e822320c Merge pull request #264 from mschmitt/master
Esperanto at 100% again
2012-04-25 00:25:05 -07:00
friendica
50f10a4fd7 Merge https://github.com/friendica/friendica into pull 2012-04-25 00:14:20 -07:00
friendica
ba0ade3380 cleanup - make bb-buttons vanish when comment closed 2012-04-25 00:13:36 -07:00
Martin Schmitt
15f7125df2 Esperanto at 100% again 2012-04-25 08:50:02 +02:00
tomtom84
5187faa595 Merge pull request #263 from tomtom84/master
diabook-themes: fix css to login.tpl
2012-04-24 18:42:32 -07:00
tommy tomson
9fe6333fd4 diabook-themes: fix css to login.tpl 2012-04-25 03:38:21 +02:00
friendica
5af80dbb89 restore qcomment selector 2012-04-24 18:23:48 -07:00
tommy tomson
e72eaf2408 zero-themes: add bbcode-toolbar to commentbox 2012-04-25 02:43:50 +02:00
tommy tomson
08b990a314 diabook-themes: small fix 2012-04-25 00:19:57 +02:00
friendica
5ebc221c28 Merge pull request #261 from fabrixxm/eventspage
Some tweak on events page and events/bitrhdays reminder
2012-04-24 14:50:22 -07:00
Thomas Willingham
a28fea987e Diabook-dark css fix 2012-04-24 20:07:08 +01:00
Thomas Willingham
fade45ca76 Diabook-dark, couple of new icons, and another css fix. 2012-04-24 20:00:49 +01:00
Fabio Comuni
c9a8dbc322 quattro: small week calendar view for event/birthday reminders 2012-04-24 09:50:44 +02:00
Fabio Comuni
62ad5043d6 remove html from get_birthdays() and get_events() 2012-04-24 09:50:10 +02:00
Fabio Comuni
fc61616c53 events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id]) 2012-04-24 08:12:30 +02:00
Martin Schmitt
c85fd87df1 Esperanto at 100% again 2012-04-24 06:52:36 +02:00
Thomas Willingham
9443248fad Improvements to diabook-dark
Still a long way to go, but some icons and a few CSS fixes
2012-04-24 04:55:39 +01:00
Tobias Diekershoff
af7abcea27 DE strings, correction of a typo 2012-04-23 20:55:48 +02:00
tommy tomson
a305cf9f5c diabok-themes: fixed bug in green-wide and dark-wide 2012-04-23 18:42:37 +02:00
tommy tomson
c5c419a785 diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders 2012-04-23 17:22:22 +02:00
tommy tomson
d072c12e7d diabook-themes: bugfix in admin-section 2012-04-23 15:47:18 +02:00
tommy tomson
e74ae8b031 diabook-themes: bugfix 2012-04-22 23:58:34 +02:00
tommy tomson
d6c8a14fb0 diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer 2012-04-22 22:31:44 +02:00
Tobias Diekershoff
9434b447f3 DE strings update 2012-04-22 13:13:27 +02:00
tommy tomson
c0a377e0de diabook-themes: comment-bbcode-bugfix 2012-04-22 12:59:00 +02:00
Vasudev Kamath
f1d84c1045 Merge branch 'master' of git://github.com/friendica/friendica 2012-04-22 12:08:05 +05:30
Simon L'nu
203aa819e2 fix tinymce theming
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-22 01:22:29 -04:00
tommy tomson
fe6567cb88 diabook-themes: deleted obsolete diabook-folder & minor bug-fixes 2012-04-22 03:15:06 +02:00
Simon L'nu
7a14f45904 fix checkbox/radio buttons for some browsers
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-20 20:18:47 -04:00
tommy tomson
8809e96310 diabook-themes: add diabook-dark 2012-04-21 01:06:17 +02:00
Vasudev Kamath
8465ad6e1e Few more files with unnecessary executable permissions 2012-04-21 00:22:48 +05:30
tommy tomson
e052be606c diabook-themes: add diabook-green and some minor css/bug-fixes 2012-04-20 17:16:42 +02:00
Simon
0e25376e4a Merge pull request #254 from simonlnu/master
add some knobs to comment boxes
2012-04-20 03:43:55 -07:00
fabrixxm
16c308791f Merge pull request #253 from fabrixxm/master
fix bug n385
2012-04-20 03:42:50 -07:00
Simon L'nu
5d2dd5798b fix the buttons. don't hide the buttons once shown
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-20 06:42:08 -04:00
Simon L'nu
eb9ddb884a optimise imgs; add some comment editing knobs
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-20 05:56:54 -04:00
Fabio Comuni
6af5a3a485 escape email template var names. fix bug n385. 2012-04-20 11:39:36 +02:00
Fabio Comuni
3bb785fdad Merge remote-tracking branch 'CatoTH/master' into req245 2012-04-20 09:25:51 +02:00
tommy tomson
f5f1956e8b diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes 2012-04-20 01:44:21 +02:00
Simon L'nu
05173d0a8a fix .item-select
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-19 13:02:41 -04:00
Simon L'nu
4fd1a17f06 tweak drop-down and add in filebrowser
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-19 12:54:53 -04:00
fabrixxm
44f4b4b9d1 Merge pull request #248 from fabrixxm/tmcefilebrowser
TinyMCE file browser
2012-04-19 00:30:45 -07:00
Martin Schmitt
25f6753a1f Hadn't merged fixed typo from upstream. 2012-04-19 06:51:52 +02:00
Martin Schmitt
7e3c183601 EO translation fixes 2012-04-19 06:45:54 +02:00
Fabio Comuni
fddf21d983 filebrowser: fix style, show 10 recent photos if not in an album 2012-04-18 15:15:52 +02:00
Fabio Comuni
0630120455 filebrowser: more style, load min and max scale photos 2012-04-18 14:56:03 +02:00
Fabio Comuni
56efb42223 tinymce: add inlinepopups plugin 2012-04-18 14:55:21 +02:00
Fabio Comuni
e2e6b56c44 tinymce: add filebrowser for photos and attached files 2012-04-18 13:23:42 +02:00
Simon L'nu
a30ea16218 only affect immediate li children
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 06:17:20 -04:00
Simon L'nu
311f39f12f fix silly abandonded typo. shouldn't affect translations
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 06:10:34 -04:00
Simon L'nu
af3e37ce20 fix alignment issues with toolbar
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 05:59:50 -04:00
Tobias Hößl
b885fedee1 XSRF protection and PHPdoc for mod/admin.php 2012-04-18 07:36:48 +00:00
Tobias Hößl
d7e750ad74 XSRF protection and PHPdoc for mod/admin.php 2012-04-18 07:24:47 +00:00
tommy tomson
1b6c84d8f4 diabook-themes: some css/bug-fixes 2012-04-18 02:36:30 +02:00
Martin Schmitt
2fbd5127ba messages.po/strings.php at 100% Esperanto 2012-04-17 22:50:44 +02:00
tommy tomson
5b407b5ee7 diabook-themes: theme-settings: "wide"-option and new screenshots 2012-04-17 19:45:53 +02:00
Simon L'nu
f4ff75cace [SECURITY] finish ripping out fpostit
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-17 13:21:30 -04:00
Simon
04af5d9e2c Merge pull request #241 from simonlnu/master
rip out fpostit
2012-04-17 10:16:56 -07:00
Simon L'nu
1b2209fb3c rip out fpostit
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-17 13:15:11 -04:00
Tobias Diekershoff
dbff4252d4 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-17 18:07:20 +02:00
Tobias Diekershoff
757e3429ac update to the German string files 2012-04-17 18:06:28 +02:00
tommy tomson
b30c761aae diabook-themes: removed fpostit due to security issues and small fix in german translation 2012-04-17 16:15:49 +02:00
Simon L'nu
68e1523496 finally fix the ui in the settings. it was fugly.... other bug fixes too
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-17 00:26:37 -04:00
tommy tomson
f08844a8a5 diabook-themes: bugfix (sry, necessary) 2012-04-16 19:23:11 +02:00
tommy tomson
15dc8f4b21 diabook-themes: small bug/css-fixes ---> ver. 1.019 2012-04-16 18:51:08 +02:00
tommy tomson
b32a731517 diabook-themes: bug-fixes 2012-04-16 17:12:08 +02:00
tommy tomson
947b6073b1 diabook-themes: minor bugfixes 2012-04-16 16:05:29 +02:00
friendica
93df525f5c Merge pull request #238 from annando/master
API: Support of the statusnet application
2012-04-15 16:00:07 -07:00
tommy tomson
b5c164bf2f diabook-themes: css-fixes 2012-04-15 19:58:26 +02:00
friendica
c4e8ef330e where did this "lang" string come from and why? 2012-04-15 06:04:54 -07:00
Simon L'nu
6a2f0eb475 REALLY fix fpostit this time
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-15 03:18:55 -04:00
Simon L'nu
d836be1dc3 fix fpostJS, add and fix some other stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-15 02:13:36 -04:00
tommy tomson
dddf3307af diabook-themes: added js for auto-growing comment-textareas 2012-04-15 04:39:33 +02:00
tommy tomson
170c15ceb9 diabook: theme-settings: add a wide-option 2012-04-15 02:50:16 +02:00
friendica
31b1d353b2 Merge pull request #234 from copyninja/master
Executable permisson removal on files which are not elf/script
2012-04-14 14:50:54 -07:00
Simon L'nu
6278b2a923 string fix: typo. slow down scroll to top in dispys
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-14 16:24:35 -04:00
Vasudev Kamath
41d74c0868 Another bunch of executable permission removal 2012-04-14 20:16:06 +05:30
Vasudev Kamath
626bb57e1d Removed execution permission: lintian warning in Debian packaging 2012-04-14 20:04:54 +05:30
friendica
6591b292a1 bogus empty list element in dfrn_request page when emailnet not enabled 2012-04-14 05:32:31 -07:00
Michael Vogel
4e220ec391 Merge commit 'upstream/master' 2012-04-14 13:15:25 +02:00
Simon L'nu
96cda3136b lighten wrapper shadow a bit on dispy
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-13 20:14:09 -04:00
Simon L'nu
6b46fe3dfe neat little changes. hopefully the shadow will be well recieved
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-13 19:30:07 -04:00
friendica
bfb821e918 well that was a silly mistake... 2012-04-13 16:12:06 -07:00
tommy tomson
a300616bcb diabook-themes: theme-settings: users can set font-size and line-height for posts and comments 2012-04-13 22:08:13 +02:00
tommy tomson
2c843466a9 diabook: theme-settings: users can set font-size and line-height for posts and comments 2012-04-13 21:34:21 +02:00
tommy tomson
615cd53e51 diabook-themes: small fixes 2012-04-13 18:28:11 +02:00
Fabio Comuni
f6e1ddf7fb Merge remote-tracking branch 'friendica/master' 2012-04-13 11:59:25 +02:00
Fabio Comuni
469710893d quattro: language icon in navbar 2012-04-13 11:56:56 +02:00
Fabio Comuni
4496d075e5 move html out of lang_selector() and new template lang_selector.tpl 2012-04-13 11:56:21 +02:00
Fabio Comuni
fdf50b8574 display settings: show theme screenshot on page load 2012-04-13 11:55:36 +02:00
Fabio Comuni
7aa3b92f4c quattro: add admin theme settigs. darker items background with a bottom border. 2012-04-13 11:21:15 +02:00
Fabio Comuni
138a0e06b8 admin: change global theme settings 2012-04-13 11:20:05 +02:00
Fabio Comuni
8be7b5c65b quattro: work on
"like" activitiy items less visible
    fixes to widths
    popup notification out of navbar
    category input in jot
2012-04-13 09:43:38 +02:00
friendica
3c4e6d3461 bug #369 - show contacts who are not in any groups 2012-04-12 23:06:41 -07:00
friendica
972c01edb3 profile change activities 2012-04-12 21:10:32 -07:00
friendica
32cd62ff0a allow setting default new friend notify 2012-04-12 18:15:46 -07:00
Michael Vogel
572678fef9 Merge commit 'upstream/master'
Conflicts:

	include/dba.php
2012-04-13 00:10:41 +02:00
tommy tomson
e3af552bbf diabook-themes: fixed css for settings aside-links 2012-04-12 22:00:18 +02:00
tommy tomson
39009b5ac9 diabook-themes: css-fixes in aside 2012-04-12 20:23:03 +02:00
tommy tomson
3a8e6cbacb fix css in aside 2012-04-12 17:37:55 +02:00
Fabio Comuni
309f2bfa5f quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu 2012-04-12 09:17:35 +02:00
Fabio Comuni
6c50eba206 quattro: move center css to style.php. add tpl for generic_links_widget 2012-04-12 08:40:17 +02:00
Fabio Comuni
e992e29685 settings: move tabs to aside. add a new template "generic_links_widget.tpl" 2012-04-12 08:38:55 +02:00
Simon L'nu
c21244f679 fix the icons a bit
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-12 01:08:02 -04:00
Michael Vogel
ee714daf4d Merge commit 'upstream/master' 2012-04-11 19:35:51 +02:00
Michael Vogel
c88c2515e4 API: Improved the timeline. Several (disabled) tests with caching of photos. 2012-04-11 19:31:01 +02:00
tommy tomson
a1d5026abf diabook-themes: small fix 2012-04-11 18:49:07 +02:00
Simon L'nu
c79d1deb92 major refactor. step 1
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-11 01:59:33 -04:00
friendica
b02a671494 visit "random profile" feature 2012-04-10 20:50:31 -07:00
friendica
ed608694ce make editplain work everywhere 2012-04-10 18:08:06 -07:00
friendica
703bfcb6d4 Merge https://github.com/friendica/friendica into pull 2012-04-10 16:07:05 -07:00
friendica
3c66816938 Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull 2012-04-10 15:28:48 -07:00
Tobias Hößl
e1c43c1c1c Incorrect tranlation (one negation too much) 2012-04-10 20:43:31 +00:00
tommy tomson
6db33fc513 diabook-themes: smal fix in bbcode-js 2012-04-10 15:13:34 +02:00
tommy tomson
b3f18945ba diabook-themes: added url and quote to bbcode toolbar under comment box 2012-04-10 14:38:59 +02:00
Simon L'nu
707a5dbae7 aaah, nice asides ;). we'll be updating these soon
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-10 05:48:42 -04:00
friendica
2d23c8a246 Merge pull request #218 from campino/master
db errors and update error mail
2012-04-09 16:53:23 -07:00
tommy tomson
0d4fab4ee3 bbcode toolbar attached to the comment text field
minor css-fixes
2012-04-10 00:55:39 +02:00
Klaus Weidenbach
1f9fe8b5ee Remove Gravatar from core and add new hook avatar_lookup.
This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow?
2012-04-09 21:22:09 +02:00
tommy tomson
d25a9df996 diabook-themes: small icon fix 2012-04-09 19:56:53 +02:00
Alexander Kampmann
2190b95d80 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-09 16:56:37 +02:00
tommy tomson
c27c340de1 diabook-nav-icons with gradient 2012-04-09 16:41:23 +02:00
Alexander Kampmann
1370ba5d16 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-09 14:28:21 +02:00
Alexander Kampmann
7187516718 fixed some typos 2012-04-09 14:27:52 +02:00
Michael Vogel
894e126c55 API: Tweetdeck is now working 2012-04-09 11:49:33 +02:00
zottel
5183d4f77d Some new German translations 2012-04-09 02:30:18 +02:00
Alexander Kampmann
0d60dbef31 added exceptions to dba class
added exception handling to index.php, please mind that there is no
recovery at the moment
added transactions to db update. Please mind that they might not be
supported by db table engines. 
added admin email on failed updates

added german translation for admin email
2012-04-09 00:45:10 +02:00
tommy tomson
7d018f651d fixed z-index of youtube-vids
fixed bug to hide right_side
2012-04-09 00:02:48 +02:00
friendica
741a5dba57 provide theme_init() functions 2012-04-08 05:52:00 -07:00
Michael Vogel
ce0eac44b5 Merge commit 'upstream/master' 2012-04-08 10:07:39 +02:00
Simon L'nu
01961f7caa minor dispy* fixes
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-07 23:46:47 -04:00
tommy tomson
f931d5c918 diabook-themes: small fix 2012-04-07 19:56:00 +02:00
Michael Vogel
17d097124c "vier": Some design stuff 2012-04-07 18:35:37 +02:00
Michael Vogel
cb05801a90 Merge commit 'upstream/master' 2012-04-07 18:35:29 +02:00
tommy tomson
1c0700f371 changelog 1.014 :
image-rezise via jquery-plugin in stream
comments under uploaded pictues
add Diabook's version-number in head-section

css-fixes:
tabs
youtube-iframe
title-bar in jot-wrapper
blockquote & .oembed
2012-04-07 16:39:43 +02:00
Michael Vogel
7308dbae28 "vier": Bookmarks now look better. 2012-04-07 01:19:07 +02:00
tomtom84
adf3ad5fd6 Merge pull request #210 from tomtom84/master
fixes in diabook-derivates
2012-04-06 04:29:01 -07:00
Tobias Diekershoff
eb6370fa41 small fixes for the German strings 2012-04-06 12:43:20 +02:00
tommy tomson
f980b79edc new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator...
profile-picture is now scaled right in firefox...
fixed broken css on introductions-page in firefox...
2012-04-06 11:19:12 +02:00
Tobias Diekershoff
afd2bf031e update to the German strings 2012-04-06 09:37:50 +02:00
Michael Vogel
34d268544e Merge commit 'upstream/master' 2012-04-06 00:00:46 +02:00
Alexander Kampmann
355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
Simon L'nu
df82affe2f finish styling category tags and category input
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-05 00:04:23 -04:00
Simon L'nu
9ee424c1e3 style categorytags
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-04 23:47:35 -04:00
Simon L'nu
8e5489846d update the dispy* templates
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-04 23:35:07 -04:00
friendica
c4ca21a762 move alert box away from nav links 2012-04-04 19:13:41 -07:00
Simon L'nu
922d690d1e latest changes are the popup menu for notifs, fixes
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-04 02:19:39 -04:00
friendica
1e02fd8a72 Merge branch 'pull' 2012-04-03 19:16:59 -07:00
friendica
3db2cf76b9 remove loozah themes which fell too far behind to recover 2012-04-03 16:40:25 -07:00
tommy tomson
f0a8ef64fe smal fix 2012-04-03 21:45:58 +02:00
tommy tomson
cd309b69e6 german translation for right_aside 2012-04-03 21:06:57 +02:00
tommy tomson
8a71191d6d make right_aside translatable and provide german translation...
and some css-fixes
2012-04-03 20:59:00 +02:00
Michael Vogel
81dfb61f93 API: template for test function added 2012-04-02 22:36:05 +02:00
Michael Vogel
3dc317dcc6 Merge commit 'upstream/master' 2012-04-02 22:00:22 +02:00
tommy tomson
6dfd55668f diabook-themes: css-fixes 2012-04-02 20:30:27 +02:00
tommy tomson
076b1b374b diabook-themes: fixes in js 2012-04-02 18:16:58 +02:00
tommy tomson
b5d57d5313 diabook-themes: fixed pageheader 2012-04-02 17:17:14 +02:00
tommy tomson
9faa940f04 diabook-themes: bugfixes / css-fixes 2012-04-02 15:06:55 +02:00
Michael Johnston
581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
tommy tomson
23dc376364 diabook-themes: add link to global dir in "find friends" at right_aside 2012-04-02 01:29:20 +02:00
Michael Vogel
a39d8d3f02 The "vier"-theme is now working again. But there is still work needed 2012-04-02 00:08:49 +02:00
tommy tomson
408de09f72 css-fixes 2012-04-02 00:05:49 +02:00
tommy tomson
f075e977fe add new messages-layout in diabook 2012-04-01 18:12:20 +02:00
tommy tomson
ff12637ceb fix the display of community-plugin in diabook-themes 2012-04-01 16:34:31 +02:00
tommy tomson
15ba0ef5d0 various bugfixes and css-fixes 2012-04-01 13:12:15 +02:00
friendica
bc283f7c5d qcomment overflow 2012-04-01 03:37:41 -07:00
friendica
ae5e5bf1e4 Merge branch 'pull' 2012-04-01 01:03:05 -07:00
friendica
5c2fdc795f send unverified private mail using zrl 2012-04-01 00:59:35 -07:00
Simon L'nu
db7f7e4237 latest fixes for dispys. tweaking/repairing
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-01 03:57:05 -04:00
tommy tomson
36545e554b diabook-themes: move "common tabs" to left side on settings page 2012-03-31 18:42:11 +02:00
tommy tomson
13ded12ffb move the common tabs to right_aside in diabook-derivates 2012-03-31 16:58:02 +02:00
friendica
d5a31e5791 Merge branch 'pull' 2012-03-31 04:40:35 -07:00
tommy tomson
893ece9066 bug fix in diabook-aerith and -red 2012-03-31 11:50:33 +02:00
tommy tomson
0b41654935 bug-fixes in diabook-derivates 2012-03-31 11:09:57 +02:00
Simon L'nu
f5e3ec9a56 forgot the css changes for last push
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-31 04:02:51 -04:00
friendica
b4b1055b50 settings for unknown private mail acceptance 2012-03-31 00:57:59 -07:00
Simon L'nu
b88a452c6b theme fixes; fix qcomment (finally)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-31 03:56:06 -04:00
Fabio Comuni
be2005f146 quattro: move quattro-green inside quattro folder.
Add config option to select quattro color scheme.
2012-03-30 21:21:14 +02:00
Fabio Comuni
77f57e1b13 Merge remote-tracking branch 'friendica/master' 2012-03-30 19:37:43 +02:00
tommy tomson
f50fb7d6ca css-fixes in diabook-derivates 2012-03-30 17:52:29 +02:00
tommy tomson
6d3d882f9b css-fixes in diabook-derivates 2012-03-30 16:33:34 +02:00
Fabio Comuni
24e7a3413c quattro-green: remove settings code
Use config.php from quattro
2012-03-30 15:46:14 +02:00
Fabio Comuni
db59a45030 quattro: add config.php 2012-03-30 15:45:23 +02:00
Fabio Comuni
054d21a2e8 settings: add "display settings" tab, with UI-related settings.
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
2012-03-30 15:45:02 +02:00
tommy tomson
5b4bb347a6 css-fixes in diabook-derivates 2012-03-30 14:38:21 +02:00
Tobias Diekershoff
8685a91742 quattro-green: added Description to the theme.php 2012-03-30 14:24:45 +02:00
Tobias Diekershoff
b5e292509e quattro-green: adopted quattro option for centered display 2012-03-30 14:03:33 +02:00
tommy tomson
5ced7f2bc5 add themes diabook-red & diabook-aerith 2012-03-30 13:48:34 +02:00
Tobias Diekershoff
e2370b56bf quattro-greey: apply theming to private mail 2012-03-30 08:10:49 +02:00
Simon L'nu
3b4016168d tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-29 20:19:43 -04:00
friendica
e935b3a225 theme file_as combobox for 2.0 2012-03-29 04:07:16 -07:00
tommy tomson
339c8a4b56 css fixes in diabook-derivates 2012-03-29 11:02:59 +02:00
fabrixxm
3ee529d095 Merge pull request #185 from fabrixxm/master
Updated private message pages
2012-03-28 23:47:23 -07:00
friendica
75f3d41da2 Merge pull request #184 from annando/master
Enhancing the API - Preparations for a better facebook export
2012-03-28 15:08:15 -07:00
tommy tomson
aa26517cdc add a searchbox to "find friends" for global search 2012-03-28 23:07:34 +02:00
tommy tomson
1a9bbac0be bugfix in diabook 2012-03-28 20:45:39 +02:00
Michael Vogel
bdd2754740 Merge commit 'upstream/master' 2012-03-28 19:52:30 +02:00
Fabio Comuni
011a96d960 quattro: style pm pages 2012-03-28 15:34:02 +02:00
Fabio Comuni
50711040cb message: remove tabs, move new message link to aside, all message with gmail-style 2012-03-28 15:31:58 +02:00
Fabio Comuni
f86e909a82 Merge remote-tracking branch 'friendica/master' 2012-03-28 15:21:01 +02:00
friendica
e894775a39 Merge branch 'pull' 2012-03-28 05:16:25 -07:00
Fabio Comuni
0f2a34c23b quattro: tpl for "file as" 2012-03-28 13:37:04 +02:00
Simon L'nu
4a75ea2f42 really fix it this time...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 06:47:38 -04:00
Simon L'nu
3d5e711780 WITH is going on?
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 06:20:13 -04:00
friendica
b58dc43148 Merge branch 'pull' 2012-03-28 03:19:42 -07:00
friendica
b18086097e title not updated when editing post 2012-03-28 03:18:26 -07:00
Simon
c32ee4d226 Merge pull request #180 from simonlnu/master
duh...
2012-03-28 03:03:47 -07:00
Simon L'nu
356e654521 doh fix
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 06:03:04 -04:00
fabrixxm
768326e484 Merge pull request #179 from fabrixxm/master
new field_combobox template and some eyecandy to "file as" function
2012-03-28 03:00:24 -07:00
Simon L'nu
bcf8a571f9 add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 05:52:28 -04:00
Fabio Comuni
0a2675d8b6 filer: replace "file as" prompt with combobox opened in fancybox 2012-03-28 10:49:34 +02:00
Fabio Comuni
82106632f0 template: field_combobox
a text input plus a select wich updates text input value on change.
html5 version commented out for poor browsers support.
2012-03-28 10:43:52 +02:00
friendica
7fc57f486f support autocomplete @-tags in plaintext mode 2012-03-28 00:44:45 -07:00
friendica
f95fb2667a vier navbar messed up after default theme template move 2012-03-28 00:16:22 -07:00
friendica
47eaa97af6 Merge branch 'pull' 2012-03-27 15:21:30 -07:00
friendica
aba63f8b78 turn on gecko spellcheck in tinymce 2012-03-27 15:20:36 -07:00
tommy tomson
f30471df4f small fix in diabook 2012-03-27 23:41:19 +02:00
tommy tomson
211d00a1f5 fixes in diabook 2012-03-27 23:27:43 +02:00
tommy tomson
31fbc3fde3 provide a close-option for boxes in right_aside and store info via js and cookies 2012-03-27 19:02:07 +02:00
tommy tomson
9fd54de691 provide a close-option for boxes in right_aside and store info via js and cookies 2012-03-27 15:29:46 +02:00
Simon L'nu
c3388ad813 more fixes for dispys
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-27 04:40:31 -04:00
Simon L'nu
6cd56e0f33 add dispy-dark snapshot; fix toolbar
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-27 03:57:47 -04:00
tommy tomson
e7bc3f2bd0 add "find friends" to right_aside to diabook, fixes in css in diabook 2012-03-27 08:28:47 +02:00
Tobias Diekershoff
b9d976e31b fixed Umlaute in de strings.php 2012-03-27 07:18:20 +02:00
friendica
5275b5d049 qcomment enhancements 2012-03-26 20:13:03 -07:00
Simon L'nu
3b9f0fd801 fix dispy's nav element; fix colours in #search-text
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-26 14:19:59 -04:00
tommy tomson
2d834d0f45 add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css 2012-03-26 18:54:57 +02:00
Tobias Diekershoff
f1d15d8884 Merge branch 'master' of https://github.com/friendica/friendica 2012-03-26 14:49:15 +02:00
Tobias Diekershoff
37f10a6d4f marking quattro-green as extension of quattro and deleting the tpl files 2012-03-26 14:48:01 +02:00
tommy tomson
aaddee0d94 minor css fixes in diabook 2012-03-26 13:52:44 +02:00
friendica
0164da4fb9 screenshot for darkzero-NS, same as darkzero 2012-03-26 04:25:20 -07:00
Tobias Diekershoff
8ded404aaa added quaddro templates to quaddro-green 2012-03-26 11:28:38 +02:00
friendica
63fa5f6c77 Merge pull request #172 from fabrixxm/master
Rearrange theme tpls
2012-03-26 02:00:14 -07:00
tommy tomson
876aa0c752 small fix in diabook :: add local friendica to right_aside 2012-03-26 10:33:28 +02:00
friendica
ca31aed490 Merge branch 'pull' 2012-03-26 00:53:32 -07:00
friendica
2820dba1e7 comix screenshot 2012-03-26 00:52:54 -07:00
Fabio Comuni
579c4f3079 diabook: small fix in theme_info array 2012-03-26 09:48:38 +02:00
friendica
109e8d4f05 more theme screenshots 2012-03-26 00:47:52 -07:00
Simon L'nu
0c4aba4b57 [fix] contact_edit.tpl syntax; reduce cols to fit better
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-26 03:39:06 -04:00
tommy tomson
c4c69959e2 add screenshots to diabook 2012-03-26 09:37:14 +02:00
Fabio Comuni
51d419e159 themes: use duepuntozero tpls as default 2012-03-26 09:09:14 +02:00
Simon L'nu
7de8e15ca4 fix the search box
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-26 03:01:13 -04:00
tommy tomson
37f02424f8 small fix 2012-03-26 07:02:27 +02:00
friendica
ba28362242 position the theme-preview on settings page 2012-03-25 21:12:10 -07:00
friendica
a06185e87c screenshot gallery 2012-03-25 20:08:28 -07:00
friendica
be52ec6f5a Merge branch 'pull' 2012-03-25 19:48:17 -07:00
Simon L'nu
3d11c22b01 add in the search box
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 22:45:44 -04:00
Simon L'nu
758e1b7424 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  theme screenshots

* master:
2012-03-25 22:40:24 -04:00
friendica
c88674aaf2 theme preview for end users 2012-03-25 19:05:14 -07:00
friendica
7ab117fd31 Merge branch 'pull' 2012-03-25 18:19:58 -07:00
friendica
7ef1ed2d70 theme screenshots 2012-03-25 17:55:43 -07:00
Simon L'nu
3d62cb9782 minor fix to dispy theme.php
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 17:13:24 -04:00
Simon L'nu
aa33815d3c urgent fix to dispy-dark theme.php
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 17:06:38 -04:00
tommy tomson
baeb735315 small fixes 2012-03-25 19:43:42 +02:00
Simon L'nu
2c43120129 dispy-dark not experimental. start implementing fpostit
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 03:22:16 -04:00