Commit Graph

1701 Commits

Author SHA1 Message Date
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
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 L'nu 0c4aba4b57 [fix] contact_edit.tpl syntax; reduce cols to fit better
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-26 03:39:06 -04:00
tommy tomson c4c69959e2 add screenshots to diabook 2012-03-26 09:37:14 +02:00
Fabio Comuni 51d419e159 themes: use duepuntozero tpls as default 2012-03-26 09:09:14 +02:00
Simon L'nu 7de8e15ca4 fix the search box
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-26 03:01:13 -04:00
tommy tomson 37f02424f8 small fix 2012-03-26 07:02:27 +02:00
friendica ba28362242 position the theme-preview on settings page 2012-03-25 21:12:10 -07:00
friendica a06185e87c screenshot gallery 2012-03-25 20:08:28 -07:00
friendica be52ec6f5a Merge branch 'pull' 2012-03-25 19:48:17 -07:00
Simon L'nu 3d11c22b01 add in the search box
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 22:45:44 -04:00
Simon L'nu 758e1b7424 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  theme screenshots

* master:
2012-03-25 22:40:24 -04:00
friendica c88674aaf2 theme preview for end users 2012-03-25 19:05:14 -07:00
friendica 7ab117fd31 Merge branch 'pull' 2012-03-25 18:19:58 -07:00
friendica 7ef1ed2d70 theme screenshots 2012-03-25 17:55:43 -07:00
Simon L'nu 3d62cb9782 minor fix to dispy theme.php
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 17:13:24 -04:00
Simon L'nu aa33815d3c urgent fix to dispy-dark theme.php
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 17:06:38 -04:00
tommy tomson baeb735315 small fixes 2012-03-25 19:43:42 +02:00
Simon L'nu 2c43120129 dispy-dark not experimental. start implementing fpostit
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 03:22:16 -04:00
Simon L'nu 84686a2698 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  move community_pages to right_aside, fixes in css
  improved the inivitations and added a bit of sales pitch.

