Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #8861 from owncloud/share-overview-linklist | Vincent Petry | 2014-06-05 | 4 | -2/+146 | |
|\ \ \ | ||||||
| * | | | Fixed wording to "Shared by link" | Vincent Petry | 2014-06-04 | 2 | -3/+3 | |
| * | | | Added "Shared with link" sidebar section in files app | Vincent Petry | 2014-06-04 | 4 | -2/+146 | |
* | | | | Merge pull request #8620 from owncloud/design-navigation-two | Thomas Müller | 2014-06-05 | 1 | -1/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | adjust controls bar position for removed nav bar | Jan-Christoph Borchardt | 2014-06-04 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #8862 from owncloud/share-overview-fixmimetype | icewind1991 | 2014-06-05 | 1 | -4/+2 | |
|\ \ \ | ||||||
| * | | | Fix mime type returning for "shared with others" files | Vincent Petry | 2014-06-04 | 1 | -4/+2 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #8852 from owncloud/kill-permissions-master | Thomas Müller | 2014-06-05 | 5 | -120/+3 | |
|\ \ \ | ||||||
| * | | | - drop permissions table and related code | Thomas Müller | 2014-06-05 | 5 | -120/+3 | |
| | |/ | |/| | ||||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-05 | 103 | -48/+204 | |
* | | | Merge pull request #8724 from owncloud/update-sabre-2.0 | Thomas Müller | 2014-06-04 | 6 | -14/+15 | |
|\ \ \ | ||||||
| * | | | Upgrade SabreDAV to 1.8.10 | Thomas Müller | 2014-06-04 | 6 | -14/+15 | |
| |/ / | ||||||
* | | | Merge pull request #8824 from owncloud/mail_template_editing_in_webui | Morris Jobke | 2014-06-04 | 10 | -0/+457 | |
|\ \ \ | ||||||
| * | | | fixes during test | Thomas Müller | 2014-06-04 | 3 | -21/+32 | |
| * | | | convert mail template editor to app framework for a restful api | Jörn Friedrich Dreyer | 2014-06-03 | 13 | -141/+204 | |
| * | | | minimal mail template editor for administrators, refs #7177 | Jörn Friedrich Dreyer | 2014-06-02 | 10 | -0/+383 | |
* | | | | Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size | Thomas Müller | 2014-06-04 | 6 | -117/+11 | |
|\ \ \ \ | ||||||
| * | | | | Fix merge conflict | Thomas Müller | 2014-06-03 | 1 | -31/+0 | |
| * | | | | use OC_DB::dropTable() | Thomas Müller | 2014-06-02 | 2 | -4/+2 | |
| * | | | | return size '0' if the trashbin folder doesn't exists yet | Bjoern Schiessle | 2014-06-02 | 1 | -2/+2 | |
| * | | | | let file cache handle the versions size | Bjoern Schiessle | 2014-06-02 | 4 | -86/+13 | |
| |/ / / | ||||||
* | | | | Merge pull request #8791 from owncloud/share-overview-sharewithstatus | Morris Jobke | 2014-06-04 | 6 | -110/+640 | |
|\ \ \ \ | ||||||
| * | | | | Do not update action icon recipients for file list | Vincent Petry | 2014-06-04 | 1 | -0/+5 | |
| * | | | | Use recipient display names when updating shares in the UI | Vincent Petry | 2014-06-04 | 2 | -25/+33 | |
| * | | | | Multiple fixes to sharing overview | Vincent Petry | 2014-06-03 | 3 | -36/+145 | |
| * | | | | Now using shareOwner for the share owner | Vincent Petry | 2014-06-02 | 3 | -6/+12 | |
| * | | | | More unit tests and fixes for share | Vincent Petry | 2014-06-02 | 2 | -125/+255 | |
| * | | | | Added unit tests for share.js and share icon | Vincent Petry | 2014-06-02 | 3 | -21/+229 | |
| * | | | | Update share action text to display owner/recipients | Vincent Petry | 2014-06-02 | 3 | -99/+163 | |
* | | | | | remove obsolete position rule from files app | Jan-Christoph Borchardt | 2014-06-04 | 1 | -4/+0 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge pull request #8662 from owncloud/f-lock | Thomas Müller | 2014-06-04 | 4 | -13/+21 | |
|\ \ \ \ | ||||||
| * | | | | workaround to get the unit test going | Thomas Müller | 2014-06-04 | 1 | -4/+6 | |
| * | | | | get the storage from the view | Bjoern Schiessle | 2014-06-04 | 1 | -4/+5 | |
| * | | | | don't ask for fileInfo if we already have one | Bjoern Schiessle | 2014-06-04 | 1 | -5/+4 | |
| * | | | | make sure to close the stream at the end of each test | Bjoern Schiessle | 2014-06-04 | 1 | -0/+6 | |
| * | | | | Continued flock work. | ringmaster | 2014-06-04 | 1 | -0/+1 | |
| * | | | | flock changes. Work in progress. | ringmaster | 2014-06-04 | 1 | -1/+0 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #8842 from owncloud/ldap_cli_methods | Thomas Müller | 2014-06-04 | 5 | -1/+232 | |
|\ \ \ \ | ||||||
| * | | | | Fix casing and PHPDoc | Thomas Müller | 2014-06-03 | 4 | -8/+7 | |
| * | | | | fix description texts | Arthur Schiwon | 2014-06-03 | 2 | -2/+2 | |
| * | | | | command line tools to see, modify and test existing LDAP configurations | Arthur Schiwon | 2014-06-03 | 5 | -1/+233 | |
* | | | | | Merge pull request #8849 from owncloud/trash_expire_fix | Thomas Müller | 2014-06-04 | 1 | -8/+9 | |
|\ \ \ \ \ | ||||||
| * | | | | | fixing typo | Thomas Müller | 2014-06-04 | 1 | -1/+1 | |
| * | | | | | get files in trash from file cache | Bjoern Schiessle | 2014-06-03 | 1 | -7/+8 | |
* | | | | | | Merge pull request #8468 from owncloud/remove-infieldlabels | Jan-Christoph Borchardt | 2014-06-04 | 2 | -9/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | infield label removal: remove last occurences of infield labels | Jan-Christoph Borchardt | 2014-06-03 | 2 | -9/+2 | |
| |/ / / / / | ||||||
* | | / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-04 | 137 | -319/+72 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge pull request #8698 from owncloud/sharing_improve_permissions | Thomas Müller | 2014-06-03 | 2 | -36/+16 | |
|\ \ \ \ \ | ||||||
| * | | | | | check if it is a share storage | Bjoern Schiessle | 2014-06-02 | 1 | -1/+5 | |
| * | | | | | no need to empty array in a special way | Thomas Müller | 2014-06-02 | 1 | -3/+1 |