Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-07-23 | 1 | -71/+79 |
|\ | |||||
| * | fix "resend" function when editor is disabled | Fabio Comuni | 2011-07-22 | 1 | -71/+79 |
| | | |||||
* | | dispy ACL into the fancybox | Tobias Diekershoff | 2011-07-23 | 3 | -31/+117 |
|/ | |||||
* | Use new ACL selector in photo edit | Fabio Comuni | 2011-07-20 | 3 | -6/+17 |
| | |||||
* | Use popup ACL selector in photo upload. js_upload use new acl selector. | Fabio Comuni | 2011-07-20 | 3 | -6/+16 |
| | |||||
* | Load tinyMCE on post editor only if needed. | Fabio Comuni | 2011-07-20 | 4 | -64/+93 |
| | |||||
* | Merge remote-tracking branch 'friendika/master' into newacl | Fabio Comuni | 2011-07-20 | 13 | -27/+131 |
|\ | |||||
| * | diaspora encryption xml template | Friendika | 2011-07-19 | 1 | -0/+8 |
| | | |||||
| * | Merge pull request #141 from fabrixxm/newacl | Friendika | 2011-07-19 | 5 | -114/+203 |
| |\ | | | | | | | New jot ACL selector | ||||
| * | | resize editor | Friendika | 2011-07-18 | 1 | -1/+1 |
| | | | |||||
| * | | improved code blocks | Friendika | 2011-07-18 | 1 | -2/+2 |
| | | | |||||
| * | | basic diaspora discovery | Friendika | 2011-07-18 | 2 | -0/+4 |
| | | | |||||
| * | | green icons for greenzero | Friendika | 2011-07-18 | 2 | -0/+7 |
| | | | |||||
| * | | invite system | Friendika | 2011-07-17 | 1 | -0/+11 |
| | | | |||||
| * | | Merge pull request #139 from fabrixxm/update | Friendika | 2011-07-15 | 3 | -4/+136 |
| |\ \ | | | | | | | | | Experiment with on-line update | ||||
| * | | | template for statusnet api config.xml | Friendika | 2011-07-14 | 1 | -0/+67 |
| | | | | |||||
| * | | | link tips on nav bar | Friendika | 2011-07-14 | 1 | -17/+17 |
| | | | | |||||
| * | | | openid settings appearing when disabled, don't tag numbers, install admin ↵ | Friendika | 2011-07-12 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | not getting set | ||||
| * | | | email notifications not working - unable to change notification settings | Friendika | 2011-07-12 | 2 | -5/+11 |
| | | | | |||||
* | | | | show acl selector in a popup with fancybox | Fabio Comuni | 2011-07-20 | 6 | -35/+34 |
| |_|/ |/| | | |||||
* | | | add icons to acl selector | Fabio Comuni | 2011-07-19 | 2 | -0/+21 |
| | | | |||||
* | | | Fix style and scrollbar | Fabio Comuni | 2011-07-19 | 2 | -6/+6 |
| | | | |||||
* | | | New jot acl selector | Fabio Comuni | 2011-07-19 | 5 | -118/+186 |
| |/ |/| | |||||
* | | move update link in admin aside | Fabio Comuni | 2011-07-13 | 1 | -4/+4 |
| | | |||||
* | | First test for friendika "live" update | Fabio Comuni | 2011-07-08 | 3 | -4/+136 |
|/ | |||||
* | input the admin email address during install/setup. | Friendika | 2011-07-07 | 9 | -8/+18 |
| | |||||
* | friendika-z configuration details in admin page | Friendika | 2011-07-07 | 1 | -0/+2 |
| | |||||
* | Merge pull request #138 from fabrixxm/master | Friendika | 2011-07-07 | 1 | -1/+18 |
|\ | | | | | some minor tweaks | ||||
| * | duepuntozero: style blockquote | Fabio Comuni | 2011-07-07 | 1 | -1/+6 |
| | | |||||
| * | duepuntozero: style "connect" link in profile page | Fabio Comuni | 2011-07-07 | 1 | -0/+12 |
| | | |||||
* | | don't show mailbox settings at all if disabled | Friendika | 2011-07-06 | 1 | -2/+2 |
|/ | |||||
* | Add missing files from previus checkin | Fabio Comuni | 2011-07-06 | 7 | -0/+48 |
| | |||||
* | Update settings page to use field templates. | Fabio Comuni | 2011-07-06 | 8 | -720/+204 |
| | | | | | | | 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 | ||||
* | Merge pull request #135 from fabrixxm/dispy | Friendika | 2011-07-04 | 1 | -1/+13 |
|\ | | | | | More Dispy css | ||||
| * | Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy | fabrixxm | 2011-07-05 | 20 | -75/+277 |
| |\ | |||||
| | * | dispy: style private mails | Fabio Comuni | 2011-07-04 | 1 | -0/+9 |
| | | | |||||
| * | | dispy: photos display don't overflow onto sidebar | fabrixxm | 2011-06-27 | 1 | -1/+4 |
| | | | |||||
* | | | community page | Friendika | 2011-07-04 | 2 | -1/+4 |
| |/ |/| | |||||
* | | profile match layout issues | Friendika | 2011-07-03 | 2 | -0/+7 |
| | | |||||
* | | starred items | Friendika | 2011-07-03 | 4 | -2/+32 |
| | | |||||
* | | add starred, unstarred icons to duepuntozero, loozah | Friendika | 2011-07-02 | 2 | -0/+5 |
| | | |||||
* | | improvied group highlighting, move new group link down | Friendika | 2011-07-02 | 2 | -0/+16 |
| | | |||||
* | | improved group-selected highlighting | Friendika | 2011-07-02 | 1 | -1/+2 |
| | | |||||
* | | indicate currently selected group in group picker | Friendika | 2011-07-01 | 1 | -0/+6 |
| | | |||||
* | | consolidate perrmisions sql, minor duepuntozero validation fixes | Friendika | 2011-06-30 | 1 | -7/+7 |
| | | |||||
* | | update oembed and widgets plugins settings form | Fabio Comuni | 2011-06-30 | 1 | -2/+12 |
| | | |||||
* | | style template field outside admin pages | Fabio Comuni | 2011-06-30 | 2 | -48/+56 |
| | | |||||
* | | Add javascript var "baseurl" | Fabio Comuni | 2011-06-30 | 2 | -0/+45 |
| | | | | | | | | Add field_richtext template | ||||
* | | re-added last item date in admin user page. relative_date return 'never' if ↵ | Fabio Comuni | 2011-06-29 | 1 | -0/+1 |
| | | | | | | | | null is passed | ||||
* | | Fix bug #98, add "never" to relative_date(), fix batch operations | Fabio Comuni | 2011-06-29 | 1 | -4/+3 |
| | |