summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | prefer closest over parentJörn Friedrich Dreyer2013-10-311-1/+1
* | | | | | | | Merge pull request #5531 from owncloud/upgrade-form-occAndreas Fischer2013-10-313-77/+90
|\ \ \ \ \ \ \ \
| * | | | | | | | Add some color to the occ upgrade output.Andreas Fischer2013-10-281-11/+11
| * | | | | | | | Use "else if" to remove one level of indentation.Andreas Fischer2013-10-281-13/+11
| * | | | | | | | Missed one write()->writeln(). Fixed.ringmaster2013-10-281-1/+1
| * | | | | | | | Use writeln() instead of write()ringmaster2013-10-281-11/+11
| * | | | | | | | Use the OutputInterface for output and return error codes.ringmaster2013-10-281-21/+30
| * | | | | | | | Move all upgrade routines into the command-line tool.ringmaster2013-10-282-78/+55
| * | | | | | | | Add `occ upgrade` command.ringmaster2013-10-242-0/+29
* | | | | | | | | use data-file to retrieve filenameJörn Friedrich Dreyer2013-10-311-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #5638 from owncloud/admin-quotafieldMorris Jobke2013-10-313-6/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | fix translation stringsMorris Jobke2013-10-311-2/+2
| * | | | | | | | Fixed input field and tipsy positioning in singleselectVincent Petry2013-10-311-4/+3
| * | | | | | | | Improve quota input fieldVincent Petry2013-10-303-5/+27
* | | | | | | | | Adding link to documents repoThomas Müller2013-10-311-0/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #5642 from owncloud/fixing-5271-masterVicDeo2013-10-301-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | we should check if a user is logged in before we check for admin privilegeThomas Müller2013-10-301-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #5634 from owncloud/admin-loglevellabelsThomas Müller2013-10-301-6/+14
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Changed wording in log level dropdownVincent Petry2013-10-301-5/+5
| * | | | | | | Changed log level labels in log level dropdownVincent Petry2013-10-301-6/+14
| |/ / / / / /
* | | | | | | Merge pull request #5615 from owncloud/fixing-5614-masterLukas Reschke2013-10-301-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Added missing HTTP prefix to the $_SERVER variableLukas Reschke2013-10-301-1/+1
| * | | | | | | http header OCS-ApiRequest: true is required in case of session based OCS API...Thomas Müller2013-10-291-1/+2
* | | | | | | | Merge pull request #5628 from owncloud/files-fixsummaryVicDeo2013-10-301-6/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed summary visibility checkVincent Petry2013-10-301-6/+7
* | | | | | | | | Merge pull request #5633 from owncloud/files-createdropdownstayswithrightclickVincent Petry2013-10-301-1/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Prevent closing the create dropdown when right clicking in FirefoxVincent Petry2013-10-301-1/+5
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #5632 from owncloud/allow_nested_link_sharesVincent Petry2013-10-301-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | allow to share a file/folder as public link also if one of it parents was alr...Bjoern Schiessle2013-10-301-2/+4
* | | | | | | | | Merge pull request #5625 from owncloud/fix-test-masterJörn Friedrich Dreyer2013-10-301-7/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix failing preview test on masterMorris Jobke2013-10-301-7/+5
| |/ / / / / / / /
* | | | | | | | | Merge pull request #5626 from owncloud/fix_search_in_shared_filesJörn Friedrich Dreyer2013-10-301-38/+42
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expectedJörn Friedrich Dreyer2013-10-301-38/+42
* | | | | | | | | Merge pull request #5549 from owncloud/encryption-insertmigrationentrywhenmis...Vincent Petry2013-10-301-1/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed encryption migration when entry is missing in DBVincent Petry2013-10-251-1/+12
* | | | | | | | | | Merge pull request #5602 from owncloud/update-parent-storage-mtimeThomas Müller2013-10-302-2/+52
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into update-parent-storage-mtimeRobin Appelman2013-10-30327-4904/+12915
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #5618 from owncloud/set_default_value_for_recovery_modeBjörn Schießle2013-10-301-3/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | remove unused variableBjoern Schiessle2013-10-301-2/+0
| * | | | | | | | | if the database doesn't contain any information about the recovery mode than ...Bjoern Schiessle2013-10-301-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5616 from owncloud/fixing-l10n-masterVincent Petry2013-10-305-5/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | replacing ownCloud by theme-able name or avoid it's usageThomas Müller2013-10-293-3/+4
| * | | | | | | | | avoid usage of brand name 'ownCloud'Thomas Müller2013-10-282-2/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #5603 from owncloud/fix_file_cache_updater_masterVincent Petry2013-10-304-33/+105
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into fix_file_cache_updater_masterBjoern Schiessle2013-10-2911-68/+129
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | make sure that also the storage etag gets changedBjoern Schiessle2013-10-291-4/+7
| * | | | | | | | | | make getUidAndFilename() privateBjoern Schiessle2013-10-291-1/+1
| * | | | | | | | | | backport of https://github.com/owncloud/core/pull/5513Bjoern Schiessle2013-10-294-33/+102
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-30162-4302/+4246
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Fix typoLukas Reschke2013-10-291-1/+1