]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agofix issue with filetable background
Georg Ehrke [Fri, 30 Aug 2013 20:05:44 +0000 (22:05 +0200)]
fix issue with filetable background

11 years agoMerge master into oc_preview
Georg Ehrke [Fri, 30 Aug 2013 16:11:18 +0000 (18:11 +0200)]
Merge master into oc_preview

11 years agoMerge pull request #4661 from owncloud/separate-app-styles
Jan-Christoph Borchardt [Fri, 30 Aug 2013 16:08:25 +0000 (09:08 -0700)]
Merge pull request #4661 from owncloud/separate-app-styles

Move CSS for apps and browser-specific fixes out of main styles.css

11 years agouse gerMimeTypeDetector detectPath instead of getMimeType
Georg Ehrke [Fri, 30 Aug 2013 16:07:49 +0000 (18:07 +0200)]
use gerMimeTypeDetector detectPath instead of getMimeType

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 30 Aug 2013 13:38:20 +0000 (09:38 -0400)]
[tx-robot] updated from transifex

11 years agoMerge pull request #4578 from houbaastef/master
Stephane Martin [Fri, 30 Aug 2013 13:20:07 +0000 (06:20 -0700)]
Merge pull request #4578 from houbaastef/master

fixes #4574

11 years agoMerge pull request #4660 from owncloud/apps-management-sticky
Morris Jobke [Fri, 30 Aug 2013 10:47:15 +0000 (03:47 -0700)]
Merge pull request #4660 from owncloud/apps-management-sticky

Apps management as sticky footer and rename to 'Apps', fix #4622

11 years agoUse Group methods for searching, fixes #4201
Arthur Schiwon [Wed, 21 Aug 2013 11:15:31 +0000 (13:15 +0200)]
Use Group methods for searching, fixes #4201

11 years agoprefix 'tbody tr' to separate app/core css errors
petemcfarlane [Fri, 30 Aug 2013 09:48:04 +0000 (10:48 +0100)]
prefix 'tbody tr' to separate app/core css errors

For specific details see:
https://github.com/owncloud/core/pull/4536/files#r6082305

11 years agoUse the real username in preferences and magic cookie instead of case-insensitive...
Arthur Schiwon [Thu, 29 Aug 2013 22:33:48 +0000 (00:33 +0200)]
Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616.

11 years agomove CSS for browser-specific fixes out of styles.css into new fixes.css
Jan-Christoph Borchardt [Fri, 30 Aug 2013 09:42:32 +0000 (11:42 +0200)]
move CSS for browser-specific fixes out of styles.css into new fixes.css

11 years agomove CSS for apps out of styles.css into new apps.css
Jan-Christoph Borchardt [Fri, 30 Aug 2013 09:38:49 +0000 (11:38 +0200)]
move CSS for apps out of styles.css into new apps.css

11 years agoApps management as sticky footer and rename to 'Apps', fix #4622
Jan-Christoph Borchardt [Fri, 30 Aug 2013 09:17:31 +0000 (11:17 +0200)]
Apps management as sticky footer and rename to 'Apps', fix #4622

11 years agoMerge pull request #4642 from masakik/master
Morris Jobke [Thu, 29 Aug 2013 19:05:32 +0000 (12:05 -0700)]
Merge pull request #4642 from masakik/master

Minor enhancement to console.php

11 years agoreplace ident spaces with tabs
Masaki [Thu, 29 Aug 2013 18:03:16 +0000 (15:03 -0300)]
replace ident spaces with tabs

11 years agoMerge pull request #4592 from owncloud/fix-logic
Thomas Müller [Thu, 29 Aug 2013 15:40:33 +0000 (08:40 -0700)]
Merge pull request #4592 from owncloud/fix-logic

fix weird logical behaviour

11 years agoMerge pull request #4643 from owncloud/touch-newfile-hook
Thomas Müller [Thu, 29 Aug 2013 15:37:46 +0000 (08:37 -0700)]
Merge pull request #4643 from owncloud/touch-newfile-hook

also emmit create hook when creating new files using touch()

11 years agofix parameter missing warning
Georg Ehrke [Thu, 29 Aug 2013 14:13:16 +0000 (16:13 +0200)]
fix parameter missing warning

11 years agoalso emmit create hook when creating new files using touch()
Robin Appelman [Thu, 29 Aug 2013 13:31:03 +0000 (15:31 +0200)]
also emmit create hook when creating new files using touch()

