Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-08 | 49 | -21/+229 |
|\ | |||||
| * | experimental new notifications - needs pconfig experimental_notif set to 1 ↵ | Mario Vavti | 2017-10-08 | 48 | -17/+221 |
| | | | | | | | | for your channel to work. | ||||
| * | fix filestorage spinner | Mario Vavti | 2017-10-07 | 1 | -1/+1 |
| | | |||||
| * | introduce public stream notifications | Mario Vavti | 2017-10-06 | 1 | -3/+7 |
| | | |||||
* | | navbar controls now functionally hidden with too low z-index when ↵ | zotlabs | 2017-10-07 | 1 | -0/+4 |
|/ | | | | cover_photo is showing and navbar doesn't have class fixed-top | ||||
* | update some old spinners which were causing js issues | zotlabs | 2017-10-05 | 5 | -14/+14 |
| | |||||
* | Experimental alternate channel_menu navigation. To use, "util/config ↵ | zotlabs | 2017-10-05 | 2 | -3/+15 |
| | | | | system.channel_menu 1" | ||||
* | introduce shared files notifications | Mario Vavti | 2017-10-04 | 2 | -8/+16 |
| | |||||
* | bring back notifications for account approvals | Mario Vavti | 2017-10-04 | 2 | -4/+15 |
| | |||||
* | some basic work on mod common | Mario Vavti | 2017-10-03 | 1 | -11/+13 |
| | |||||
* | move common connections widget to left aside | Mario Vavti | 2017-10-03 | 2 | -28/+13 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-03 | 1 | -1/+2 |
|\ | |||||
| * | Hubzilla issue #866 allow navbar to be used when cover photo is displayed - ↵ | zotlabs | 2017-10-02 | 1 | -1/+2 |
| | | | | | | | | also scroll cover photo on keyup event. | ||||
* | | whitespace | Mario Vavti | 2017-10-02 | 1 | -3/+3 |
| | | |||||
* | | wiki: show save button and commit input field in all tabs if there is ↵ | Mario Vavti | 2017-10-02 | 1 | -25/+37 |
|/ | | | | unsaved content. fix #853 | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-01 | 3 | -22/+20 |
|\ | |||||
| * | Merge pull request #863 from mjfriaza/dev | git-marijus | 2017-10-01 | 2 | -11/+11 |
| |\ | | | | | | | Fixed some errors in the Spanish translation | ||||
| | * | Fixed the Spanish translation | Manuel Jiménez Friaza | 2017-10-01 | 2 | -11/+11 |
| | | | |||||
| * | | fix profile edit dropdown for multiple profiles | Mario Vavti | 2017-10-01 | 1 | -11/+9 |
| | | | |||||
* | | | use imagick converter for large photos | zotlabs | 2017-09-30 | 1 | -0/+1 |
|/ / | |||||
* | | remove double remote login button and slightly change appearence | Mario Vavti | 2017-09-28 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #860 from waitman/patch-2 | git-marijus | 2017-09-28 | 1 | -0/+1 |
|\ \ | | | | | | | add remote login to login form | ||||
| * | | add remote login to login form | Waitman Gobble | 2017-09-18 | 1 | -0/+1 |
| | | | | | | | | | This exists in nav login but not login.tpl | ||||
* | | | re-arrange some html | Mario Vavti | 2017-09-27 | 2 | -7/+7 |
| | | | |||||
* | | | make justifiedGallery even more happy | Mario Vavti | 2017-09-27 | 1 | -1/+1 |
| | | | |||||
* | | | make justifiedGallery happy again | Mario Vavti | 2017-09-27 | 3 | -2/+7 |
| | | | |||||
* | | | do not use our spinner css on the justifiedGallery spinner which has the ↵ | Mario Vavti | 2017-09-27 | 1 | -1/+3 |
| | | | | | | | | | | | | same classname hardcoded | ||||
* | | | fix some missing spinners | Mario Vavti | 2017-09-27 | 9 | -9/+20 |
| | | | |||||
* | | | get rid of spinner.js in use a lightweight css spinner instead | Mario Vavti | 2017-09-26 | 21 | -556/+173 |
| | | | |||||
* | | | tagging changes - provides ability to mention a forum by using !forumname as ↵ | zotlabs | 2017-09-24 | 1 | -1/+11 |
| | | | | | | | | | | | | well as the traditional red style (@forumname+). This should probably not be advertised on a wide scale until after a critical mass of sites have updated to a version containing these changes. This adds yet another option type to the ACL module which probably needs refactoring soon since it is turning into option type spaghetti. | ||||
* | | | fix missing content on channel page | Mario Vavti | 2017-09-23 | 1 | -0/+1 |
| | | | |||||
* | | | no visible feedback when moving the affinity slider and waiting for content ↵ | zotlabs | 2017-09-21 | 1 | -0/+2 |
| | | | | | | | | | | | | to load, the appropriate spinner div seems to have gone missing at some time in the past | ||||
* | | | wiki css fixes | Mario Vavti | 2017-09-20 | 2 | -13/+14 |
| | | | |||||
* | | | wiki: translateable strings and move page mimetype selector to options submenu | Mario Vavti | 2017-09-20 | 2 | -5/+10 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-19 | 3 | -9/+7 |
|\ \ \ | |||||
| * | | | Revert "remove some redundant references to sticky_kit" | Mario Vavti | 2017-09-19 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | This reverts commit dbc0cc8c929809d70ec306f08d4c0031b49c5c93. | ||||
| * | | | remove some redundant references to sticky_kit | Mario Vavti | 2017-09-19 | 2 | -3/+0 |
| | | | | |||||
| * | | | jquery-3.2.1 | Mario | 2017-09-19 | 1 | -4/+4 |
| | | | | |||||
| * | | | fix some issues with sticky-kit | Mario | 2017-09-19 | 2 | -5/+3 |
| | | | | |||||
* | | | | turn common friends into a widget | zotlabs | 2017-09-19 | 3 | -17/+27 |
|/ / / | |||||
* / / | fix various wikipage widget issues (sort pages by name, respect locked mime ↵ | Mario | 2017-09-19 | 1 | -11/+11 |
|/ / | | | | | | | type setting, move create tool back to the bottom) | ||||
* | | Moved add wiki page form to top of page list to address issue ↵ | Andrew Manning | 2017-09-16 | 1 | -17/+17 |
| | | | | | | | | https://github.com/redmatrix/hubzilla/issues/719 | ||||
* | | Page title is what we need in order to delete pages, not the url | Andrew Manning | 2017-09-16 | 1 | -1/+1 |
| | | |||||
* | | do not show edit pencil if not allowed to edit | Mario Vavti | 2017-09-16 | 1 | -0/+4 |
| | | |||||
* | | implement wiki editing | Mario | 2017-09-15 | 3 | -20/+24 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | git-marijus | 2017-09-15 | 3 | -5/+13 |
|\ \ | |||||
| * | | wiki: lock mimetype | zotlabs | 2017-09-14 | 3 | -4/+12 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-09-14 | 1 | -0/+2 |
| |\ \ | |||||
| * | | | bring back wiki download | zotlabs | 2017-09-14 | 1 | -2/+2 |
| | | | | |||||
* | | | | some work on wiki acl | git-marijus | 2017-09-15 | 1 | -1/+15 |
| |/ / |/| | |