summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* rename confusing getMailHeaderColor to getColorPrimary, ref #3491Jan-Christoph Borchardt2017-03-291-3/+3
* Merge pull request #4116 from nextcloud/swift-cache-tokenRoeland Jago Douma2017-03-291-10/+62
|\
| * serialize the token to json instead of using php's serializeRobin Appelman2017-03-281-10/+36
| * cache swift tokens in memcacheRobin Appelman2017-03-281-10/+36
* | Merge pull request #4129 from nextcloud/remove-verbose-error-messageJoas Schilling2017-03-291-2/+3
|\ \
| * | Remove verbose error messageLukas Reschke2017-03-291-2/+3
* | | Merge pull request #4091 from nextcloud/Rudloff-manifestMorris Jobke2017-03-281-0/+1
|\ \ \
| * | | Web app manifestPierre Rudloff2017-03-281-0/+1
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-296-0/+20
* | | | Merge pull request #4120 from nextcloud/newest-item-first-in-activityMorris Jobke2017-03-281-4/+4
|\ \ \ \
| * | | | Change the order on merging activities so the newest item is firstJoas Schilling2017-03-281-4/+4
* | | | | Merge pull request #4127 from nextcloud/update-legacy-csp-policyMorris Jobke2017-03-281-1/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update legacy CSP policyLukas Reschke2017-03-281-1/+3
* | | | | Merge pull request #4070 from nextcloud/gzip_scss_jsMorris Jobke2017-03-282-1/+17
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix testsRoeland Jago Douma2017-03-281-1/+1
| * | | | Allow to gzip CSS/JS filesRoeland Jago Douma2017-03-282-1/+17
| | |_|/ | |/| |
* | | | Merge pull request #4004 from nextcloud/backport-27172Roeland Jago Douma2017-03-281-0/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Remove SharedCache::getNumericStorageId to let CacheWrapper do itVincent Petry2017-03-231-0/+8
* | | | Merge pull request #4112 from nextcloud/swift-configRobin Appelman2017-03-281-5/+80
|\ \ \ \ | |_|_|/ |/| | |
| * | | better error messages for invalid regions, urltypes and service namesRobin Appelman2017-03-281-4/+63
| * | | better error messages when swift authentication failsRobin Appelman2017-03-281-1/+17
| | |/ | |/|
* | | [tx-robot] updated from transifexNextcloud bot2017-03-2816-0/+16
* | | Merge pull request #4084 from nextcloud/fix-log-spam-with-too-few-navigation-...Morris Jobke2017-03-271-5/+3
|\ \ \
| * | | Don't spam the log with "Undefined index showInHeader"Joas Schilling2017-03-271-5/+3
* | | | Merge pull request #4096 from nextcloud/touch-floorMorris Jobke2017-03-271-1/+1
|\ \ \ \
| * | | | round the mtime in touchRobin Appelman2017-03-271-1/+1
| | |/ / | |/| |
* | | | Merge pull request #4072 from nextcloud/move-x-frame-options-into-phpGeorg Ehrke2017-03-271-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Move X-Frame-Options into PHPLukas Reschke2017-03-261-1/+1
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2017-03-2752-1314/+312
* | | Allow to specify the idJoas Schilling2017-03-261-1/+2
* | | Make sure help is always after usersJoas Schilling2017-03-261-1/+1
* | | Fix order as @jancborchardt requestedMorris Jobke2017-03-261-2/+2
* | | Don't use the dropdown for one item onlyJoas Schilling2017-03-261-2/+12
* | | Allow multiple navigation links from info.xmlJoas Schilling2017-03-261-48/+38
* | | Allow apps to register a setting via info.xmlJoas Schilling2017-03-261-0/+2
* | | Move app management to the settings menuJoas Schilling2017-03-261-4/+3
* | | Manage the right side menu via the navigation manager as wellJoas Schilling2017-03-263-103/+136
* | | Register the app management in the normal wayJoas Schilling2017-03-263-12/+11
|/ /
* | Create a notification when the update server couldn't be reached for some daysJoas Schilling2017-03-261-9/+11
* | [tx-robot] updated from transifexNextcloud bot2017-03-262-2/+2
* | Don't run JSCombiner when not installedLukas Reschke2017-03-251-3/+6
* | Merge pull request #4043 from nextcloud/merge-js-for-template-prependMorris Jobke2017-03-241-23/+4
|\ \
| * | Merge JS for template prependLukas Reschke2017-03-241-23/+4
* | | Merge sharing backend JSLukas Reschke2017-03-241-9/+2
|/ /
* | Update autoloaderRoeland Jago Douma2017-03-242-0/+4
* | Add returnRoeland Jago Douma2017-03-241-1/+1
* | Add debug modeRoeland Jago Douma2017-03-243-2/+41
* | Add cachingRoeland Jago Douma2017-03-242-7/+44
* | [PoC] JS CombinerRoeland Jago Douma2017-03-243-2/+166
* | Merge pull request #4013 from nextcloud/bundle_vendor_jsLukas Reschke2017-03-241-12/+15
|\ \