clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,301 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

1507 Commits

Author SHA1 Message Date
Simon L'nu 9c698b1a60 fix for comment-wwedit-wrapper CSS class in tpl had a stray $ 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-02 12:00:16 -05:00
tommy tomson ac1d758f6e github finally working 2012-03-02 17:47:45 +01:00
tommy tomson d72520f5f1 adjust3 2012-03-02 17:45:21 +01:00
tommy tomson e2798cee16 adjust 2012-03-02 16:01:20 +01:00
Fabio Comuni ef34847501 templates: fix tags 2012-03-02 12:41:34 +01:00
fabrixxm 3a609adfb7 Merge pull request #55 from fabrixxm/master 
Some minor and one majior mod in templates
 2012-03-02 00:00:03 -08:00
tommy tomson 5183e737d0 diabook commit 2012-03-02 02:05:35 +01:00
Fabio Comuni ed42fa7d59 conversation: remove templating items in code and move it to template. 2012-03-01 11:46:08 +01:00
Fabio Comuni a26ce7c56b show relation in contact_template 2012-03-01 11:31:16 +01:00
Fabio Comuni b71a3af457 Merge remote-tracking branch 'friendica/master' into randomerror 2012-02-29 14:58:37 +01:00
Fabio Comuni 42d591d257 revert 01a2791e3a to avoid random preg internal errors. fix contact_template 2012-02-27 18:48:59 +01:00
friendica 153e7beb19 add plugin hooks to enotify 2012-02-26 23:54:04 -08:00
Simon L'nu 72e78046af minor typographical fixes. need to do something about the http on https sites for html5shiv. changed to https on mine 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-02-27 01:04:41 -05:00
friendica 6bc48b29cc fix tag icon size 2012-02-26 16:40:21 -08:00
friendica e994b990eb typo in css 2012-02-26 16:31:51 -08:00
friendica a1861d1128 tagging missing from wallwall and a couple of themes, star missing from dispy 2012-02-26 16:29:06 -08:00
Michael fe3dfbee56 Mail: New options for actions after importing mails. 2012-02-26 23:39:29 +01:00
Michael 437e18d7a7 Merge remote branch 'upstream/master' 2012-02-26 21:47:47 +01:00
Michael edc44933a4 "Vier-Theme" Some more design stuff. 2012-02-26 21:16:29 +01:00
Tobias Diekershoff 2081e6d507 some revision to the German strings 2012-02-26 17:12:14 +01:00
Tobias Diekershoff 0877fbb42a German strings 2012-02-26 15:41:27 +01:00
friendica 5f7858a688 show experimental and unsupported theme status on theme admin page 2012-02-26 04:17:02 -08:00
friendica fb8675f349 jumping divs with no scrolling 2012-02-26 01:20:43 -08:00
friendica 484426d3e2 imrpove contrast on darkzero blockquotes 2012-02-26 00:53:31 -08:00
friendica 828034ad23 darkzero-NS theme 2012-02-26 00:48:11 -08:00
friendica d075fd8a40 reverse order of links 2012-02-25 16:47:21 -08:00
friendica 579738aff7 fixed link for toggling plugin from detail page 2012-02-25 13:00:44 -08:00
Michael 1cf1870512 poller.php: Test for moving to archive, vier-style: notifications fixed 2012-02-25 19:40:05 +01:00
friendica 00edc89c47 notify positioning, theming 2012-02-25 05:00:48 -08:00
friendica c90bac5727 sysnotify count in wrong location, and wrong number 2012-02-25 04:37:12 -08:00
friendica 4839c235da theme seen,unseen notifications 2012-02-25 03:28:07 -08:00
Michael 3c68bf25ac "vier" popup menu looks nicer now (more like quattro again) 2012-02-25 11:13:04 +01:00
Michael dccefb3c36 "vier": The contacts are now working again. Line break before closing bbcodes removed. 2012-02-25 11:00:35 +01:00
friendica aa67771eaa photos in notifications 2012-02-25 00:42:25 -08:00
friendica 18bf5d1402 theme info (like plugin info) 2012-02-25 00:30:14 -08:00
friendica 6092567c97 notifications to zeros, bug in notify link 2012-02-24 23:44:55 -08:00
friendica 44c23cda8e theme shakeup commences - themes are now administered in admin panel. 2012-02-23 20:29:09 -08:00
friendica 65ddefe9c5 system notifications to notify module, untranslated string in notifications.tpl 2012-02-23 17:37:03 -08:00
Fabio Comuni f5b8654818 fix visualization in groupeditor 2012-02-23 16:21:28 +01:00
Fabio Comuni fd3274ff53 less html in mod/group.php, template for group members editor, quattro theme for group edit. 2012-02-23 16:17:36 +01:00
Fabio Comuni d45e26d6d9 Merge remote-tracking branch 'friendica/master' 2012-02-23 15:23:52 +01:00
Tobias Diekershoff 1dacb2e570 quattro-green: removed contact_template.tpl 2012-02-23 14:16:20 +01:00
Fabio Comuni 6a0c815c1f Merge remote-tracking branch 'friendica/master' 2012-02-23 14:10:32 +01:00
Fabio Comuni edd946bcad quattro: fix typos 2012-02-23 14:10:23 +01:00
Tobias Diekershoff c03b5b62c0 green-quattro: applied a color for shiny class and preview 2012-02-23 12:54:14 +01:00
Fabio Comuni cbc60d525e quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside. 
remove html from viewcontacts.php and contacts.php
use contact_template.tpl to print contacts also in viewcontacts
 2012-02-23 11:22:32 +01:00
