Commit graph

1001 commits

Author SHA1 Message Date
Friendika
2abcf76ec1 salmon protocol changes magicsig draft-experimental, fixes to hostxrd 2011-08-04 22:37:45 -07:00
Friendika
639204c2ec diaspora structures 2011-08-03 22:05:20 -07:00
Friendika
1aaded10b4 api compatibility fixes 2011-08-02 20:02:07 -07:00
Friendika
2637831d90 some more zot changes migrating back to f9a mainline 2011-08-01 21:02:25 -07:00
Friendika
326a873082 merge diaspora/friendika vcard formats - not yet complete 2011-08-01 05:13:59 -07:00
Friendika
0c9f033505 some api enhancements 2011-07-31 16:35:53 -07:00
Fabio Comuni
6c423feed2 add missing link to navbar 2011-07-29 16:32:01 +02:00
Fabio Comuni
97eea6ecd6 style update 2011-07-29 16:24:18 +02:00
Fabio Comuni
d12e2cbfe9 Fix nav template and add missing strings 2011-07-29 16:23:47 +02:00
Friendika
f47d582736 api/statusnet/config.xml 2011-07-28 21:56:56 -07:00
Friendika
41c7d71e3b make profile-jot-desc track lock state changes 2011-07-28 20:44:35 -07:00
Friendika
04675e3ec3 revup 2011-07-28 16:49:43 -07:00
Friendika
06802dd8fe auto focus jot editor 2011-07-25 20:10:21 -07:00
Fabio Comuni
23d6339a41 change to some nav ids, notice in empty notifications popup 2011-07-25 17:12:42 +02:00
Fabio Comuni
ba4ea589d0 update style 2011-07-25 16:55:43 +02:00
Fabio Comuni
5fb2b522f4 move <header> and <nav> tag into nav.tpl. add notification popup items template 2011-07-25 16:53:27 +02:00
Fabio Comuni
dfba0f13c8 Merge branch 'newacl' into newui 2011-07-25 08:59:28 +02:00
Fabio Comuni
363c4c5798 Remove "share" greyed text in jot editor when user reshare an item 2011-07-25 08:56:51 +02:00
a09bdf5ad6 added link to community page to dispy theme menu 2011-07-24 11:07:39 +02:00
a4f7e8e8fe dispy theme hide editor if without focus 2011-07-24 09:32:20 +02:00
abc01cad20 Merge branch 'master' of git://github.com/friendika/friendika 2011-07-23 07:43:25 +02:00
a213a9babf dispy ACL into the fancybox 2011-07-23 07:41:20 +02:00
Fabio Comuni
93eda9d9c1 Initial work on new UI 2011-07-22 17:37:51 +02:00
Fabio Comuni
5c9eb19767 fix "resend" function when editor is disabled 2011-07-22 08:46:29 +02:00
Fabio Comuni
096ecba883 Use new ACL selector in photo edit 2011-07-20 14:19:20 +02:00
Fabio Comuni
19c93adf84 Use popup ACL selector in photo upload. js_upload use new acl selector. 2011-07-20 11:40:24 +02:00
Fabio Comuni
7a069c1438 Load tinyMCE on post editor only if needed. 2011-07-20 11:08:42 +02:00
Fabio Comuni
020deefba6 Merge remote-tracking branch 'friendika/master' into newacl 2011-07-20 10:01:12 +02:00
Fabio Comuni
1c9ed08620 show acl selector in a popup with fancybox 2011-07-20 10:00:33 +02:00
Friendika
9048ecd85c diaspora encryption xml template 2011-07-19 22:58:38 -07:00
Friendika
1d35d1e5a1 Merge pull request #141 from fabrixxm/newacl
New jot ACL selector
2011-07-19 17:24:09 -07:00
Fabio Comuni
0a3ae96093 add icons to acl selector 2011-07-19 17:15:34 +02:00
Fabio Comuni
89eefbe46c Fix style and scrollbar 2011-07-19 16:34:27 +02:00
Fabio Comuni
9fa0956966 New jot acl selector 2011-07-19 16:17:58 +02:00
Friendika
07a77a4d27 resize editor 2011-07-18 21:25:49 -07:00
Friendika
7008bec045 improved code blocks 2011-07-18 19:17:16 -07:00
Friendika
c0b8e63a3f basic diaspora discovery 2011-07-18 18:13:46 -07:00
Friendika
25b4aacf3b green icons for greenzero 2011-07-18 16:42:39 -07:00
Friendika
1fa2231c20 invite system 2011-07-17 21:12:31 -07:00
Friendika
f35a61761a Merge pull request #139 from fabrixxm/update
Experiment with on-line update
2011-07-15 01:29:46 -07:00
Friendika
ed94028894 template for statusnet api config.xml 2011-07-14 03:38:25 -07:00
Friendika
7534b8873b link tips on nav bar 2011-07-14 03:05:54 -07:00
Fabio Comuni
34ab2aa959 move update link in admin aside 2011-07-13 08:58:47 +02:00
Friendika
74a608e1c7 openid settings appearing when disabled, don't tag numbers, install admin not getting set 2011-07-12 23:14:38 -07:00
Friendika
706b6e8c84 email notifications not working - unable to change notification settings 2011-07-12 05:09:07 -07:00
Fabio Comuni
4fdc5ff30c First test for friendika "live" update 2011-07-08 17:12:08 +02:00
Friendika
2d2b500639 input the admin email address during install/setup. 2011-07-07 19:12:35 -07:00
Friendika
d99dfbe4ef friendika-z configuration details in admin page 2011-07-07 18:25:56 -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
Friendika
d7b5a606fb don't show mailbox settings at all if disabled 2011-07-06 20:27:18 -07:00
Fabio Comuni
2c2df90dc0 Add missing files from previus checkin 2011-07-06 14:19:03 +02: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
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
20d3aa2e77 community page 2011-07-04 20:57:07 -07:00
Fabio Comuni
2359783b9f dispy: style private mails 2011-07-04 11:30:53 +02:00
Friendika
9871cc8c0e profile match layout issues 2011-07-03 22:53:11 -07:00
Friendika
5ceeb6752d starred items 2011-07-03 19:41:04 -07:00
Friendika
ab7f209fe3 add starred, unstarred icons to duepuntozero, loozah 2011-07-02 20:51:27 -07:00
Friendika
24836f2966 improvied group highlighting, move new group link down 2011-07-02 02:47:01 -07:00
Friendika
2d4f2f86cb improved group-selected highlighting 2011-07-02 02:34:19 -07:00
Friendika
b1aa77584f indicate currently selected group in group picker 2011-07-01 06:14:15 -07:00
Friendika
53653f6a4d consolidate perrmisions sql, minor duepuntozero validation fixes 2011-06-30 17:35:35 -07:00
Fabio Comuni
762bb8de79 update oembed and widgets plugins settings form 2011-06-30 17:00:26 +02:00
Fabio Comuni
779292077c style template field outside admin pages 2011-06-30 16:43:04 +02:00
Fabio Comuni
81e7535914 Add javascript var "baseurl"
Add field_richtext template
2011-06-30 16:42:27 +02:00
Fabio Comuni
f4a1820110 re-added last item date in admin user page. relative_date return 'never' if null is passed 2011-06-29 16:06:32 +02:00
Fabio Comuni
1e307e9869 Fix bug #98, add "never" to relative_date(), fix batch operations 2011-06-29 12:05:09 +02:00
Friendika
5023eed605 change simplepie path in dispy 2011-06-28 21:30:46 -07:00
Friendika
0b221e8945 bug #96 move libraries to library - better alignment of like rotator 2011-06-28 21:11:52 -07:00
Friendika
60caa03494 darkzero textareas hard to read 2011-06-28 19:08:13 -07:00
399c5aed1e added deleteCheckedItems to jot-header.tpl 2011-06-28 13:03:19 +02:00
Friendika
1947b74e5b some basic margins for friend suggestion screen 2011-06-27 16:18:06 -07:00
fabrixxm
cfd59f6ac8 dispy: photos display don't overflow onto sidebar 2011-06-27 18:23:03 +02:00
Friendika
c410c9013c friend suggestions 2011-06-26 22:57:08 -07:00
Friendika
23f00aaab4 recipient ui, friend suggestions 2011-06-26 21:55:24 -07:00
Friendika
3fe1e19725 pass notify endpoint with friend suggestions 2011-06-26 19:30:57 -07:00
Friendika
59d9070d13 suggestion template 2011-06-25 19:10:38 -07:00
Fabio Comuni
e7737d2ea4 dispy: style profile tab 2011-06-23 12:36:36 +02:00
Fabio Comuni
95a933c9a2 dispy: update icons, style events 2011-06-23 12:13:04 +02:00
Fabio Comuni
5de7d0f12f add profile tabs to "photos", "events" and "notes". in dispy, show active tab. 2011-06-23 11:30:17 +02:00
Fabio Comuni
655f5c7b9f use "contacts/<id_contact>" url as subject id, as statusnet and twitter use urls like "domain/<id_user>".
This seem to make StatusNet Desktop client work better.
2011-06-21 12:00:52 +02:00
Fabio Comuni
7cd7a79807 remove duplicate tag in atom response 2011-06-21 11:44:26 +02:00
Fabio Comuni
296f1b0123 add users infos to rss and atom api responses 2011-06-21 11:41:16 +02:00
Friendika
55112cfdd0 item source 2011-06-20 19:08:40 -07:00
Friendika
db336929cd add rate limit call so spaz will work 2011-06-20 17:16:13 -07:00
Friendika
f256e31e4f Merge pull request #122 from tobiasd/master
German language stuff
2011-06-20 04:17:37 -07:00
Friendika
b86ae9de7f use atom_time on atom entries 2011-06-20 01:38:26 -07:00
f0c5a1b21b typo and wording for the German language files 2011-06-20 09:47:42 +02:00
Friendika
b56e00c7c5 api post sort of working - output status,user need to be swapped 2011-06-19 20:13:24 -07:00
Friendika
c2dcff0d02 move profile privacy settings to the Privacy section of the Settings page 2011-06-19 16:47:03 -07:00
fabrixxm
33bafa62aa dispy code tag style 2011-06-19 12:17:13 +02:00
fabrixxm
4bc8ab6e7d Update dispy. Add admin link and styles, add help link, other fixes 2011-06-19 11:21:30 +02:00
fabrixxm
c10e913a4b update admin style in loozah 2011-06-19 11:20:35 +02:00
fabrixxm
3b759585d2 fix banner in duepuntozero 2011-06-19 11:20:13 +02:00
bufalo1973
ccffd583d1 Added backslash to $name so it doesn't throws an error.
Añadida una barra a $name para que no dé error.
2011-06-18 14:01:49 -07:00
Friendika
cf9f23fb74 Merge pull request #118 from fabrixxm/admin
Admin work
2011-06-18 00:17:36 -07:00
fabrixxm
4b633d54bb admin: fix last item date in users list, fix plugins details template 2011-06-18 08:52:51 +02:00
fabrixxm
23931ab719 Admin: add translatable strings, remove 'rino' settings, invert 'no'-setings, add "plugin_admin" hook for global plugins settings. add settings to twitter connector as example. 2011-06-18 08:29:59 +02:00
Friendika
9e2db5d5a6 tooltip for selecting items 2011-06-17 23:06:42 -07:00
Friendika
787f079d13 improved UI for checked items to be deleted 2011-06-17 22:58:15 -07:00
Friendika
fb0b22fb13 fix admin log viewer (will only read the last 5M of the log, and puts the text into a scrolling div) 2011-06-16 22:20:12 -07:00
Friendika
bb73c0b9f3 Merge branch 'pull' 2011-06-16 15:29:04 -07:00
Friendika
6709beb2ac Merge pull request #117 from tobiasd/master
german strings and green background for the greenzero theme
2011-06-16 15:27:45 -07:00
Friendika
b61a7158da Merge pull request #116 from fabrixxm/admin
Admin pages
2011-06-16 15:27:12 -07:00
Friendika
0f3292fefb revup 2011-06-16 15:26:39 -07:00
6802911522 put the green back in the panel background 2011-06-16 17:22:03 +02:00
bca1dcf2d6 Merge branch 'master' of git://github.com/friendika/friendika 2011-06-16 15:30:51 +02:00
Fabio Comuni
a652cd5095 admin styles to loozah. missing user admin template 2011-06-16 15:08:50 +02:00
Fabio Comuni
ede011cc32 Admin users page. some fix to template processor. 2011-06-16 14:56:43 +02:00
Fabio Comuni
5f583fb8d6 Admin: register policy in site page, initial users page. Aside 'Users' link show pending registrations. 2011-06-16 12:05:35 +02:00
Friendika
c92e6ed929 avoid race condition on delete checked items 2011-06-16 00:38:41 -07:00
Friendika
e5b54e74ba delete selected items 2011-06-15 20:43:39 -07:00
dbf6ee6a05 Merge branch 'master' of git://github.com/friendika/friendika 2011-06-15 07:02:38 +02:00
Friendika
fcdebc2324 event theming 2011-06-14 20:07:40 -07:00
Friendika
5105b3febc event calendar links, editing 2011-06-14 19:48:37 -07:00
Fabio Comuni
b7dc9f8867 Update info comments in all plugins 2011-06-14 15:08:03 +02:00
Fabio Comuni
00e142e4f7 Load plugin info from plugin file. Show README.md or README from plugin dir in plugin details page 2011-06-14 14:21:43 +02:00
Fabio Comuni
283160901f update styles 2011-06-14 14:21:00 +02:00
Fabio Comuni
25d1637ec4 simple plugin details and log view in admin 2011-06-14 11:54:14 +02:00
Fabio Comuni
b1184f3fde Merge remote-tracking branch 'friendika-master/master' into admin 2011-06-14 10:37:54 +02:00
Fabio Comuni
5882d8d022 Initial plugins admin page 2011-06-14 10:35:56 +02:00
d08b068031 Merge branch 'master' of git://github.com/friendika/friendika 2011-06-14 08:10:38 +02:00
Friendika
fb92dbf5d6 link events + personal notes to profile tabs 2011-06-13 20:32:30 -07:00
Fabio Comuni
ab27f1393e Admin site page 2011-06-13 18:03:06 +02:00
Fabio Comuni
a1c59d6011 Fix it strings 2011-06-13 12:53:03 +02:00
Fabio Comuni
494288ab9f Add admin page in nav 2011-06-13 12:52:52 +02:00
Fabio Comuni
3364c2a2d8 Initial admin page 2011-06-13 12:52:29 +02:00
4d3c6941ca Merge branch 'master' of git://github.com/friendika/friendika 2011-06-11 08:33:02 +02:00
Friendika
d66056af9d reduce visibility of lang-select flag (duepuntozero) 2011-06-10 20:39:46 -07:00
8390e8b19b Merge branch 'master' of git://github.com/friendika/friendika 2011-06-10 07:02:53 +02:00
Friendika
b857a49bfe event publish 2011-06-09 21:23:45 -07:00
7ffd0ee41a Merge branch 'master' of git://github.com/friendika/friendika 2011-06-09 10:20:47 +02:00
Friendika
d371241e66 events 2011-06-09 00:58:45 -07:00
Friendika
df8ac668b8 more calendar work, undo strict_privacy flag to use different approach 2011-06-08 21:06:02 -07:00
9ef5cb1c38 Merge branch 'master' of git://github.com/friendika/friendika 2011-06-08 07:21:19 +02:00
Friendika
33fe26ecb0 more progress on events 2011-06-07 20:10:43 -07:00
e036434b8a Merge branch 'master' of git://github.com/friendika/friendika 2011-06-07 20:03:58 +02:00
fabrixxm
16446ab0d0 update it strings 2011-06-07 11:44:20 +02:00
Friendika
9f51233451 event listings 2011-06-06 20:17:36 -07:00
Fabio Comuni
89fc56723d Add 'attach' and 'language' icons and enable file upload in dispy template 2011-06-06 15:38:21 +02:00
Friendika
edbad772ba add flag for experimental themes 2011-06-05 18:05:25 -07:00
Friendika
c4cec593ba position language selector in dispy 2011-06-05 17:51:39 -07:00
Friendika
4284c6f9ee use icon for language selector instead of hotkey 2011-06-05 17:32:56 -07:00
bda839635c Update to the German language files 2011-06-01 18:34:49 +02:00
2413a6b422 Merge branch 'master' of git://github.com/friendika/friendika 2011-06-01 07:56:27 +02:00
Friendika
fc34641d4a improve colour balance and banner on html email notifications 2011-05-31 22:41:09 -07:00
Friendika
fa986849c9 Brazilian (portugese) translation 2011-05-31 21:40:57 -07:00