summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8604 from owncloud/sharing_encforce_passwordBjörn Schießle2014-05-162-2/+4
|\
| * allow admin to enforce passwords for public link sharesBjoern Schiessle2014-05-162-2/+4
* | Merge pull request #6260 from owncloud/jan-navigation-filesidebarVincent Petry2014-05-161-6/+0
|\ \
| * | Added app navigation for files appVincent Petry2014-05-151-6/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1616-22/+44
|/ /
* | Merge pull request #8597 from owncloud/l10n-fix-typoVincent Petry2014-05-151-2/+2
|\ \
| * | fix typo encryptionVolkan Gezer2014-05-151-2/+2
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2014-05-1542-176/+220
|/
* Merge pull request #8522 from owncloud/sharing_ux_improvementsBjörn Schießle2014-05-143-23/+32
|\
| * hide input field if default expire date isn't activatedBjoern Schiessle2014-05-133-23/+32
* | Merge pull request #8398 from owncloud/enc_backup_keysBjörn Schießle2014-05-136-12/+135
|\ \
| * | backup the encryption key after the encryption was disabled so that the userBjoern Schiessle2014-05-136-12/+135
| |/
* | remove legacy aka deprecated code: OC_FilesystemViewThomas Müller2014-05-122-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-122-1/+36
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-111-0/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-074-0/+58
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-031-0/+12
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-013-1/+19
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-302-0/+6
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-294-0/+23
* Merge pull request #8309 from DavidPrevot/chosenThomas Müller2014-04-281-1/+1
|\
| * Adapt chosen (css) pathDavid Prévot2014-04-221-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-289-3/+202
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-275-0/+11
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-2615-2/+60
* | typo fix, by translators on transifexVolkan Gezer2014-04-251-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-2510-2/+151
* | add setting to set default expire dateBjoern Schiessle2014-04-243-1/+23
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-2413-3/+23
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-2336-36/+8
|/
* fix spelling 'Allow user ...' -> 'Allow users ...'Thomas Müller2014-04-221-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-222-15/+16
* Some more PHPDoc fixesLukas Reschke2014-04-211-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-211-1/+1
* Use JS as content-type due to mimesniffingLukas Reschke2014-04-171-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-161-0/+5
* Make email display name change translatable againVolkan Gezer2014-04-152-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-143-3/+8
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-1311-0/+33
* Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encr...Björn Schießle2014-04-112-4/+5
|\
| * Fix some localization issues with file encryption/decription stringsVolkan Gezer2014-04-052-4/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-101-0/+1
* | Always define sendmail_is_availableJoas Schilling2014-04-091-3/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-092-1/+18
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-083-0/+17
* | reduce code duplication, fix parse error, prevent page reload on hitting ente...Thomas Müller2014-04-071-50/+47
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-073-0/+64
|/
* Delete oauth.cssLukas Reschke2014-04-041-4/+0
* Remove uneeded fileLukas Reschke2014-04-041-19/+0
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-045-5/+6