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

1129 commits

Author SHA1 Message Date
Friendika
c63adcfae0 bug #159 multiple definition of string_plural_form function when changing languages 2011-09-21 07:09:37 -07:00
Friendika
deeae7bdb5 diaspora markdown changes, parse_url format change 2011-09-20 15:23:36 -07:00
Friendika
8a11cec61a allow setting all the bookmarked URL fields via script/API 2011-09-19 22:21:55 -07:00
Friendika
d6d24f3b6a personal notes going to wall instead of PN in dispy 2011-09-19 16:51:52 -07:00
fabrixxm
ad3d2bd6ae Merge pull request #173 from fabrixxm/master 
a pair of missing IT email templates
 2011-09-19 05:45:43 -07:00
Fabio Comuni
ca71808515 IT: missing email templates 2011-09-19 14:43:17 +02:00
Fabio Comuni
991656a3ef Show "404.tpl" instead of using 'notice()' in case of 404 2011-09-19 11:52:32 +02:00
Friendika
0a30a91b14 basic zot discovery framework 2011-09-19 02:13:59 -07:00
Friendika
672ecc7f7d more tag infrastructure 2011-09-18 22:42:47 -07:00
Fabio Comuni
6b6f45f9f1 quattro: initial style of conversations 2011-09-16 12:51:14 +02:00
Fabio Comuni
80af4f3fe6 new icons 2011-09-16 12:50:15 +02:00
Fabio Comuni
9d2afc2d3c Merge remote-tracking branch 'friendika/master' into newui 2011-09-16 09:39:29 +02:00
Fabio Comuni
019b735ec7 Merge branch 'newui' of github.com:fabrixxm/friendika into newui 2011-09-15 10:39:41 +02:00
Fabio Comuni
7e806429cc quattro 2011-09-15 10:38:37 +02:00
Friendika
d7a2ab9c1f send profile visits to 'redir' window 2011-09-09 16:22:32 -07:00
Friendika
3f59f63224 saved searches on search page, templates: Invalid argument supplied for foreach() on line 167 2011-09-08 21:42:52 -07:00
fabrixxm
d284f8017c Merge remote-tracking branch 'friendika/master' into newui 2011-09-08 20:15:27 +02:00
Fabio Comuni
2f93a4d70d style vcard infos 2011-09-08 10:11:57 +02:00
Friendika
18315a1377 Russian translation (80% complete) 2011-09-06 01:52:45 -07:00
Friendika
eeecb412aa view bookmarks 2011-09-06 00:55:24 -07:00
Friendika
e921b97a7f bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings 2011-09-05 18:34:30 -07:00
Fabio Comuni
08e54234e3 profiles popup menu in sidebar 2011-09-05 16:55:40 +02:00
Fabio Comuni
abd65e00ab Load infos and notices via ping and show them with js popup 2011-09-05 14:01:21 +02:00
Fabio Comuni
14125ce67b Add tipTip js tooltips 2011-09-05 11:32:40 +02:00
Fabio Comuni
2c1aca7ffe fix aside contact block, add edit profiles icon 2011-09-05 11:16:08 +02:00
Fabio Comuni
20ca451200 move js to js folder 2011-09-05 11:15:30 +02:00
Fabio Comuni
ab5bda526e move icons style in new file 2011-09-05 11:14:43 +02:00
Fabio Comuni
0283cbfcd3 Merge remote-tracking branch 'friendika/master' into newui 2011-09-05 09:09:34 +02:00
Friendika
7e8100d2cd custom attags 2011-09-04 22:40:36 -07:00
Friendika
82f7f33cf5 bookmarks + bug #140 2011-09-04 19:58:03 -07:00
Friendika
481853d2cc saved searches on network page 2011-09-04 17:35:06 -07:00
Friendika
f6a43afb8d set max height of acl names to avoid wrap 2011-09-04 06:18:26 -07:00
Friendika
e440353013 truncate overflow text on acl selector items (3 themes) 2011-09-04 05:41:11 -07:00
Friendika
d49895a8a1 Merge pull request #169 from michal-s/master 
minor changes of czech translations
 2011-09-02 22:20:47 -07:00
