upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-18 21:21:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
31656 commits 974 branches 1224 tags 8.6 GiB
Commit graph

31656 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
176fbf95fd
theming tests need to be fixed 2016-07-29 13:19:10 +02:00
Jan-Christoph Borchardt
5bc34c2d8d also adjust log in background color in theme 2016-07-28 10:29:25 +02:00
Jan-Christoph Borchardt
444684821c fix searchbox overlapping on mobile 2016-07-28 10:29:20 +02:00
Marius Blüm
fe9dee376d Merge pull request #615 from nextcloud/stable9-ns-server-contributing.md 
[stable9] change core to server - backport of #533
 2016-07-28 10:01:48 +02:00
Olivier Paroz
fb6ad7bb19 change core to server 2016-07-28 09:25:51 +02:00
Björn Schießle
a091a438fd Merge pull request #589 from nextcloud/stable9-app-icons 
[stable9] Add app icons for Comments and Tags
 2016-07-27 12:30:48 +02:00
Marius Blüm
5974d9c96b Add icon for tags app 2016-07-27 11:16:36 +02:00
Marius Blüm
f034686a8c Add icon for comments app 2016-07-27 11:14:30 +02:00
William Bargent
900267333e Merge pull request #570 from nextcloud/stable9-fix-theme-logo-position 
[stable9] fix theme logo position
 2016-07-27 09:14:56 +01:00
Julius Haertl
608dbc64d9
Theming: Fix preview and center alignment of logo 2016-07-26 13:30:06 +02:00
Lukas Reschke
a494e4f712
Adjust tests 2016-07-26 13:28:54 +02:00
Jos Poortvliet
f02eabb6a7
Update header.css 
make the logo look good on the login page
 2016-07-26 13:26:48 +02:00
Jos Poortvliet
fa814b9715
Update themingcontroller.php 2016-07-26 13:26:42 +02:00
Joas Schilling
fa361ba968 Merge pull request #552 from nextcloud/stable9-backport-547 
[stable9] Fix error message while restoring all files
 2016-07-25 14:32:32 +02:00
Morris Jobke
034276400e
Fix error message while restoring all files 
* use $_POST['files'] only of ssinlge files are restored
* fixes #528
 2016-07-25 13:00:51 +02:00
Joas Schilling
6175e5d05b Merge pull request #549 from nextcloud/backport-530-theming-autoloading-9 
[stable9] Make sure we try to autoload the class
 2016-07-25 11:01:30 +02:00
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
Joas Schilling
593608f25c
Make sure we try to autoload the class 2016-07-25 09:46:07 +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