wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
29273 commits 157 branches 562 tags 714 MiB
Commit graph

29273 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
99cf90c8a4 fix warning box size for avatar change 2016-01-08 10:27:55 +01:00
Roeland Jago Douma
186e35d954 Verify the path is a file on avatar update 
Fixes #21533

Before we just assumed that the passed path was a file. This does not
have to be the case. Thus check if it actually is a file before doing
any more tests.
 2016-01-08 10:03:49 +01:00
Thomas Müller
a1a8a06042 Merge pull request #21527 from owncloud/remove_all_avatars 
Remove all cache avatars on avatar deletion
 2016-01-08 09:41:25 +01:00
Jenkins for ownCloud
88c4cba1f5 [tx-robot] updated from transifex 2016-01-08 01:56:39 -05:00
Roeland Jago Douma
4e6f6518ff Remove all cache avatars on avatar deletion 
Fixes #21513

Since we cache the generated avatars. We should also delete the
generated sizes when we remove the avatar.
 2016-01-07 20:51:18 +01:00
Thomas Müller
1cc6fddead Merge pull request #21498 from owncloud/cleanup-OC_DB 
Cleanup OC_DB methods
 2016-01-07 20:13:16 +01:00
Thomas Müller
e307406486 Merge pull request #20966 from knox/master 
Do not rewrite letsencrypt .well-known URI
 2016-01-07 17:16:51 +01:00
Thomas Müller
6a796ff3cc Merge pull request #21066 from owncloud/behat_capabilities_changing_server_configuration 
Added new capabilities test with changes in server configuration
 2016-01-07 17:07:29 +01:00
Thomas Müller
46107f82d4 Merge pull request #21506 from owncloud/issue-20218-min-max-owncloud-version-warning 
Issue 20218 min max owncloud version warning
 2016-01-07 16:51:00 +01:00
Thomas Müller
5b22ee4c05 Merge pull request #21512 from owncloud/allow-searching-by-app-id 
Allow searching apps by ID
 2016-01-07 16:43:47 +01:00
Joas Schilling
3a494033d2 Allow searching apps by ID 2016-01-07 16:33:25 +01:00
Thomas Müller
629061d00a Merge pull request #21481 from owncloud/ext-smb-dependencies 
Check libsmbclient-php as well as smbclient binary
 2016-01-07 16:19:20 +01:00
Thomas Müller
f6f492ba4e Merge pull request #21502 from owncloud/di_mimetypedetector 
Add 'OCP\Files\IMimeTypeDetector' to DI container
 2016-01-07 16:18:55 +01:00
Thomas Müller
5a5803f414 Merge pull request #21507 from owncloud/users-dropdownscroll 
Fix users list dropdown position after scroll
 2016-01-07 16:18:29 +01:00
Thomas Müller
fddbdbd0e6 Merge pull request #21455 from owncloud/fix-method-signature 
Fix method call + undefined variable
 2016-01-07 16:18:02 +01:00
Thomas Müller
9ca670f94f Merge pull request #21505 from owncloud/allow-downgrades-for-brave-developers 
Allow downgrades for our brave developers, that switch between branches
 2016-01-07 16:03:36 +01:00
Vincent Petry
112ccd00a3 Fix users list dropdown position after scroll 
When scrolling, the position calculation of the multiselect dropdown was
wrong. Adding "position: relative" to the list container makes the
button calculation relative to it instead of the whole page. In this
case the dropdown is properly aligned with the field regardless of
scrolling.
 2016-01-07 15:25:04 +01:00
Joas Schilling
ae285c0654 Remove deprecated shipped flag from info.xml which has no use anymore 2016-01-07 15:15:58 +01:00
Joas Schilling
40f786060e Add ownCloud min and max version for shipped apps 2016-01-07 15:11:49 +01:00
Joas Schilling
c55da1fc8d Add a warning to the app:check-code if the version is missing 2016-01-07 15:04:36 +01:00
Joas Schilling
83855c073b Add a warning on the apps list when the version is missing 2016-01-07 15:03:55 +01:00
Thomas Müller
601457d221 Merge pull request #20773 from owncloud/share2.0_create 
[Sharing 2.0] create share
 2016-01-07 14:57:05 +01:00
