Commit Graph

17891 Commits

Author SHA1 Message Date
Thomas Müller f8cb8f4803 Merge branch 'master' into csrf-on-login-and-logout
Conflicts:
	core/templates/login.php
2014-05-19 20:40:55 +02:00
Thomas Müller b6d2d6329d Merge pull request #8639 from owncloud/drop-brief
Remove all occurences of @brief and @returns from PHPDoc
2014-05-19 20:18:32 +02:00
Morris Jobke dc36d30953 Remove all occurences of @brief and @returns from PHPDoc
* test case added to avoid adding them later
2014-05-19 17:50:53 +02: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 95741f3936 Merge pull request #8435 from owncloud/fix-8322-master
Expose permission via WebDAV
2014-05-19 16:52:03 +02:00
Thomas Müller 04e6c12fe2 Merge pull request #8557 from owncloud/custom_session_handling
Allow apps to create custom session handlers.
2014-05-19 15:58:30 +02:00
Andreas Fischer 6c4b650524 Merge pull request #8585 from owncloud/phpdoc-improvements-apps
PHPDoc improvements /apps

* owncloud/phpdoc-improvements-apps:
  Fix whitespace issues
  Reduce double-space with single-space.
  Remove spaces around | operator in doc block.
  Fix more missing or broken PHPDoc
  PHPDoc fixes for user_ldap
  Fix PHPDoc in /apps
2014-05-19 14:08:42 +02:00
Morris Jobke 1cff73b615 Merge branch 'libasys-patch-1' 2014-05-19 13:14:33 +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
Morris Jobke 804020bb6d Merge pull request #7363 from owncloud/optimize-startup-queries
Optimize some queries that are always executed when loading base.php
2014-05-19 01:21:37 +02:00
Morris Jobke db9cfaa56d Merge pull request #8592 from owncloud/login-timezone
Disable login button until the timezone is set
2014-05-19 01:14:03 +02:00
Jenkins for ownCloud a7509e5fd9 [tx-robot] updated from transifex 2014-05-18 01:55:01 -04:00
Vincent Petry b3d12412ce Merge pull request #8609 from owncloud/ie8-svgfallbackforicons
SVG fallback for a few icons
2014-05-17 18:20:47 +02:00
Jenkins for ownCloud a1b356c7b6 [tx-robot] updated from transifex 2014-05-17 01:57:38 -04:00
Robin McCorkell e7aebc5c32 Fix whitespace issues 2014-05-16 22:23:36 +01:00
Andreas Fischer 5b1ffd7611 Reduce double-space with single-space. 2014-05-16 22:21:57 +01:00
Andreas Fischer e04d956cac Remove spaces around | operator in doc block. 2014-05-16 22:21:57 +01:00
Robin McCorkell 6930ae22e4 Fix more missing or broken PHPDoc 2014-05-16 22:21:57 +01:00
Robin McCorkell a17f9111a0 PHPDoc fixes for user_ldap 2014-05-16 22:21:57 +01:00
Robin McCorkell c4f1de63a8 Fix PHPDoc in /apps 2014-05-16 22:21:57 +01:00
Björn Schießle 42b99b6d0f Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links
use default expire date only for link shares
2014-05-16 14:57:11 -04:00
Björn Schießle b52cb8f557 Merge pull request #8604 from owncloud/sharing_encforce_password
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
Bjoern Schiessle 7a48f24459 use default expire date only for link shares 2014-05-16 18:12:13 +02:00
Bjoern Schiessle b6e14af861 allow admin to enforce passwords for public link shares 2014-05-16 17:41:09 +02:00
Vincent Petry d5f60a8eb0 Merge pull request #8610 from owncloud/ie8-filesdndbug
Fix drag and drop in IE8
2014-05-16 17:27:50 +02:00
Vincent Petry 1fb0d5412c Merge pull request #6260 from owncloud/jan-navigation-filesidebar
Files app navigation sidebar
2014-05-16 13:00:35 +02:00
Vincent Petry f3d421d24b Fix drag and drop in IE8
For some reason IE8 didn't like the sort function, so using the one from
underscore instead.
2014-05-16 11:25:36 +02:00
Vincent Petry 9d3fcfcac8 SVG fallback for settings icon 2014-05-16 11:17:38 +02:00
Vincent Petry d4801e078e Fallback for triangle icons 2014-05-16 11:15:40 +02:00
Jenkins for ownCloud 43d6650d19 [tx-robot] updated from transifex 2014-05-16 01:55:55 -04:00
Vincent Petry 6fd084243b Fixed many issues, clean up
- fixed upload and storage statistics
- fixed infinite scroll to use the correct contain for scroll detection
- fixed unit test that sometimes fail for rename case
- controls are now sticky again
- fixed selection overlay to be aligned with the table
- fixed "select all" checkbox that had id conflicts
- fixed public page
- fixed global actions permissions detection
- fix when URL contains an invalid view id
- viewer mode now hides the sidebar (ex: text editor)
- added unit tests for trashbin
- clean up storage info in template (most is retrieved via ajax call now)
2014-05-15 17:51:04 +02:00
Vincent Petry 9d38e3602b Namespacing for FileList, FileActions and trashbin app
- FileList is now an instantiable class
- FileActions is now in namespace
- added App class for trashbin app
- moved trashbin overrides into classes extending FileList
- replaced many static calls with "this." or "self." to make the classes
  reusable/extendable
