keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5618 commits 4 branches 0 tags 179 MiB
Commit graph

2007 commits

Author SHA1 Message Date
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
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
friendica
44c23cda8e theme shakeup commences - themes are now administered in admin panel. 2012-02-23 20:29:09 -08:00
friendica
65ddefe9c5 system notifications to notify module, untranslated string in notifications.tpl 2012-02-23 17:37:03 -08:00
Fabio Comuni
f5b8654818 fix visualization in groupeditor 2012-02-23 16:21:28 +01:00
Fabio Comuni
fd3274ff53 less html in mod/group.php, template for group members editor, quattro theme for group edit. 2012-02-23 16:17:36 +01:00
Fabio Comuni
d45e26d6d9 Merge remote-tracking branch 'friendica/master' 2012-02-23 15:23:52 +01:00
Tobias Diekershoff
1dacb2e570 quattro-green: removed contact_template.tpl 2012-02-23 14:16:20 +01:00
Fabio Comuni
6a0c815c1f Merge remote-tracking branch 'friendica/master' 2012-02-23 14:10:32 +01:00
Fabio Comuni
edd946bcad quattro: fix typos 2012-02-23 14:10:23 +01:00
Tobias Diekershoff
c03b5b62c0 green-quattro: applied a color for shiny class and preview 2012-02-23 12:54:14 +01:00
Fabio Comuni
cbc60d525e quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside. 
remove html from viewcontacts.php and contacts.php
use contact_template.tpl to print contacts also in viewcontacts
 2012-02-23 11:22:32 +01:00
friendica
d9e9fd0359 Merge branch 'master' into notify 2012-02-23 00:30:17 -08:00
friendica
fd43e2c563 more theme notify fixes 2012-02-23 00:28:26 -08:00
Tobias Diekershoff
56f3c00eec quattro: added styling to pivate message view 2012-02-23 09:02:40 +01:00
friendica
41636a50aa new notify sort of working in testbubble 2012-02-22 23:34:30 -08:00
friendica
808b886a3e Merge branch 'master' into notify 2012-02-22 22:36:07 -08:00
friendica
58a9c652de Merge pull request #45 from annando/master 
New HTML to BBCode converter, changes to BBCode, nginx support, ...
 2012-02-22 20:21:05 -08:00
Michael
e34a648cad German translation more gender friendly. Some more logging in poller.php 2012-02-22 15:20:49 +01:00
friendica
9fe12d1724 some cleanup of tb notifications 2012-02-21 20:22:09 -08:00
Abinoam P. Marques Jr
914169472e view/admin_remoteupdate.tpl - Friendika -> Friendica 2012-02-20 19:47:56 -03:00
Abinoam P. Marques Jr
d89a0449d0 htconfig.tpl - Friendika -> Friendica 2012-02-20 19:47:44 -03:00
Abinoam P. Marques Jr
12a8796854 mod/dfrn_request.php and templates - Friendika -> Friendica 2012-02-20 19:38:43 -03:00
Michael
3a7695ded1 Fetched some missing styles from testbubble. 2012-02-20 15:11:27 +01:00
root
b6d7777226 New version of markdown. Playing with stylesheet. Testing line breaks. 2012-02-19 22:47:32 +01:00
Michael
4713069e68 Many small changes 2012-02-19 20:11:36 +01:00
Michael
cafd400352 Merge remote branch 'upstream/master' 
Conflicts:
	view/theme/vier/style.css
 2012-02-19 20:09:42 +01:00
ike
73e0e4d783 New theme "vier" derives from "quattro" 2012-02-19 20:05:51 +01:00
friendica
75acc1ed96 support plaintext on editpost, editorinit called before all buttons laid out 2012-02-17 11:49:27 -08:00
Tobias Diekershoff
652622894f de strings 2012-02-16 11:55:52 +01:00
friendica
b1d31aca51 quick comments 2012-02-15 18:13:41 -08:00
fabrixxm
16f00cb73b Merge pull request #36 from fabrixxm/master 
Missing icons in 'quattro' and ajax events calendar
 2012-02-15 03:51:44 -08:00
