summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-06-1612-2/+20
|
* Merge pull request #5421 from nextcloud/5190-masterMorris Jobke2017-06-151-9/+32
|\ | | | | [master] Treat PHP Errors on User session regenerate
| * Forward port of #5190 to masterArthur Schiwon2017-06-151-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat PHP Errors on User session regenerate Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> remove unnecessary lines… Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> change PHP errors to ErrorException in the session (PHP >=7) Otherwise it might be that authentication apps are being disabled on during operation while in fact the session handler has hiccup. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #5396 from nextcloud/gpx-mimetypeblizzz2017-06-151-0/+15
|\ \ | |/ |/| add gpx mimetype
| * added kml, kmz, tcx types as well while at itArthur Schiwon2017-06-141-1/+4
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * add geospatial mime types repair stepArthur Schiwon2017-06-141-0/+12
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2017-06-158-0/+8
| |
* | Merge pull request #4993 from michaelletzgus/emit_css-tagsMorris Jobke2017-06-141-1/+31
|\ \ | | | | | | Emit css tags
| * | Streamline templates, more DRYMichael Letzgus2017-05-251-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | Use Unified function to emit <link> tags for css loading, obey "Don't Repeat Yourself" ;-) (Next step might by to combine this with the emit <script> function (even more DRY?) AND move all this to a better place?) Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
* | | a parameter too muchArthur Schiwon2017-06-141-2/+1
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #5392 from nextcloud/maintenance-mode-styleLukas Reschke2017-06-141-0/+1
|\ \ \ | | | | | | | | Use the guest.css for the maintenance page as well
| * | | Use the guest.css for the maintenance page as wellMorris Jobke2017-06-131-0/+1
| | |/ | |/| | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #5361 from ↵Lukas Reschke2017-06-141-0/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/exclude-files-external-dir-from-encryption don't try to encrypt/decrypt the certificate bundle
| * | | don't try to encrypt/decrypt the certificate bundleBjoern Schiessle2017-06-131-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-1414-4/+18
| | | |
* | | | Merge pull request #5072 from mjmunger/masterMorris Jobke2017-06-131-1/+1
|\ \ \ \ | |_|/ / |/| | | Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
| * | | Fixed a crash caused by Local::copyFromStorage() not conforming to ↵Michael Munger2017-05-231-1/+1
| | | | | | | | | | | | | | | | Common::copyFromStorage. Issue# 5071
* | | | Fix unknown share tokenJoas Schilling2017-06-131-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #5343 from nextcloud/share-filter-missing-groupsLukas Reschke2017-06-132-1/+3
|\ \ \ \ | |_|/ / |/| | | filter missing groups in share provider
| * | | filter missing groups in share providerRobin Appelman2017-06-122-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #5027 from nextcloud/require-nextcloud-version-as-per-docsMorris Jobke2017-06-121-31/+7
|\ \ \ \ | | | | | | | | | | Version and dependency are now required
| * | | | Version and dependency are now requiredJoas Schilling2017-05-221-31/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-06-1356-114/+114
| | | | |
* | | | | Merge pull request #5167 from nextcloud/rakekniven-patch-2Morris Jobke2017-06-121-2/+2
|\ \ \ \ \ | | | | | | | | | | | | l10n improvements from transifex
| * | | | | Update setupchecks.jsrakekniven2017-05-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed typo and removed doclink symbol. Reported at transifex Update util.php Another l10n improvement from transifex. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #5323 from nextcloud/use-touch-icon-for-favicon-fb.pngMorris Jobke2017-06-121-4/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Theme image for favicon-fb.png
| * | | | | | Theme image for favicon-fb.pngLukas Reschke2017-06-091-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/5322 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-124-4/+4
| | | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-114-4/+4
| | | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-106-132/+132
|/ / / / / /
* | | | | | Revert "Always enable Zip64 extension for zipstreamer"Joas Schilling2017-06-091-1/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-092-458/+0
| |_|/ / / |/| | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-06-084-6/+6
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-06-074-6/+464
| | | | |
* | | | | Merge pull request #5268 from nextcloud/allow-to-theme-emailsMorris Jobke2017-06-061-0/+10
|\ \ \ \ \ | | | | | | | | | | | | Allow to overwrite the email template again
| * | | | | Allow to overwrite the email template againJoas Schilling2017-06-061-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Update autoloaderMorris Jobke2017-06-062-0/+4
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-06-064-4/+4
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-06-046-12/+20
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-06-032-4/+4
| | | | |
* | | | | Merge pull request #5213 from nextcloud/fix-change-hookblizzz2017-06-021-2/+7
|\ \ \ \ \ | | | | | | | | | | | | Trigger changeUser hook only on real changes
| * | | | | emit changeUser only if there really was a change (quota, displayname)Arthur Schiwon2017-06-011-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #5209 from nextcloud/fix-install-mysql-mb4blizzz2017-06-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix install on mb4 enabled mariadb/mysql
| * | | | | | fix install on mb4 enabled mariadb/mysqlArthur Schiwon2017-06-011-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #5084 from nextcloud/useful-gs-settingsBjörn Schießle2017-06-024-1/+130
|\ \ \ \ \ \ | | | | | | | | | | | | | | add new config switched for the global scale architecture
| * | | | | | add new config switched for the global scale architectureBjoern Schiessle2017-05-294-1/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-0210-54/+62
| |/ / / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-014-4/+462
| |/ / / / |/| | | |
* | | | | Merge pull request #5116 from McNetic/zipstreamerJoas Schilling2017-05-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Always enable Zip64 extension for zipstreamer
| * | | | | Always enable Zip64 extension for zipstreamerNicolai Ehemann2017-05-251-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Nicolai Ehemann <en@enlightened.de>