mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
31,639 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

31639 Commits

Author SHA1 Message Date
Joas Schilling d2396b900f Merge pull request #546 from nextcloud/stable9-backport-451 
fix Github link in Personal and Admin settings Version note
 2016-07-25 09:55:17 +02:00
Jan-Christoph Borchardt e517282d1c
fix Github link in Personal and Admin settings Version note 2016-07-25 08:45:45 +02:00
Roeland Douma 3be8f7a369 Merge pull request #491 from nextcloud/backport-460-html-decoded-error-message-when-uploading-folder 
Fix the HTML encoding when uploading a folder in FF when using french…
 2016-07-22 21:49:47 +02:00
Joas Schilling b42bce7439 Merge pull request #518 from nextcloud/rebrand-stable9 
Rebrand stable9
 2016-07-22 12:13:38 +02:00
Joas Schilling 7177e31b96 Merge pull request #516 from nextcloud/run-le-script-9 
[stable9] Run the license script
 2016-07-22 11:41:34 +02:00
Roeland Douma 34f72b3d6b Merge pull request #514 from nextcloud/backport-505-license-mailmap-9 
[stable9] license and mailmap backports
 2016-07-22 11:13:51 +02:00
Roeland Douma a760564f59 Merge pull request #511 from nextcloud/backport-496-doc-changes 
[stable9] Make the changes from doc fix persistant
 2016-07-22 11:11:35 +02:00
Morris Jobke 46ed47766b
Rebrand stable9 
* adjust issue_template and README
* fixes #426
 2016-07-22 10:34:19 +02:00