Fabio Comuni
73bee08ac2 enable ajax calendar with $a->config['experimentals']['new_calendar']=1 2012-02-15 12:47:50 +01:00
Fabio Comuni
fe3e8ee854 quattro: icons for attachments 2012-02-15 11:10:02 +01:00
friendica
03171fd7de preliminary qcomment support, [nosmile] tag to disable smiley processing 2012-02-14 23:13:18 -08:00
Fabio Comuni
549c920e6f events js: don't modify rendered item if not autor specified 2012-02-14 16:28:10 +01:00
Fabio Comuni
22cfb77173 events: first test for full-javascript events calendar 2012-02-14 16:19:48 +01:00
friendica
060ac4ebf1 delete mail message icon not brightening on hover 2012-02-14 02:34:05 -08:00
friendica
d2a9ce9362 more contacts categorisation, page cleanup 2012-02-13 22:48:35 -08:00
friendica
d75b6a00d4 tabs and total count for contacts page 2012-02-13 20:38:00 -08:00
friendica
bcad629633 more stray quotes 2012-02-13 18:40:56 -08:00
friendica
803a7425ea make hr bbtag shareable, stray quote in duepuntozero wall_item 2012-02-13 18:40:28 -08:00
friendica
23f5abfa1f Merge branch 'pull' 2012-02-13 14:17:20 -08:00
friendica
52cb63655a POST should be lowercase these days 2012-02-13 14:15:39 -08:00
Tobias Diekershoff
22bb285c7f green variation of the quattro theme 2012-02-13 17:05:48 +01:00
Fabio Comuni
8369c243b3 Fix 'item not found' message 2012-02-13 10:19:10 +01:00
Fabio Comuni
850560519a Merge remote-tracking branch 'friendica/master' into mobile 2012-02-13 09:46:42 +01:00
Fabio Comuni
16d3bc9deb quattro: pause icon 2012-02-13 09:35:11 +01:00
Fabio Comuni
3e664dbdfe reshare in "display" view 2012-02-13 09:33:20 +01:00
friendica
0c4606682f fix link/bookmark reshares 2012-02-11 19:21:41 -08:00
friendica
da946bb9b0 bug #278 show only blocked contacts 2012-02-11 03:07:15 -08:00
friendica
75a62db9c5 show tags (pub_keywords) in advanced profile 2012-02-11 01:24:29 -08:00
Fabio Comuni
ed38808aae hidden jot in "display" to allow reshare 2012-02-10 17:30:22 +01:00
Fabio Comuni
8480550144 quattro: add "view in context" link in search results 2012-02-10 17:29:37 +01:00
friendica
ffe7d8b1e9 item tag notifications 2012-02-09 21:18:50 -08:00
friendica
03435853b3 fix apps sub-menu on quattro and vier 2012-02-08 18:12:26 -08:00
Tobias Diekershoff
d8157f73ef quattro: added delete button to mail list overview 2012-02-08 22:29:38 +01:00
Tobias Diekershoff
ca8a25172e quattro: added delete buttons to groups and contacts 2012-02-08 22:13:36 +01:00
Tobias Diekershoff
72c30deb64 quattro: group member selection styling 2012-02-08 20:47:52 +01:00
Tobias Diekershoff
1eb32a0bb5 added theme "vier" by Michael Vogel 2012-02-08 19:09:25 +01:00
friendica
e92e3658b2 make individual advanced profile items addressable via script or plugin 2012-02-07 20:34:40 -08:00
friendica
c6cdad946e more fixes for textmode 2012-02-07 00:13:16 -08:00
friendica
2b77002471 basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html). 2012-02-06 20:28:50 -08:00
friendica
76308eca67 add toggle to choose sending "friends with" activity even if contact is not hidden 2012-02-06 16:41:05 -08:00
friendica
57f7083706 style missing on crepair-name 2012-02-05 17:38:32 -08:00
zottel
3149e3cd3e testbubble fix: tools for wall-to-wall items now appear at the bottom where they should be 2012-01-30 13:33:25 -08:00
Tobias Diekershoff
d658cdaa84 quattro: small adjustments to the profile edit style 2012-01-30 14:25:24 +01:00
Tobias Diekershoff
43df068d2e quattro: styling of the edit profile page 2012-01-30 13:22:16 +01:00
Tobias Diekershoff
a5974d1981 moving the pager down below the contact/photo list in quattro 2012-01-28 13:13:21 +01:00
friendica
3197a6e8aa fix some changes lost from another branch 2012-01-26 23:03:27 -08:00
friendica
f1f480c2bf slackr -> wall-to-wall comment form background different than regular comment 2012-01-26 20:32:05 -08:00
friendica
068cb53a9e page delegation 2012-01-26 20:08:02 -08:00
friendica
d2a9341128 new event current date off by one, submit button misplaced 2012-01-25 13:42:06 -08:00
friendica
a24a383dab by default allow pseudonyms 2012-01-25 00:30:36 -08:00
friendica
a76a497d92 implement "moderate" flag on items 2012-01-23 20:56:11 -08:00
friendica
1f074cb44c shaka, slackr theme 2012-01-23 15:07:40 -08:00
Fabio Comuni
9047840ec2 nav: fix "See all notifications" 2012-01-23 09:23:37 +01:00
Fabio Comuni
30fcda7576 nav: fix intro notification url, fix "See all notifications" url and make it translatable 2012-01-22 19:27:56 +01:00
friendica
8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
Tobias Diekershoff
40edcec06f German translation 2012-01-13 15:14:40 +01:00
friendica
a1dc3185be typo in greenzero 2012-01-12 23:33:20 -08:00
friendica
28edeefc14 reset width of openid input, settings page 2012-01-12 20:35:05 -08:00
friendica
520ba0960b put openid logo back on openid input box, duepuntozero settings page 2012-01-12 20:31:14 -08:00
friendica
df14d7abc4 allow crepair to change name - as long as it isn't blank 2012-01-12 18:54:35 -08:00
friendica
bdfe3ba129 missing source file, fix link icon in testbubble 2012-01-12 17:58:55 -08:00
friendica
4d07cfa2d0 and and theme previewing for testbubble 2012-01-12 17:50:02 -08:00
Tobias Diekershoff
9b2669eb5d profile-match and contact suggestion list styling 2012-01-12 21:21:00 +01:00
Fabio Comuni
ea9f14c27b quattro: style fakelink 2012-01-12 10:42:59 +01:00
Fabio Comuni
3d7857ecdd quattro: item acl popup panel, max height to notifications menu, style comment preview and wall-to-wall item photos 2012-01-12 10:38:24 +01:00
Fabio Comuni
302d62f7a3 templates: add class to comment preview div, fix search_item.tpl 2012-01-12 10:37:11 +01:00
Fabio Comuni
1f9e8f90a2 fix jot acl 2012-01-12 10:35:50 +01:00
friendica
b7ccbfc702 Merge branch 'pull' 2012-01-10 17:48:05 -08:00
friendica
cf7008e575 post preview to loozah 2012-01-10 17:47:11 -08:00
zottel
bd3dee43c1 New German translations 2012-01-10 08:13:30 -08:00
friendica
375cb82124 move post preview link 2012-01-09 21:02:02 -08:00
friendica
7011f71e8f post preview 2012-01-09 20:03:00 -08:00
friendica
805eb35a1a not ready for post preview 2012-01-09 18:54:05 -08:00
friendica
a13156c0f3 bypass D* markdown bug for now 2012-01-09 18:52:49 -08:00
friendica
9d0664ba48 Merge branch 'pull' 2012-01-08 05:17:59 -08:00
friendica
0828ab353f fix git horkage 2012-01-08 05:16:55 -08:00
friendica
9f6d38a61a something weird with git 2012-01-08 04:30:35 -08:00
friendica
a6d0a65321 more recovery of lost contact page formatting 2012-01-08 04:16:23 -08:00
friendica
dd7a10a219 contact page float got lost somewhere 2012-01-08 04:13:53 -08:00
friendica
358b2a46f5 fix photo top view in testbubble, extend network_to_name 2012-01-07 13:00:06 -08:00
friendica
41bb47ca1b title fixups 2012-01-06 03:59:05 -08:00
Fabio Comuni
f70f2eedaf duepuntozero: get back jot icons 2012-01-06 10:03:20 +01:00
Fabio Comuni
a5a6719283 fix photo album pager 2012-01-06 09:35:29 +01:00
Fabio Comuni
98a8693e9e quattro: style network widget 2012-01-06 09:27:05 +01:00
Fabio Comuni
f9b0af6f2f Merge remote-tracking branch 'friendica/master' 2012-01-06 09:11:48 +01:00
Fabio Comuni
efe308b5ac Use html5 placeholder for title text input 2012-01-06 09:11:25 +01:00
Fabio Comuni
a9670cbb7d Merge remote-tracking branch 'friendica/master' 2012-01-06 09:10:21 +01:00
friendica
c3ada095f4 network select widget 2012-01-05 20:40:48 -08:00
friendica
b99cb511ca comment preview 2012-01-05 16:38:24 -08:00
friendica
53878625f6 backend support for post preview 2012-01-05 15:02:44 -08:00
friendica
2f73be326e change to hover function 2012-01-04 21:01:24 -08:00
friendica
c5d27c48f5 more title stuff 2012-01-04 20:43:38 -08:00
friendica
dbb5955469 bit more improvement on dynamic title 2012-01-04 20:35:32 -08:00
friendica
f1c7db593c better title handling (duepuntozero only at this time) 2012-01-04 20:09:14 -08:00
friendica
47edaf9ad7 dynamic title input box - via fabrixxm 2012-01-04 18:03:09 -08:00
friendica
378f86d046 Merge branch 'pull' 2012-01-04 14:31:37 -08:00
friendica
48a5a2484e new smiley 2012-01-04 00:04:19 -08:00
23n
0077997eb6 Update view/de/strings.php 2012-01-04 07:05:44 +01:00
friendica
8e6c02cda3 remove some old email templates 2012-01-03 18:12:58 -08:00
friendica
969cd145ce suggestion notifications 2012-01-03 17:29:07 -08:00
friendica
c583d16209 fix reference variable effects on sorting 2012-01-03 14:27:00 -08:00
Fabio Comuni
93563370c9 Merge remote-tracking branch 'friendica/master' 2012-01-03 21:14:48 +01:00
Fabio Comuni
c7bfd1e1ba install: fix install procedure 
install procedure as a wizard
graphical rappresentation of passed/unpassed system checks
db connection test don't try anymore to create the db
admin email and timezone are asked in a separate pass
fix loading of database.sql, removing comments from phpmyadmin export
fix check for .htconfig.php writability
ask for php-cli path if not found in PATH
install_db.tpl use field_* templates to render the form
 2012-01-02 20:16:28 +01:00
