Commit Graph

2911 Commits

Author SHA1 Message Date
Vincent Petry d677e3860d Added unit tests for share.js and share icon 2014-06-02 15:59:06 +02:00
Vincent Petry 7961d4a87e Update share action text to display owner/recipients
- when a share was changed, update the share action text
- added file data attribute "data-share-recipients"
2014-06-02 12:12:57 +02:00
Vincent Petry f931df2dac Merge pull request #8718 from owncloud/share_icons_for_shared_by
add share icons for folders shared by the current user
2014-06-02 12:03:22 +02:00
Vincent Petry 4e957c7b18 Merge pull request #8443 from owncloud/csrf-on-login-and-logout
Add CSRF check on login and logout
2014-06-02 11:27:20 +02:00
Morris Jobke 27c8c87e94 Merge pull request #8187 from owncloud/escape-more-character
Also encode > and '
2014-06-02 10:59:47 +02:00
Jenkins for ownCloud d39216c5e7 [tx-robot] updated from transifex 2014-06-02 01:54:37 -04:00
Jenkins for ownCloud 36b0c599f5 [tx-robot] updated from transifex 2014-06-01 01:55:19 -04:00
Lukas Reschke 603b6c13b4 Fix typo 2014-05-31 21:11:29 +02:00
Vincent Petry 56b60b9cd2 Merge pull request #8798 from owncloud/fix-corejs
Fix undefined JS on login/setup page
2014-05-31 17:26:30 +02:00
Jenkins for ownCloud cff9440a37 [tx-robot] updated from transifex 2014-05-31 01:55:46 -04:00
Vincent Petry a0987ebf59 Fix undefined JS on login/setup page 2014-05-30 19:02:19 +02:00
Bjoern Schiessle 717eff22d4 add share icons for folders shared by the current user 2014-05-30 15:14:01 +02:00
Vincent Petry 66afd1aa39 Fix fileList fallback in OC.Share for outside files app
OC.Share can be used in non-files apps, so the fileList callback needs
to support that as well.
2014-05-30 10:06:30 +02:00
Vincent Petry 1d9129eac3 Sharing overview fixes and unit tests
- Fixed renaming and fileActionsReady event
- Added unit tests for shares list
- Fixed public page with defer
- Fixed file actions in sharing overview
- Fixed sharing counterpart list (10 entries max)
- Fixed file path attribute to be used in download action
- Fix sharing list headers
- OC.Share icons now operate on fileList instance
- Fix OC.Share.updateIcon when more than one list in DOM
2014-05-30 10:06:29 +02:00
Vincent Petry c9d05c66de Fix IE8 issue when icon is not defined
Sometimes no icon file is passed to replaceSVGIcon(), it showed an error
in IE8 and broke the code flow.

This fix adds a check whether the file name is set.
2014-05-30 10:06:29 +02:00
Vincent Petry 60bcdc550e Fixed file actions for sharing views
FileActions can now be clone to be use for separate file list views
without having the side-effect of affecting the main file list view.

Added "Open" action in sharing overview file lists to redirect to the
regular file list when clicking on a folder.
2014-05-30 10:06:29 +02:00
Vincent Petry 6ebc436505 Added sharing overview page (WIP)
- added sharing overview entries in the sidebar
- use OCS Share API to get the list of files
2014-05-30 10:06:29 +02:00
Jenkins for ownCloud 929882a32a [tx-robot] updated from transifex 2014-05-30 01:55:11 -04:00
Lukas Reschke 5cd0fd2559 Merge pull request #8700 from owncloud/design-smallfixes
Design detail fixes
2014-05-29 21:54:15 +02:00
Lukas Reschke 705242d390 Merge pull request #8727 from owncloud/upgrade-overview
Added update overview page
2014-05-29 21:28:47 +02:00
Lukas Reschke c8b32f4309 Remove deprecated functions
This functions have been deprecated since Oct 2012 (ownCloud 5), let's finally remove them for ownCloud 7.

Ref c4b8bb1041
2014-05-29 17:01:30 +02:00
Andreas Fischer 9fba8221a6 Merge pull request #8554 from owncloud/add_resetadminpass_command
Add a resetadminpass command to console

* owncloud/add_resetadminpass_command:
  Move resetpassword into user: command space.
  Document type of user project.
  Receive \OC\User\Manager as a constructor dependency.
  Use userManager, color output, return 1 on error
  Add doc, check return-value, fix spacing, require interactive
  Back to the future
  Make ResetAdminPass to ResetPassword
  Add a resetadminpass command to console - fix #8248
