Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-05 | 817 | -12478/+17543 |
| | |||||
* | Merge pull request #8882 from owncloud/remove-placeholdercall | Morris Jobke | 2014-06-05 | 1 | -2/+0 |
|\ | | | | | remove obsolete placeholder call, fix #8881 | ||||
| * | remove obsolete placeholder call, fix #8881 | Jan-Christoph Borchardt | 2014-06-04 | 1 | -2/+0 |
| | | |||||
* | | Merge pull request #8724 from owncloud/update-sabre-2.0 | Thomas Müller | 2014-06-04 | 34 | -212/+193 |
|\ \ | | | | | | | Update SabreDAV to 1.8.10 | ||||
| * | | use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface | Thomas Müller | 2014-06-04 | 3 | -10/+1 |
| | | | |||||
| * | | Upgrade SabreDAV to 1.8.10 | Thomas Müller | 2014-06-04 | 34 | -212/+202 |
| | | | | | | | | | | | | Updating SabreDAV namespaces | ||||
* | | | Merge pull request #8824 from owncloud/mail_template_editing_in_webui | Morris Jobke | 2014-06-04 | 10 | -0/+457 |
|\ \ \ | | | | | | | | | minimal mail template editor for administrators | ||||
| * | | | fixes during test | Thomas Müller | 2014-06-04 | 4 | -59/+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 | 11 | -0/+421 |
| | | | | |||||
* | | | | Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size | Thomas Müller | 2014-06-04 | 7 | -118/+12 |
|\ \ \ \ | | | | | | | | | | | [versioning] let the file cache track the size of the versions | ||||
| * | | | | 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 | 5 | -87/+14 |
| | | | | | |||||
* | | | | | Merge pull request #8876 from owncloud/design-css-settings | Morris Jobke | 2014-06-04 | 1 | -4/+7 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | personal settings: unbold clients header and remove obsolete CSS | ||||
| * | | | | personal settings: unbold clients header and remove obsolete CSS | Jan-Christoph Borchardt | 2014-06-04 | 1 | -4/+7 |
| | | | | | |||||
* | | | | | Merge pull request #8791 from owncloud/share-overview-sharewithstatus | Morris Jobke | 2014-06-04 | 11 | -169/+901 |
|\ \ \ \ \ | | | | | | | | | | | | | Update share action text to display owner/recipients | ||||
| * | | | | | Do not update action icon recipients for file list | Vincent Petry | 2014-06-04 | 1 | -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 UI | Vincent Petry | 2014-06-04 | 4 | -52/+85 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 overview | Vincent Petry | 2014-06-03 | 4 | -41/+150 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 owner | Vincent Petry | 2014-06-02 | 3 | -6/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | Makes it consistent with the regular file list fileData | ||||
| * | | | | | More unit tests and fixes for share | Vincent Petry | 2014-06-02 | 4 | -140/+421 |
| | | | | | | |||||
| * | | | | | change shared folder icon to use share icon instead of people | Jan-Christoph Borchardt | 2014-06-02 | 2 | -20/+24 |
| | | | | | | |||||
| * | | | | | Added unit tests for share.js and share icon | Vincent Petry | 2014-06-02 | 5 | -35/+234 |
| | | | | | | |||||
| * | | | | | Update share action text to display owner/recipients | Vincent Petry | 2014-06-02 | 4 | -131/+226 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - when a share was changed, update the share action text - added file data attribute "data-share-recipients" | ||||
* | | | | | | Merge pull request #8875 from owncloud/app-css-relative | Jan-Christoph Borchardt | 2014-06-04 | 2 | -4/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | explicit position:relative for app-content, fixes first run layout | ||||
| * | | | | | remove obsolete position rule from files app | Jan-Christoph Borchardt | 2014-06-04 | 1 | -4/+0 |
| | | | | | | |||||
| * | | | | | explicit position:relative for app-content, fixes first run layout | Jan-Christoph Borchardt | 2014-06-04 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #8822 from owncloud/cache-change-propagator | Vincent Petry | 2014-06-04 | 7 | -68/+320 |
|\ \ \ \ \ | | | | | | | | | | | | | [WIP] Improved propagation of cache changes | ||||
| * | | | | | Fix unit tests | Robin Appelman | 2014-06-04 | 2 | -12/+10 |
| | | | | | | |||||
| * | | | | | Fix size calculation during recursive scan | Robin Appelman | 2014-06-03 | 1 | -7/+3 |
| | | | | | | |||||
| * | | | | | Fix unit tests | Robin Appelman | 2014-06-03 | 2 | -13/+19 |
| | | | | | | |||||
| * | | | | | Fix recursive scanning | Robin Appelman | 2014-06-02 | 1 | -3/+5 |
| | | | | | | |||||
| * | | | | | propagate changes in the scanner | Robin Appelman | 2014-06-02 | 3 | -1/+77 |
| | | | | | | |||||
| * | | | | | Split of cache writes in the scanner to their own methods | Robin Appelman | 2014-06-02 | 1 | -39/+43 |
| | | | | | | |||||
| * | | | | | Add a change propagator class to handle propagating etag and mtime changes | Robin Appelman | 2014-06-02 | 2 | -0/+170 |
| | | | | | | |||||
* | | | | | | Merge pull request #8844 from owncloud/design-icons | Morris Jobke | 2014-06-04 | 4 | -12/+130 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | [WIP] simplify icons, remove shadow | ||||
| * | | | | | simplify logout and caret icons, remove shadow | Jan-Christoph Borchardt | 2014-06-03 | 4 | -12/+130 |
| | | | | | | |||||
* | | | | | | Merge pull request #8701 from owncloud/slide-up-toggle | Bernhard Posselt | 2014-06-04 | 2 | -0/+77 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Create reusable data attribute for apps setting slideup | ||||
| * | | | | | | disable dynamic slide toggle by default and offer a way to enable it | Bernhard Posselt | 2014-05-26 | 1 | -3/+15 |
| | | | | | | | |||||
| * | | | | | | rename to apps.js | Bernhard Posselt | 2014-05-26 | 2 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | query buttons on every click to not worry about weird edge case scenarios | Bernhard Posselt | 2014-05-24 | 1 | -19/+5 |
| | | | | | | | |||||
| * | | | | | | use different ns | Bernhard Posselt | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | allow apps to add buttons on runtime without negatively impacting performance | Bernhard Posselt | 2014-05-24 | 1 | -4/+17 |
| | | | | | | | |||||
| * | | | | | | add ; to make jshint happy | Bernhard Posselt | 2014-05-23 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | remove unecessary parenths | Bernhard Posselt | 2014-05-23 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | add a slideup mechanism | Bernhard Posselt | 2014-05-23 | 2 | -0/+66 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #8853 from owncloud/design-typeface | Jan-Christoph Borchardt | 2014-06-04 | 8 | -3/+236 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use Open Sans as typeface | ||||
| * | | | | | | | IE -> IE8 only | Morris Jobke | 2014-06-04 | 1 | -1/+1 |
| | | | | | | | |