Commit graph

806 commits

Author SHA1 Message Date
Simon L'nu
356e654521 doh fix
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 06:03:04 -04:00
fabrixxm
768326e484 Merge pull request #179 from fabrixxm/master
new field_combobox template and some eyecandy to "file as" function
2012-03-28 03:00:24 -07:00
Simon L'nu
bcf8a571f9 add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 05:52:28 -04:00
Fabio Comuni
0a2675d8b6 filer: replace "file as" prompt with combobox opened in fancybox 2012-03-28 10:49:34 +02:00
friendica
f95fb2667a vier navbar messed up after default theme template move 2012-03-28 00:16:22 -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
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
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
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
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
tommy tomson
e7bc3f2bd0 add "find friends" to right_aside to diabook, fixes in css in diabook 2012-03-27 08:28:47 +02:00
friendica
5275b5d049 qcomment enhancements 2012-03-26 20:13:03 -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
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
f1d15d8884 Merge branch 'master' of https://github.com/friendica/friendica 2012-03-26 14:49:15 +02:00
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
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
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
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
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
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
07c5b0af5a quattro(-green) styling the 'filed under: remove' text 2012-03-22 14:09:21 +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
adcf52d02d facepark is unsupported ATM 2012-03-21 00:08:06 -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
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
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
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 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
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
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
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
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
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
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