summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into files_encryptionFlorin Peter2013-05-014-9/+11
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-014-8/+12
* | revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is ...Florin Peter2013-05-0160-386/+319
* | Merge branch 'master' into files_encryption to get the latest files_trashbin appFlorin Peter2013-04-3060-319/+386
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2013-04-304-10/+80
| * [tx-robot] updated from transifexJenkins for ownCloud2013-04-296-4/+23
| * [tx-robot] updated from transifexJenkins for ownCloud2013-04-282-6/+8
| * Merge pull request #3114 from owncloud/update-notificationRaghu Nayyar2013-04-261-2/+1
| |\
| | * Add an update notification on every page for admin usersLukas Reschke2013-04-241-2/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2753-189/+257
| * | Merge pull request #3002 from owncloud/priorize_common_languagesBart Visscher2013-04-263-4/+21
| |\ \
| | * | Make divider not selectablekondou2013-04-192-5/+4
| | * | Priorize common languages.kondou2013-04-183-4/+22
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2636-108/+0
| * | | Merge pull request #3098 from jerrac/displaynamesaveontimeoutMorris Jobke2013-04-253-40/+46
| |\ \ \
| | * | | Fixed comment in personal.js. Changed message text in changedisplayname.php.David Reagan2013-04-232-2/+2
| | * | | Made saving the display name work the same way as the email address. Fixed a ...David Reagan2013-04-233-40/+46
| |/ / / |/| | |
| * | | Merge pull request #3094 from owncloud/log-ajaxBart Visscher2013-04-252-8/+6
| |\ \ \
| | * | | fix syntax layoutMorris Jobke2013-04-231-3/+6
| | * | | remove log sort in admin sectionMorris Jobke2013-04-231-5/+0
| | * | | fix logical issue while retrieving log via ajaxMorris Jobke2013-04-231-1/+1
| |/ / / |/| | |
| * | | Merge pull request #3096 from owncloud/add_missing_space_for_new_groupsRaghu Nayyar2013-04-241-9/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Fix #3095.kondou2013-04-241-9/+3
| |/ / |/| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-04-242-0/+7
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2013-04-221-0/+4
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-184-4/+7
* Merge pull request #2975 from owncloud/log-dateMorris Jobke2013-04-172-2/+10
|\
| * also adjust template properly for log date fixBernhard Posselt2013-04-171-1/+5
| * fix admin log display and use a more readable formatBernhard Posselt2013-04-171-1/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-172-1/+65
* | Removed extra id from jquery selectors. Remove console.log call. Removed comm...David Reagan2013-04-161-4/+2
* | Modified how the #lostpassword or #email fields save email addresses on the P...David Reagan2013-04-161-12/+24
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-161-3/+3
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-151-3/+9
* Merge pull request #2896 from owncloud/app-enable-fixThomas Tanghus2013-04-131-1/+3
|\
| * Add span tag while enabling or disbling apps as well.raghunayyar2013-04-121-1/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-132-1/+71
|/
* Merge pull request #2554 from owncloud/hide-toggle-checkboxBernhard Posselt2013-04-111-1/+1
|\
| * New Password in Personal Password Page loads fine.raghunayyar2013-04-111-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-113-0/+3
* | Add the quota change listeners to newly added user entries in the user listRobin Appelman2013-04-101-12/+19
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-105-44/+137
* | Users: fix "Other.." quota option for the default quotaRobin Appelman2013-04-091-1/+1
* | Merge pull request #2800 from owncloud/fixing-2743-masterBernhard Posselt2013-04-091-1/+1
|\ \
| * | fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determin...Thomas Mueller2013-04-081-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-0935-34/+37
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-083-3/+71
* | Merge pull request #2738 from Kondou-ger/fix_alert_issuesBart Visscher2013-04-061-3/+3
|\ \
| * | Translate 'Error' in corekondou2013-04-061-3/+3
| * | Fixed things in alert-messagesroot2013-04-051-3/+3