Michal Supler
7813f1798f minor changes of czech translations 2011-09-03 02:01:15 -03:00
Erkan Yilmaz
463a136c15 typo in German admin log page 2011-09-02 10:17:17 +02:00
Fabio Comuni
058e329dfb Fix profile vcard and style 2011-09-01 12:37:30 +02:00
Fabio Comuni
18f6d4e639 small fix to IT strings 2011-09-01 12:39:42 +02:00
Fabio Comuni
8b615133d5 remove html from profile vcard code 2011-08-31 17:31:44 +02:00
Fabio Comuni
54f0685a03 quattro: more colors 2011-08-31 17:30:48 +02:00
Fabio Comuni
62295af1f2 quattro: cleanup and split of less files 2011-08-31 16:19:17 +02:00
Fabio Comuni
5ce6f893a6 Apps popup menu in navbar 2011-08-31 16:18:03 +02:00
Fabio Comuni
71d44d78ec Installed apps as array instead of string 2011-08-31 16:17:32 +02:00
Fabio Comuni
d0926240a8 Merge remote-tracking branch 'friendika/master' into newui 2011-08-30 11:00:23 +02:00
Friendika
22d9d97d71 remove "online reputation" section on contact editing - nobody ever uses it, and there is no interface to query it. 2011-08-29 19:18:59 -07:00
fabrixxm
8438da7d70 Small fix to IT strings 2011-08-26 16:36:02 +02:00
Friendika
99ea045723 some minor work on contact edit page 2011-08-25 18:12:42 -07:00
Friendika
83605cf3dc theme settings for contact photo menu 2011-08-25 05:15:05 -07:00
Friendika
71fc694c67 contact photo menu 2011-08-24 23:20:04 -07:00
Friendika
74d61ed00b contact menu beginnings 2011-08-24 22:40:26 -07:00
Olivier Migeot
1548449586 Small fix 2011-08-24 18:04:16 +02:00
Olivier Migeot
1f5a67c81f French translation up to date. 2011-08-24 17:47:21 +02:00
Tobias Diekershoff
56c29a527d Merge github.com:tobiasd/friendika 2011-08-24 07:38:05 +02:00
Friendika
56d64316f4 diaspora photos ? 2011-08-23 18:17:35 -07:00
Tobias Diekershoff
9cd28af4e8 fixed a missing string in DE 2011-08-23 06:32:21 +02:00
Friendika
eb2ef6dec4 diaspora admin toggle, update install guide 2011-08-22 18:52:02 -07:00
fabrixxm
d5567eb297 compatiblity for old themes 2011-08-22 14:06:55 +02:00
fabrixxm
d8bd4fbb3e Merge branch 'master' into newui 2011-08-22 13:56:08 +02:00
Michal Supler
f3c5154f0c added Czech translation of mail messages 2011-08-21 23:45:43 -03:00
fabrixxm
b465d1f30b Merge pull request #158 from fabrixxm/master 
Some works on API
 2011-08-19 08:03:20 -07:00
fabrixxm
fc9c73da49 API: missing template and small fix for hotot 2011-08-19 15:09:10 +02:00
Friendika
609741573c darkzero - friend request - identity address invisible 2011-08-18 17:11:57 -07:00
tobiasd
bdd71b10be Merge pull request #155 from tobiasd/master 
update DE strings
 2011-08-18 01:07:33 -07:00
Tobias Diekershoff
bea02876eb update DE strings 2011-08-18 10:05:33 +02:00
Friendika
9634287839 fix several probe related issues 2011-08-17 23:01:44 -07:00
fabrixxm
8cc368966d Update IT strings 2011-08-17 19:52:10 +02:00
fabrixxm
07b6c868b3 remove javascript to set selectect nav item. enanche img template prefetch ignoring 2011-08-17 18:36:24 +02:00
fabrixxm
bdf42473a0 Merge remote-tracking branch 'friendika/master' into newui 2011-08-17 17:35:37 +02:00
Friendika
b28b468b21 cleanup 2011-08-16 20:05:02 -07:00
Friendika
e15e18e0d1 hopefully fix statusnet bug by altering our feed format slightly 2011-08-12 21:01:51 -07:00
Friendika
e3841ce15c pt-br strings.php update from messages.po change 2011-08-09 19:05:43 -07:00
Abinoam P. Marques Jr.
4cfe75c6bc small typo - pt-br localization 2011-08-09 22:34:44 -03:00
Tobias Diekershoff
e2873e542b fixed some typos 2011-08-09 16:19:39 +02:00
Tobias Diekershoff
97b2c56c98 update of the German localization 2011-08-09 15:57:08 +02:00
Friendika
7eb7f77413 use separate hcard from profile url 2011-08-07 19:26:44 -07:00
Friendika
8ae0a8a94c fix statusnet_html timelines on api 2011-08-05 07:26:54 -07:00
Friendika
1d659bd854 move public profile warning to top of page 2011-08-05 06:42:27 -07:00
Friendika
112fc59e31 more api tweaks 2011-08-05 05:17:18 -07:00
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
Tobias Diekershoff
a09bdf5ad6 added link to community page to dispy theme menu 2011-07-24 11:07:39 +02:00
Tobias Diekershoff
a4f7e8e8fe dispy theme hide editor if without focus 2011-07-24 09:32:20 +02:00
Tobias Diekershoff
abc01cad20 Merge branch 'master' of git://github.com/friendika/friendika 2011-07-23 07:43:25 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
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
Tobias Diekershoff
6802911522 put the green back in the panel background 2011-06-16 17:22:03 +02:00
Tobias Diekershoff
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
Tobias Diekershoff
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