Commit graph

2310 commits

Author SHA1 Message Date
Friendika
d99dfbe4ef friendika-z configuration details in admin page 2011-07-07 18:25:56 -07:00
Friendika
eccaa525cc 'dislike' is not part of activitystreams core schema - use symblic constants instead 2011-07-07 16:56:44 -07:00
Friendika
0470eb7805 Merge branch 'pull' 2011-07-07 15:36:03 -07:00
Friendika
5ab30578ae revup 2011-07-07 15:35:42 -07:00
Friendika
8cc6e69705 Merge pull request #138 from fabrixxm/master
some minor tweaks
2011-07-07 15:33:32 -07:00
Fabio Comuni
bf19b219ef duepuntozero: style blockquote 2011-07-07 14:27:39 +02:00
Fabio Comuni
4116beb276 duepuntozero: style "connect" link in profile page 2011-07-07 14:03:47 +02:00
Fabio Comuni
9dfd798368 Add post type "event" to like/unlike localizated text 2011-07-07 14:02:58 +02:00
Friendika
d187c39d5d don't warn about php upload limits. nothing can be done by the user. 2011-07-07 03:03:09 -07:00
Friendika
d7b5a606fb don't show mailbox settings at all if disabled 2011-07-06 20:27:18 -07:00
Friendika
3f25830076 more friendika-z 2011-07-06 20:16:40 -07:00
Friendika
474156b15c remove insecure java_uploader, add some debugging to twitter plugin 2011-07-06 19:07:43 -07:00
Friendika
94ca19c016 a few minor fixes to settings page 2011-07-06 16:47:55 -07:00
Friendika
5cf9d9d877 revup 2011-07-06 14:29:04 -07:00
Friendika
e315b2defb Merge pull request #137 from fabrixxm/master
Add missing files from previus checkin
2011-07-06 14:19:16 -07:00
Fabio Comuni
5526afcf76 let js_upload addon be aware of upload image size limit, and return message to user in case of error 2011-07-06 17:26:04 +02:00
Fabio Comuni
23c9af5b26 Another missing file 2011-07-06 17:25:23 +02:00
Fabio Comuni
e8a29c64ca Merge remote-tracking branch 'friendika/master' 2011-07-06 16:22:16 +02:00
Fabio Comuni
2c2df90dc0 Add missing files from previus checkin 2011-07-06 14:19:03 +02:00
Friendika
e3e27458f8 removed another local line 2011-07-06 04:14:17 -07:00
Friendika
e3f061382b removed local testing statement from .htaccess 2011-07-06 03:52:51 -07:00
Friendika
358cb38325 Merge pull request #136 from fabrixxm/master
Works on settings page and field teplates
2011-07-06 03:39:10 -07:00
Fabio Comuni
e7834e60f8 Update settings page to use field templates.
Add tabs to switch user settings/plugin settings
Add new field templates 'custom', 'password', radio' and 'yesno'
Update main.js to support advanced fileds
Update duepuntozero, dispy e loozah themes
2011-07-06 12:10:00 +02:00
Friendika
84d12c3e08 move hidewall to user table - queries are getting too complicated and servers falling over 2011-07-05 23:23:43 -07:00
Friendika
c221d5ea59 honour hidden profiles on display item page 2011-07-05 21:11:38 -07:00
Friendika
40aa6f33b5 incorrect links for "view in context" on community page 2011-07-05 21:03:37 -07:00
Friendika
c552248b7c item tags instead of feed 2011-07-05 20:32:43 -07:00
Friendika
8992c27fa6 better handling of feed photos (e,g, google+) 2011-07-05 20:29:26 -07:00
Friendika
d7154a4606 ability to link contacts that are "really me, but on another system/network". 2011-07-05 19:55:09 -07:00
Friendika
76e56fd44e begin work on relocation conversation 2011-07-05 19:19:11 -07:00
Friendika
db30a2342c undo last checkin 2011-07-05 18:21:56 -07:00
Friendika
1a4a6b5ff9 explicitly close db connections - do not rely on process exit 2011-07-05 17:45:33 -07:00
Friendika
308d98f7ac hash tags cannot contains spaces 2011-07-05 16:23:27 -07:00
Friendika
24d41e2c6e purify html before trying to parse wild urls. This way at least it should parse. 2011-07-04 23:02:04 -07:00
Friendika
92831c9416 Merge pull request #135 from fabrixxm/dispy
More Dispy css
2011-07-04 22:17:35 -07:00
fabrixxm
4e7a5dc56e Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy 2011-07-05 07:11:57 +02:00
Friendika
5e1335ac89 don't show delete buttons on community page 2011-07-04 21:52:21 -07:00
Friendika
1048ee744e reversed logic 2011-07-04 21:13:10 -07:00
Friendika
20d3aa2e77 community page 2011-07-04 20:57:07 -07:00
Friendika
308ffe500a Merge branch 'pull' 2011-07-04 15:45:01 -07:00
Friendika
246b0f1efe revup 2011-07-04 15:44:33 -07:00
Friendika
300f59ff3e Merge pull request #134 from defel/fix-HTTP417-lighttpd-1.4.19-bug2
require 'Expect' http-header for non-apache webserver (like lighttpd)
2011-07-04 15:42:51 -07:00
aweiher
f164a63144 require 'Expect' http-header for non-apache webserver (like lighttpd) 2011-07-04 17:22:47 +02:00
Fabio Comuni
2359783b9f dispy: style private mails 2011-07-04 11:30:53 +02:00
Friendika
78363ecfb1 msearch typo 2011-07-04 00:46:23 -07:00
Friendika
a82e0e32b3 add site info to site json response 2011-07-04 00:44:25 -07:00
Friendika
9871cc8c0e profile match layout issues 2011-07-03 22:53:11 -07:00
Friendika
e795d1265e show keywords in match results 2011-07-03 21:30:48 -07:00
Friendika
cd7098501e change wording of "new item view" to be consistent 2011-07-03 20:18:20 -07:00
Friendika
07ea67e33b removed stray debug statement 2011-07-03 19:57:20 -07:00