mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,058 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

2891 Commits

Author SHA1 Message Date
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 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
Jan-Christoph Borchardt 5bf13783e2 darken scrollbar to distinguish from selected sidebar items 2014-05-23 17:43:20 +02:00
Jan-Christoph Borchardt 7be0ce6ada remove noise texture from interface (not necessary, and blurry on high-res) 2014-05-23 14:15:36 +02:00
Arthur Schiwon e9fa74bfb7 save a whitespace 2014-05-23 10:55:54 +02:00
Arthur Schiwon 09bb8e0e3a add cli command to check a users last login 2014-05-23 10:37:34 +02:00
Björn Schießle 050df76830 Merge pull request #8599 from owncloud/sharing_disable_for_groups 
allow admin to disable sharing for specific groups of users
 2014-05-22 08:19:27 -04:00
Bjoern Schiessle 12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Remco Brenninkmeijer 4f0370f1da Fix for #8654 2014-05-22 10:35:01 +02:00
Thomas Müller 0249c6d8c7 Merge pull request #8634 from owncloud/handle-excpetions-in-console-master 
Handle excpetions in console master
 2014-05-22 10:30:33 +02:00
Jenkins for ownCloud 40fc1d5b4b [tx-robot] updated from transifex 2014-05-20 01:54:53 -04:00
Frank Karlitschek 090d127050 Merge pull request #6457 from owncloud/db-convert-tool 
Command line tool to convert current database to others, except sqlite
 2014-05-19 16:41:31 +01:00
Thomas Müller 58e22cefaf fix description of console command maintenance:repair - fixes #8574 2014-05-19 15:29:38 +02:00
libasys 9e1d47bd90 Add generic 'share by link' URL generator in share.js 
Some more global definition to autogenerate a "Shared by Link" with token! Why we not add these lines for more global use of the public service feature? At the moment there is a pr for sharing a calendar by Link. With this little mod the calendar can work with the core share api and needs no own js share definition!
 2014-05-19 13:12:59 +02:00
Morris Jobke 48977c8579 Merge pull request #7286 from owncloud/issue/4823 
Set expiration date by default when adding additional shares
 2014-05-19 10:26:54 +02:00
Jenkins for ownCloud d52252998a [tx-robot] updated from transifex 2014-05-19 01:54:46 -04:00
Morris Jobke f633fb537f fix wrong conflict resolution 2014-05-19 01:53:20 +02:00
Joas Schilling d273b55e98 Correctly set expiration dates when adding additional shares 2014-05-19 01:40:32 +02:00
Joas Schilling ab7ae004f7 Automatically copy the share expiration date when new shares are created 
Fix #4823
 2014-05-19 01:38:47 +02:00