Fabio Comuni
f35109827b datetime: new field_timezone() function, new template field_select_raw.tpl 
returns a timezone select like select_timezone() but using template field_select_raw.tpl.
field_select_raw get options html as forth argument, instead of array value=>label like field_select
 2012-01-02 20:09:25 +01:00
Fabio Comuni
be2fd56aae Merge branch 'master' of github.com:fabrixxm/friendica 2012-01-02 15:32:37 +01:00
friendica
c735582ead hide contacts on approval 2011-12-29 00:23:05 -08:00
friendica
aca8c8a13a Merge branch 'pull' 2011-12-27 14:27:39 -08:00
friendica
356c05c6b3 extending notifications to other types 2011-12-26 14:16:25 -08:00
Tobias Diekershoff
f29507cdba translation of email templates 2011-12-26 09:16:33 +01:00
Tobias Diekershoff
f1b7ce6ef4 translation of email template 2011-12-26 09:08:32 +01:00
Tobias Diekershoff
02af9cd3b2 translation of the email template 2011-12-26 09:05:02 +01:00
friendica
bb40e54dec new notification module working for "email message received" 2011-12-25 23:00:19 -08:00
friendica
170b841834 more enotify 2011-12-25 16:20:53 -08:00
friendica
bef8f95ef3 more enotify 2011-12-24 22:36:17 -08:00
friendica
95b4bc55bf Merge branch 'master' into notify 2011-12-22 15:42:01 -08:00
Fabio Comuni
2ef2d0b79f quattro: contacts and first photo page 2011-12-22 16:33:14 +01:00
Fabio Comuni
0b4535e6da quattro: more on editor 2011-12-22 11:24:34 +01:00
Fabio Comuni
bf00e4dded quattro: more on editor 2011-12-21 17:36:42 +01:00
Fabio Comuni
ba732c97c1 Merge remote-tracking branch 'friendica/master' 2011-12-20 17:18:19 +01:00
Fabio Comuni
f3b499f119 quattro: more on editor 2011-12-20 17:17:17 +01:00
friendica
0bef863015 wrong style for unvisited links 2011-12-19 20:23:11 -08:00
Fabio Comuni
2a3f94e452 Merge remote-tracking branch 'friendica/master' 2011-12-19 18:04:04 +01:00
Fabio Comuni
c3d12bc77e quattro: fix icons in oauth settings page 2011-12-19 18:03:03 +01:00
Fabio Comuni
16d45e5c13 quattro: first work on jot style 2011-12-19 18:02:43 +01:00
friendica
177af1fc9d jquery effects missing from zero derivatives 2011-12-19 01:23:12 -08:00
friendica
eb05d00794 connect on suggest/match - added to testbubble 2011-12-18 12:51:45 -08:00
friendica
5d6a098ce0 add connect link to suggestion and matches 2011-12-18 01:44:46 -08:00
friendica
974a52a16d add connect link to friend suggest 2011-12-18 01:08:32 -08:00
friendica
c4a5fcaf27 fix xml poco for arrays 2011-12-18 00:39:15 -08:00
friendica
978717a247 add webfinger to poco, if present 2011-12-18 00:14:34 -08:00
friendica
ed725df5f1 Merge branch 'master' into notify 2011-12-12 20:13:12 -08:00
friendica
01cae9a50a remove all plugins from default config 2011-12-12 16:28:33 -08:00
friendica
a38d3b82b9 browser_update settings 2011-12-11 21:03:33 -08:00
friendica
4f254ffb5b system support for personal configurable ajax update interval 2011-12-11 20:32:43 -08:00
friendica
50c4b9a780 Merge branch 'master' into notify 2011-12-11 20:03:46 -08:00
friendica
3da3cd686c notifications refactor 2011-12-08 01:28:27 -08:00
zottel
f661bb4250 fixed some glitches in testbubble theme 2011-12-08 00:12:51 -08:00
friendica
961e34f67f missing template 2011-12-07 15:26:17 -08:00
friendica
7eba8adbf7 pm replies 2011-12-06 19:15:42 -08:00
Tobias Diekershoff
06b904ffcb copied code styling from duepuntozero to quattro theme 2011-12-06 17:10:27 +01:00
friendica
47f369e052 hide some contacts from others 2011-12-05 18:36:26 -08:00
zottel
ced28a8827 added #pause 2011-12-05 05:17:37 -08:00
zottel
3d0f17570f added img properties to get good results on all screen sizes 2011-12-05 00:29:29 -08:00
friendica
6fc9eae9de more d* PM stuff 2011-12-04 17:26:55 -08:00
zottel
5dcce83927 Take out overflow: hidden; from .wall-item-outside-wrapper to fix 
problem with photo-menu being cut off.
 2011-12-02 08:02:10 -08:00