2014-05-29 14:43:27 +02:00
Jenkins for ownCloud 368006c7af [tx-robot] updated from transifex 2014-05-29 01:54:40 -04:00
Andreas Fischer 678a6b98ff Merge pull request #8748 from owncloud/cli_maintenance_mode
Add ability to enable/disable maintenance mode from cli.

* owncloud/cli_maintenance_mode:
  Use OC\Config instead of OC_Config
  Changed class name to mode
  Add ability to enable/disable maintenance mode from cli.
2014-05-29 03:45:49 +02:00
Andreas Fischer 5754b0b9e7 Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_command
* owncloud/master: (238 commits)
  Change visibility of scanner internals
  [tx-robot] updated from transifex
  remove legacy OC_Filesystem being used in a hook callback
  add title property to share dialog
  forgotten infobox messages translations
  reverts 188c543 and translates only mail
  fix warning text and margin
  Adjust core apps to use "requiremin" instead of "require"
  Added requiremin/requiremax fields for apps
  [tx-robot] updated from transifex
  unwrapped strings fix
  allow resharing of files with only share permissions
  don't lose file size during rename
  drop superflous statement in phpdoc
  add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook
  [tx-robot] updated from transifex
  fix grammar
  make user_ldap fully translatable
  [tx-robot] updated from transifex
  fix typo
  ...

Conflicts:
	core/register_command.php
2014-05-28 22:57:33 +02:00
Andreas Fischer f81ee94cad Move resetpassword into user: command space. 2014-05-28 22:53:44 +02:00
Andreas Fischer 8981929e92 Document type of user project. 2014-05-28 22:48:35 +02:00
Andreas Fischer 52e7bf9630 Receive \OC\User\Manager as a constructor dependency. 2014-05-28 22:42:33 +02:00
scolebrook 43759f1f46 Use OC\Config instead of OC_Config 2014-05-28 16:26:13 -04:00
Lukas Reschke 360a79b8f4 Add unit tests for escapeHTML 2014-05-28 22:14:05 +02:00
Lukas Reschke ce9d5df6df Merge pull request #8681 from owncloud/logintimestamp
Record login timestamp per user. Required for new user managament.
2014-05-28 19:06:47 +02:00
scolebrook 00f811f09c Changed class name to mode 2014-05-28 09:41:34 -04:00
Vincent Petry 7e055a9404 Fixed DOM elements, styling and code style issues
- Reduced number of DOM elements
- Also added mention of "config" backup.
2014-05-28 11:29:22 +02:00
Volkan Gezer de1f7c9600 Merge pull request #8750 from owncloud/l10n-add-title-property
add title property to share dialog will close #8638
2014-05-28 10:52:00 +02:00
Jan-Christoph Borchardt 3d701ca3ca Merge pull request #8732 from owncloud/fix-warning-text
fix warning text and margin. fixes #8715
2014-05-28 10:43:28 +02:00
Jenkins for ownCloud 80641cae72 [tx-robot] updated from transifex 2014-05-28 01:56:09 -04:00
Volkan Gezer 9c5fdc5005 add title property to share dialog 2014-05-27 22:09:55 +02:00
scolebrook 7151369e5f Add ability to enable/disable maintenance mode from cli. 2014-05-27 13:03:53 -04:00
Vincent Petry ca45937d84 Fixed styles in update overview page 2014-05-27 16:36:21 +02:00
Vincent Petry 02f682b156 Now showing disabled apps as upgrade status line
- Added app id in update overview.
- Added status message for disabled app for CLI upgrade and web upgrade
2014-05-27 15:20:33 +02:00
Vincent Petry 146583a98d Added update overview page 2014-05-27 14:53:08 +02:00
Volkan Gezer 46555b50a1 fix warning text and margin 2014-05-27 12:29:08 +02:00
Jenkins for ownCloud a756666585 [tx-robot] updated from transifex 2014-05-27 01:54:54 -04:00
Jenkins for ownCloud 790c0e8e7c [tx-robot] updated from transifex 2014-05-26 01:55:36 -04:00
Jenkins for ownCloud 3029029afd [tx-robot] updated from transifex 2014-05-25 01:54:35 -04:00
kondou f216d81408 Use userManager, color output, return 1 on error 2014-05-24 09:49:02 +02:00
Jenkins for ownCloud 2afdd1bf1a [tx-robot] updated from transifex 2014-05-24 01:55:34 -04:00
Arthur Schiwon 7f7999c7d8 print time in 24h format 2014-05-23 19:12:51 +02:00
Jan-Christoph Borchardt 0977911c82 fix height of select boxes for OS X 2014-05-23 18:03:01 +02:00
Jan-Christoph Borchardt 574e4f0579 use user-select: none; on header, navigation and user menu 2014-05-23 17:57:29 +02:00