friendica d9e9fd0359 Merge branch 'master' into notify 2012-02-23 00:30:17 -08:00
friendica fd43e2c563 more theme notify fixes 2012-02-23 00:28:26 -08:00
Tobias Diekershoff 56f3c00eec quattro: added styling to pivate message view 2012-02-23 09:02:40 +01:00
friendica 41636a50aa new notify sort of working in testbubble 2012-02-22 23:34:30 -08:00
friendica 808b886a3e Merge branch 'master' into notify 2012-02-22 22:36:07 -08:00
friendica 58a9c652de Merge pull request #45 from annando/master 
New HTML to BBCode converter, changes to BBCode, nginx support, ...
 2012-02-22 20:21:05 -08:00
Michael e34a648cad German translation more gender friendly. Some more logging in poller.php 2012-02-22 15:20:49 +01:00
friendica 9fe12d1724 some cleanup of tb notifications 2012-02-21 20:22:09 -08:00
Abinoam P. Marques Jr 914169472e view/admin_remoteupdate.tpl - Friendika -> Friendica 2012-02-20 19:47:56 -03:00
Abinoam P. Marques Jr d89a0449d0 htconfig.tpl - Friendika -> Friendica 2012-02-20 19:47:44 -03:00
Abinoam P. Marques Jr 12a8796854 mod/dfrn_request.php and templates - Friendika -> Friendica 2012-02-20 19:38:43 -03:00
Michael 3a7695ded1 Fetched some missing styles from testbubble. 2012-02-20 15:11:27 +01:00
root b6d7777226 New version of markdown. Playing with stylesheet. Testing line breaks. 2012-02-19 22:47:32 +01:00
Michael 4713069e68 Many small changes 2012-02-19 20:11:36 +01:00
Michael cafd400352 Merge remote branch 'upstream/master' 
Conflicts:
	view/theme/vier/style.css
 2012-02-19 20:09:42 +01:00