friendica
7faa6c3e93 more theme works 2011-12-01 22:44:27 -08:00
friendica
d703f4bc52 theme works d'zero 2011-12-01 20:57:09 -08:00
friendica
513c1c0d68 dynamic delete icons for saved-search on network page 2011-12-01 18:27:45 -08:00
friendica
ac3df5fece dynamic group edit buttons 2011-12-01 16:33:53 -08:00
friendica
f1af2c224f personal notifications 2011-11-30 22:26:02 -08:00
friendica
3bf192ba08 Merge branch 'pull' 2011-11-29 01:19:43 -08:00
friendica
669f40c342 private notes in testbubble 2011-11-29 01:18:18 -08:00
Fabio Comuni
68dee0fa71 quattro: "manage" menu item in site menu 2011-11-29 09:30:21 +01:00
Fabio Comuni
938b2bf438 quattro: default user image in item 2011-11-29 09:29:56 +01:00
friendica
034038849c mysql error report fix (no mysqli), suggested friends for new members settings 2011-11-28 19:28:33 -08:00
friendica
6b93324c11 "show more" -> move closer to text 2011-11-24 18:51:14 -08:00
friendica
9e8053e3bd fixing conversation updates 2011-11-24 16:42:12 -08:00
friendica
b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
friendica
7a259d4acb ensure comment counts update after refactor of collapsed comments 2011-11-23 14:03:53 -08:00
friendica
deb182b92e string update es,fr 2011-11-22 16:13:23 -08:00
friendica
1443a0c8cd Merge branch 'pull' 2011-11-22 16:02:12 -08:00
friendica
53590d2166 rework show/hide comments 2011-11-22 16:00:05 -08:00
Tobias Diekershoff
4f555212a1 German strings 2011-11-22 16:48:53 +01:00
friendica
c568493f57 add expire_starred option, fix "delete selected" on some themes, new project name in email templates 2011-11-21 19:01:05 -08:00
Fabio Comuni
a86fd26bd8 more work on quattro. remove html from php for groups and saved searches widgets. 2011-11-21 12:34:22 +01:00
Fabio Comuni
79603e3146 expire settings for items, notes and photos. 
show default privacy acl in popup
 2011-11-17 15:53:59 +01:00
