bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
5029 commits 4 branches 62 tags 178 MiB
Commit graph

1754 commits

Author SHA1 Message Date
friendica
b4b1055b50 settings for unknown private mail acceptance 2012-03-31 00:57:59 -07:00
Simon L'nu
b88a452c6b theme fixes; fix qcomment (finally) 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-31 03:56:06 -04:00
Fabio Comuni
be2005f146 quattro: move quattro-green inside quattro folder. 
Add config option to select quattro color scheme.
 2012-03-30 21:21:14 +02:00
Fabio Comuni
77f57e1b13 Merge remote-tracking branch 'friendica/master' 2012-03-30 19:37:43 +02:00
tommy tomson
f50fb7d6ca css-fixes in diabook-derivates 2012-03-30 17:52:29 +02:00
tommy tomson
6d3d882f9b css-fixes in diabook-derivates 2012-03-30 16:33:34 +02:00
Fabio Comuni
24e7a3413c quattro-green: remove settings code 
Use config.php from quattro
 2012-03-30 15:46:14 +02:00
Fabio Comuni
db59a45030 quattro: add config.php 2012-03-30 15:45:23 +02:00
Fabio Comuni
054d21a2e8 settings: add "display settings" tab, with UI-related settings. 
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
 2012-03-30 15:45:02 +02:00
tommy tomson
5b4bb347a6 css-fixes in diabook-derivates 2012-03-30 14:38:21 +02:00
Tobias Diekershoff
8685a91742 quattro-green: added Description to the theme.php 2012-03-30 14:24:45 +02:00
Tobias Diekershoff
b5e292509e quattro-green: adopted quattro option for centered display 2012-03-30 14:03:33 +02:00
tommy tomson
5ced7f2bc5 add themes diabook-red & diabook-aerith 2012-03-30 13:48:34 +02:00
Tobias Diekershoff
e2370b56bf quattro-greey: apply theming to private mail 2012-03-30 08:10:49 +02:00
Simon L'nu
3b4016168d tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now. 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-29 20:19:43 -04:00
friendica
e935b3a225 theme file_as combobox for 2.0 2012-03-29 04:07:16 -07:00
tommy tomson
339c8a4b56 css fixes in diabook-derivates 2012-03-29 11:02:59 +02:00
fabrixxm
3ee529d095 Merge pull request #185 from fabrixxm/master 
Updated private message pages
 2012-03-28 23:47:23 -07:00
friendica
75f3d41da2 Merge pull request #184 from annando/master 
Enhancing the API - Preparations for a better facebook export
 2012-03-28 15:08:15 -07:00
tommy tomson
aa26517cdc add a searchbox to "find friends" for global search 2012-03-28 23:07:34 +02:00
tommy tomson
1a9bbac0be bugfix in diabook 2012-03-28 20:45:39 +02:00
Michael Vogel
bdd2754740 Merge commit 'upstream/master' 2012-03-28 19:52:30 +02:00
Fabio Comuni
011a96d960 quattro: style pm pages 2012-03-28 15:34:02 +02:00
Fabio Comuni
50711040cb message: remove tabs, move new message link to aside, all message with gmail-style 2012-03-28 15:31:58 +02:00
Fabio Comuni
f86e909a82 Merge remote-tracking branch 'friendica/master' 2012-03-28 15:21:01 +02:00
friendica
e894775a39 Merge branch 'pull' 2012-03-28 05:16:25 -07:00
Fabio Comuni
0f2a34c23b quattro: tpl for "file as" 2012-03-28 13:37:04 +02:00
Simon L'nu
4a75ea2f42 really fix it this time... 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-28 06:47:38 -04:00
Simon L'nu
3d5e711780 WITH is going on? 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-28 06:20:13 -04:00
friendica
b58dc43148 Merge branch 'pull' 2012-03-28 03:19:42 -07:00
friendica
b18086097e title not updated when editing post 2012-03-28 03:18:26 -07:00
Simon
c32ee4d226 Merge pull request #180 from simonlnu/master 
duh...
 2012-03-28 03:03:47 -07:00
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
Fabio Comuni
82106632f0 template: field_combobox 
a text input plus a select wich updates text input value on change.
html5 version commented out for poor browsers support.
 2012-03-28 10:43:52 +02:00
friendica
7fc57f486f support autocomplete @-tags in plaintext mode 2012-03-28 00:44:45 -07:00
friendica
f95fb2667a vier navbar messed up after default theme template move 2012-03-28 00:16:22 -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
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
Tobias Diekershoff
b9d976e31b fixed Umlaute in de strings.php 2012-03-27 07:18:20 +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
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
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