summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22725 from owncloud/app-bannersThomas Müller2016-03-013-163/+3
|\ | | | | compress app banners on personal page
| * compress app banners on personal pageJan-Christoph Borchardt2016-02-293-163/+3
| |
* | Merge pull request #22727 from owncloud/decrypt_all_master_keyThomas Müller2016-03-013-27/+46
|\ \ | | | | | | make decrypt all work with the master key
| * | make decrypt all work with the master keyBjoern Schiessle2016-02-293-27/+46
| | |
* | | Merge pull request #22733 from owncloud/size-propagation-new-fileThomas Müller2016-03-011-1/+5
|\ \ \ | | | | | | | | fix size propagation for new files
| * | | fix size propagation for new filesRobin Appelman2016-02-291-1/+5
| | | |
* | | | Merge pull request #22736 from owncloud/propagation-ignore-encryptionThomas Müller2016-03-012-0/+68
|\ \ \ \ | | | | | | | | | | ignore encryption keys for propagation
| * | | | ignore encryption keys for propagationRobin Appelman2016-02-292-0/+68
| |/ / /
* | | | Merge pull request #22740 from owncloud/fix_resare_updatesThomas Müller2016-03-013-0/+41
|\ \ \ \ | | | | | | | | | | Check correct permissions when resharing
| * | | | Check correct permissions when resharingRoeland Jago Douma2016-02-293-0/+41
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22675 Since we only get a share id we do not know the path for the sharer. Now if we edit a share we start searching for shares for that user of that node. And deduce the permissions that way. * Intergration test added * Fix unit tests
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0124-6/+108
| | | |
* | | | Merge pull request #22707 from owncloud/use-our-public-apiThomas Müller2016-03-0115-69/+76
|\ \ \ \ | |_|/ / |/| | | Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*
| * | | Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*Joas Schilling2016-02-2915-69/+76
| | | |
* | | | Merge pull request #22623 from owncloud/docker-logs-on-swift-externalThomas Müller2016-02-291-0/+2
|\ \ \ \ | | | | | | | | | | Print docker logs to the console fro debugging
| * | | | Print docker logs to the console fro debuggingThomas Müller2016-02-241-0/+2
| | | | |
* | | | | Merge pull request #22701 from owncloud/input-telThomas Müller2016-02-291-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | Style telephone inputs like other types
| * | | | style telephone inputs like other typesHendrik Leppelsack2016-02-291-0/+4
| | | | |
* | | | | Merge pull request #22663 from owncloud/sidebar-mobileThomas Müller2016-02-292-5/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | do not expand sidebar to full width on mobile, but up the min-width
| * | | | do not expand sidebar to full width on mobile, but up the min-width, fix #19915Jan-Christoph Borchardt2016-02-252-5/+1
| | | | |
* | | | | Merge pull request #22662 from owncloud/comments-countThomas Müller2016-02-292-5/+3
|\ \ \ \ \ | | | | | | | | | | | | remove comments count because it is not that relevant to show directly
| * | | | | remove comments count because it is not that relevant to show directlyJan-Christoph Borchardt2016-02-252-5/+3
| | | | | |
* | | | | | Merge pull request #22713 from owncloud/fix-since-version-on-commentsveventThomas Müller2016-02-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix since version
| * | | | | | Fix since versionJoas Schilling2016-02-291-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #22638 from owncloud/comments-db-indexesThomas Müller2016-02-292-11/+48
|\ \ \ \ \ \ | |/ / / / / |/| | | | | add index definitions for comments tables
| * | | | | exchange user_id_key for a unique one.Arthur Schiwon2016-02-262-8/+14
| | | | | |
| * | | | | add index definitions for comments tablesArthur Schiwon2016-02-242-11/+42
| | |_|_|/ | |/| | |
* | | | | Merge pull request #22683 from owncloud/fix_22682Thomas Müller2016-02-293-2/+25
|\ \ \ \ \ | | | | | | | | | | | | Relax rootfolder check
| * | | | | Relax rootfolder checkRoeland Jago Douma2016-02-263-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated unit tests * Added intergration test
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2916-0/+34
| | | | | |
* | | | | | Merge pull request #22673 from owncloud/fix_enforced_expire_date_settingThomas Müller2016-02-292-1/+17
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Expiration date can only be enforced if default is enabled
| * | | | | Expiration date can only be enforced if default is enabledRoeland Jago Douma2016-02-262-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the default expiration date is not enebaled it can not be enforced. * Added unit tests
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2864-36/+654
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2768-44/+90
| |/ / / / |/| | | |
* | | | | Merge pull request #22669 from owncloud/fix-email-formThomas Müller2016-02-261-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | Fix email form on personal page
| * | | | Email endpoint is controlled by the username setting, not passwordJoas Schilling2016-02-261-1/+1
| | | | |
| * | | | Correctly indent uneditable email/display name fieldsJoas Schilling2016-02-261-2/+2
| | | | |
* | | | | Merge pull request #22660 from owncloud/fix_22656Thomas Müller2016-02-263-0/+42
|\ \ \ \ \ | | | | | | | | | | | | Do not allow sharing of the users root folder
| * | | | | Do not allow sharing of the root folderRoeland Jago Douma2016-02-253-0/+42
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sharing of the users root folder should not be allowed as it is very weird UX. Also many of our clients have no proper way of displaying this. Added unit test Also added intergration tests to make sure we won't allow it in the future.
* | | | | Merge pull request #22671 from owncloud/issue-22670Thomas Müller2016-02-262-26/+26
|\ \ \ \ \ | | | | | | | | | | | | Move the tag filter at the end for now
| * | | | | Move the tag filter at the end for nowJoas Schilling2016-02-262-26/+26
| | |/ / / | |/| | |
* | | | | Merge pull request #22646 from owncloud/fix_22642Thomas Müller2016-02-262-22/+43
|\ \ \ \ \ | | | | | | | | | | | | Set default expiration date if none given on share creation
| * | | | | Set default expiration date if none given on share creationRoeland Jago Douma2016-02-252-22/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we create a share for the first time we should set the default expiration date. If none is given. Fixes #22642
* | | | | | Merge pull request #22640 from owncloud/fix_22587Thomas Müller2016-02-262-0/+129
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove delete permissions for read-only federated reshares
| * | | | | | Remove delete permissions for read-only federated resharesRoeland Jago Douma2016-02-252-0/+129
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An incomming federated share is just a mount point. Therefor if we request the permissions on the mountpoint DELETE permissions will be returned (among others). Since we can always remove a mountpoint, update a mount point. However now when trying to reshare we will try to reshare with DELETE permissions. Which is false. This PR removes the delete permissions if it is a shared storage. Basically a quick hack. Fixes #22587
* | | | | | Merge pull request #22608 from owncloud/collaborative-tagsThomas Müller2016-02-263-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rename system tags app to collaborative tags
| * | | | | | Rename system tags app to collaborative tagsJoas Schilling2016-02-263-4/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #22461 from owncloud/fix_6773Thomas Müller2016-02-2616-77/+166
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow theming of actions
| * | | | | | Fix favorite icon unit test for icon imageVincent Petry2016-02-251-2/+4
| | | | | | |
| * | | | | | Make more action icons themable + style fixesVincent Petry2016-02-256-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Action icons now appear properly in public link page. More actions are now CSS icons.
| * | | | | | Close classRoeland Jago Douma2016-02-251-1/+1
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 16:08:29 +0000