Fabio Comuni
281f9edce7 Update IT strings 2011-11-15 19:40:38 +01:00
Fabio Comuni
f5bfe5a1a3 quattro: tags style 2011-11-15 17:42:30 +01:00
Fabio Comuni
962467ee68 item tags as array to templates 2011-11-15 17:41:38 +01:00
Fabio Comuni
5c7fb2b0fe quattro: fix delete selected items 2011-11-15 16:17:36 +01:00
Fabio Comuni
8e588b530f duepuntozero: fix input width in aside 2011-11-15 15:59:53 +01:00
friendica
bbf857ba39 add revision date to main profile photo to overcome cache when updated, other photos (e.g. conversations) must wait for cache update 2011-11-12 17:50:14 -08:00
friendica
02b11c5d59 several little nits in the hcard template output which could affect parsers 2011-11-12 12:28:21 -08:00
Fabio Comuni
e853549bc8 duepuntozero: add notice and info popups css style 2011-11-11 17:34:15 +01:00
Friendika
f4f8f7623b theme birthday/event notifications under testbubble 2011-11-11 01:19:16 -08:00
Friendika
02f21fb74c some testbubble fixes 2011-11-10 19:53:13 -08:00
Friendika
199da623ff testbubble showing post jot-tools on edit page - these are not changed so should not be visible 2011-11-10 18:20:25 -08:00
Friendika
c66b886d7e shared tags for testbubble, prevent tag hijacking of shared tag activities 2011-11-10 17:11:55 -08:00
Friendika
15f2ce5459 contact edit updates 2011-11-09 19:30:14 -08:00
Friendika
e35f3f1ada Merge branch 'master' into contacts 2011-11-09 18:29:30 -08:00
Friendika
a2018e2d14 vcard position - dpzero 2011-11-09 18:29:05 -08:00
Friendika
2b1e011851 fix to overlapping tabs on testbubble when width too small 2011-11-09 17:55:36 -08:00
Friendika
2825c49573 more work on new contact edit page - plus first port to testbubble 2011-11-09 03:46:36 -08:00
Friendika
d6d4d3ed3a various testbubble fixes 2011-11-09 00:29:14 -08:00
Friendika
02d4a742ab more contact edit page stuff 2011-11-08 21:22:45 -08:00
Friendika
05cabf24a9 first checkin - updated contact_edit, more work remains 2011-11-08 18:30:20 -08:00
fabrixxm
eeec29c6be Merge pull request #2 from fabrixxm/master 
Oauth1 support in API
 2011-11-08 00:18:37 -08:00
