upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 08:25:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
31647 commits 951 branches 1208 tags 8.3 GiB
Commit graph

13124 commits

Author SHA1 Message Date
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
fa814b9715
Update themingcontroller.php 2016-07-26 13:26:42 +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
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
ca6a7d9e6a
Run the license script 2016-07-22 09:48:05 +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
Thomas Müller
96e2a3a4b2
Cast share id to string (#25402) (#25431) 2016-07-20 15:11:04 +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
Morris Jobke
11e834ea74
Merge branch 'stable9' into sync-stable9 2016-07-07 12:03:34 +02:00
Carlos Damken
64a15191e4 Backport 25367 to Stable 9.0 (#25384) 2016-07-06 22:10:52 +02:00
Vincent Petry
c92c234059
Ignore invalid paths in the JS file list (#25368) 2016-07-06 12:02:04 +02:00
Vincent Petry
a2e0573987 Merge pull request #25298 from owncloud/schiessle-fix-get-contact-stable9 
[stable9] get only vcards which match both the address book id and the vcard uri
 2016-07-06 11:52:27 +02:00
felixboehm
fdb0d4ad52 check if renamed user is still valid by reapplying the ldap filter (#25338) 2016-07-04 14:16:13 +02:00
Bjoern Schiessle
717b480a2e
add additional check if we have a valid uid and filename 2016-07-04 11:00:50 +02:00
Lukas Reschke
531e69947f
Revert "Revert "[stable9] Don't show the updater if updater is incompatible"" 
This reverts commit f896470542.
 2016-07-01 23:09:32 +02:00
Björn Schießle
12796500e0 Merge pull request #277 from nextcloud/traversal-directory-js 
[stable9] Do not allow directory traversal using "../" in JS file list
 2016-07-01 18:00:25 +02:00
Björn Schießle
756b0c05b6 Merge pull request #282 from nextcloud/fix-tests 
Fix unit test compatibility issues with phpunit 5.2+
 2016-07-01 17:11:19 +02:00
Joas Schilling
3399d66c8e
Fix Comments tests with phpunit 5.2+ 2016-07-01 16:41:29 +02:00
Joas Schilling
eb715dd1b6
Fix Sharing app tests with phpunit 5.2+ 2016-07-01 16:29:53 +02:00
Joas Schilling
fd5bdf5e1a
Fix Encryption tests with phpunit 5.2+ 2016-07-01 16:22:50 +02:00
Björn Schießle
7e4366ec86 Merge pull request #244 from nextcloud/theming-app-stable9 
[stable9] theming app
 2016-07-01 16:22:01 +02:00
Joas Schilling
28b3a0a37e
Fix DAV tests with phpunit 5.2+ 2016-07-01 16:16:40 +02:00
Joas Schilling
497c3fbfd7
Also fix the dav test 2016-07-01 15:45:58 +02:00
Morris Jobke
6e3bf06c1d Merge pull request #274 from nextcloud/stable9-sync-upstream 
[Stable9] sync upstream
 2016-07-01 15:20:08 +02:00
Lukas Reschke
dea8e29289
Match on 405 2016-07-01 15:19:08 +02:00
Lukas Reschke
8aa0832bd4
Match for /../ 2016-07-01 15:00:31 +02:00
Lukas Reschke
2da43e3751
Do not allow directory traversal using "../" 
We should not allow directory traversals using "../" here.

To test access the following URL once with and then without this patch:

http://localhost/server/index.php/apps/files/?dir=../../This+Should+Not+Be+Here
 2016-07-01 13:33:00 +02:00
Lukas Reschke
2c785ebdf1
Merge remote-tracking branch 'upstream/stable9' into stable9-sync-upstream 2016-07-01 11:31:15 +02:00
Thomas Müller
4a4103b923 Suppress warnings from DAV migration if there's nothing to do (#25279) 2016-07-01 11:30:14 +02:00
Morris Jobke
23cc465b0d Merge pull request #254 from nextcloud/fix-229-stable9 
[stable9] get only vcard which match both the address book id and the vcard uri
 2016-06-30 17:43:46 +02:00
Bjoern Schiessle
3cb7672b06
initial commit for the theming app 2016-06-30 17:26:03 +02:00
Lukas Reschke
d52343fc4e Merge pull request #260 from nextcloud/fix-versions-stable9 
[stable9] check permissions before rollback
 2016-06-30 17:15:28 +02:00
Morris Jobke
07c43751d1 Merge pull request #265 from nextcloud/stable9-add-wnd 
[stable9] Backport WND
 2016-06-30 16:47:29 +02:00
Lukas Reschke
da0666e4f0
Name method properly 2016-06-30 15:37:33 +02:00
Lukas Reschke
a80af7079d
[stable9] Backport WND 
Backports:

- https://github.com/nextcloud/server/pull/233
- https://github.com/nextcloud/server/pull/190
- https://github.com/nextcloud/server/pull/188
 2016-06-30 15:36:03 +02:00
Bjoern Schiessle
3491400261
add some additonal permission checks to the webdav backend 2016-06-30 15:05:13 +02:00
Bjoern Schiessle
1208953ba1
check permissions before rollback 2016-06-30 14:22:40 +02:00
Bjoern Schiessle
6a61cc0e35
get only vcard which match both the address book id and the vcard uri 2016-06-30 10:46:21 +02:00
Björn Schießle
1f71285137
get only vcards which match both the address book id and the vcard uri (#25294) 2016-06-29 12:18:28 +02:00
Lukas Reschke
f896470542
Revert "[stable9] Don't show the updater if updater is incompatible" 
This reverts commit 5e2bf16db1.
 2016-06-26 17:33:05 +02:00
Lukas Reschke
dcb5f00461
Merge remote-tracking branch 'upstream/stable9' into stable9-upstream-sync 2016-06-26 12:48:19 +02:00
Vincent Petry
fd05ff0392
Hide search results after switching directory 
When clicking on a folder result in the search result list, the result
box for "results in another folder" must disappear.
 2016-06-24 17:14:12 +02:00