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

9993 commits

Author SHA1 Message Date
Bjoern Schiessle
a3592534ef always fall back to default share folder 2015-03-26 21:56:44 +01:00
Thomas Müller
7bff0681fe Merge pull request #15001 from owncloud/kill-share-proxy 
Replace share proxy with a hook
 2015-03-26 21:20:05 +01:00
Thomas Müller
232518ac54 Merge pull request #15234 from owncloud/encryption2_core 
core part of encryption 2.0
 2015-03-26 21:14:59 +01:00
Bjoern Schiessle
ff9c85ce60 implement basic encryption functionallity in core to enable multiple encryption modules 2015-03-26 20:56:51 +01:00
Thomas Müller
0cb133003c Merge pull request #15237 from owncloud/remove-ide-autocomplete-fail 
Remove IDE autocomplete fail
 2015-03-26 20:21:26 +01:00
Morris Jobke
d3ed020d34 Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-master 
no php execution timeout for webdav
 2015-03-26 20:18:01 +01:00
Robin Appelman
1be7da4a57 replace share proxy with hook 2015-03-26 19:56:57 +01:00
Robin Appelman
173c31e42a rename proxy test 2015-03-26 19:56:31 +01:00
Lukas Reschke
c8c722bc6d Merge pull request #15129 from owncloud/version-command-bus 
expire versions in a background command
 2015-03-26 19:55:13 +01:00
Lukas Reschke
071a339593 Remove IDE autocomplete fail 
🙈 *cough* *cough*
 2015-03-26 19:39:15 +01:00
Jan-Christoph Borchardt
e3d60ee5b0 Merge pull request #14958 from owncloud/dropdown-style 
popover style for apps and user dropdown menus
 2015-03-26 18:07:35 +01:00
Robin Appelman
6447962f2a teardown after we're done 2015-03-26 17:30:43 +01:00
Thomas Müller
a8b756154a Merge pull request #14495 from owncloud/update-mailmap-01 
Updating .mailmap
 2015-03-26 17:17:18 +01:00
Robin Appelman
1969c8d5c8 save uid instead of user object in command 2015-03-26 17:11:34 +01:00
Robin Appelman
176fba83ea Setup the filesystem in the expire command 2015-03-26 17:07:02 +01:00
Robin Appelman
7ec8f12ad4 expire versions in a background command 2015-03-26 17:07:01 +01:00
Robin McCorkell
a323d781a6 Revert "add https:// placeholder for From Link feature. closes #13255" 
This reverts commit 18b5966f3a.
 2015-03-26 14:47:21 +00:00
Thomas Müller
7804d0445b Merge pull request #15206 from owncloud/mark-dot-files-gray 
Show hidden files (dot files) in gray
 2015-03-26 12:40:47 +01:00
Jan-Christoph Borchardt
f0b0287333 adjust animations of Share, Versions and others to OC.menuSpeed 2015-03-26 12:21:40 +01:00
Thomas Müller
f9525b153e no php execution timeout for webdav 2015-03-26 11:55:26 +01:00
Jenkins for ownCloud
b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Morris Jobke
20f5290462 Merge pull request #15195 from owncloud/reanimate-add-guzzle 
Add wrapper for Guzzle
 2015-03-26 11:06:48 +01:00
Morris Jobke
92f0dba3c8 Show hidden files (dot files) in gray 2015-03-26 10:35:27 +01:00
Jenkins for ownCloud
40b77eb97a [tx-robot] updated from transifex 2015-03-26 01:55:29 -04:00
Morris Jobke
dac4436807 Merge pull request #15170 from owncloud/middleclickbreadcrumb 
Fix middle click on breadcrumb
 2015-03-26 00:19:52 +01:00
Vincent Petry
bdd749ba5b Merge pull request #15185 from owncloud/fix-14775-master 
tearDown the file system before reinitializing
 2015-03-25 16:26:58 +01:00
Lukas Reschke
5f044ebf1b Add wrapper for Guzzle 2015-03-25 16:04:41 +01:00
Morris Jobke
d83741396a Merge pull request #15180 from owncloud/ext-tabbing 
Use individual timers for separate config rows
 2015-03-25 15:46:59 +01:00
Vincent Petry
13904a7f89 Merge pull request #15179 from owncloud/trash-recreatetrashfolderafterfulldelete 
Recreate trashbin folder after full deletion
 2015-03-25 14:58:06 +01:00
Thomas Müller
1f6d8f2fdb tearDown the file system before reinitializing - fixes #14775 2015-03-25 10:55:54 +01:00
Vincent Petry
b3de3d7245 Fix breadcrumb click JS unit test 2015-03-25 09:27:55 +01:00
Jan-Christoph Borchardt
e188f0e436 Merge pull request #14970 from owncloud/sidebar-enhancements 
sidebar fixes
 2015-03-25 09:16:49 +01:00
Jenkins for ownCloud
fb61889490 [tx-robot] updated from transifex 2015-03-25 01:55:46 -04:00
Robin McCorkell
c68fd6d5e3 Use individual timers for separate config rows 2015-03-24 22:25:30 +00:00
Vincent Petry
f8f543945f Recreate trashbin folder after full deletion 2015-03-24 23:02:14 +01:00
Vincent Petry
2b8ef3aca9 Fix middle click on breadcrumb 2015-03-24 22:05:02 +01:00
Morris Jobke
1db177b841 Merge pull request #15055 from owncloud/share-activity-grouping 
Group sharing activities by user/group and file respectively
 2015-03-24 20:23:36 +01:00
Morris Jobke
09ea260957 Merge pull request #15160 from owncloud/deduplicate-external-manager-tests 
Deduplicate external manager tests
 2015-03-24 20:15:56 +01:00
Roeland Jago Douma
0ea3878111 No longer directly output OC_Image for thumbnails 
* Only use public interfaces
  - Injected IPreview
* Added unit tests
 2015-03-24 18:55:06 +01:00
Robin Appelman
1bd141b655 Merge pull request #15158 from owncloud/fix-failing-master 
Fix failing master unit tests
 2015-03-24 17:54:11 +01:00
Joas Schilling
8c33f05e93 Merge the two tests into one 2015-03-24 17:26:38 +01:00
Joas Schilling
7de15f3125 *cough* 2015-03-24 17:08:03 +01:00
Morris Jobke
2370af62ea Merge pull request #14998 from rullzer/ocs_api_new_url 
OCS API should return fancy OC url
 2015-03-24 17:04:31 +01:00
Jan-Christoph Borchardt
7ea061e6f0 correctly align file list summary when the list has the favorite feature 2015-03-24 15:26:17 +01:00
Jan-Christoph Borchardt
fcac7d8c13 double padding to account for Deleted files entry, issue with Firefox 2015-03-24 15:14:20 +01:00
Morris Jobke
965d97a8f5 Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-share 
"Integrity constraint violation" when sharing the same item twice with the same user
 2015-03-24 15:05:58 +01:00
Vincent Petry
302c19067a Merge pull request #15145 from owncloud/fix-15097-master 
Properly catch whether a share is `null`
 2015-03-24 13:37:47 +01:00
Vincent Petry
46475bf580 Merge pull request #15003 from owncloud/issue/14859-speed-up-favorite-list 
Do not walk over the users directory, but over the list of tagged objects
 2015-03-24 13:26:59 +01:00
Robin Appelman
d46b7d73e7 when the path doesnt exist show a proper error page 2015-03-24 12:21:25 +01:00
Joas Schilling
f2be172ae8 Do not duplicate the empty content css 2015-03-24 11:29:29 +01:00