ike 73e0e4d783 New theme "vier" derives from "quattro" 2012-02-19 20:05:51 +01:00
friendica 75acc1ed96 support plaintext on editpost, editorinit called before all buttons laid out 2012-02-17 11:49:27 -08:00
Tobias Diekershoff 652622894f de strings 2012-02-16 11:55:52 +01:00
friendica b1d31aca51 quick comments 2012-02-15 18:13:41 -08:00
fabrixxm 16f00cb73b Merge pull request #36 from fabrixxm/master 
Missing icons in 'quattro' and ajax events calendar
 2012-02-15 03:51:44 -08:00
Fabio Comuni 73bee08ac2 enable ajax calendar with $a->config['experimentals']['new_calendar']=1 2012-02-15 12:47:50 +01:00
Fabio Comuni fe3e8ee854 quattro: icons for attachments 2012-02-15 11:10:02 +01:00
friendica 03171fd7de preliminary qcomment support, [nosmile] tag to disable smiley processing 2012-02-14 23:13:18 -08:00
Fabio Comuni 549c920e6f events js: don't modify rendered item if not autor specified 2012-02-14 16:28:10 +01:00
Fabio Comuni 22cfb77173 events: first test for full-javascript events calendar 2012-02-14 16:19:48 +01:00
friendica 060ac4ebf1 delete mail message icon not brightening on hover 2012-02-14 02:34:05 -08:00
friendica d2a9ce9362 more contacts categorisation, page cleanup 2012-02-13 22:48:35 -08:00
friendica d75b6a00d4 tabs and total count for contacts page 2012-02-13 20:38:00 -08:00
friendica bcad629633 more stray quotes 2012-02-13 18:40:56 -08:00
friendica 803a7425ea make hr bbtag shareable, stray quote in duepuntozero wall_item 2012-02-13 18:40:28 -08:00
friendica 23f5abfa1f Merge branch 'pull' 2012-02-13 14:17:20 -08:00
friendica 52cb63655a POST should be lowercase these days 2012-02-13 14:15:39 -08:00
Tobias Diekershoff 22bb285c7f green variation of the quattro theme 2012-02-13 17:05:48 +01:00
Fabio Comuni 8369c243b3 Fix 'item not found' message 2012-02-13 10:19:10 +01:00
Fabio Comuni 850560519a Merge remote-tracking branch 'friendica/master' into mobile 2012-02-13 09:46:42 +01:00
Fabio Comuni 16d3bc9deb quattro: pause icon 2012-02-13 09:35:11 +01:00
Fabio Comuni 3e664dbdfe reshare in "display" view 2012-02-13 09:33:20 +01:00
friendica 0c4606682f fix link/bookmark reshares 2012-02-11 19:21:41 -08:00
friendica da946bb9b0 bug #278 show only blocked contacts 2012-02-11 03:07:15 -08:00
friendica 75a62db9c5 show tags (pub_keywords) in advanced profile 2012-02-11 01:24:29 -08:00
Fabio Comuni ed38808aae hidden jot in "display" to allow reshare 2012-02-10 17:30:22 +01:00
Fabio Comuni 8480550144 quattro: add "view in context" link in search results 2012-02-10 17:29:37 +01:00
friendica ffe7d8b1e9 item tag notifications 2012-02-09 21:18:50 -08:00
friendica 03435853b3 fix apps sub-menu on quattro and vier 2012-02-08 18:12:26 -08:00
Tobias Diekershoff d8157f73ef quattro: added delete button to mail list overview 2012-02-08 22:29:38 +01:00
Tobias Diekershoff ca8a25172e quattro: added delete buttons to groups and contacts 2012-02-08 22:13:36 +01:00
Tobias Diekershoff 72c30deb64 quattro: group member selection styling 2012-02-08 20:47:52 +01:00
Tobias Diekershoff 1eb32a0bb5 added theme "vier" by Michael Vogel 2012-02-08 19:09:25 +01:00
friendica e92e3658b2 make individual advanced profile items addressable via script or plugin 2012-02-07 20:34:40 -08:00
friendica c6cdad946e more fixes for textmode 2012-02-07 00:13:16 -08:00
friendica 2b77002471 basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html). 2012-02-06 20:28:50 -08:00
friendica 76308eca67 add toggle to choose sending "friends with" activity even if contact is not hidden 2012-02-06 16:41:05 -08:00
friendica 57f7083706 style missing on crepair-name 2012-02-05 17:38:32 -08:00
zottel 3149e3cd3e testbubble fix: tools for wall-to-wall items now appear at the bottom where they should be 2012-01-30 13:33:25 -08:00
Tobias Diekershoff d658cdaa84 quattro: small adjustments to the profile edit style 2012-01-30 14:25:24 +01:00
Tobias Diekershoff 43df068d2e quattro: styling of the edit profile page 2012-01-30 13:22:16 +01:00
Tobias Diekershoff a5974d1981 moving the pager down below the contact/photo list in quattro 2012-01-28 13:13:21 +01:00
friendica 3197a6e8aa fix some changes lost from another branch 2012-01-26 23:03:27 -08:00
friendica f1f480c2bf slackr -> wall-to-wall comment form background different than regular comment 2012-01-26 20:32:05 -08:00
friendica 068cb53a9e page delegation 2012-01-26 20:08:02 -08:00
friendica d2a9341128 new event current date off by one, submit button misplaced 2012-01-25 13:42:06 -08:00
friendica a24a383dab by default allow pseudonyms 2012-01-25 00:30:36 -08:00
friendica a76a497d92 implement "moderate" flag on items 2012-01-23 20:56:11 -08:00
friendica 1f074cb44c shaka, slackr theme 2012-01-23 15:07:40 -08:00
Fabio Comuni 9047840ec2 nav: fix "See all notifications" 2012-01-23 09:23:37 +01:00
Fabio Comuni 30fcda7576 nav: fix intro notification url, fix "See all notifications" url and make it translatable 2012-01-22 19:27:56 +01:00
friendica 8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
Tobias Diekershoff 40edcec06f German translation 2012-01-13 15:14:40 +01:00
friendica a1dc3185be typo in greenzero 2012-01-12 23:33:20 -08:00
friendica 28edeefc14 reset width of openid input, settings page 2012-01-12 20:35:05 -08:00
friendica 520ba0960b put openid logo back on openid input box, duepuntozero settings page 2012-01-12 20:31:14 -08:00
friendica df14d7abc4 allow crepair to change name - as long as it isn't blank 2012-01-12 18:54:35 -08:00
friendica bdfe3ba129 missing source file, fix link icon in testbubble 2012-01-12 17:58:55 -08:00
friendica 4d07cfa2d0 and and theme previewing for testbubble 2012-01-12 17:50:02 -08:00
Tobias Diekershoff 9b2669eb5d profile-match and contact suggestion list styling 2012-01-12 21:21:00 +01:00
Fabio Comuni ea9f14c27b quattro: style fakelink 2012-01-12 10:42:59 +01:00
Fabio Comuni 3d7857ecdd quattro: item acl popup panel, max height to notifications menu, style comment preview and wall-to-wall item photos 2012-01-12 10:38:24 +01:00
Fabio Comuni 302d62f7a3 templates: add class to comment preview div, fix search_item.tpl 2012-01-12 10:37:11 +01:00
Fabio Comuni 1f9e8f90a2 fix jot acl 2012-01-12 10:35:50 +01:00
friendica b7ccbfc702 Merge branch 'pull' 2012-01-10 17:48:05 -08:00
friendica cf7008e575 post preview to loozah 2012-01-10 17:47:11 -08:00
zottel bd3dee43c1 New German translations 2012-01-10 08:13:30 -08:00
friendica 375cb82124 move post preview link 2012-01-09 21:02:02 -08:00
friendica 7011f71e8f post preview 2012-01-09 20:03:00 -08:00
friendica 805eb35a1a not ready for post preview 2012-01-09 18:54:05 -08:00
friendica a13156c0f3 bypass D* markdown bug for now 2012-01-09 18:52:49 -08:00
friendica 9d0664ba48 Merge branch 'pull' 2012-01-08 05:17:59 -08:00
friendica 0828ab353f fix git horkage 2012-01-08 05:16:55 -08:00
friendica 9f6d38a61a something weird with git 2012-01-08 04:30:35 -08:00
friendica a6d0a65321 more recovery of lost contact page formatting 2012-01-08 04:16:23 -08:00
friendica dd7a10a219 contact page float got lost somewhere 2012-01-08 04:13:53 -08:00
friendica 358b2a46f5 fix photo top view in testbubble, extend network_to_name 2012-01-07 13:00:06 -08:00
friendica 41bb47ca1b title fixups 2012-01-06 03:59:05 -08:00
Fabio Comuni f70f2eedaf duepuntozero: get back jot icons 2012-01-06 10:03:20 +01:00
Fabio Comuni a5a6719283 fix photo album pager 2012-01-06 09:35:29 +01:00
Fabio Comuni 98a8693e9e quattro: style network widget 2012-01-06 09:27:05 +01:00
Fabio Comuni f9b0af6f2f Merge remote-tracking branch 'friendica/master' 2012-01-06 09:11:48 +01:00
Fabio Comuni efe308b5ac Use html5 placeholder for title text input 2012-01-06 09:11:25 +01:00
Fabio Comuni a9670cbb7d Merge remote-tracking branch 'friendica/master' 2012-01-06 09:10:21 +01:00
friendica c3ada095f4 network select widget 2012-01-05 20:40:48 -08:00
friendica b99cb511ca comment preview 2012-01-05 16:38:24 -08:00
friendica 53878625f6 backend support for post preview 2012-01-05 15:02:44 -08:00
friendica 2f73be326e change to hover function 2012-01-04 21:01:24 -08:00
friendica c5d27c48f5 more title stuff 2012-01-04 20:43:38 -08:00
friendica dbb5955469 bit more improvement on dynamic title 2012-01-04 20:35:32 -08:00
friendica f1c7db593c better title handling (duepuntozero only at this time) 2012-01-04 20:09:14 -08:00
friendica 47edaf9ad7 dynamic title input box - via fabrixxm 2012-01-04 18:03:09 -08:00
friendica 378f86d046 Merge branch 'pull' 2012-01-04 14:31:37 -08:00
friendica 48a5a2484e new smiley 2012-01-04 00:04:19 -08:00
23n 0077997eb6 Update view/de/strings.php 2012-01-04 07:05:44 +01:00
friendica 8e6c02cda3 remove some old email templates 2012-01-03 18:12:58 -08:00
friendica 969cd145ce suggestion notifications 2012-01-03 17:29:07 -08:00
friendica c583d16209 fix reference variable effects on sorting 2012-01-03 14:27:00 -08:00
Fabio Comuni 93563370c9 Merge remote-tracking branch 'friendica/master' 2012-01-03 21:14:48 +01:00
Fabio Comuni c7bfd1e1ba install: fix install procedure 
install procedure as a wizard
graphical rappresentation of passed/unpassed system checks
db connection test don't try anymore to create the db
admin email and timezone are asked in a separate pass
fix loading of database.sql, removing comments from phpmyadmin export
fix check for .htconfig.php writability
ask for php-cli path if not found in PATH
install_db.tpl use field_* templates to render the form
 2012-01-02 20:16:28 +01:00