* master:
2012-03-25 03:18:21 -04:00
tommy tomson 329a26d62e move community_pages to right_aside, fixes in css 2012-03-25 08:47:17 +02:00
Simon L'nu 1d56224b08 increase version to 1.0 for dispys \o/
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 01:12:28 -04:00
Simon L'nu 8fe77e5b86 implement filer/file-as
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 01:01:59 -04:00
tommy tomson 8451b22d42 small fix in css 2012-03-24 08:56:26 +01:00
tommy tomson ba027f174d add right_aside to diabook-blue 2012-03-24 08:13:48 +01:00
tommy tomson 378762fed2 add connectable services to right_aside 2012-03-24 06:17:14 +01:00
tommy tomson d76b052f90 add PostIt to right_aside, fixes in css 2012-03-24 04:05:21 +01:00
Fabio Comuni 1780fff161 diabook: theme.php
remove code duplication
last photos check for user "hidewall"
remove unneeded regex
move js code to close popup in main.js (missing stop event propagation in popup links)
2012-03-23 14:09:06 +01:00
Fabio Comuni 82cc86a41a user settings: don't show emoticons 2012-03-23 12:07:22 +01:00
tommy tomson c35b9ec24f fix in css right_aside 2012-03-23 10:16:11 +01:00
tommy tomson 7706a8f9d8 small fix 2012-03-23 07:28:48 +01:00
tommy tomson 687fa80094 fix 1024resolution 2012-03-23 07:02:21 +01:00
tommy tomson bf4dd8ad17 add right_aside to theme diabook 2012-03-23 02:36:34 +01:00
Tobias Diekershoff 07c5b0af5a quattro(-green) styling the 'filed under: remove' text 2012-03-22 14:09:21 +01:00
Tobias Diekershoff 1e86e3fb26 it's only item.filer ;-) 2012-03-22 13:46:05 +01:00
Tobias Diekershoff 5babf5c8b4 Merge branch 'quattrofiler' 2012-03-22 13:42:10 +01:00
Tobias Diekershoff 6df7fae4b5 non static filer text 2012-03-22 13:41:41 +01:00
Tobias Diekershoff 54c08b2b0f adding filer functionality to quattro(-green) 2012-03-22 12:41:51 +01:00
friendica 808180ce5f missing tooltip for "file as" 2012-03-22 04:07:37 -07:00
tommy tomson e37c4f69b4 add file_as-option to diabook-derivates 2012-03-22 06:54:18 +01:00
tommy tomson 72d0756fa6 add icons to aside diabook, fixes in css 2012-03-22 04:33:21 +01:00
friendica 89028f2e2f add comix-plain 2012-03-21 13:55:37 -07:00
friendica 56495e04b2 smooth the comix comment box 2012-03-21 06:48:04 -07:00
friendica 1a98f3c067 ika to ica 2012-03-21 00:35:33 -07:00
friendica adcf52d02d facepark is unsupported ATM 2012-03-21 00:08:06 -07:00
friendica db02eebde1 Merge branch 'pull' 2012-03-20 23:59:02 -07:00
friendica 6c7b619b34 remove stray template variable from old code 2012-03-20 23:57:33 -07:00
friendica efd7c14c24 Merge pull request #154 from tonybaldwin/master
added theme
2012-03-20 23:31:12 -07:00
friendica 0dc4c3f484 add comix theme 2012-03-20 22:54:20 -07:00
friendica 4d39b0658f use password field for DB input 2012-03-20 22:53:19 -07:00
tony baldwin e5c29fcc78 Merge remote branch 'upstream/master' 2012-03-21 01:36:23 -04:00
tony baldwin cf17606d0f added Vijay's theme from facepark.in 2012-03-21 01:33:48 -04:00
Simon L'nu de0298e67e some tweakings for intro boxes (finally got an intro i could see :). dispy synced with dispy-dark
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-20 11:37:51 -04:00
friendica cca524495c community discovery cont., cleanup of DB debugging 2012-03-18 22:12:36 -07:00
friendica c286681158 Merge pull request #147 from CatoTH/master
CSRF-Protection in the group-related form
2012-03-18 17:54:12 -07:00
Simon L'nu e84095182f fix the comment box being too wide and looking off-kilter
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-18 18:33:38 -04:00
Michael Vogel 6f10142b2e API: Seesmic is now working. Optimizing text export. 2012-03-18 17:52:51 +01:00
Tobias Hößl 453b5b46a3 CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it) 2012-03-18 15:44:33 +00:00
Simon L'nu 87fdae2dd8 [fix] whitespace in photo_view and like_noshare. dispy-dark clean up
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-17 01:55:40 -04:00
Simon L'nu 75883b196e remove auto-complete from darkzero-NS, dispys, since the comment one is now global
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 21:23:24 -04:00
Simon L'nu 368d93625d make auto-complete in darkzero-NS. other themes can use this easily. might need to edit the id it hooks into
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 20:29:02 -04:00
Simon L'nu 91fee866b7 make profiles-menu disappear when clicked outside it
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 16:43:34 -04:00
Simon 1246a40ec2 Merge pull request #141 from CatoTH/master
Private messages - tabindex
2012-03-16 10:54:20 -07:00
Tobias Hößl 90bb32ab73 Bugfix of old IEs 2012-03-16 17:47:40 +00:00
Tobias Hößl 27054964fe Forgot to remove a debug line 2012-03-16 17:46:26 +00:00
Tobias Hößl 75823c2353 Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button 2012-03-16 17:45:07 +00:00
Simon L'nu 7b15f27ba4 weee, dispys get another update
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 13:31:59 -04:00
Simon L'nu d965f73ef1 missing close double quote in mail_list.tpl
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 01:57:27 -04:00
Simon L'nu 6bdb71f01c more changes in dispy-dark
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-16 01:55:34 -04:00
friendica 33e03a8df0 Merge branch 'pull' 2012-03-15 19:56:32 -07:00
friendica 5a12383b78 undo git stuffup 2012-03-15 19:55:58 -07:00
tommy tomson 02395c8af5 added icons to profile_side, fixes in css 2012-03-16 03:49:43 +01:00
friendica 5d2c590fa9 Merge pull request #136 from annando/master
Mail improvements, item caching and so on
2012-03-15 15:30:52 -07:00
Simon L'nu 5c75d40c0b fixed the sidebar edit thingy. haven't synced dispy yet.
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-15 17:27:06 -04:00
Michael Vogel 9243c9fc14 Merge commit 'upstream/master' 2012-03-15 21:11:58 +01:00
Simon L'nu 5b757e4e0e commit latest to dispy-dark. fixes in html css and js
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-15 15:07:17 -04:00
friendica a7fd3a8b24 Merge branch 'pull' 2012-03-15 01:48:10 -07:00
friendica 4cd3d5cd02 Merge https://github.com/friendica/friendica into pull 2012-03-15 01:48:07 -07:00
tommy tomson 6dbee45d92 add links to wall, photos, events, etc to aside on networkpage, fixes in css 2012-03-15 08:29:39 +01:00
friendica 93a8907f43 force login to ssl on SSL_POLICY_SELFSIGN 2012-03-14 21:29:44 -07:00
friendica f0a62d8908 ssl_policy stuff 2012-03-14 20:36:23 -07:00
friendica 531201f2a1 Merge pull request #132 from campino/master
Test cases
2012-03-14 15:16:30 -07:00
friendica 959aa13de0 Merge pull request #133 from tonybaldwin/master
slack-NS
2012-03-14 15:15:34 -07:00
friendica 2dc527609e Merge https://github.com/friendica/friendica into pull 2012-03-14 14:34:48 -07:00
Simon c95deb4839 Merge pull request #134 from simonlnu/master
PHP Fatal error:  Call-time pass-by-reference has been removed in mod/item.php on line 630
2012-03-14 08:02:04 -07:00
Alexander Kampmann 70709a8825 Merge branch 'master' of git://github.com/friendica/friendica
Conflicts:
	view/de/strings.php