11 years agoenable usage with CLI interface
Masaki Kawabata Neto [Thu, 29 Aug 2013 13:03:58 +0000 (10:03 -0300)]
enable usage with CLI interface

Added option to use the status.php with console.php via CLI

11 years agoadded help and status commands
Masaki Kawabata Neto [Thu, 29 Aug 2013 13:00:53 +0000 (10:00 -0300)]
added help and status commands

switch structure enables many commands seamlessy.
also added some help and status command.

11 years agoadded help and status commands
Masaki Kawabata Neto [Thu, 29 Aug 2013 13:00:30 +0000 (10:00 -0300)]
added help and status commands

switch structure enables many commands seamlessy.
also added some help and status command.

11 years agowebdav quota information contains the values for used and free - not total
Thomas Müller [Thu, 29 Aug 2013 08:49:50 +0000 (10:49 +0200)]
webdav quota information contains the values for used and free - not total

11 years agoMerge master into oc_preview
Georg Ehrke [Thu, 29 Aug 2013 08:50:55 +0000 (10:50 +0200)]
Merge master into oc_preview

11 years agoinvert logic of disable_previews
Georg Ehrke [Thu, 29 Aug 2013 08:08:53 +0000 (10:08 +0200)]
invert logic of disable_previews

11 years agoMerge pull request #4552 from dampfklon/fix4552
Morris Jobke [Wed, 28 Aug 2013 22:46:51 +0000 (15:46 -0700)]
Merge pull request #4552 from dampfklon/fix4552

Make group suffix in share dialog translatable

11 years agoMerge pull request #4631 from owncloud/hotfix_4630
Morris Jobke [Wed, 28 Aug 2013 22:42:06 +0000 (15:42 -0700)]
Merge pull request #4631 from owncloud/hotfix_4630

Work around #4630 to fix license showing

11 years agoMerge pull request #3926 from owncloud/improve_filesummary
Thomas Müller [Wed, 28 Aug 2013 22:11:09 +0000 (15:11 -0700)]
Merge pull request #3926 from owncloud/improve_filesummary

Improve filelist summary

11 years agoMerge pull request #4614 from owncloud/trashbin_also_show_empty_folders
Thomas Müller [Wed, 28 Aug 2013 21:54:37 +0000 (14:54 -0700)]
Merge pull request #4614 from owncloud/trashbin_also_show_empty_folders

also move empty folders to the trash bin

11 years agoMerge pull request #4615 from owncloud/npm-modules
Thomas Müller [Wed, 28 Aug 2013 21:18:47 +0000 (14:18 -0700)]
Merge pull request #4615 from owncloud/npm-modules

Adds Node Modules to build in gitignore for easy testing.

11 years agoMerge pull request #4618 from owncloud/visualize-js
Morris Jobke [Wed, 28 Aug 2013 21:17:50 +0000 (14:17 -0700)]
Merge pull request #4618 from owncloud/visualize-js

visualize

11 years agofixing typo
Thomas Müller [Wed, 28 Aug 2013 21:04:55 +0000 (23:04 +0200)]
fixing typo

11 years agono duplicate declaration of appLicense + camelCase
Thomas Müller [Wed, 28 Aug 2013 20:42:43 +0000 (22:42 +0200)]
no duplicate declaration of appLicense + camelCase

11 years agoMerge pull request #3961 from owncloud/logrotate
Morris Jobke [Wed, 28 Aug 2013 20:17:38 +0000 (13:17 -0700)]
Merge pull request #3961 from owncloud/logrotate

Very simple log rotation

11 years agoWork around #4630 to fix license showing
kondou [Wed, 28 Aug 2013 20:12:01 +0000 (22:12 +0200)]
Work around #4630 to fix license showing

11 years agocalculate fontsize and line-height
Morris Jobke [Wed, 28 Aug 2013 19:54:20 +0000 (21:54 +0200)]
calculate fontsize and line-height

11 years agoupdate 3rdparty - md5
Morris Jobke [Wed, 28 Aug 2013 19:22:56 +0000 (21:22 +0200)]
update 3rdparty - md5

11 years agofix typo
Morris Jobke [Wed, 28 Aug 2013 16:36:32 +0000 (18:36 +0200)]
fix typo

11 years agoMerge pull request #4627 from owncloud/trashbin-tipsy
Morris Jobke [Wed, 28 Aug 2013 16:09:40 +0000 (09:09 -0700)]
Merge pull request #4627 from owncloud/trashbin-tipsy