Fabio Comuni f35109827b datetime: new field_timezone() function, new template field_select_raw.tpl 
returns a timezone select like select_timezone() but using template field_select_raw.tpl.
field_select_raw get options html as forth argument, instead of array value=>label like field_select
 2012-01-02 20:09:25 +01:00
Fabio Comuni be2fd56aae Merge branch 'master' of github.com:fabrixxm/friendica 2012-01-02 15:32:37 +01:00
friendica c735582ead hide contacts on approval 2011-12-29 00:23:05 -08:00
friendica aca8c8a13a Merge branch 'pull' 2011-12-27 14:27:39 -08:00
friendica 356c05c6b3 extending notifications to other types 2011-12-26 14:16:25 -08:00
Tobias Diekershoff f29507cdba translation of email templates 2011-12-26 09:16:33 +01:00
Tobias Diekershoff f1b7ce6ef4 translation of email template 2011-12-26 09:08:32 +01:00
Tobias Diekershoff 02af9cd3b2 translation of the email template 2011-12-26 09:05:02 +01:00
friendica bb40e54dec new notification module working for "email message received" 2011-12-25 23:00:19 -08:00
friendica 170b841834 more enotify 2011-12-25 16:20:53 -08:00
friendica bef8f95ef3 more enotify 2011-12-24 22:36:17 -08:00
friendica 95b4bc55bf Merge branch 'master' into notify 2011-12-22 15:42:01 -08:00
Fabio Comuni 2ef2d0b79f quattro: contacts and first photo page 2011-12-22 16:33:14 +01:00
Fabio Comuni 0b4535e6da quattro: more on editor 2011-12-22 11:24:34 +01:00
Fabio Comuni bf00e4dded quattro: more on editor 2011-12-21 17:36:42 +01:00
Fabio Comuni ba732c97c1 Merge remote-tracking branch 'friendica/master' 2011-12-20 17:18:19 +01:00
Fabio Comuni f3b499f119 quattro: more on editor 2011-12-20 17:17:17 +01:00
friendica 0bef863015 wrong style for unvisited links 2011-12-19 20:23:11 -08:00
Fabio Comuni 2a3f94e452 Merge remote-tracking branch 'friendica/master' 2011-12-19 18:04:04 +01:00
Fabio Comuni c3d12bc77e quattro: fix icons in oauth settings page 2011-12-19 18:03:03 +01:00
Fabio Comuni 16d45e5c13 quattro: first work on jot style 2011-12-19 18:02:43 +01:00
friendica 177af1fc9d jquery effects missing from zero derivatives 2011-12-19 01:23:12 -08:00
friendica eb05d00794 connect on suggest/match - added to testbubble 2011-12-18 12:51:45 -08:00
friendica 5d6a098ce0 add connect link to suggestion and matches 2011-12-18 01:44:46 -08:00
friendica 974a52a16d add connect link to friend suggest 2011-12-18 01:08:32 -08:00
friendica c4a5fcaf27 fix xml poco for arrays 2011-12-18 00:39:15 -08:00
friendica 978717a247 add webfinger to poco, if present 2011-12-18 00:14:34 -08:00
friendica ed725df5f1 Merge branch 'master' into notify 2011-12-12 20:13:12 -08:00
friendica 01cae9a50a remove all plugins from default config 2011-12-12 16:28:33 -08:00
friendica a38d3b82b9 browser_update settings 2011-12-11 21:03:33 -08:00
friendica 4f254ffb5b system support for personal configurable ajax update interval 2011-12-11 20:32:43 -08:00
friendica 50c4b9a780 Merge branch 'master' into notify 2011-12-11 20:03:46 -08:00
friendica 3da3cd686c notifications refactor 2011-12-08 01:28:27 -08:00
zottel f661bb4250 fixed some glitches in testbubble theme 2011-12-08 00:12:51 -08:00
friendica 961e34f67f missing template 2011-12-07 15:26:17 -08:00
friendica 7eba8adbf7 pm replies 2011-12-06 19:15:42 -08:00
Tobias Diekershoff 06b904ffcb copied code styling from duepuntozero to quattro theme 2011-12-06 17:10:27 +01:00
friendica 47f369e052 hide some contacts from others 2011-12-05 18:36:26 -08:00
zottel ced28a8827 added #pause 2011-12-05 05:17:37 -08:00