bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4524 commits 4 branches 0 tags 133 MiB
Commit graph

1571 commits

Author SHA1 Message Date
tomtom84
68ca29719e Merge pull request #116 from tomtom84/master 
fixes in diabook-derivates
 2012-03-09 09:17:01 -08:00
tommy tomson
8fe4645a5d add js to hide nav-menus, when clicked outside 2012-03-09 18:15:27 +01:00
tomtom84
68541b5dd2 Merge pull request #115 from tomtom84/master 
fixes in diabook-derivates
 2012-03-09 04:24:59 -08:00
tommy tomson
9f441731af fixes in css 2012-03-09 13:23:38 +01:00
Alexander Kampmann
af34cf019c Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 12:17:19 +01:00
friendica
2ce78253ae Merge branch 'pull' 2012-03-09 00:48:16 -08:00
friendica
3878b58f0d bug #324 - tinymce used for mail even if editplain being used. 2012-03-09 00:47:10 -08:00
Simon L'nu
81f5b0e2df [theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts. 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-09 00:26:54 -05:00
Simon L'nu
dc8d060d4d i consider dispy pretty stable at this point, so i'm removing the experimental file 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-09 00:00:56 -05:00
Simon L'nu
20b2090182 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  removed info
  add info
  fixed star-bug
  More improved transparency for smilies
  removed dolphin file (wtf?)
  .

* master:
 2012-03-08 23:59:43 -05:00
tomtom84
e25fb2b2f9 Merge pull request #112 from tomtom84/master 
fixes in diabook-derivates
 2012-03-08 19:39:39 -08:00
tommy tomson
e06b941307 removed info 2012-03-09 04:38:20 +01:00
tomtom84
92ab98f8d8 Merge pull request #111 from tomtom84/master 
fixes in diabook-derivates
 2012-03-08 19:16:01 -08:00
tommy tomson
722f631d15 add info 2012-03-09 04:14:24 +01:00
tomtom84
05561bd905 Merge pull request #110 from tomtom84/master 
fixes in diabook-derivates
 2012-03-08 18:02:25 -08:00
tommy tomson
feda3cfc96 fixed star-bug 2012-03-09 02:59:13 +01:00
Simon L'nu
8d19baadff Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  theme info file for testbubble
  catalan translation
  revup
  add theme diabook-blue, fix css

* master:
 2012-03-08 20:38:54 -05:00
friendica
b86a08166c theme info file for testbubble 2012-03-08 16:30:45 -08:00
friendica
af9f7da449 catalan translation 2012-03-08 16:29:22 -08:00
friendica
3b47626c15 Merge https://github.com/friendica/friendica into pull 2012-03-08 14:35:47 -08:00
tommy tomson
b9dda93f0c add theme diabook-blue, fix css 2012-03-08 23:22:26 +01:00
Simon L'nu
5fe8952c29 make svg from notifications.svg to ease future editing. more dispy tweaks 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-08 13:37:45 -05:00
tomtom84
08b5ede5a1 Merge pull request #107 from tomtom84/master 
fixes in theme diabook
 2012-03-08 05:52:14 -08:00
tommy tomson
1fcbc7aa5a add links to /profiles, add some icons to diabook/icons, fixes in css 2012-03-08 14:49:07 +01:00
Simon L'nu
15d310e4c3 fix jot.tpl buttons. fix up subsequent styling breakage 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-07 12:35:04 -05:00
Simon L'nu
66d2c52b5f push fix for funky menu action. the overflow-x might break again for some people 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-07 10:07:36 -05:00
Alexander Kampmann
4690d00141 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-07 12:06:20 +01:00
Alexander Kampmann
b2df1205ef merged 2012-03-07 12:06:09 +01:00
tomtom84
dd2ff7c796 Merge pull request #103 from tomtom84/master 
fixes in theme diabook
 2012-03-06 23:44:18 -08:00
tommy tomson
ec3ce05357 fix in navbar 2012-03-07 08:42:19 +01:00
tomtom84
05a52b2660 Merge pull request #101 from tomtom84/master 
fixes in theme diabook
 2012-03-06 15:49:32 -08:00
tommy tomson
49b5a1bf20 fix in navbar 2012-03-07 00:47:43 +01:00
Simon
decc9e5798 Merge pull request #99 from tomtom84/master 
fixes in theme diabook
 2012-03-06 15:22:55 -08:00
tommy tomson
6a5c4bab9c messages-menu translation, add scroll-to-top and theme-bug-report in theme 2012-03-07 00:07:27 +01:00
Simon L'nu
edd450cf06 dispy, dispy, oh what a little lispy 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-06 17:55:05 -05:00
friendica
8fb0ea4048 bugs #312, #313 2012-03-06 14:27:53 -08:00
Simon L'nu
bc8b014906 styling fixes in dispy. fix typos in settings.tpl 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-06 16:18:26 -05:00
Fabio Comuni
607ee1ff9c quattro: theme settings (a bit hackish) 2012-03-06 09:50:18 +01:00
tommy tomson
eaaf030c18 Merge remote-tracking branch 'origin/master' 2012-03-06 08:28:21 +01:00
tommy tomson
b64b1d13a4 fixes in diabook 2012-03-06 08:27:20 +01:00
friendica
321b651635 Merge branch 'pull' 2012-03-05 18:52:15 -08:00
friendica
23460302f5 some admin page fixes and cleanup 2012-03-05 18:51:21 -08:00
Michael Johnston
9f44dbbb48 changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero) 2012-03-05 21:10:01 -05:00
friendica
e5de03040e Merge branch 'pull' 2012-03-05 15:59:28 -08:00
friendica
7b3349f38a some testbubble stuff 2012-03-05 15:58:26 -08:00
Simon L'nu
190650060a forgot a small change in .field_help 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 18:16:51 -05:00
Simon L'nu
50824bddd0 implement more of the changes requested 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 17:57:04 -05:00
tommy tomson
a406c16581 fixes 2012-03-05 22:31:03 +01:00
Alexander Kampmann
fbc017cdba added test blueprints, fixed? encoding issues 2012-03-05 22:22:10 +01:00
Simon L'nu
9d461846e2 multiple fixes; the jot-header works as standalone, not sure what's up. 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 15:55:17 -05:00
Simon L'nu
02f825ca3c tweak sizing of <section> and <aside> more; fix link in 'view contacts' in sidebar 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 13:16:28 -05:00
Simon L'nu
ef1d02e7bd still working on jot-header. amending <aside> and other elements 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 12:21:57 -05:00
Simon L'nu
65b6ec79ed hopefully fix the overflow issue everywhere this time 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 10:55:26 -05:00
friendica
965e657c20 $name appearing on testbubble items 2012-03-05 03:10:45 -08:00
friendica
31f192bb57 Merge branch 'pull' 2012-03-05 00:54:25 -08:00
friendica
0d97799324 testbubble notifications 2012-03-05 00:53:42 -08:00
Simon L'nu
7de79a8c49 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  like dislike button
  fixes in diabook