change orientation for delete tooltip to left, fix #4589

11 years agochange orientation for delete tooltip to left, fix #4589
Jan-Christoph Borchardt [Wed, 28 Aug 2013 15:58:23 +0000 (17:58 +0200)]
change orientation for delete tooltip to left, fix #4589

11 years agoOnly enable logrotate when configured. Also rotate size is settable.
Bart Visscher [Wed, 28 Aug 2013 15:41:27 +0000 (17:41 +0200)]
Only enable logrotate when configured. Also rotate size is settable.

11 years agoCheck for installed state before registering the logrotate background job
Bart Visscher [Wed, 10 Jul 2013 16:07:43 +0000 (18:07 +0200)]
Check for installed state before registering the logrotate background job

11 years agoAdd description to log rotate class
Bart Visscher [Fri, 5 Jul 2013 20:59:42 +0000 (22:59 +0200)]
Add description to log rotate class

11 years agoReview fixes
Bart Visscher [Fri, 5 Jul 2013 20:42:17 +0000 (22:42 +0200)]
Review fixes

11 years agoVery simple log rotation
Bart Visscher [Fri, 5 Jul 2013 20:24:36 +0000 (22:24 +0200)]
Very simple log rotation

11 years agofix 3rdparty commit
Morris Jobke [Wed, 28 Aug 2013 14:59:12 +0000 (16:59 +0200)]
fix 3rdparty commit

11 years agoreviewers comments
Morris Jobke [Wed, 28 Aug 2013 14:52:12 +0000 (16:52 +0200)]
reviewers comments

11 years agoadd visualize
Morris Jobke [Wed, 28 Aug 2013 14:25:14 +0000 (16:25 +0200)]
add visualize

11 years agoAdds Node Modules to build in gitignore for easy testing.
raghunayyar [Wed, 28 Aug 2013 14:00:49 +0000 (19:30 +0530)]
Adds Node Modules to build in gitignore for easy testing.

11 years agoalso move empty folders to the trash bin as discussed here #4590
Bjoern Schiessle [Wed, 28 Aug 2013 13:46:44 +0000 (15:46 +0200)]
also move empty folders to the trash bin as discussed here #4590

11 years agoMerge pull request #4563 from owncloud/use_personal-password
Jan-Christoph Borchardt [Wed, 28 Aug 2013 13:23:13 +0000 (06:23 -0700)]
Merge pull request #4563 from owncloud/use_personal-password

Use personal-password for the password name in personal.php

11 years agoMerge pull request #4489 from owncloud/clean-3rdparty-mess-master
Bart Visscher [Wed, 28 Aug 2013 13:12:58 +0000 (06:12 -0700)]
Merge pull request #4489 from owncloud/clean-3rdparty-mess-master

Clean 3rdparty mess master

11 years agoReimplement filesummary in JS
kondou [Wed, 3 Jul 2013 17:50:03 +0000 (19:50 +0200)]
Reimplement filesummary in JS

Fix #993

11 years agoMerge pull request #3891 from owncloud/fix_loadAppScriptFile
Bart Visscher [Wed, 28 Aug 2013 13:10:06 +0000 (06:10 -0700)]
Merge pull request #3891 from owncloud/fix_loadAppScriptFile

Check if the app is enabled and the app path is found before trying to l...

11 years agoMerge pull request #4610 from owncloud/password-toggle-login
Morris Jobke [Wed, 28 Aug 2013 13:04:15 +0000 (06:04 -0700)]
Merge pull request #4610 from owncloud/password-toggle-login

Password toggle login

11 years agofix shadow style of username input box
Jan-Christoph Borchardt [Wed, 28 Aug 2013 11:59:23 +0000 (13:59 +0200)]
fix shadow style of username input box

11 years agoremove show password toggle from log in page, ref #4577 #4580
Jan-Christoph Borchardt [Wed, 28 Aug 2013 11:58:49 +0000 (13:58 +0200)]
remove show password toggle from log in page, ref #4577 #4580

11 years agoMerge pull request #4601 from owncloud/fixing-4341-master
Morris Jobke [Wed, 28 Aug 2013 11:42:50 +0000 (04:42 -0700)]
Merge pull request #4601 from owncloud/fixing-4341-master

backport of #4357 to master

