Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-16 | 12 | -2/+20 |
| | |||||
* | Merge pull request #5421 from nextcloud/5190-master | Morris Jobke | 2017-06-15 | 1 | -9/+32 |
|\ | | | | | [master] Treat PHP Errors on User session regenerate | ||||
| * | Forward port of #5190 to master | Arthur Schiwon | 2017-06-15 | 1 | -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-mimetype | blizzz | 2017-06-15 | 1 | -0/+15 |
|\ \ | |/ |/| | add gpx mimetype | ||||
| * | added kml, kmz, tcx types as well while at it | Arthur Schiwon | 2017-06-14 | 1 | -1/+4 |
| | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | add geospatial mime types repair step | Arthur Schiwon | 2017-06-14 | 1 | -0/+12 |
| | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-15 | 8 | -0/+8 |
| | | |||||
* | | Merge pull request #4993 from michaelletzgus/emit_css-tags | Morris Jobke | 2017-06-14 | 1 | -1/+31 |
|\ \ | | | | | | | Emit css tags | ||||
| * | | Streamline templates, more DRY | Michael Letzgus | 2017-05-25 | 1 | -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 much | Arthur Schiwon | 2017-06-14 | 1 | -2/+1 |
| | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | Merge pull request #5392 from nextcloud/maintenance-mode-style | Lukas Reschke | 2017-06-14 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Use the guest.css for the maintenance page as well | ||||
| * | | | Use the guest.css for the maintenance page as well | Morris Jobke | 2017-06-13 | 1 | -0/+1 |
| | |/ | |/| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #5361 from ↵ | Lukas Reschke | 2017-06-14 | 1 | -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 bundle | Bjoern Schiessle | 2017-06-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-14 | 14 | -4/+18 |
| | | | | |||||
* | | | | Merge pull request #5072 from mjmunger/master | Morris Jobke | 2017-06-13 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Fixed a crash caused by Local::copyFromStorage() not conforming to Co… | ||||
| * | | | Fixed a crash caused by Local::copyFromStorage() not conforming to ↵ | Michael Munger | 2017-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Common::copyFromStorage. Issue# 5071 | ||||
* | | | | Fix unknown share token | Joas Schilling | 2017-06-13 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | Merge pull request #5343 from nextcloud/share-filter-missing-groups | Lukas Reschke | 2017-06-13 | 2 | -1/+3 |
|\ \ \ \ | |_|/ / |/| | | | filter missing groups in share provider | ||||
| * | | | filter missing groups in share provider | Robin Appelman | 2017-06-12 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | Merge pull request #5027 from nextcloud/require-nextcloud-version-as-per-docs | Morris Jobke | 2017-06-12 | 1 | -31/+7 |
|\ \ \ \ | | | | | | | | | | | Version and dependency are now required | ||||
| * | | | | Version and dependency are now required | Joas Schilling | 2017-05-22 | 1 | -31/+7 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-13 | 56 | -114/+114 |
| | | | | | |||||
* | | | | | Merge pull request #5167 from nextcloud/rakekniven-patch-2 | Morris Jobke | 2017-06-12 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | l10n improvements from transifex | ||||
| * | | | | | Update setupchecks.js | rakekniven | 2017-05-31 | 1 | -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.png | Morris Jobke | 2017-06-12 | 1 | -4/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Theme image for favicon-fb.png | ||||
| * | | | | | | Theme image for favicon-fb.png | Lukas Reschke | 2017-06-09 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/5322 Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-12 | 4 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-11 | 4 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-10 | 6 | -132/+132 |
|/ / / / / / | |||||
* | | | | | | Revert "Always enable Zip64 extension for zipstreamer" | Joas Schilling | 2017-06-09 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-09 | 2 | -458/+0 |
| |_|/ / / |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-08 | 4 | -6/+6 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-07 | 4 | -6/+464 |
| | | | | | |||||
* | | | | | Merge pull request #5268 from nextcloud/allow-to-theme-emails | Morris Jobke | 2017-06-06 | 1 | -0/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow to overwrite the email template again | ||||
| * | | | | | Allow to overwrite the email template again | Joas Schilling | 2017-06-06 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | | Update autoloader | Morris Jobke | 2017-06-06 | 2 | -0/+4 |
|/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-06 | 4 | -4/+4 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-04 | 6 | -12/+20 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-03 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | Merge pull request #5213 from nextcloud/fix-change-hook | blizzz | 2017-06-02 | 1 | -2/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Trigger changeUser hook only on real changes | ||||
| * | | | | | emit changeUser only if there really was a change (quota, displayname) | Arthur Schiwon | 2017-06-01 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | | | Merge pull request #5209 from nextcloud/fix-install-mysql-mb4 | blizzz | 2017-06-02 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix install on mb4 enabled mariadb/mysql | ||||
| * | | | | | | fix install on mb4 enabled mariadb/mysql | Arthur Schiwon | 2017-06-01 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | | | Merge pull request #5084 from nextcloud/useful-gs-settings | Björn Schießle | 2017-06-02 | 4 | -1/+130 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | add new config switched for the global scale architecture | ||||
| * | | | | | | add new config switched for the global scale architecture | Bjoern Schiessle | 2017-05-29 | 4 | -1/+130 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-02 | 10 | -54/+62 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-06-01 | 4 | -4/+462 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #5116 from McNetic/zipstreamer | Joas Schilling | 2017-05-30 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Always enable Zip64 extension for zipstreamer | ||||
| * | | | | | Always enable Zip64 extension for zipstreamer | Nicolai Ehemann | 2017-05-25 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Signed-off-by: Nicolai Ehemann <en@enlightened.de> |