Commit Graph

1384 Commits

Author SHA1 Message Date
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