- new URL parameter "view" to specify which view is shown, for example
  "files" or "trashbin"
- added OC.Util.History utility class in core for handling history
- moved URL handling/routing to OCA.Files.App
- popstate will correctly update the current view and notify the view of
  the URL change so it can update the current dir
- added JS unitt tests for the trashbin app
- fixed public app to work with the new namespaces
2014-05-15 17:51:04 +02:00
Vincent Petry fb10bf4048 Files app navigation can now switch
- added new OCA.Files namespace for files classes
- the sidebar can now switch between views/containers
- the trashbin renders in its own container but currently doesn't work
  due to overrides
- added app.js as entry point for JS code (ideally all other files should
  only contain classes and not trigger anything)
2014-05-15 17:51:04 +02:00
Vincent Petry 88ebb15f1d Added navigation manager in files app for the sidebar
Apps can now register navigation items into the sidebar of the files app.
For every sidebar item there is a container.
The container's content is rendered based on the script name given at
registration time.
2014-05-15 17:51:04 +02:00
Vincent Petry 9ccb3279dd Added app navigation for files app
- Added links to trashbin and shared dir
- Moved "WebDAV" settings block to the app nav's settings section
- Added sidebar support in trashbin app as well
2014-05-15 17:51:04 +02:00
Vincent Petry 04f73275ba Now settings CSS class with appid in content DIV 2014-05-15 17:51:04 +02:00
Vincent Petry b2e8aa70cd Merge pull request #8603 from owncloud/trashbinfix
[regression] Fixed trashbin to use correct class
2014-05-15 17:49:18 +02:00
Vincent Petry 818c77684d Fixed trashbin to use correct class
It seems that \OC_Filesystemview has been removed.
Now using the correct class \OC\Files\View()
2014-05-15 15:21:27 +02:00
Jan-Christoph Borchardt 60efa0f1c8 Merge pull request #8140 from owncloud/login-valign
Vertically align public layout to better fit small mobile screens
2014-05-15 15:06:52 +02:00
Robin McCorkell a0f309bbd8 Merge pull request #8589 from fibsifan/files_external_sftp_port
rename URL-fields to Host for SFTP/FTP and SMB external Storage backends
2014-05-15 13:22:22 +01:00
fibsifan 06c084cc3c changing label "URL" to "Host" 2014-05-15 14:09:10 +02:00
Thomas Müller 7abe3b1989 Merge pull request #8587 from Raydiation/master
Small cleanup and language detection for apps
2014-05-15 12:22:47 +02:00
Vincent Petry 3daaf6ba4f Merge pull request #8597 from owncloud/l10n-fix-typo
fix typo encryption
2014-05-15 10:05:37 +02:00
Jenkins for ownCloud d9d684197a [tx-robot] updated from transifex 2014-05-15 01:55:53 -04:00
Volkan Gezer 5291f47c66 fix typo encryption 2014-05-15 01:29:14 +02:00