Joas Schilling 74ed2befe1
Fix typo 2016-07-22 09:54:43 +02:00
Joas Schilling ca6a7d9e6a
Run the license script 2016-07-22 09:48:05 +02:00
Roeland Jago Douma c445cc4ad9
Fix e-mail in mailmap 2016-07-22 09:41:17 +02:00
Joas Schilling 540978d2b0
Fix more mailmap entries 2016-07-22 09:41:09 +02:00
Joas Schilling d6a00efd38
Change nickvergessen mailmap entry (#25349) 2016-07-22 09:40:55 +02:00
Lukas Reschke 34a24d813d
Add new mailmap file 2016-07-22 09:40:44 +02:00
Bjoern Schiessle 70a1d5bc26
only search the license header for @copyright statements 2016-07-22 09:39:18 +02:00
Joas Schilling 5419b74ef0
Fix the license script 2016-07-22 09:39:07 +02:00
Bjoern Schiessle 4e52b845ea
- keep copyright notice and only update the authors list 
- check if all changes to a file happened after the fork, this allows the authors to check if the file can be relicensed to AGPLv3 or later
 2016-07-22 09:38:56 +02:00
Bjoern Schiessle e685de8b5f
no more CLA and switch to AGPLv3 or later 2016-07-22 09:38:43 +02:00
Joas Schilling 7b1951677e
Make the changes from 6ccd2c5678 persistant 2016-07-22 09:19:35 +02:00
Joas Schilling 4672ef91bc
Fix the HTML encoding when uploading a folder in FF when using french l10n 2016-07-21 10:14:37 +02:00
Lukas Reschke 87eb86902f Merge pull request #469 from nextcloud/stable9-stringid-fix 
[stable9] Cast share id to string (#25402) (#25431)
 2016-07-20 16:49:19 +02:00
Björn Schießle 895655d20a Merge pull request #463 from nextcloud/stable9-explode 
[stable9] Use explode() instead of split
 2016-07-20 15:26:11 +02:00
Thomas Müller 96e2a3a4b2
Cast share id to string (#25402) (#25431) 2016-07-20 15:11:04 +02:00
Lukas Reschke c008346c08
[stable9] Use explode() instead of split 
Upstream from https://github.com/owncloud/core/pull/25488
 2016-07-20 14:37:34 +02:00
Roeland Douma 2e6f7a66cf Merge pull request #447 from nextcloud/stable9-guzzle 
[stable9] Update third-party reference
 2016-07-19 21:46:03 +02:00
Lukas Reschke df0951da54
[stable9] Update third-party reference 
For https://github.com/nextcloud/3rdparty/pull/6
 2016-07-19 20:49:07 +02:00
Björn Schießle 1681433696 Merge pull request #442 from nextcloud/fix-maintenance-mode-9 
[stable9] Fix maintenance mode
 2016-07-19 16:59:51 +02:00
Joas Schilling 3024f20270
Fix maintenance mode 
When the server is in maintenance mode, apps are not loaded.
That means apps/theming/ is not in the allowed paths. So we
need to check without autoloading, whether the class exists.
 2016-07-19 10:23:26 +02:00
Björn Schießle 174b297f34 Merge pull request #406 from nextcloud/theming-fixes-stable9 
Theming fixes stable9
 2016-07-18 16:00:21 +02:00
Joas Schilling 3cdd10b9d7
Add unit tests 2016-07-15 11:55:43 +02:00
Joas Schilling e6ddf775f6
Also load the theming app on CLI 2016-07-15 09:23:22 +02:00
Joas Schilling 06ac822b71
Use the themed Defaults everywhere 2016-07-15 09:22:44 +02:00
Joas Schilling b73e46f471
Better handling of empty slogan 2016-07-15 08:51:30 +02:00
Marius Blüm d35d9d246e Merge pull request #370 from nextcloud/stable9-backport-361 
[Stable9] Make theming work with pretty URLs
 2016-07-12 06:59:42 +02:00
Lukas Reschke 450926ea1c Implement "getTitle" (#372) 
Fixes https://github.com/nextcloud/server/issues/341
 2016-07-11 23:31:58 +02:00
oparoz 3c0ba186e1 Fix tests 
(cherry picked from commit eceb0db)
 2016-07-11 17:42:45 +02:00
oparoz 1f28ed8a0a Make theming work with pretty URLs 
In some envs the rewrite rules for pretty URLs apply to all CSS files, so let's not end the route name with that etension.
Fixes #315
(cherry picked from commit 839ee5e)
 2016-07-11 17:42:34 +02:00
blizzz 980d900b88 Merge pull request #334 from nextcloud/sync-stable9 
Sync stable9
 2016-07-07 15:13:34 +02:00
Morris Jobke f593a09360
Revert "occ web executor (#24957)" 
This reverts commit 9fcb26910e.
 2016-07-07 12:08:10 +02:00
Morris Jobke 4782b92347
Revert "Bypass upgrade page when occ controller is requested (#25363)" 
This reverts commit 445a76bb1b.
 2016-07-07 12:07:35 +02:00
Morris Jobke 06964b32f3
Revert "Revert "Remove repair steps for broken updater repair"" 
This reverts commit 1a42979104.
 2016-07-07 12:04:57 +02:00
Morris Jobke 11e834ea74
Merge branch 'stable9' into sync-stable9 2016-07-07 12:03:34 +02:00
Morris Jobke e5645a94ec Merge pull request #329 from nextcloud/stable9-backport-327 
[stable9] Add PHP 5.4 and 5.5 jobs to CI
 2016-07-07 09:44:52 +02:00
Carlos Damken 64a15191e4 Backport 25367 to Stable 9.0 (#25384) 2016-07-06 22:10:52 +02:00
VicDeo 445a76bb1b Bypass upgrade page when occ controller is requested (#25363) 2016-07-06 22:08:58 +02:00
Vincent Petry ad67b3f0b0 Merge pull request #25375 from owncloud/stable9-147c672f5866002d45ec68e99e379449792eeaf8 
[stable9] Ignore invalid paths in the JS file list
 2016-07-06 18:18:17 +02:00
Vincent Petry 116a6f3938 Merge pull request #25343 from owncloud/stable9-revertrepairrevert 
Revert "Remove repair steps for broken updater repair"
 2016-07-06 17:49:05 +02:00
Morris Jobke cb86e11ef8
Add PHP 5.4 and 5.5 jobs to CI 2016-07-06 17:07:32 +02:00
Lukas Reschke ca1296c740 Merge pull request #325 from nextcloud/stable9-fix-naming-issue-drone 
[stable9] Fix docker image naming issue for CI
 2016-07-06 15:34:24 +02:00
Morris Jobke 024919b9de
Fix docker image naming issue for CI 
* wrongly named PHP7 - it is PHP 5.6
* moved integration tests at the very end
 2016-07-06 15:05:27 +02:00