summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8880 from owncloud/webdav-read-permissionsThomas Müller2014-06-051-0/+24
|\ | | | | Use the permissions exposed by ownCloud for webdav external storages
| * Use the permissions exposed by ownCloud for webdav external storagesRobin Appelman2014-06-041-0/+24
| |
* | use slide toggle for files appBernhard Posselt2014-06-052-8/+2
| |
* | Merge pull request #8861 from owncloud/share-overview-linklistVincent Petry2014-06-054-2/+146
|\ \ | | | | | | Added Shared with link sidebar section in files app
| * | Fixed wording to "Shared by link"Vincent Petry2014-06-042-3/+3
| | |
| * | Added "Shared with link" sidebar section in files appVincent Petry2014-06-044-2/+146
| | | | | | | | | | | | | | | | | | | | | Added section to only show link shares. Please note that the filtering is currently done on the client side which might not be the most efficient way of doing it.
* | | Merge pull request #8620 from owncloud/design-navigation-twoThomas Müller2014-06-051-1/+1
|\ \ \ | | | | | | | | Toggle app navigation not only on mobile, but on desktop as well
| * | | adjust controls bar position for removed nav barJan-Christoph Borchardt2014-06-041-1/+1
| | |/ | |/|
* | | Merge pull request #8862 from owncloud/share-overview-fixmimetypeicewind19912014-06-051-4/+2
|\ \ \ | | | | | | | | Fix mime type returning for shared with others files
| * | | Fix mime type returning for "shared with others" filesVincent Petry2014-06-041-4/+2
| | |/ | |/| | | | | | | | | | Use "path" instead of "file_target", as the latter is not always set / reliable.
* | | Merge pull request #8852 from owncloud/kill-permissions-masterThomas Müller2014-06-055-120/+3
|\ \ \ | | | | | | | | Kill permissions table
| * | | - drop permissions table and related codeThomas Müller2014-06-055-120/+3
| | |/ | |/| | | | | | | | | | | | | - the file/folder's permission is now stored in the file cache - BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs - increase version to trigger database migration
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-05103-48/+204
| | |
* | | Merge pull request #8724 from owncloud/update-sabre-2.0Thomas Müller2014-06-046-14/+15
|\ \ \ | | | | | | | | Update SabreDAV to 1.8.10
| * | | Upgrade SabreDAV to 1.8.10Thomas Müller2014-06-046-14/+15
| |/ / | | | | | | | | | Updating SabreDAV namespaces
* | | Merge pull request #8824 from owncloud/mail_template_editing_in_webuiMorris Jobke2014-06-0410-0/+457
|\ \ \ | | | | | | | | minimal mail template editor for administrators
| * | | fixes during testThomas Müller2014-06-043-21/+32
| | | |
| * | | convert mail template editor to app framework for a restful apiJörn Friedrich Dreyer2014-06-0313-141/+204
| | | |
| * | | minimal mail template editor for administrators, refs #7177Jörn Friedrich Dreyer2014-06-0210-0/+383
| | | |
* | | | Merge pull request #8471 from owncloud/versioning_no_longer_track_the_sizeThomas Müller2014-06-046-117/+11
|\ \ \ \ | | | | | | | | | | [versioning] let the file cache track the size of the versions
| * | | | Fix merge conflictThomas Müller2014-06-031-31/+0
| | | | |
| * | | | use OC_DB::dropTable()Thomas Müller2014-06-022-4/+2
| | | | |
| * | | | return size '0' if the trashbin folder doesn't exists yetBjoern Schiessle2014-06-021-2/+2
| | | | |
| * | | | let file cache handle the versions sizeBjoern Schiessle2014-06-024-86/+13
| |/ / /
* | | | Merge pull request #8791 from owncloud/share-overview-sharewithstatusMorris Jobke2014-06-046-110/+640
|\ \ \ \ | | | | | | | | | | Update share action text to display owner/recipients
| * | | | Do not update action icon recipients for file listVincent Petry2014-06-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the files app doesn't have the recipient information on load it cannot initially render the recipients in the action icons. For this reason the action icon will not be updated with the recipients after changing the shares, for consistency.
| * | | | Use recipient display names when updating shares in the UIVincent Petry2014-06-042-25/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since OC.Share didn't have any array containing the list of shares for the current file, OC.Share.currentShares has been introduced to contain the full share item structure instead of the reduced one OC.Share.itemShares. The event "sharesChanged" is now passing OC.Share.currentShares, which itself includes the display name to be displayed for the recipients in the action icon.
| * | | | Multiple fixes to sharing overviewVincent Petry2014-06-033-36/+145
| | | | | | | | | | | | | | | | | | | | | | | | | - scrolling to next page now correctly renders share icons - reshareing/unsharing a reshare will now still keep "Shared by" label
| * | | | Now using shareOwner for the share ownerVincent Petry2014-06-023-6/+12
| | | | | | | | | | | | | | | | | | | | Makes it consistent with the regular file list fileData
| * | | | More unit tests and fixes for shareVincent Petry2014-06-022-125/+255
| | | | |
| * | | | Added unit tests for share.js and share iconVincent Petry2014-06-023-21/+229
| | | | |
| * | | | Update share action text to display owner/recipientsVincent Petry2014-06-023-99/+163
| | | | | | | | | | | | | | | | | | | | | | | | | - when a share was changed, update the share action text - added file data attribute "data-share-recipients"
* | | | | remove obsolete position rule from files appJan-Christoph Borchardt2014-06-041-4/+0
| |_|/ / |/| | |
* | | | Merge pull request #8662 from owncloud/f-lockThomas Müller2014-06-044-13/+21
|\ \ \ \ | | | | | | | | | | f-lock
| * | | | workaround to get the unit test goingThomas Müller2014-06-041-4/+6
| | | | |
| * | | | get the storage from the viewBjoern Schiessle2014-06-041-4/+5
| | | | |
| * | | | don't ask for fileInfo if we already have oneBjoern Schiessle2014-06-041-5/+4
| | | | |
| * | | | make sure to close the stream at the end of each testBjoern Schiessle2014-06-041-0/+6
| | | | |
| * | | | Continued flock work.ringmaster2014-06-041-0/+1
| | | | |
| * | | | flock changes. Work in progress.ringmaster2014-06-041-1/+0
| | |_|/ | |/| |
* | | | Merge pull request #8842 from owncloud/ldap_cli_methodsThomas Müller2014-06-045-1/+232
|\ \ \ \ | | | | | | | | | | command line tools to see, modify and test existing LDAP configurations
| * | | | Fix casing and PHPDocThomas Müller2014-06-034-8/+7
| | | | |
| * | | | fix description textsArthur Schiwon2014-06-032-2/+2
| | | | |
| * | | | command line tools to see, modify and test existing LDAP configurationsArthur Schiwon2014-06-035-1/+233
| | | | |
* | | | | Merge pull request #8849 from owncloud/trash_expire_fixThomas Müller2014-06-041-8/+9
|\ \ \ \ \ | | | | | | | | | | | | get files in trash from file cache
| * | | | | fixing typoThomas Müller2014-06-041-1/+1
| | | | | |
| * | | | | get files in trash from file cacheBjoern Schiessle2014-06-031-7/+8
| | | | | |
* | | | | | Merge pull request #8468 from owncloud/remove-infieldlabelsJan-Christoph Borchardt2014-06-042-9/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove infieldlabels
| * | | | | | infield label removal: remove last occurences of infield labelsJan-Christoph Borchardt2014-06-032-9/+2
| |/ / / / /
* | | / / / [tx-robot] updated from transifexJenkins for ownCloud2014-06-04137-319/+72
| |_|/ / / |/| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 13:58:40 +0000