11 years agoMerge pull request #4434 from owncloud/fix_octemplate_escaping
Thomas Tanghus [Wed, 28 Aug 2013 10:59:43 +0000 (03:59 -0700)]
Merge pull request #4434 from owncloud/fix_octemplate_escaping

Fix octemplate string escaping.

11 years agoCache Object.keys(this.vars)
Thomas Tanghus [Wed, 28 Aug 2013 10:50:05 +0000 (12:50 +0200)]
Cache Object.keys(this.vars)

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 28 Aug 2013 10:24:14 +0000 (06:24 -0400)]
[tx-robot] updated from transifex

11 years agobackport of #4357 to master
Thomas Müller [Tue, 27 Aug 2013 21:53:04 +0000 (23:53 +0200)]
backport of #4357 to master

11 years agoMerge pull request #4572 from NCTU-NBA/pr-checkbox-displacement
Morris Jobke [Tue, 27 Aug 2013 21:21:34 +0000 (14:21 -0700)]
Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement

Fix "select all" checkbox displacement when checked, fix #4571

11 years agoLDAP: case insensitive replace for more robustness
Arthur Schiwon [Tue, 27 Aug 2013 11:47:31 +0000 (13:47 +0200)]
LDAP: case insensitive replace for more robustness

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 27 Aug 2013 15:23:18 +0000 (11:23 -0400)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3208 from owncloud/api_capabilities_quota
Morris Jobke [Tue, 27 Aug 2013 15:07:47 +0000 (08:07 -0700)]
Merge pull request #3208 from owncloud/api_capabilities_quota

Add the quota to the external API for use with the mobile and desktop clients

11 years agoadd documentation
Morris Jobke [Tue, 27 Aug 2013 14:07:25 +0000 (16:07 +0200)]
add documentation

11 years agoMerge pull request #4596 from owncloud/fix_isEmpty_trash
Björn Schießle [Tue, 27 Aug 2013 13:40:39 +0000 (06:40 -0700)]
Merge pull request #4596 from owncloud/fix_isEmpty_trash

trash bin: fix isEmpty() function

11 years agoCode style
Tom Needham [Wed, 1 May 2013 17:26:02 +0000 (18:26 +0100)]
Code style

11 years agoAdd quota to core api
Tom Needham [Wed, 1 May 2013 17:20:46 +0000 (18:20 +0100)]
Add quota to core api

11 years agothe trash bin can also contain empty files. Don't use the trash bin size as indicator...
Bjoern Schiessle [Tue, 27 Aug 2013 12:39:43 +0000 (14:39 +0200)]
the trash bin can also contain empty files. Don't use the trash bin size as indicator to decide if the trash bin is empty or not

11 years agoMerge pull request #4348 from owncloud/fixing-4343-master
Jörn Friedrich Dreyer [Tue, 27 Aug 2013 11:26:51 +0000 (04:26 -0700)]
Merge pull request #4348 from owncloud/fixing-4343-master

fixes #4343

11 years agoMerge pull request #4507 from owncloud/existingusersfromgroup
blizzz [Tue, 27 Aug 2013 10:47:56 +0000 (03:47 -0700)]
Merge pull request #4507 from owncloud/existingusersfromgroup

return only existing users in group

11 years agoMerge pull request #4586 from owncloud/fixing-3431-master
Morris Jobke [Tue, 27 Aug 2013 09:00:48 +0000 (02:00 -0700)]
Merge pull request #4586 from owncloud/fixing-3431-master

kill zh_CN.GB2312

11 years agofix weird logical behaviour
Morris Jobke [Tue, 27 Aug 2013 08:58:17 +0000 (10:58 +0200)]
fix weird logical behaviour

11 years agorevert debugging code which accidentially entered this pull request
Thomas Müller [Tue, 27 Aug 2013 08:49:10 +0000 (10:49 +0200)]
revert debugging code which accidentially entered this pull request

11 years agoMerge pull request #4585 from owncloud/fixing-4385-master
Morris Jobke [Tue, 27 Aug 2013 08:40:50 +0000 (01:40 -0700)]
Merge pull request #4585 from owncloud/fixing-4385-master

Fixing 4385 master

11 years agoMerge pull request #4584 from owncloud/fixing-4575-master
Morris Jobke [Tue, 27 Aug 2013 08:26:16 +0000 (01:26 -0700)]
Merge pull request #4584 from owncloud/fixing-4575-master

adding translations to update events

11 years agokill zh_CN.GB2312
Thomas Müller [Mon, 26 Aug 2013 23:27:05 +0000 (01:27 +0200)]
kill zh_CN.GB2312

