summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge translations with those from themeAndreasErgenzinger2013-04-171-0/+9
* Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_betterBart Visscher2013-04-172-1/+2
|\
| * Hint to default data directorykondou2013-04-161-1/+1
| * Handle empty datafolder better.kondou2013-04-132-1/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-17834-1788/+4438
* | Merge pull request #2951 from owncloud/no_personal_variablesicewind19912013-04-161-11/+11
|\ \
| * | No personal prefixes for variables.kondou2013-04-161-11/+11
* | | Merge pull request #2953 from jerrac/emailsavetimeoutBernhard Posselt2013-04-161-12/+22
|\ \ \
| * | | 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
|/ / /
* | | Merge pull request #2943 from owncloud/always_load_cache_hooks_firstMichael Gapczynski2013-04-162-5/+7
|\ \ \ | |/ / |/| |
| * | always connect file cache updater hooks firstJörn Friedrich Dreyer2013-04-162-5/+7
* | | Merge pull request #2887 from owncloud/l10n-cachingBart Visscher2013-04-161-0/+6
|\ \ \ | |/ / |/| |
| * | -L10N: cache the result of findLanguageRobin Appelman2013-04-121-0/+6
* | | add explenation of the expire function to the apps descriptionBjörn Schießle2013-04-162-2/+33
* | | write a info message to the log if a file gets removed from the trash bin aut...Björn Schießle2013-04-161-0/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-16872-6914/+7017
* | | Merge pull request #2934 from owncloud/shorten_css_colorcodesBernhard Posselt2013-04-151-4/+4
|\ \ \
| * | | Shorten CSS colorcodeskondou2013-04-151-4/+4
* | | | Merge pull request #2769 from owncloud/octemplateThomas Tanghus2013-04-151-0/+101
|\ \ \ \ | |/ / / |/| | |
| * | | Updated docs.Thomas Tanghus2013-04-151-2/+7
| * | | Add octemplate jQuery pluginThomas Tanghus2013-04-061-0/+96
* | | | Merge pull request #2933 from owncloud/fix-active-styleJan-Christoph Borchardt2013-04-151-1/+2
|\ \ \ \
| * | | | also show black background on links that are active, fixes the news app that ...Bernhard Posselt2013-04-151-1/+2
|/ / / /
* | | | Make FileCache upgrade more robust, fixes #2650Arthur Schiwon2013-04-152-5/+21
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-1519-117/+123
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-1413-33/+35
* | | | Merge pull request #2918 from owncloud/update_CONTRIBUTING.mdJan-Christoph Borchardt2013-04-131-2/+9
|\ \ \ \
| * | | | move notice to search existing issues upJan-Christoph Borchardt2013-04-141-2/+2
| * | | | correct naming for Pictures app, add MusicJan-Christoph Borchardt2013-04-141-1/+1
| * | | | Update CONTRIBUTING.mdGeorg Ehrke2013-04-131-1/+8
|/ / / /
* | | | 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
* | | | | Merge pull request #2910 from owncloud/password-toggle-db-2Bernhard Posselt2013-04-133-7/+10
|\ \ \ \ \
| * | | | | Implements Toggle for Database Password.raghunayyar2013-04-133-7/+10
* | | | | | Merge pull request #2909 from owncloud/addHookFrank Karlitschek2013-04-131-0/+4
|\ \ \ \ \ \
| * | | | | | allow Storages to join MountPoint initializationArthur Schiwon2013-04-131-0/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #2903 from owncloud/disabled-classRaghu Nayyar2013-04-121-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | add .disabled class so it can be used for simple a buttons as wellJan-Christoph Borchardt2013-04-121-1/+2
| |/ / / /
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-04-1337-377/+609
|/ / / /
* | | | Merge pull request #2895 from owncloud/button-foxJan-Christoph Borchardt2013-04-121-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | dont overwrite background image when hovering over buttonBernhard Posselt2013-04-121-1/+1
| | |/ | |/|
* / | [tx-robot] updated from transifexJenkins for ownCloud2013-04-1227-73/+83
|/ /
* | Merge pull request #2874 from owncloud/proper-font-stackBernhard Posselt2013-04-111-2/+2
|\ \
| * | use proper sans-serif font-stackJan-Christoph Borchardt2013-04-111-2/+2
|/ /
* | cleanup the trash bin tables in the database after a user was deletedBjörn Schießle2013-04-113-1/+33
* | remove used space for versions from db is a user was deletedBjörn Schießle2013-04-113-0/+28
* | Merge pull request #2554 from owncloud/hide-toggle-checkboxBernhard Posselt2013-04-112-5/+15
|\ \
| * | New Password in Personal Password Page loads fine.raghunayyar2013-04-111-1/+1
| * | Removes the setTimeout() method.raghunayyar2013-03-261-12/+9