Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #529 from phellmes/dev | git-marijus | 2016-09-22 | 2 | -7794/+8199 | |
|\ | | | | | Update DE translation strings | |||||
| * | Update DE translation strings | phellmes | 2016-09-22 | 2 | -7794/+8199 | |
| | | ||||||
* | | Merge pull request #530 from wave72/dev | Wave | 2016-09-22 | 2 | -5106/+5151 | |
|\ \ | |/ |/| | Updated Italian strings | |||||
| * | Updated Italian strings | Wave72 | 2016-09-22 | 2 | -5106/+5151 | |
| | | ||||||
* | | objects with id=share_container seem to be blacklisted in various security ↵ | Mario Vavti | 2016-09-22 | 1 | -14/+2 | |
| | | | | | | | | browser plugins. rename it to distr_container. also remove some superfluous js | |||||
* | | fix #525 | Mario Vavti | 2016-09-22 | 1 | -1/+1 | |
| | | ||||||
* | | narrow navbar css fixes | Mario Vavti | 2016-09-20 | 1 | -12/+8 | |
| | | ||||||
* | | Merge pull request #510 from wave72/dev | Wave | 2016-09-09 | 2 | -4745/+4849 | |
|\| | | | | | Updated Italian strings | |||||
| * | Updated Italian strings | Wave72 | 2016-09-09 | 2 | -4745/+4849 | |
| | | ||||||
* | | update justifiedGallery 3.6.1 -> 3.6.3 | Mario Vavti | 2016-09-09 | 1 | -1/+1 | |
| | | ||||||
* | | pro: provide settings for techlevel and techlevel_lock on admin/site page | redmatrix | 2016-09-08 | 1 | -0/+6 | |
| | | ||||||
* | | photo move to another album - resurrected from a temporary branch where the ↵ | redmatrix | 2016-09-06 | 1 | -0/+3 | |
| | | | | | | | | work had gotten lost | |||||
* | | add links to zcards #500 ; also provide drag/drop highlighting of comment ↵ | redmatrix | 2016-09-05 | 4 | -4/+34 | |
| | | | | | | | | regions when a link is being dragged over them | |||||
* | | revert moving home button to first position. instead move register and login ↵ | Mario Vavti | 2016-09-03 | 1 | -37/+38 | |
| | | | | | | | | buttons to the end of the list. | |||||
* | | pro: allow admin to set a site techlevel and optionally lock it. | redmatrix | 2016-09-02 | 1 | -1/+1 | |
| | | ||||||
* | | show home icon in first position in nav, provide register link also if ↵ | Mario Vavti | 2016-09-02 | 1 | -21/+25 | |
| | | | | | | | | register policy is set to approve and whitespace cleanup | |||||
* | | put theme config into its own namespace | redmatrix | 2016-09-01 | 1 | -2/+4 | |
| | | ||||||
* | | turn theme configuration into a class object | redmatrix | 2016-09-01 | 1 | -116/+122 | |
| | | ||||||
* | | separate the 'expert' feature into 'advanced_theming' and ↵ | redmatrix | 2016-09-01 | 1 | -2/+2 | |
| | | | | | | | | 'advanced_dirsearch'. Hide both features unless techlevel > 3. | |||||
* | | actively set all the theme options on the display settings page based on the ↵ | redmatrix | 2016-09-01 | 3 | -8/+23 | |
| | | | | | | | | current theme selection | |||||
* | | more work on theme select backend | redmatrix | 2016-09-01 | 1 | -3/+7 | |
| | | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-09-01 | 2 | -6/+10 | |
|\ \ | ||||||
| * | | introduce checklist BBcode for checklists | Mario Vavti | 2016-09-01 | 2 | -6/+10 | |
| | | | ||||||
* | | | theme preview - that was easy; plus a bit more tweaking of the saved search ↵ | redmatrix | 2016-09-01 | 1 | -1/+1 | |
|/ / | | | | | | | widget to try and get the sucker to auto submit | |||||
* | | even though there is now a sitesearch widget, remove it from the search page ↵ | redmatrix | 2016-08-31 | 1 | -1/+1 | |
| | | | | | | | | pdl since we can just use the navbar and it offers more modes. | |||||
* | | some issues with saved search - tags and connection searches weren't being ↵ | redmatrix | 2016-08-31 | 2 | -1/+6 | |
| | | | | | | | | saved. | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-31 | 4 | -13784/+14054 | |
|\ \ | ||||||
| * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | jeroenpraat | 2016-08-31 | 8 | -43/+291 | |
| |\ \ | ||||||
| * | | | Dutch and Spanish string update | jeroenpraat | 2016-08-31 | 4 | -13784/+14054 | |
| | | | | ||||||
* | | | | provide techlevels in the pro server role. Should have no visible effect on ↵ | redmatrix | 2016-08-31 | 1 | -0/+7 | |
| |/ / |/| | | | | | | | | other roles. | |||||
* | | | resolve merge conflict | Mario Vavti | 2016-08-31 | 8 | -43/+286 | |
|\ \ \ | ||||||
| * | | | The 'save to folder' modal dialog looked like crap. Now it only looks like dung. | redmatrix | 2016-08-30 | 3 | -5/+15 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-30 | 6 | -6175/+6206 | |
| |\| | | ||||||
| * | | | Merge remote-tracking branch 'upstream/dev' into website-export. Added ↵ | Andrew Manning | 2016-08-27 | 4 | -24/+53 | |
| |\ \ \ | | | | | | | | | | | | | | | | attach_move() to include/attach.php. | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-23 | 7 | -174/+114 | |
| |\ \ \ \ | ||||||
| * | | | | | Website export to cloud files works. Created new recursive copy function in ↵ | Andrew Manning | 2016-08-23 | 1 | -1/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | attach.php. | |||||
| * | | | | | Visual improvements to the export element table | Andrew Manning | 2016-08-21 | 1 | -25/+25 | |
| | | | | | | ||||||
| * | | | | | Block export and re-import works. Fixed bug where layout content was not ↵ | Andrew Manning | 2016-08-20 | 1 | -0/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | being imported properly. | |||||
| * | | | | | Layouts list and are selectable for export to the zip file | Andrew Manning | 2016-08-20 | 1 | -0/+35 | |
| | | | | | | ||||||
| * | | | | | Export of pages and their layouts to a zip file works. Bug on importing the ↵ | Andrew Manning | 2016-08-20 | 2 | -3/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | exported zip file for pages. | |||||
| * | | | | | Merge remote-tracking branch 'upstream/dev' into website-export | Andrew Manning | 2016-08-19 | 2 | -6106/+6089 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Pages populate the available-to-export list. New checkbox class for smaller ↵ | Andrew Manning | 2016-08-19 | 2 | -6/+110 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | boxes. | |||||
| * | | | | | | Progress implementing zip file export | Andrew Manning | 2016-08-17 | 4 | -20/+47 | |
| | | | | | | | ||||||
| * | | | | | | Stash changes for merge with dev | Andrew Manning | 2016-08-17 | 2 | -0/+15 | |
| | | | | | | | ||||||
* | | | | | | | provide a possibility to create checklists in bbcode [x] creates a checked ↵ | Mario Vavti | 2016-08-31 | 1 | -0/+5 | |
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | checkbox, [] creates an unchecked checkbox | |||||
* | | | | | | Merge pull request #505 from wave72/dev | Wave | 2016-08-30 | 2 | -6166/+6197 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | Updated Italian strings | |||||
| * | | | | | Updated Italian strings | Wave72 | 2016-08-30 | 2 | -6166/+6197 | |
| | |/ / / | |/| | | | ||||||
* | | | | | make lock switching actually work with multiple acl forms | Mario Vavti | 2016-08-29 | 2 | -7/+6 | |
| | | | | | ||||||
* | | | | | move allowed email domains to admin->security page | redmatrix | 2016-08-28 | 2 | -2/+3 | |
| |_|_|/ |/| | | | ||||||
* | | | | contact-block needs a class clear div at the end to not mess with following ↵ | Mario Vavti | 2016-08-26 | 1 | -11/+12 | |
| | | | | | | | | | | | | | | | | widgets and whitespace |