2012-03-14 12:57:35 +01:00
tommy tomson f03c57007a fix in nav 2012-03-14 12:56:59 +01:00
tommy tomson 42462cc1f0 add links to home, profile, photos, events, notes to aside in network-stream 2012-03-14 12:50:11 +01:00
Simon fb77bfa648 Merge pull request #131 from simonlnu/master
massive work done to both dispys, mostly -dark
2012-03-13 22:10:02 -07:00
Simon L'nu 975781d3e2 massive work done to both dispys, mostly -dark
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-14 01:05:08 -04:00
friendica 4972d7ef6e more work on filer, comment level and file tag removal 2012-03-13 20:46:37 -07:00
Tony Baldwin 1ae740535d added slack-NS, non-scrolly, slackr-based theme. 2012-03-13 23:05:04 -04:00
friendica be48fff157 file as widget and basic filing implementation for duepuntozero,slackr
much more work needed - this is just for test/evaluation currently
2012-03-13 18:13:03 -07:00
friendica 427362c324 Merge branch 'pull' 2012-03-13 15:41:13 -07:00
friendica dc84da520d invite potential connectees to the free social web 2012-03-13 15:40:16 -07:00
friendica acc4bbeb6e Merge pull request #129 from CatoTH/master
CSRF-Protection and minor changes
2012-03-13 14:36:52 -07:00
friendica bf7425c591 click anywhere to close notifications -> zeros and bubbles 2012-03-12 20:21:32 -07:00
tommy tomson 8358b9247f fix css 2012-03-13 00:38:38 +01:00
tomtom84 ecc9f4ba70 Merge pull request #127 from tomtom84/master
fixes in diabook-derivates
2012-03-12 16:06:15 -07:00
tommy tomson 27bc8052d0 use fancybox instead of lightbox 2012-03-13 00:04:19 +01:00
tomtom84 8a85914e1d Merge pull request #126 from tomtom84/master
fixes in diabook-derivates
2012-03-12 15:33:29 -07:00
tommy tomson caffb217c1 fixes 2012-03-12 23:31:54 +01:00
Tobias Hößl 59766b944c Some security against XSRF-attacks 2012-03-12 20:17:37 +00:00
tomtom84 a1305433b8 Merge pull request #125 from tomtom84/master
fixes in diabook-derivates
2012-03-12 13:11:19 -07:00
tommy tomson 9436175746 add lightbox, fixex in css 2012-03-12 21:09:16 +01:00
Simon L'nu 9f52e3df8d fix dispy-dark photo album stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 21:34:51 -04:00
Simon L'nu e9b82bb5ee fix dispys' css and layout
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 20:36:16 -04:00
Michael Vogel 7235d5466a Removed changes 2012-03-11 20:24:55 +01:00
Michael Vogel d653e27e2d Merge commit 'upstream/master'
Conflicts:

	view/theme/diabook/wall_item.tpl
	view/theme/diabook/wallwall_item.tpl
2012-03-11 20:22:28 +01:00
Michael Vogel b879a1ddf1 Pages: Show every community page - even from foreign servers (with caching) 2012-03-11 17:45:12 +01:00
Simon L'nu 258a8c0871 screwed up on the font-size for screen last push
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:29:12 -04:00
Simon L'nu fa0cb8514d add some '@media handheld' types for dispys
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:24:49 -04:00
Simon L'nu 62fe48f064 fix more stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 10:14:31 -04:00
Simon L'nu 57d8370376 fix some stuff right away
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 09:12:31 -04:00
Simon L'nu f7ade749b8 preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-11 01:32:11 -05:00
friendica 1bddd48661 bug #327 - composed private message is lost if no recip specified. 2012-03-10 15:50:51 -08:00
Michael Vogel 74b3e9f273 Enabled Caching for items. Changed color of tags in diabook. 2012-03-10 15:50:35 +01:00
tomtom84 c79cb57e1e Merge pull request #118 from tomtom84/master
fixes in diabook-derivates
2012-03-10 04:24:49 -08:00
tommy tomson 0f3255467e fixed login-fields, fixed. notofication.png, changed locations 2012-03-10 13:22:41 +01:00
Tobias Diekershoff 1e37477fdc German translation 2012-03-10 10:36:20 +01:00
Michael Johnston fd1f8fb436 allow user to set number of items to show on network page 2012-03-09 21:29:39 -05:00
Michael Vogel cb1ecf2c5a diabook: Moving the location between the icons 2012-03-10 00:15:27 +01:00
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