Commit graph

4613 commits

Author SHA1 Message Date
friendica 7ee07daf04 use theme directory for page templates, not language directory 2012-03-27 18:39:52 -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
tomtom84 0bf22d64f6 Merge pull request #177 from tomtom84/master
fixes in theme diabook
2012-03-27 10:05:32 -07: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
tomtom84 fef7790762 Merge pull request #176 from tomtom84/master
fixes in theme diabook-blue
2012-03-27 06:32:30 -07: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
friendica 1982184ca0 Merge branch 'pull' 2012-03-27 04:52:39 -07:00
friendica 117d2165f5 form security error when using existing photo 2012-03-27 04:51:20 -07:00
Simon 928e6c7ef7 Merge pull request #175 from simonlnu/master
various fixes for dispys
2012-03-27 01:43:01 -07:00
Simon L'nu cc33a564e1 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  profile wall privacy
  don't expire filed items

* master:
2012-03-27 04:40:42 -04: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
friendica 7c6c3d36f5 profile wall privacy 2012-03-27 01:31:47 -07: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
friendica ed30635bee Merge branch 'pull' 2012-03-27 00:55:25 -07:00
friendica 20f9733250 don't expire filed items 2012-03-27 00:54:34 -07:00
Simon L'nu a57e1e9cbc Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  add "find friends" to right_aside to diabook, fixes in css in diabook
  fixed Umlaute in de strings.php

* master:
2012-03-27 03:23:50 -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
Simon L'nu cfdb2979cb Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  @-completion bug
  qcomment enhancements
  theme description with preview (non-translatable unfortunately)
  preparation for some possibly killer features
  translate br with extra elements
  revup
  Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK.

* master:
2012-03-27 00:54:47 -04:00
friendica daa036e34c @-completion bug 2012-03-26 21:48:04 -07:00
friendica 5275b5d049 qcomment enhancements 2012-03-26 20:13:03 -07:00
friendica 4c585f759f theme description with preview (non-translatable unfortunately) 2012-03-26 18:15:10 -07:00
friendica b5d0315d55 preparation for some possibly killer features 2012-03-26 17:57:27 -07:00
friendica 03b95c9a09 translate br with extra elements 2012-03-26 16:56:44 -07:00
friendica 70cc2fff6f Merge branch 'pull' 2012-03-26 14:55:35 -07:00
friendica 7a1d044b21 revup 2012-03-26 14:54:30 -07:00
friendica cc3617e286 Merge pull request #174 from beardy-unixer/master
Fixed regions
2012-03-26 14:40:47 -07:00
Thomas Willingham ca8769e193 Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK. 2012-03-26 22:03:54 +01:00
Thomas Willingham 286c230fa8 Merge remote-tracking branch 'main/master' 2012-03-26 20:17:01 +01:00
Simon 0a3f2bdd5b Merge pull request #173 from simonlnu/master
fix dispy's nav element; fix colours in #search-text
2012-03-26 11:33:31 -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
Simon L'nu a0ee51b3db Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css
  marking quattro-green as extension of quattro and deleting the tpl files
  minor css fixes in diabook
  screenshot for darkzero-NS, same as darkzero
  added quaddro templates to quaddro-green
  language issues in enotify
  small fix in diabook :: add local friendica to right_aside
  comix screenshot
  diabook: small fix in theme_info array
  more theme screenshots
  themes: use duepuntozero tpls as default

* master:
2012-03-26 14:18:39 -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
friendica 3431d0b427 Merge branch 'pull' 2012-03-26 01:43:48 -07:00
friendica b240b8489a language issues in enotify 2012-03-26 01:43:26 -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 4b83b9bee6 Merge pull request #171 from simonlnu/master
changes in contact_edit.tpl
2012-03-26 00:41:22 -07:00