Friendika
99a548d4ac fix friend suggest link in testbubble 2011-11-07 17:25:40 -08:00
Fabio Comuni
00c342e13d Merge branch 'oauthapi' 2011-11-07 17:41:23 +01:00
Fabio Comuni
4407fc2c5d oauth apps/authorization management in settings page 2011-11-07 17:38:30 +01:00
Fabio Comuni
b464b819a1 minimal page layout for oauth authorize 2011-11-07 17:37:49 +01:00
Fabio Comuni
955326acca add hidden fields in login template 2011-11-07 17:37:25 +01:00
Fabio Comuni
10e5754e24 oauth: authorize 2011-11-07 17:36:41 +01:00
Friendika
c991a1a606 darkzero pager links washed out 2011-11-06 01:20:46 -08:00
Friendika
7d8acd038e button text not closed 2011-11-06 00:49:30 -07:00
Friendika
57beadc86b add diaspora signed_retraction template 2011-11-05 14:25:06 -07:00
Friendika
e19b597180 tinymce tag complete stuff 2011-11-03 20:40:56 -07:00
Friendika
5f531aa537 add js events to ignore button 2011-11-03 16:18:50 -07:00
Friendika
1ff59fd6e8 move ignore link 2011-11-03 16:06:32 -07:00
Friendika
014c91431e ignore suggestions 2011-11-03 16:00:52 -07:00
Friendika
4f4b03367a plugin check returning 0 vs false 2011-11-03 15:14:33 -07:00
Fabio Comuni
69e41f7703 oauth: authorize view, wrong verifier. 2011-11-02 09:54:07 +01:00
Friendika
e38aa67263 link suggestions into the main code 2011-11-01 21:27:11 -07:00
Friendika
3d9a9614e2 common friends 2011-11-01 19:16:33 -07:00
Friendika
d5ce13ee12 bug #186 - $type macro not replaced in diaspora 'like' message 2011-10-31 14:30:27 -07:00
Friendika
056fe0a3aa poco discovery 2011-10-27 14:52:35 -07:00
Friendika
ea0ab6fbac poco should now be spec compliant 2011-10-27 04:38:33 -07:00
Friendika
abe96155b4 hmmm - why won't poco xml work 2011-10-27 01:54:52 -07:00
Friendika
31502207bd more poco spec compliance 2011-10-27 00:57:19 -07:00
Friendika
2f3e39ba15 edit profile quick link 2011-10-26 16:57:25 -07:00
Fabio Comuni
951c73d825 style autocomplete popup in themes 2011-10-26 14:02:17 +02:00
Fabio Comuni
dc212de960 Merge remote-tracking branch 'friendika/master' 2011-10-26 12:15:38 +02:00
Friendika
52038c6b88 event notification stuff 2011-10-25 15:36:49 -07:00
Fabio Comuni
bcb672e7ff autocomplete contacts nickname while writting in a comment box. 2011-10-25 15:01:58 +02:00
Fabio Comuni
afce790e56 oembed: wrap in iframe only html from remote service 2011-10-25 14:59:31 +02:00
Friendika
efe3365431 tag privacy settings 2011-10-24 21:11:05 -07:00
Friendika
3b33c0d075 allow tag input to contain leading '#' 2011-10-24 17:00:22 -07:00
Friendika
4218e3f494 Merge branch 'pull' 2011-10-24 15:51:14 -07:00
Friendika
3b6b0eaa8b social tag - add UI 2011-10-24 15:47:17 -07:00
Fabio Comuni
75d4f33233 move html for oembeded videos in template. fix oembed discovery 2011-10-24 17:28:28 +02:00
Fabio Comuni
d80c0da3c0 add custom style to object tag in tinymce 2011-10-21 16:26:57 +02:00
Friendika
01164c8c2f fix various html parse errors 2011-10-20 16:48:07 -07:00
Friendika
19129e06c3 diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order 2011-10-19 15:08:16 -07:00
Friendika
b14914ee2e fix tb tabs 2011-10-18 13:07:27 -07:00
fabrixxm
a19b33651e Merge pull request #33 from fabrixxm/master 
missing template field_openid
 2011-10-17 23:56:02 -07:00