* master:
 2012-03-05 01:08:54 -05:00
Simon L'nu
fe7a6b070d yet more ui things, and bug fixing 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 01:08:45 -05:00
tomtom84
9c541dbd67 Merge pull request #83 from tomtom84/master 
fixes in diabook theme
 2012-03-04 20:15:26 -08:00
tommy tomson
fe614b4e7c like dislike button 2012-03-05 05:14:08 +01:00
Simon
04527bd0b1 Merge pull request #80 from unary/darkzero 
improved contrast in acl selector, and preview (darkzero)
 2012-03-04 19:19:45 -08:00
Simon
3b95171824 Merge pull request #82 from simonlnu/master 
say hello to dispy's younger brother
 2012-03-04 19:19:08 -08:00
Simon L'nu
58cdf776b6 more ui thingies with dispy - we'll get you well dispy, we promise 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 22:16:10 -05:00
friendica
b57247d6a6 Merge branch 'pull' 2012-03-04 19:15:42 -08:00
friendica
b9bea3a549 wrap title and text for editplain in zero and TB themes 2012-03-04 19:14:03 -08:00
friendica
fba089012a correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode 2012-03-04 18:50:32 -08:00
tommy tomson
e52891d8ab fixes in diabook 2012-03-05 03:08:58 +01:00
tomtom84
d369fcc994 Merge pull request #81 from tomtom84/master 
fixes in diabook theme
 2012-03-04 17:46:48 -08:00
tommy tomson
1653e5a615 fixes in diabook 2012-03-05 02:45:24 +01:00
Michael Johnston
b2035ae0c6 improved contrast in acl selector, and preview (darkzero) 2012-03-04 17:29:00 -05:00
Simon L'nu
2441babbe9 removed extra padding/border on tread-wrapper (heh, tea read :P) 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 15:52:50 -05:00
Simon L'nu
25510453bf fix up toolbar so the notifications line up better together 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-04 14:55:09 -05:00
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