Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #11366 from owncloud/invalid-doc | Morris Jobke | 2014-09-30 | 1 | -3/+3 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Remove invalid PHPDoc | Lukas Reschke | 2014-09-30 | 1 | -3/+3 | |
| |/ / / | ||||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-30 | 24 | -76/+119 | |
* | | | | Merge pull request #11337 from danbartram/better_encryption_recovery_labels | Lukas Reschke | 2014-09-29 | 2 | -4/+8 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Add clickable labels to encryption recovery radios | Dan Bartram | 2014-09-27 | 2 | -4/+8 | |
* | | | | Merge pull request #11352 from owncloud/close-session-for-previews | Lukas Reschke | 2014-09-29 | 1 | -0/+1 | |
|\ \ \ \ | ||||||
| * | | | | Close the session for preview generation | Lukas Reschke | 2014-09-29 | 1 | -0/+1 | |
* | | | | | Merge pull request #11347 from mark0n/create_empty_config | Lukas Reschke | 2014-09-29 | 2 | -0/+52 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add a CLI command that creates an empty LDAP config | Martin Konrad | 2014-09-29 | 2 | -0/+52 | |
* | | | | | | Merge pull request #10107 from owncloud/sharing_group_shares | Lukas Reschke | 2014-09-29 | 14 | -429/+743 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | some small fixed, suggested by scrutinizer | Bjoern Schiessle | 2014-09-29 | 5 | -10/+9 | |
| * | | | | | | throw a exception if we can't handle the provided path | Bjoern Schiessle | 2014-09-29 | 4 | -3/+75 | |
| * | | | | | | on unshare only unshare childrens if there is no other parent available | Bjoern Schiessle | 2014-09-26 | 2 | -15/+63 | |
| * | | | | | | only create a new share entry, if the user needs a different target name than... | Bjoern Schiessle | 2014-09-26 | 1 | -1/+1 | |
| * | | | | | | for group shares we don't need a extra db entry of groupTarget equals itemTarget | Bjoern Schiessle | 2014-09-26 | 1 | -3/+3 | |
| * | | | | | | for group shares only the parent has the up-to-date permission. Make sure tha... | Bjoern Schiessle | 2014-09-26 | 1 | -1/+12 | |
| * | | | | | | call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all c... | Bjoern Schiessle | 2014-09-25 | 3 | -35/+66 | |
| * | | | | | | always select permissions, used in getItems() | Bjoern Schiessle | 2014-09-25 | 1 | -2/+3 | |
| * | | | | | | some small fixes | Bjoern Schiessle | 2014-09-25 | 4 | -11/+6 | |
| * | | | | | | clear share table after each test run | Bjoern Schiessle | 2014-09-24 | 1 | -0/+3 | |
| * | | | | | | only add a new row if it isn't a unique share, otherwise update the existing row | Bjoern Schiessle | 2014-09-24 | 1 | -1/+1 | |
| * | | | | | | mark exclude list as deprecated. It neither used by the files app nor by the | Bjoern Schiessle | 2014-09-24 | 1 | -1/+1 | |
| * | | | | | | fix unit tests | Bjoern Schiessle | 2014-09-24 | 2 | -5/+22 | |
| * | | | | | | fix add user to group to work with grouped shares | Bjoern Schiessle | 2014-09-24 | 1 | -10/+18 | |
| * | | | | | | generateTarget() will always find a unique target | Bjoern Schiessle | 2014-09-24 | 2 | -96/+80 | |
| * | | | | | | unit tests for grouping of shares pointing to the same source | Bjoern Schiessle | 2014-09-22 | 4 | -48/+155 | |
| * | | | | | | group shares and combine permissions | Bjoern Schiessle | 2014-09-22 | 4 | -240/+278 | |
* | | | | | | | Merge pull request #11357 from owncloud/kill-dead-code | Thomas Müller | 2014-09-29 | 2 | -18/+0 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Remove dead code | Lukas Reschke | 2014-09-29 | 2 | -18/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #11321 from owncloud/ldap-fix-memberof-detection | Lukas Reschke | 2014-09-29 | 1 | -2/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | dn needs to be fetched to be able to detect memberOf support | Arthur Schiwon | 2014-09-26 | 1 | -2/+4 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #11324 from owncloud/tryToCreateDatadirectory | Lukas Reschke | 2014-09-29 | 1 | -1/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Try to create datadirectory to test whether the .htaccess works | Lukas Reschke | 2014-09-26 | 1 | -1/+6 | |
| |/ / / / / | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-29 | 30 | -19/+78 | |
* | | | | | | Merge pull request #11322 from owncloud/adding-unittest-helper | Thomas Müller | 2014-09-29 | 1 | -0/+28 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Adding test helper to test private methods | Clark Tomlinson | 2014-09-26 | 1 | -0/+28 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #11335 from danbartram/imp_logrotate_conf_example | Morris Jobke | 2014-09-28 | 1 | -1/+2 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Clear up confusion of log_rotate_size config value | Dan Bartram | 2014-09-27 | 1 | -1/+2 | |
| | |_|/ / | |/| | | | ||||||
* / | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-28 | 28 | -97/+166 | |
|/ / / / | ||||||
* | | | | Merge pull request #11304 from owncloud/share-spinner | Morris Jobke | 2014-09-27 | 2 | -27/+112 | |
|\ \ \ \ | ||||||
| * | | | | Prevent monkey clicking on labels | Vincent Petry | 2014-09-26 | 1 | -0/+5 | |
| * | | | | Add ID to markup to have the checkboxes in the right position | Lukas Reschke | 2014-09-26 | 1 | -5/+5 | |
| * | | | | Added spinners in share dropdown | Vincent Petry | 2014-09-26 | 2 | -22/+102 | |
* | | | | | Merge pull request #11319 from owncloud/header-owncloud-name | Morris Jobke | 2014-09-27 | 1 | -1/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of app... | Jan-Christoph Borchardt | 2014-09-26 | 1 | -1/+7 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-27 | 36 | -15/+98 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge pull request #11311 from owncloud/fixing-unhandled-exception-cleanTmp-m... | Lukas Reschke | 2014-09-26 | 1 | -3/+21 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | catch and log exception in OC_Helper::cleanTmp() | Thomas Müller | 2014-09-26 | 1 | -3/+21 | |
* | | | | | Merge pull request #11285 from owncloud/dav-permissions-create | Thomas Müller | 2014-09-26 | 4 | -1/+72 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix dav permissions for folders without create permissions | Robin Appelman | 2014-09-25 | 2 | -1/+56 |