Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-18 | 1 | -1/+1 | |
|\| | | | | | | | | | Conflicts: util/messages.po | |||||
| * | fix calculation of content height with margins | Mario Vavti | 2015-09-17 | 1 | -1/+1 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-09-01 | 2 | -426/+614 | |
|\| | ||||||
| * | cert updates | redmatrix | 2015-09-01 | 3 | -427/+615 | |
| | | ||||||
* | | sync abook entries from redmatrix | redmatrix | 2015-07-02 | 4 | -572/+987 | |
|\| | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php | |||||
| * | since we can now use plain upstream justifiedGallery library - switch to ↵ | Mario Vavti | 2015-07-01 | 2 | -0/+14 | |
| | | | | | | | | minified version | |||||
| * | update justifiedGallery to versio 3.6.0 | Mario Vavti | 2015-07-01 | 2 | -572/+973 | |
| | | ||||||
* | | remove all QR-code stuff from core - now in qrator addon | redmatrix | 2015-06-25 | 425 | -10416/+0 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 20 | -0/+19077 | |
|\| | | | | | | | | | | | Conflicts: index.php mod/setup.php | |||||
| * | use $a->data instead of $a->page for $content and ad another library for use ↵ | Mario Vavti | 2015-05-23 | 20 | -0/+19077 | |
| | | | | | | | | with webpages - foundation | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-14 | 14 | -0/+494 | |
|\| | ||||||
| * | Add sprintf.js v1.0.2. | Klaus Weidenbach | 2015-05-14 | 14 | -0/+494 | |
| | | | | | | | | | | | | | | | | This script provides sprintf() for JavaScript. It can be used for example for translating strings used in JavaScript with variables. It is licensed under BSD-3-Clause and can be found on GitHub: https://github.com/alexei/sprintf.js | |||||
* | | first pass name change | redmatrix | 2015-05-05 | 1 | -1/+1 | |
|/ | ||||||
* | revert some changes in justified gallery | Mario Vavti | 2015-04-28 | 1 | -5/+2 | |
| | ||||||
* | make jRange behave again | Mario Vavti | 2015-04-09 | 1 | -2/+2 | |
| | ||||||
* | jRange: width is innacurate depending on box model, padding and margins. ↵ | friendica | 2015-04-08 | 1 | -1/+1 | |
| | | | | Using css width instead. | |||||
* | move bootbox out of bootstrap | Mario Vavti | 2015-03-17 | 2 | -0/+0 | |
| | ||||||
* | update bootstrap-3.3.4 and bootbox-4.4.0 | Mario Vavti | 2015-03-17 | 13 | -430/+835 | |
| | ||||||
* | prepare for demise of google code | friendica | 2015-03-12 | 1 | -0/+8 | |
| | ||||||
* | first cut openid server. Mostly just getting it architecturally prepared - ↵ | friendica | 2015-03-10 | 1 | -1/+1 | |
| | | | | as there may be a few twists and turns ahead. | |||||
* | jrange update | friendica | 2015-02-20 | 9 | -113/+2131 | |
| | ||||||
* | Merge pull request #900 from einervonvielen/doc_dev_beginner_corrections | RedMatrix | 2015-02-19 | 1 | -30/+23 | |
|\ | | | | | Changed bbcode [toc] and changed doc for beginning deveopers | |||||
| * | Changed bb code [toc] to make it more flexible | Einer von Vielen | 2015-02-14 | 1 | -30/+23 | |
| | | | | | | | | | | | | | | | | | | | | This usage is know closer to the original usage of http://ndabas.github.io/toc/ Changed: - jquery.toc.js: Do not check for empty headings - bbcode.php: Added processing of [toc] with parameters - main.js: Use the default params for jquery.toc.js - bbcode.html: Added more help for [toc] and corrected some html | |||||
* | | update justifiedGallery to version 3.5.4 and add ignoreElement option which ↵ | marijus | 2015-02-14 | 4 | -76/+106 | |
|/ | | | | will hopefully be accepted upstream | |||||
* | bring some styling back to the colorbox and improve the event preview ability | friendica | 2015-02-09 | 1 | -3/+3 | |
| | ||||||
* | Update to latest version of jRange (fixes issue #867) | Stefan Parviainen | 2015-01-21 | 4 | -4/+14 | |
| | ||||||
* | Update to latest version of jquery-textcomplete. | Stefan Parviainen | 2015-01-21 | 1 | -2/+17 | |
| | ||||||
* | allow system-loaded (i.e. pecl-oauth) to coexist | Habeas Codice | 2015-01-18 | 1 | -1/+2 | |
| | ||||||
* | Fixed bbode element toc for webpages | Einer von Vielen | 2015-01-18 | 1 | -24/+31 | |
| | | | | | | - At the moment webpages can contain empty headings if the textarea "Title" is left empty in the webpage creator (https://hostname/webpages/username) | |||||
* | Merge pull request #854 from pafcu/fixcollapse | pafcu | 2015-01-15 | 1 | -14/+2 | |
|\ | | | | | Actually fix problem with post collapsing in webkit-based browsers | |||||
| * | Actually fix problem with post collapsing in webkit-based browsers | Stefan Parviainen | 2015-01-15 | 1 | -14/+2 | |
| | | ||||||
* | | Added a table of content as bbcode element [toc] for webpages | 2015-01-14 | 2 | -191/+96 | ||
| | | | | | | | | | | - Included jquery.toc.js (http://www.apache.org/licenses/LICENSE-2.0) - Modified jquery.toc.js to work with the webpages of the red#matrix - Added info to the help | |||||
* | | Test | Einer von Vielen | 2015-01-13 | 1 | -0/+191 | |
|/ | | | | ...with table of content. jquery.tableofconent.js works bunt not properly | |||||
* | Possibly fix issue with readmore.js collapse | Stefan Parviainen | 2015-01-12 | 1 | -0/+2 | |
| | ||||||
* | Merge autocomplete caching, show more results in navbar search | Stefan Parviainen | 2015-01-07 | 1 | -139/+208 | |
|\ | ||||||
| * | Merge branch 'mainjsoptimize' of git://github.com/pafcu/red into ↵ | friendica | 2015-01-06 | 1 | -139/+208 | |
| |\ | | | | | | | | | | | | | | | | | | | pafcu-mainjsoptimize Conflicts: view/js/main.js | |||||
| | * | Update jquery.timeago.js to add support for dispose action | Stefan Parviainen | 2015-01-06 | 1 | -139/+208 | |
| | | | ||||||
* | | | Allow textcomplete to work on inputs (PR also filed upstream) | Stefan Parviainen | 2015-01-07 | 1 | -3/+4 | |
|/ / | ||||||
* / | Fix bug in readmore.js | Stefan Parviainen | 2015-01-06 | 1 | -3/+4 | |
|/ | ||||||
* | Remove unneeded divgrow library | Stefan Parviainen | 2015-01-05 | 4 | -136/+0 | |
| | ||||||
* | Remove some unneeded libraries | Stefan Parviainen | 2015-01-05 | 86 | -14554/+0 | |
| | ||||||
* | Replace fancybox with colorbox | Stefan Parviainen | 2015-01-05 | 97 | -706/+1513 | |
| | ||||||
* | Update jGrowl | Stefan Parviainen | 2015-01-05 | 3 | -148/+4 | |
| | ||||||
* | Replace jslider with jRange | Stefan Parviainen | 2015-01-05 | 13 | -0/+2142 | |
| | ||||||
* | Replace divgrow with more modern readmore.js | Stefan Parviainen | 2015-01-05 | 2 | -0/+490 | |
| | ||||||
* | htmlpurifier update - compatibility issue with language library autoloader | friendica | 2015-01-01 | 262 | -5949/+13348 | |
| | ||||||
* | Warn about unsaved settings using jquery.areyousure | Stefan Parviainen | 2015-01-01 | 11 | -0/+1434 | |
| | ||||||
* | Add missing vendor/-directory (due to upstream .gitignore) | Stefan Parviainen | 2014-12-31 | 7 | -1/+472 | |
| | ||||||
* | Revert "Revert "Language names via intl library."" | Stefan Parviainen | 2014-12-31 | 992 | -0/+498692 | |
| | | | | This reverts commit 4f35efa0bad4ae6489b63f3eebafe6542d654094. | |||||
* | Revert "Language names via intl library." | RedMatrix | 2014-12-31 | 992 | -498692/+0 | |
| |