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

1499 Commits

Author SHA1 Message Date
Simon L'nu 5f77aff486 more tweakage. stylesheet and jot-header 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 12:21:08 -05:00
tommy tomson 8e49b4332c style.css fix 2012-03-04 14:19:53 +01:00
Simon L'nu cb57a0ebfd soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 05:19:49 -05:00
Simon L'nu c28ce8a79c tweak wall items a bit (nasty-looking wall items...). jot-header tries to count chars and fails :P 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 05:00:35 -05:00
tomtom84 dfa056bb1b Merge pull request #74 from tomtom84/master 
fixes in diabook theme
 2012-03-03 20:49:09 -08:00
tommy tomson e0e0224fa6 some fixes in diabook 2012-03-04 05:48:06 +01:00
Simon f3c1e2c546 Merge pull request #73 from simonlnu/master 
dispy! (and minor formatting)
 2012-03-03 16:23:07 -08:00
Simon L'nu 09c2f81cb3 these are more finessing on formatting again 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-03 19:20:23 -05:00
Simon L'nu 64400e8d59 first commit for dispy New Edition 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-03 19:19:35 -05:00
tomtom84 74866a96de Merge pull request #72 from tomtom84/master 
fixes in diabook theme
 2012-03-03 15:10:54 -08:00
tommy tomson 25d6ca3b73 tag fix 2012-03-04 00:10:03 +01:00
tomtom84 f4b9c405da Merge pull request #71 from tomtom84/master 
fixes in diabook theme
 2012-03-03 14:45:03 -08:00
tommy tomson b3eeb22401 fix 2012-03-03 23:43:15 +01:00
tomtom84 77db5becb6 Merge pull request #70 from tomtom84/master 
fixes in diabook theme
 2012-03-03 14:13:14 -08:00
tommy tomson 173fb983c5 navbar fix 2012-03-03 23:12:03 +01:00
Simon L'nu 1bed4010aa Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  Added docblox default configuration file.
  fixed apps css

* master:
 2012-03-03 16:49:22 -05:00
tomtom84 7230fa5a94 Merge pull request #68 from tomtom84/master 
fixes in diabook theme
 2012-03-03 12:48:34 -08:00
tommy tomson 42b9887693 fixed apps css 2012-03-03 21:45:59 +01:00
Simon L'nu da78d8594f Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fixed star/unstar
  fixed admin fixed editor

* master:
 2012-03-03 13:39:56 -05:00
tomtom84 1dfd5c4f85 Merge pull request #67 from tomtom84/master 
fixes in diabook theme
 2012-03-03 10:09:28 -08:00
tommy tomson d4ac1f2a9c fixed star/unstar 2012-03-03 19:07:55 +01:00
tomtom84 e84e684fdc Merge pull request #66 from tomtom84/master 
fixed editor and admin-sec in theme diabook
 2012-03-03 07:54:21 -08:00
tommy tomson 83e9f57459 fixed admin 
fixed editor
 2012-03-03 16:49:48 +01:00
Simon L'nu 2b9ea33e8b Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fix editor

* master:
 2012-03-03 09:45:32 -05:00
tomtom84 792031c36e Merge pull request #65 from tomtom84/master 
fix editor in theme diabook
 2012-03-03 06:03:34 -08:00
tommy tomson b3ba2eb4d0 fix editor 2012-03-03 15:01:25 +01:00
Simon L'nu ba28404470 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fix text-editor in theme
  german strings as of 28th Feb from transilex
  small fix in style.css
  fix star/unstar
  fixes in wall_item.tpl and style.css in theme diabook
  fix in wall_item.tpl new icon link.png
  add diabook to default themes
  fixed broken tags and notifications in theme

* master:
 2012-03-03 08:05:53 -05:00
tomtom84 8ffe15fbb1 Merge pull request #64 from tomtom84/master 
fix editor in theme diabook
 2012-03-03 04:30:31 -08:00
tommy tomson 60adef2463 fix text-editor in theme 2012-03-03 13:27:39 +01:00
Tobias Diekershoff 9d885c4801 german strings as of 28th Feb from transilex 2012-03-03 12:17:32 +01:00
tomtom84 b4361e37e0 Merge pull request #63 from tomtom84/master 
fixes in diabook theme
 2012-03-02 21:02:55 -08:00
tommy tomson 83c25b4386 small fix in style.css 2012-03-03 06:00:46 +01:00
tommy tomson 89f667ff76 fix star/unstar 2012-03-03 04:45:34 +01:00
friendica 2ae82ae3c2 Merge pull request #62 from tomtom84/master 
fixes in diabook theme
 2012-03-02 19:32:34 -08:00
tommy tomson d138d07c05 fixes in wall_item.tpl and style.css in theme diabook 2012-03-03 04:27:06 +01:00
tommy tomson 8f72d95b0e fix in wall_item.tpl 
new icon link.png
 2012-03-03 01:52:53 +01:00
Simon L'nu 7ef861907e minor formatting issues 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-02 19:09:17 -05:00
tommy tomson d3f83c9375 fixed broken tags and notifications in theme 2012-03-03 00:41:02 +01:00
Simon L'nu 81de5f7802 apply changes to templates to testbubble 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-02 13:59:28 -05:00
Simon e2e9050d74 Merge pull request #58 from simonlnu/master 
fix for comment-wwedit-wrapper; CSS class in tpl had a stray $
 2012-03-02 09:28:04 -08:00
Simon d61ee3760d Merge pull request #59 from tomtom84/master 
diabook theme
 2012-03-02 09:25:42 -08:00
tommy tomson 64a85b2507 deleted readme.txt from folder diabook 2012-03-02 18:01:21 +01:00
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