| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' into bootstrap | Christian Vogeley | 2013-12-22 | 7 | -44/+1691 |
| |\ | | | | | | | | | Conflicts: view/php/theme_init.php | ||||
| | * | When counting not yet loaded images, count all in .wall-item-body. | zottel | 2013-12-10 | 1 | -1/+1 |
| | | | |||||
| | * | doco and add document ready function | friendica | 2013-12-09 | 1 | -0/+4 |
| | | | |||||
| | * | this should fix the "always loads page 2 first if you're scrolled down the ↵ | friendica | 2013-12-09 | 1 | -28/+25 |
| | | | | | | | | | page a fair ways and reload the page". | ||||
| | * | add icon_trnalsate | friendica | 2013-12-04 | 1 | -0/+49 |
| | | | |||||
| | * | Quick hack to allow themes/modules to use different CSS classes for the ACL ↵ | Olivier Migeot | 2013-11-27 | 1 | -2/+14 |
| | | | | | | | | | selector's icon (e.g. icon-lock/icon-unlock instead of lock/unlock). Unless a theme supports it, they'll stay at their former values. Dunno if it's the best way to achieve this, though. | ||||
| | * | create jquery-compat to hold deprecated jquery functions, load it before all ↵ | friendica | 2013-11-26 | 2 | -39/+71 |
| | | | | | | | | | the dependent js scripts | ||||
| | * | make font-asewome optional. Also include jquery.browser in js/main.js so we ↵ | friendica | 2013-11-25 | 1 | -0/+39 |
| | | | | | | | | | can turn off the migration toolkit. | ||||
| | * | pass algorithm to the decryptor so we know if our plugin is allowed to run | friendica | 2013-11-21 | 1 | -1/+1 |
| | | | |||||
| | * | e2ee algorithms are now pluggable so if you want to roll your own algorithm ↵ | friendica | 2013-11-21 | 1 | -13/+33 |
| |/ | | | | or do something like swap_bytes(rabbit(left_shift(3,triple_aes256(right_shift(base64(text)))))) - go for it. As long as the person at the other end can reverse it, you can do pretty much whatever you want. I'd like to see the NSA crack that one - especially if the algorithm was called something like "dishwasher" or something which didn't provide a lot of clues. | ||||
| * | typo | friendica | 2013-11-14 | 1 | -1/+1 |
| | | |||||
| * | e2ee in comments and a bit of cleanup so not every theme has to define how ↵ | friendica | 2013-11-14 | 1 | -0/+31 |
| | | | | | to insert bbcode, only if they're doing something special (e.g. this is how to implement a javascript plugin :-)), and I got rid of the predefined http:// in the bbcode for urls. You're almost always pasting a url which already has that bit and it just creates an extra step. | ||||
| * | revert addeditortext changes for tinymce detection | friendica | 2013-11-12 | 1 | -6/+5 |
| | | |||||
| * | very crude zid support for e2ee content and move bbcode converter to main.js ↵ | friendica | 2013-11-12 | 1 | -0/+135 |
| | | | | | so it's available when not logged in (though we might ultimately want to force people to get a matrix account to use our encryption). | ||||
| * | add rabbit and tripledes ciphers - probably need a pconfig to set the default | friendica | 2013-11-11 | 1 | -7/+40 |
| | | |||||
| * | make e2ee work on tinymce | friendica | 2013-11-11 | 1 | -1/+15 |
| | | |||||
| * | localise js ui strings for e2ee | friendica | 2013-11-11 | 1 | -3/+3 |
| | | |||||
| * | because some of the "hints" floating around are pretty pathetic and ↵ | friendica | 2013-11-11 | 1 | -1/+11 |
| | | | | | ambiguous and require a few tries. | ||||
| * | remove debugging stuff | friendica | 2013-11-11 | 1 | -1/+5 |
| | | |||||
| * | display encrypted text inline | friendica | 2013-11-11 | 1 | -2/+16 |
| | | |||||
| * | e2ee | friendica | 2013-11-10 | 1 | -17/+23 |
| | | |||||
| * | some more doco for how to finish it. | friendica | 2013-11-10 | 1 | -0/+9 |
| | | |||||
| * | Didn't finish it. Gotta' pee. | friendica | 2013-11-10 | 1 | -0/+72 |
| | | |||||
| * | add base64 converters which aren't universal across browsers | friendica | 2013-11-10 | 1 | -0/+109 |
| | | |||||
| * | issue #189 - show post edited time on relative date hovertip | friendica | 2013-10-30 | 1 | -0/+11 |
| | | |||||
| * | fix issue #123 again, except this time don't allow ping recursion | friendica | 2013-10-29 | 1 | -12/+17 |
| | | |||||
| * | Recursive ping | Thomas Willingham | 2013-10-29 | 1 | -2/+2 |
| | | |||||
| * | basic support (still needs some js to expose it) for sharing an item on a ↵ | friendica | 2013-10-23 | 1 | -14/+39 |
| | | | | | remote site by sending it through oexchange on your home hub. Untested. | ||||
| * | issue #123 - this will leave a very very short interval between the time a ↵ | friendica | 2013-10-20 | 1 | -1/+2 |
| | | | | | notification shows up and the time it is cleared. This is about as fast as we can clear it. Previously it could have been as long as the network poll interval. | ||||
| * | partial fix for issue #123 - this doesn't actually fix the reported problem, ↵ | friendica | 2013-10-20 | 1 | -0/+1 |
| | | | | | but does instantly reset the notification count when you click 'mark all xyz notifications seen' | ||||
| * | fix endless scroll | friendica | 2013-10-13 | 1 | -1/+1 |
| | | |||||
| * | turn off endless scroll if we have no more content to load - currently for ↵ | friendica | 2013-10-13 | 1 | -1/+3 |
| | | | | | mod_display, need to add to other content modules | ||||
| * | more icon conversions - savedsearch listings need more work. The drop icon ↵ | friendica | 2013-10-09 | 1 | -2/+2 |
| | | | | | should be hidden unless the entry is being hovered. | ||||
| * | replace a bunch of graphic icons with vector icons | friendica | 2013-10-08 | 1 | -0/+4 |
| | | |||||
| * | suppress creating the directory update record for profile updates which are ↵ | friendica | 2013-09-25 | 1 | -1/+2 |
| | | | | | part of the normal import_xchan sequence - otherwise we get two for every change. Create it normally if we are called with a profile_update message and don't go through the whole import_xchan thing. | ||||
| * | Sheesh. Three lines of Javascript. All you have to do is find which of the ↵ | friendica | 2013-09-01 | 1 | -0/+6 |
| | | | | | three lines is doing something wrong. Or FILE A BUG. Or use a different browser (not *try* a different browser, *use* a different browser), or turn off freaking tinymce. But no - let's argue about browsers instead. | ||||
| * | Another try at issue #61 and #62 - an earlier fix was partially working but ↵ | friendica | 2013-08-18 | 1 | -0/+34 |
| | | | | | the issue persisted - this extends it a bit. | ||||
| * | Merge pull request #77 from git-marijus/master | friendica | 2013-07-14 | 3 | -10/+439 |
| |\ | | | | | add spin.js a themable js spinner to red | ||||
| | * | port jot to spin.js | git-marijus | 2013-07-13 | 1 | -1/+1 |
| | | | |||||
| | * | port like button to spin.js | git-marijus | 2013-07-13 | 1 | -7/+7 |
| | | | |||||
| | * | Update main.js | git-marijus | 2013-07-13 | 1 | -1/+1 |
| | | | |||||
| | * | Update main.js | git-marijus | 2013-07-13 | 1 | -1/+2 |
| | | | |||||
| | * | Update main.js | git-marijus | 2013-07-13 | 1 | -3/+2 |
| | | | |||||
| | * | Create jquery.spin.js | git-marijus | 2013-07-13 | 1 | -0/+80 |
| | | | | | | | jquery plugin for spin.js | ||||
| | * | Create spin.js | git-marijus | 2013-07-13 | 1 | -0/+349 |
| | | | |||||
| * | | fix undefined commentWrap | friendica | 2013-07-04 | 1 | -1/+4 |
| | | | |||||
| * | | with luck this will fix issue #61 and issue #62 - boy that was fun (not). | friendica | 2013-07-02 | 1 | -24/+13 |
| | | | |||||
| * | | some work on issue #62 (comments collapsing on liveupdate), but still a work ↵ | friendica | 2013-07-02 | 1 | -14/+23 |
| | | | | | | | | | | | | | in progress some work on photo consolidated "view/edit", but still a work in progress | ||||
| * | | issue #65 | friendica | 2013-07-01 | 1 | -0/+16 |
| | | | |||||
| * | | implement taggable in auto-complete popups | friendica | 2013-06-16 | 1 | -3/+3 |
| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |