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

29472 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
44f4195eee Keep scroll position in users page when sorting 
When sorting, some browsers like Chrome will lose the scroll position,
possibly because the sorting code is touching the DOM elements.

This fix saves the scroll position before sorting and sets it back
afterwards.
 2016-01-07 15:48:59 +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
Roeland Jago Douma
4a38793d11 Allow only cookie auth to webdav 2016-01-07 10:44:26 +01:00
Morris Jobke
fa97e3a5a3 OC_TemplateLayout -> OC\TemplateLayout 2016-01-07 09:31:11 +01:00
Morris Jobke
c464b32738 OC_DB_MDB2SchemaManager -> OC\DB\MDB2SchemaManager 2016-01-07 09:29:21 +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
Thomas Müller
6460448b10 Merge pull request #21469 from owncloud/drop-old-gallery-table 
Drop oc_gallery_sharing which was removed in 8.0.0
 2016-01-06 17:03:58 +01:00
Thomas Müller
0d33dc11ca Merge pull request #21482 from owncloud/htaccess-ico-rule 
Allow ico files to be served statically
 2016-01-06 17:03:18 +01:00
Thomas Müller
d878002ee6 Merge pull request #21488 from th3fallen/patch-1 
Blacklist myself
 2016-01-06 16:57:43 +01:00
Clark Tomlinson
1215d76018 Blacklist myself 
To stop being mentioned endlessly
 2016-01-06 10:08:59 -05:00
Roeland Jago Douma
1358e5dcd9 [Sharing 2.0] Some error cases report 404 instead of 403 2016-01-06 15:25:29 +01:00
Roeland Jago Douma
26280e1f19 [Sharing 2.0] Add L10N instance to manager for translated errors 2016-01-06 14:53:43 +01:00
Roeland Jago Douma
527b434cd2 [Sharing 2.0] Do not use static function to get numeric storage id 2016-01-06 14:53:43 +01:00
Roeland Jago Douma
0ab227310f [Sharing 2.0] General exceptions return 403 
This is the same as the old behaviour
 2016-01-06 14:53:43 +01:00
Roeland Jago Douma
114f6115c3 Skip one intergration test until we have fixed the getshares 
The new sharing code handles things differently so there is no way for
create shares to handle this all properly.
 2016-01-06 14:53:43 +01:00
Roeland Jago Douma
0f6d55063d Make sure to login at least once for the intergration tests 
Else we run into race conditions with the skeleton code
 2016-01-06 14:53:43 +01:00