Commit Graph

20432 Commits

Author SHA1 Message Date
Bjoern Schiessle 2a4da7fe09 on unshare only unshare childrens if there is no other parent available 2014-09-26 16:58:47 +02:00
Bjoern Schiessle e115a7043f only create a new share entry, if the user needs a different target name than the group share 2014-09-26 13:19:15 +02:00
Bjoern Schiessle ed85055d31 for group shares we don't need a extra db entry of groupTarget equals itemTarget 2014-09-26 13:10:31 +02:00
Bjoern Schiessle d242e518f9 for group shares only the parent has the up-to-date permission. Make sure that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self 2014-09-26 13:01:54 +02:00
Bjoern Schiessle 52b6469b0c call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible 2014-09-25 14:26:31 +02:00
Bjoern Schiessle 968152113e always select permissions, used in getItems() 2014-09-25 12:35:11 +02:00
Bjoern Schiessle d5fc011c90 some small fixes 2014-09-25 11:29:57 +02:00
Bjoern Schiessle 5c7fe91041 clear share table after each test run 2014-09-24 14:02:02 +02:00
Bjoern Schiessle 07d43df713 only add a new row if it isn't a unique share, otherwise update the existing row 2014-09-24 14:02:02 +02:00
Bjoern Schiessle a6cc810349 mark exclude list as deprecated. It neither used by the files app nor by the
calendar or contacts app. It doesn't make sense to build a exclude list by the
share API, the apps knows best which are valid targets.
2014-09-24 14:02:02 +02:00
Bjoern Schiessle 72319bbc98 fix unit tests 2014-09-24 14:02:02 +02:00
Bjoern Schiessle 9f7b15582a fix add user to group to work with grouped shares 2014-09-24 14:02:01 +02:00
Bjoern Schiessle bd268c35f5 generateTarget() will always find a unique target 2014-09-24 14:02:01 +02:00
Bjoern Schiessle 9105e17307 unit tests for grouping of shares pointing to the same source 2014-09-22 17:54:47 +02:00
Bjoern Schiessle 89c3b650e6 group shares and combine permissions 2014-09-22 17:25:15 +02:00
Lukas Reschke 0d37e16499 Merge pull request #11092 from owncloud/conceal_sabredav_version
Conceal or display SabreDAV version number.
2014-09-17 10:35:50 +02:00
Jenkins for ownCloud 2a89bc7b51 [tx-robot] updated from transifex 2014-09-17 01:55:27 -04:00
Lukas Reschke 45b17207cc Merge pull request #10745 from owncloud/fix-10708-doctrine
Use Doctrine Platform to generate SQL query for table truncation.
2014-09-16 23:56:20 +02:00
Lukas Reschke 21afcb3e94 Merge pull request #10902 from owncloud/fix-ellepsis
Adding link to ellipsis and fixing styling
2014-09-16 21:09:47 +02:00
Lukas Reschke 368391e401 Merge pull request #11009 from owncloud/tobiasKaminsky-route
REST API for thumbnails
2014-09-16 19:31:51 +02:00
Lukas Reschke 4ebc11aa8d Merge pull request #11102 from owncloud/visit1985-issue_108
mysql setup: if dbuser exists try a different one (owncloud/core#108)
2014-09-16 18:54:37 +02:00
Morris Jobke 129e2d3c32 Merge pull request #10896 from owncloud/undo-nav-entry
Add delete undo styles
2014-09-16 18:28:39 +02:00
Bernhard Posselt ef028fcd9a add delete undo styles
use less right padding

better styling, fix padding issues

no special color for undo nav entry

fix fallback width

use class for button
2014-09-16 18:02:41 +02:00
Lukas Reschke d2743e6ad6 Merge pull request #7254 from owncloud/core-sortalgo
Fixed JS sort comparator to be consistent between JS and PHP
2014-09-16 17:29:03 +02:00
Lukas Reschke 4669ea3835 Merge pull request #10680 from helmutschneider/aws-2.6.15
Update AWS sdk to 2.6.15
2014-09-16 16:34:16 +02:00
Thomas Müller ba445e85b2 Merge pull request #11082 from owncloud/deduplicateDependencyCheck
Deduplicate dependency checks
2014-09-16 16:33:02 +02:00
Thomas Müller 7e2bff8545 adding unit test to truncate the table 2014-09-16 16:17:25 +02:00
Lukas Reschke 64653223fc Merge pull request #11108 from owncloud/add-proper-descr
Reword the description
2014-09-16 16:00:58 +02:00
Lukas Reschke b31b6db4de Reword the description
The old one was just horrible wrong.
2014-09-16 15:51:48 +02:00
Lukas Reschke 2f10b60c9e Merge pull request #10754 from cetra3/master
Refactor internal session handler to write directly to $_SESSION
2014-09-16 15:48:19 +02:00
Clark Tomlinson 140c89f1c3 Adding link to ellipsis and fixing styling 2014-09-16 09:18:01 -04:00
tobiasKaminsky e62d5b7e55 Route for thumbnail generation
Thumbnail generation

Removed Log

Added requested changes

Added requested changes.

- Fix code style
- Add exception if file does not exist
- Switch route styling

Replaces https://github.com/owncloud/core/pull/10805

Fix codestyle

Fix codestyle

Migrate to appframework

Fix typo
2014-09-16 15:00:58 +02:00
Thomas Müller 1978d3d6a2 Merge pull request #11055 from owncloud/replaceprodname
replace ownCloud with placeholder
2014-09-16 14:49:50 +02:00
Lukas Reschke 261d07c95c Merge pull request #11084 from owncloud/no-migration-for-mssql-master
Disable database migrations for MSSQL - scripts have to be applied manua...
2014-09-16 14:00:24 +02:00
Lukas Reschke ba5d3fb96b Merge pull request #11081 from owncloud/trash_fix_expire
also expire file if timestamp = limit, happens if trashbin_retention_obl...
2014-09-16 13:58:12 +02:00
scolebrook f31e4066de Conceal or display SabreDAV version number in browser and http response headers. 2014-09-16 13:25:44 +02:00
Lukas Reschke 5813cf32dc Deduplicate dependency checks
Some code that I also used for https://github.com/owncloud/administration/pull/11
2014-09-16 13:07:47 +02:00
Morris Jobke 61b040cbe8 Merge pull request #10663 from owncloud/files_trashbin_original_path
Show original path information in trashbin and for shares
2014-09-16 12:49:17 +02:00
Michael Göhler e6609d0970 simplify mysql user creation flow
if dbuser exists try a different one, owncloud/core#108

changed outdated comment

corrected length calculation

changed indentation for else clauses
2014-09-16 11:53:54 +02:00
Vincent Petry e2b504e61d Revert "improve logo flexibility to fix wide custom logo alignment, fix #9339"
This reverts commit 064e6951e1.

Reverting due to regression that breaks styles in error page, setup
page and others.

Fixes #10967
2014-09-16 11:22:54 +02:00
Morris Jobke dd70d1b88c Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdoc
Fix unexisting class and PHPDoc
2014-09-16 10:29:01 +02:00
Morris Jobke ea2022661d patch tipsy in style.css - don't patch 3rdparty libraries 2014-09-16 08:45:28 +02:00
Morris Jobke af52ffc5d5 Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspect
add y to with-aspect naming schema
2014-09-16 08:36:33 +02:00
Morris Jobke 245a0e2ad8 Merge pull request #10362 from owncloud/preserve_transparency_on_fileload
Preserve transparency when loading from a file
2014-09-16 08:33:56 +02:00
Jenkins for ownCloud 1e6ac31bde [tx-robot] updated from transifex 2014-09-16 01:54:33 -04:00
Jan-Christoph Borchardt 513fb05947 Merge pull request #11040 from owncloud/fix-app-menu-overlapp
Remove bottom: 0 from app-navigation-entry-utils to prevent the utils form overlapping the whole element....
2014-09-15 23:50:30 +02:00
Lukas Reschke 59c79781f7 Merge pull request #11023 from owncloud/users-fixundo
Add timeout to user and group deletion notification.
2014-09-15 21:55:03 +02:00
Lukas Reschke 627252fe81 Merge pull request #11060 from owncloud/rmobslang
remove obsolete language files
2014-09-15 17:31:10 +02:00
Morris Jobke d6cb489b68 add some minor fixes for IE8 2014-09-15 17:09:12 +02:00
Lukas Reschke 4f0f7e35ca Fix unexisting class and PHPDoc
You can't add int here as hint...
2014-09-15 17:08:56 +02:00