Fabio Comuni
3e5a2cb07b template field_openid 2011-10-18 08:53:01 +02:00
Tobias Diekershoff
307b707983 fix for the button height 2011-10-18 08:17:52 +02:00
Fabio Comuni
b22ab4e308 fix buttons in quattro 2011-10-17 17:11:49 +02:00
Fabio Comuni
de44072172 works on login form 2011-10-17 16:53:59 +02:00
Fabio Comuni
2116943964 Merge remote-tracking branch 'friendika/master' 2011-10-17 16:37:37 +02:00
Tobias Diekershoff
2650ba49c1 video button only for dispy and quattro 2011-10-17 07:48:33 +02:00
Friendika
af6ab38100 diaspora birthday notifications 2011-10-14 00:20:37 -07:00
Friendika
2911bf9434 sql issue item_store 2011-10-13 01:00:06 -07:00
Tobias Diekershoff
98e50a0559 better do all the buttons (quattro) 2011-10-12 09:28:19 +02:00
Tobias Diekershoff
714319457c little bit more for quattro 2011-10-12 08:06:41 +02:00
Tobias Diekershoff
0fb119496e some work on quattro theme 2011-10-12 07:47:41 +02:00
Friendika
df7702709b common tabs to notifications and mail 2011-10-11 21:30:23 -07:00
Friendika
3ef7dcac4b solve intro/notify naming issue by providing both or either, theme decides what to do 2011-10-11 20:38:09 -07:00
Friendika
2206d894b3 add contact_widgets and provide widgets on appropriate pages, fix the saved search widget 
fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in.
 2011-10-11 19:27:58 -07:00
Friendika
557a7d0cec stuff 
- background the external network notifications (Facebook, Twitter, Statusnet)
 - add vimeo support
 - consolidate editor video options (insert video, regardless of source)
 - add "Connector Settings" page purely for configuring connectors
 - moved mailbox settings to Connectors
 - Move the "Connect/Follow" dialogue out of "find people" and move to top.
 - Add "Find People" dialogue
 - minor theme edits on duepuntozero and testbubble to make all this stuff work
 - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
 2011-10-11 18:24:37 -07:00
Fabio Comuni
906addf865 common_tabs in notifications.php 2011-10-10 17:01:14 +02:00
Fabio Comuni
e9eb15373f Remove full profile html from php and add new template 'profile_advanced.tpl' 2011-10-10 16:48:38 +02:00