Morris Jobke
190cc2bb67 Remove OC_DB::getConnection 2016-01-07 14:54:55 +01:00
Morris Jobke
fddece9552 Remove OC_DB::insertid 2016-01-07 14:54:55 +01:00
Morris Jobke
0a41cfefe3 Remove beginTransaction, commit, rollback from OC_DB 2016-01-07 14:54:55 +01:00
Morris Jobke
3917d888bd Remove OC_DB::isError 2016-01-07 14:54:55 +01:00
Morris Jobke
547fbfdb76 Remove OC_DB::dropTable 2016-01-07 14:54:54 +01:00
Thomas Müller
9d3c14c7dd Merge pull request #21495 from owncloud/polyfill 
[3rdparty] Bump symfony/polyfill-php
 2016-01-07 14:23:03 +01:00
Thomas Müller
30e1a33910 Merge pull request #21493 from owncloud/fix-repair-path 
Move lib/repair to lib/private/repair
 2016-01-07 14:18:51 +01:00
Joas Schilling
fd7ed93937 Allow downgrades for our brave developers, that switch between branches 2016-01-07 14:18:33 +01:00
Thomas Müller
29416b07ac Merge pull request #21359 from owncloud/check-changes 
remove mention of 'filesystem_check_changes' => 2 from the config sample
 2016-01-07 14:07:38 +01:00
Lukas Reschke
b9e49ae13a Merge pull request #21503 from owncloud/public-fixdownloadlinktoken 
Add token in webdav download link of public page
 2016-01-07 13:55:32 +01:00
Vincent Petry
9742e9b113 Add token in webdav download link of public page 2016-01-07 13:37:18 +01:00
Lukas Reschke
fb12063ae5 Fix method call + undefined variable 
1. Variable is not defined
2. Method does not expect any parameters

```
Undefined variable: user at /Users/lukasreschke/Documents/Programming/master/apps/encryption/settings/settings-admin.php#45
```
 2016-01-07 13:22:06 +01:00
Roeland Jago Douma
cd35ad6aaa Add 'OCP\Files\IMimeTypeDetector' to DI container 
* Added test to server container as well
 2016-01-07 13:20:43 +01:00
Roeland Jago Douma
856becada3 [3rdparty] Bump symfony/polyfill-php 2016-01-07 10:59:45 +01:00
Morris Jobke
604897945b Move lib/repair to lib/private/repair 2016-01-07 09:14:35 +01:00
Thomas Müller
336fe868b2 Merge pull request #21404 from owncloud/symfony_console_2.8.0 
[3rdparty] Bump symfony/console to 2.8.0
 2016-01-07 09:11:54 +01:00
Morris Jobke
06708cc172 fix js unit tests 2016-01-07 08:57:15 +01:00
Robin Appelman
dbafec0c28 Also remove it from the web interface 2016-01-07 08:57:15 +01:00
Robin Appelman
32fe3a7d5e remove mention of 'filesystem_check_changes' => 2 from the config sample 2016-01-07 08:57:15 +01:00
Robin McCorkell
fc52327d2c Check libsmbclient-php as well as smbclient binary 2016-01-07 08:56:45 +01:00
Thomas Müller
470bf234c5 Merge pull request #21343 from owncloud/ldap-showremnants-json-output 
Add an option to occ ldap:showremnants to output a json encoded array…
 2016-01-07 08:45:06 +01:00
Jenkins for ownCloud
27dfa74d89 [tx-robot] updated from transifex 2016-01-07 01:55:48 -05:00
Thomas Müller
d3922510d0 Merge pull request #20994 from owncloud/personal-page 
improve layout of personal settings page
 2016-01-06 17:25:12 +01:00
Thomas Müller
b8ecf19650 Merge pull request #21349 from owncloud/web_use_sharee 
Webinterface use sharee API
 2016-01-06 17:24:52 +01:00
Thomas Müller
002161857c Merge pull request #21398 from owncloud/sharing-disabled-cache 
Cache isSharingDisabledForUser
 2016-01-06 17:23:14 +01:00
Thomas Müller
b6bc17d014 Merge pull request #21443 from owncloud/fix-container-lookup 
Lookup the App name instead of OCA
 2016-01-06 17:22:41 +01:00
Thomas Müller
a2c19d3d1a Merge pull request #21444 from owncloud/move-regenerate-below 
Move regeneration of session ID into session classes
 2016-01-06 17:21:43 +01:00
Thomas Müller
8b5315c90a Merge pull request #21459 from owncloud/make-ldap-more-robust 
Make LDAP more robust to exceptions and log them properly
 2016-01-06 17:04:16 +01:00