summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* add unit testGeorg Ehrke2014-06-041-1/+1
* remove console.log in apps.jsGeorg Ehrke2014-06-041-1/+0
* various fixes as requested by pr reviewersGeorg Ehrke2014-06-023-6/+4
* add button for properly uninstalling appsGeorg Ehrke2014-05-313-0/+31
* Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-05-3169-345/+912
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2014-05-314-5/+49
| * Merge pull request #7614 from owncloud/test_annotations_workingThomas Müller2014-05-302-0/+16
| |\
| | * Merge branch 'master' into test_annotations_workingThomas Müller2014-05-1967-307/+490
| | |\
| | * | adopt new settings styleThomas Müller2014-05-091-2/+2
| | * | Check if ReflectionMethod::getDocComment is workingThomas Tanghus2014-05-092-0/+16
| * | | prevent pageload if pressed enter on name email changeVolkan Gezer2014-05-301-1/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-301-0/+3
| * | | Merge pull request #8700 from owncloud/design-smallfixesLukas Reschke2014-05-293-6/+6
| |\ \ \
| | * | | Fix double "saved" message when changing email settingsJoas Schilling2014-05-281-1/+1
| | * | | move saved notification for mail server, so it's smallerJan-Christoph Borchardt2014-05-231-2/+2
| | * | | fix border-radius in settings to 3pxJan-Christoph Borchardt2014-05-231-3/+3
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-299-3/+13
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-283-0/+14
| * | | | Merge pull request #8740 from owncloud/l10n-forgotten-tagsVolkan Gezer2014-05-271-2/+2
| |\ \ \ \
| | * | | | reverts 188c543 and translates only mailVolkan Gezer2014-05-271-2/+2
| * | | | | Merge pull request #8733 from owncloud/l10n-forgotten-tagsVincent Petry2014-05-271-3/+3
| |\| | | |
| | * | | | unwrapped strings fixVolkan Gezer2014-05-271-3/+3
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-272-3/+5
| |/ / / /
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-265-10/+88
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-259-17/+40
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-247-1/+25
| |/ / /
| * | | allow admin to disable sharing for specific groups of usersBjoern Schiessle2014-05-226-4/+114
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-203-4/+6
| | |/ | |/|
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-05-193-0/+10
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-05-186-0/+14
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1755-91/+19
| * | 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
* | make it possible to update shipped apps via the appstoreGeorg Ehrke2014-05-314-9/+80
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-031-0/+12
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-013-1/+19