11 years agostorage information is path specific
Thomas Müller [Mon, 26 Aug 2013 22:59:58 +0000 (00:59 +0200)]
storage information is path specific

11 years agowebdav quota now displays the same values as the web interface does
Thomas Müller [Mon, 26 Aug 2013 22:57:28 +0000 (00:57 +0200)]
webdav quota now displays the same values as the web interface does

11 years agoadding translations to update events
Thomas Müller [Mon, 26 Aug 2013 22:26:44 +0000 (00:26 +0200)]
adding translations to update events

11 years agolacy initialization of fileView - in case basic auth is used FileSystem is not yet...
Thomas Müller [Mon, 26 Aug 2013 18:21:16 +0000 (20:21 +0200)]
lacy initialization of fileView - in case basic auth is used FileSystem is not yet initialized during the initialize() call

11 years agoMerge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso...
Morris Jobke [Mon, 26 Aug 2013 16:04:49 +0000 (18:04 +0200)]
Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso-xsendfile_complete_zip_fix from pull request #3307

Conflicts:
lib/helper.php

11 years agoconsolidate validity check for users in group class
Arthur Schiwon [Mon, 26 Aug 2013 15:46:31 +0000 (17:46 +0200)]
consolidate validity check for users in group class

11 years agouse random string as id for checkbox
Georg Ehrke [Mon, 26 Aug 2013 14:33:51 +0000 (16:33 +0200)]
use random string as id for checkbox

11 years agofixes #4574
Stephane Martin [Mon, 26 Aug 2013 13:16:41 +0000 (15:16 +0200)]
fixes #4574

11 years agofix background size in filelist.js
Georg Ehrke [Mon, 26 Aug 2013 12:36:18 +0000 (14:36 +0200)]
fix background size in filelist.js

11 years agoMerge pull request #4292 from owncloud/add_appconfig_unittest
Bart Visscher [Mon, 26 Aug 2013 11:07:18 +0000 (04:07 -0700)]
Merge pull request #4292 from owncloud/add_appconfig_unittest

Add \OC_Appconfig Unittest

11 years agoMerge master into oc_preview
Georg Ehrke [Mon, 26 Aug 2013 10:24:33 +0000 (12:24 +0200)]
Merge master into oc_preview

11 years agofix preview issue when uploading a file with parentheses
Georg Ehrke [Mon, 26 Aug 2013 10:16:51 +0000 (12:16 +0200)]
fix preview issue when uploading a file with parentheses

11 years agoMerge pull request #4281 from owncloud/ie8-multiselect
Morris Jobke [Mon, 26 Aug 2013 09:59:31 +0000 (02:59 -0700)]
Merge pull request #4281 from owncloud/ie8-multiselect

Better ie8 multiselect

11 years agoMerge pull request #4542 from owncloud/fixing-4504-master
Morris Jobke [Mon, 26 Aug 2013 09:19:32 +0000 (02:19 -0700)]
Merge pull request #4542 from owncloud/fixing-4504-master

remove duplicate code

11 years agoMerge pull request #4519 from owncloud/style-fixes
Morris Jobke [Mon, 26 Aug 2013 07:47:34 +0000 (00:47 -0700)]
Merge pull request #4519 from owncloud/style-fixes

fix minor style issue in the app navigation

11 years agofix reviewers concerns
Morris Jobke [Mon, 26 Aug 2013 07:44:21 +0000 (09:44 +0200)]
fix reviewers concerns

11 years agoFix "select all" checkbox displacement when checked
Pellaeon Lin [Mon, 26 Aug 2013 02:57:14 +0000 (10:57 +0800)]
Fix "select all" checkbox displacement when checked

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 25 Aug 2013 23:21:52 +0000 (19:21 -0400)]
[tx-robot] updated from transifex

11 years agoMerge pull request #4331 from owncloud/improve_app-management
Christopher [Sun, 25 Aug 2013 18:56:56 +0000 (11:56 -0700)]
Merge pull request #4331 from owncloud/improve_app-management

Improve app-management

11 years agoUse personal-password for the password name in personal.php
kondou [Sat, 24 Aug 2013 12:31:32 +0000 (14:31 +0200)]
Use personal-password for the password name in personal.php

Fix #4491

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 24 Aug 2013 00:17:08 +0000 (20:17 -0400)]
[tx-robot] updated from transifex