Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | prefer closest over parent | Jörn Friedrich Dreyer | 2013-10-31 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #5531 from owncloud/upgrade-form-occ | Andreas Fischer | 2013-10-31 | 3 | -77/+90 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add some color to the occ upgrade output. | Andreas Fischer | 2013-10-28 | 1 | -11/+11 | |
| * | | | | | | | | Use "else if" to remove one level of indentation. | Andreas Fischer | 2013-10-28 | 1 | -13/+11 | |
| * | | | | | | | | Missed one write()->writeln(). Fixed. | ringmaster | 2013-10-28 | 1 | -1/+1 | |
| * | | | | | | | | Use writeln() instead of write() | ringmaster | 2013-10-28 | 1 | -11/+11 | |
| * | | | | | | | | Use the OutputInterface for output and return error codes. | ringmaster | 2013-10-28 | 1 | -21/+30 | |
| * | | | | | | | | Move all upgrade routines into the command-line tool. | ringmaster | 2013-10-28 | 2 | -78/+55 | |
| * | | | | | | | | Add `occ upgrade` command. | ringmaster | 2013-10-24 | 2 | -0/+29 | |
* | | | | | | | | | use data-file to retrieve filename | Jörn Friedrich Dreyer | 2013-10-31 | 1 | -1/+1 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #5638 from owncloud/admin-quotafield | Morris Jobke | 2013-10-31 | 3 | -6/+27 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fix translation strings | Morris Jobke | 2013-10-31 | 1 | -2/+2 | |
| * | | | | | | | | Fixed input field and tipsy positioning in singleselect | Vincent Petry | 2013-10-31 | 1 | -4/+3 | |
| * | | | | | | | | Improve quota input field | Vincent Petry | 2013-10-30 | 3 | -5/+27 | |
* | | | | | | | | | Adding link to documents repo | Thomas Müller | 2013-10-31 | 1 | -0/+1 | |
| |_|/ / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #5642 from owncloud/fixing-5271-master | VicDeo | 2013-10-30 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | we should check if a user is logged in before we check for admin privilege | Thomas Müller | 2013-10-30 | 1 | -0/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #5634 from owncloud/admin-loglevellabels | Thomas Müller | 2013-10-30 | 1 | -6/+14 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Changed wording in log level dropdown | Vincent Petry | 2013-10-30 | 1 | -5/+5 | |
| * | | | | | | | Changed log level labels in log level dropdown | Vincent Petry | 2013-10-30 | 1 | -6/+14 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #5615 from owncloud/fixing-5614-master | Lukas Reschke | 2013-10-30 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Added missing HTTP prefix to the $_SERVER variable | Lukas Reschke | 2013-10-30 | 1 | -1/+1 | |
| * | | | | | | | http header OCS-ApiRequest: true is required in case of session based OCS API... | Thomas Müller | 2013-10-29 | 1 | -1/+2 | |
* | | | | | | | | Merge pull request #5628 from owncloud/files-fixsummary | VicDeo | 2013-10-30 | 1 | -6/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fixed summary visibility check | Vincent Petry | 2013-10-30 | 1 | -6/+7 | |
* | | | | | | | | | Merge pull request #5633 from owncloud/files-createdropdownstayswithrightclick | Vincent Petry | 2013-10-30 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Prevent closing the create dropdown when right clicking in Firefox | Vincent Petry | 2013-10-30 | 1 | -1/+5 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5632 from owncloud/allow_nested_link_shares | Vincent Petry | 2013-10-30 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | allow to share a file/folder as public link also if one of it parents was alr... | Bjoern Schiessle | 2013-10-30 | 1 | -2/+4 | |
* | | | | | | | | | Merge pull request #5625 from owncloud/fix-test-master | Jörn Friedrich Dreyer | 2013-10-30 | 1 | -7/+5 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fix failing preview test on master | Morris Jobke | 2013-10-30 | 1 | -7/+5 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5626 from owncloud/fix_search_in_shared_files | Jörn Friedrich Dreyer | 2013-10-30 | 1 | -38/+42 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected | Jörn Friedrich Dreyer | 2013-10-30 | 1 | -38/+42 | |
* | | | | | | | | | Merge pull request #5549 from owncloud/encryption-insertmigrationentrywhenmis... | Vincent Petry | 2013-10-30 | 1 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fixed encryption migration when entry is missing in DB | Vincent Petry | 2013-10-25 | 1 | -1/+12 | |
* | | | | | | | | | | Merge pull request #5602 from owncloud/update-parent-storage-mtime | Thomas Müller | 2013-10-30 | 2 | -2/+52 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' into update-parent-storage-mtime | Robin Appelman | 2013-10-30 | 327 | -4904/+12915 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5618 from owncloud/set_default_value_for_recovery_mode | Björn Schießle | 2013-10-30 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | remove unused variable | Bjoern Schiessle | 2013-10-30 | 1 | -2/+0 | |
| * | | | | | | | | | if the database doesn't contain any information about the recovery mode than ... | Bjoern Schiessle | 2013-10-30 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5616 from owncloud/fixing-l10n-master | Vincent Petry | 2013-10-30 | 5 | -5/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | replacing ownCloud by theme-able name or avoid it's usage | Thomas Müller | 2013-10-29 | 3 | -3/+4 | |
| * | | | | | | | | | avoid usage of brand name 'ownCloud' | Thomas Müller | 2013-10-28 | 2 | -2/+2 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5603 from owncloud/fix_file_cache_updater_master | Vincent Petry | 2013-10-30 | 4 | -33/+105 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into fix_file_cache_updater_master | Bjoern Schiessle | 2013-10-29 | 11 | -68/+129 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | make sure that also the storage etag gets changed | Bjoern Schiessle | 2013-10-29 | 1 | -4/+7 | |
| * | | | | | | | | | | make getUidAndFilename() private | Bjoern Schiessle | 2013-10-29 | 1 | -1/+1 | |
| * | | | | | | | | | | backport of https://github.com/owncloud/core/pull/5513 | Bjoern Schiessle | 2013-10-29 | 4 | -33/+102 | |
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-30 | 162 | -4302/+4246 | |
| |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Fix typo | Lukas Reschke | 2013-10-29 | 1 | -1/+1 |