summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-1911-11/+11
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-04-18140-941/+643
|
* Merge pull request #2986 from eMerzh/upgrade_warnBernhard Posselt2013-04-171-1/+1
|\ | | | | Warn when we do an upgrade
| * Warn when we do an upgradeBrice Maron2013-04-171-1/+1
|/
* Merge pull request #2925 from owncloud/navigation-icon-fixRaghu Nayyar2013-04-171-6/+29
|\ | | | | fix navigation hover effect, documentation
| * apply navigation hover effect directly to img and span, cleaner codeJan-Christoph Borchardt2013-04-171-3/+23
| |
| * additional commentsJan-Christoph Borchardt2013-04-141-3/+3
| |
| * fix navigation hover effect, documentationJan-Christoph Borchardt2013-04-141-5/+8
| |
* | Merge pull request #2978 from owncloud/displayname_can_be_nullBernhard Posselt2013-04-172-2/+1
|\ \ | | | | | | Remove not null constraint. Fix #2976
| * | Remove not null constraint. Fix #2976Thomas Tanghus2013-04-172-2/+1
| | |
* | | Merge pull request #2975 from owncloud/log-dateMorris Jobke2013-04-173-3/+12
|\ \ \ | |/ / |/| | use date and time instead of timestamp in log
| * | 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-172-2/+6
| | |
| * | use date and time instead of timestampBernhard Posselt2013-04-171-1/+2
| | |
* | | Merge pull request #2746 from owncloud/use-count-userexistsThomas Tanghus2013-04-171-2/+2
|\ \ \ | | | | | | | | Use count SQL to check for user existance
| * | | Use the MDB2 function to get the count resultBart Visscher2013-04-061-1/+1
| | | |
| * | | Use count SQL to check for user existanceBart Visscher2013-04-051-2/+2
| | | |
* | | | adapt free space calculation to the way it is done for the trash binBjörn Schießle2013-04-171-7/+15
| | | |
* | | | improved free space calculation if no quota is set, discussed in #2936Björn Schießle2013-04-171-23/+43
| | | |
* | | | Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_betterBart Visscher2013-04-172-1/+2
|\ \ \ \ | | | | | | | | | | Handle empty datafolder better.
| * | | | Hint to default data directorykondou2013-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not to before submitted data directory. Thanks to bartv2 for the heads up.
| * | | | Handle empty datafolder better.kondou2013-04-132-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If datafolder is erased, the default value will be shown as a placeholder. If installation is submitted without a datafolder the default value will be used.
* | | | | [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.
| * | | | | No personal prefixes for variables.kondou2013-04-161-11/+11
| | | | | |
* | | | | | Merge pull request #2953 from jerrac/emailsavetimeoutBernhard Posselt2013-04-161-12/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Modified how the #lostpassword or #email fields save email addresses on ...
| * | | | | | Removed extra id from jquery selectors. Remove console.log call. Removed ↵David Reagan2013-04-161-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | commented code.
| * | | | | | Modified how the #lostpassword or #email fields save email addresses on the ↵David Reagan2013-04-161-12/+24
|/ / / / / / | | | | | | | | | | | | | | | | | | Personal settings page. It now saves one second after the last keyup event, instead of after a blur event.
* | | | | | Merge pull request #2943 from owncloud/always_load_cache_hooks_firstMichael Gapczynski2013-04-162-5/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | always connect file cache updater hooks first
| * | | | | 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 findLanguage
| * | | | | -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 ↵Björn Schießle2013-04-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | automatically
* | | | | | [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 colorcodes
| * | | | | Shorten CSS colorcodeskondou2013-04-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Only need to be three digits.
* | | | | | Merge pull request #2769 from owncloud/octemplateThomas Tanghus2013-04-151-0/+101
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add octemplate jQuery plugin
| * | | | | 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 ...
| * | | | | | also show black background on links that are active, fixes the news app that ↵Bernhard Posselt2013-04-151-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | doesnt show the bg for folders correctly
* | | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Update CONTRIBUTING.md
| * | | | | 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.