Commit Graph

3046 Commits

Author SHA1 Message Date
Robin Appelman 163a7a47f9 Add prompt dialog to OC.dialogs 2014-05-09 17:09:06 +02:00
Jan-Christoph Borchardt bba2d60d36 Merge pull request #8496 from owncloud/fix-folder-icon
fix folder icon (file had a big background rectangle before)
2014-05-09 14:19:26 +02:00
Andreas Fischer 603ce95211 Add message about unsupported Microsoft SQL Server. 2014-05-09 12:31:29 +02:00
Andreas Fischer de78be3891 Store normalised DBMS type in $type. 2014-05-09 12:31:08 +02:00
Jan-Christoph Borchardt 4d595f49a0 reduce multiselect max-width from 400 to 200px to not take too much space 2014-05-09 11:09:31 +02:00
Jenkins for ownCloud 9919ec48df [tx-robot] updated from transifex 2014-05-09 01:55:42 -04:00
Jan-Christoph Borchardt 04ea938331 fix folder icon (file had a big background rectangle before) 2014-05-07 11:13:52 +02:00
Jenkins for ownCloud 283b483100 [tx-robot] updated from transifex 2014-05-07 01:55:48 -04:00
Jan-Christoph Borchardt c1dfdbbbb4 fix enlarged caret on installation page 2014-05-06 12:17:13 +02:00
Thomas Müller 341fcdc37a Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master
Images on public sharing get downscaled to increase use experience - thi...
2014-05-05 10:12:40 +02:00
jbtbnl 11300621ef Move vertical alignment of public layout to mobile. Refs #8140 2014-05-04 16:24:01 +02:00
Lukas Reschke 73b914ddbc Add CSRF check on login and logout
This is a minor issue and not worth a backport in my opinion as it could break more things than it's worth having it.
2014-05-04 13:56:21 +02:00
Jenkins for ownCloud cf20de185c [tx-robot] updated from transifex 2014-05-03 01:56:11 -04:00
Thomas Müller 20893cc3b3 Images on public sharing get downscaled to increase use experience - this will speed up loading time
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
2014-05-02 17:02:57 +02:00
Thomas Müller 49d9631eee Merge pull request #8400 from owncloud/download-button-public-folder
reintroduce download button on public shares
2014-05-02 16:59:09 +02:00
Jan-Christoph Borchardt 899c7c0443 fix position and look of public download button 2014-05-02 15:26:21 +02:00
Jan-Christoph Borchardt a280a69ecc remove unneeded header-right details styles 2014-05-02 15:14:41 +02:00
Jenkins for ownCloud 17f5a18922 [tx-robot] updated from transifex 2014-05-01 01:56:01 -04:00
Morris Jobke 09fb533167 Merge pull request #8405 from owncloud/remove-leftcontent-rightcontent
remove leftcontent and rightcontent CSS, no longer needed
2014-04-30 14:28:33 +02:00
Jenkins for ownCloud 654a6e6c6a [tx-robot] updated from transifex 2014-04-30 01:57:53 -04:00
Jan-Christoph Borchardt 4f873690d3 remove leftcontent and rightcontent CSS, no longer needed 2014-04-29 16:55:35 +02:00
Morris Jobke 14e568b13c fix oc dialog because the body isn't 100% x 100% in dimensions anymore 2014-04-29 15:34:48 +02:00
Jan-Christoph Borchardt 158b870589 Merge pull request #6870 from owncloud/uncheck-remember-checkbox
do not check 'remember' log in by default
2014-04-29 10:22:02 +02:00
Vincent Petry 9c2fbea6a4 Fix file selection for infinite scrolling
- moved file selection code to FileList
- fix selection summary when all files are selected
- nextPage now auto-selects files if "select all" checkbox is checked
- fixed trashbin to use the same selection logic as FileList
2014-04-28 14:55:00 +02:00
Vincent Petry 9f62059efa Fix file summary to use the whole file list
- moved the summary code into a new class FileSummary
- FileSummary is calculated only once, then updated with add/remove
- added new OC.Util namespace for JS utility functions
2014-04-28 14:49:39 +02:00
Vincent Petry efdf0c4df0 Added infinite scrolling (in-memory list) 2014-04-28 14:34:28 +02:00
Jenkins for ownCloud 642f57c1d5 [tx-robot] updated from transifex 2014-04-28 01:56:24 -04:00
Jan-Christoph Borchardt b41fc7cb7a Merge pull request #8352 from owncloud/icons
Icon improvements
2014-04-25 13:18:55 +02:00
Morris Jobke 99c2c6b1c6 remove metadata 2014-04-25 13:15:58 +02:00
Jan-Christoph Borchardt 93d2ff73f1 use trash as delete icon to differentiate from close 2014-04-25 12:40:14 +02:00
Jan-Christoph Borchardt ad9ff07569 compress view-close icon 2014-04-25 12:16:17 +02:00
Jenkins for ownCloud 3fc809dfd8 [tx-robot] updated from transifex 2014-04-25 01:56:28 -04:00
Jenkins for ownCloud 435672feaa [tx-robot] updated from transifex 2014-04-24 01:55:33 -04:00
Thomas Müller 032f38b230 Merge pull request #8213 from cbojar/master
Clean up js.js along suggestions from scrutinizer-ci, fixes #8204.
2014-04-23 11:05:00 +02:00
Thomas Müller 09f72204ee Merge pull request #8315 from owncloud/fix-8294
add uncompressed jquery files - fixes #8294
2014-04-23 09:28:44 +02:00
Jenkins for ownCloud 3f453d1641 [tx-robot] updated from transifex 2014-04-23 01:56:35 -04:00
Volkan Gezer ce835a3247 add uncompressed jquery files - fixes #8294 2014-04-23 00:07:00 +02:00
Thomas Müller f353e6f669 Merge pull request #8286 from owncloud/use-proper-jsdoc
Use proper JSDoc documentation instead of inconsistent documentation styles
2014-04-22 12:00:25 +02:00
Jan-Christoph Borchardt e7e87f4d9f improve upload and download icons 2014-04-22 11:47:01 +02:00
Jan-Christoph Borchardt 378f79b2d9 improve delete and close icons 2014-04-22 11:37:30 +02:00
Jan-Christoph Borchardt cef795790f thinner add icon 2014-04-22 11:36:39 +02:00
Lukas Reschke 381c1c8b6e Fix typo
to => too
2014-04-22 10:43:35 +02:00
Thomas Müller 29bc82be8d fixing typos 2014-04-22 09:54:25 +02:00
Thomas Müller 56bc5f8f43 fixing typo 2014-04-22 09:43:29 +02:00
Jenkins for ownCloud a9b4fba528 [tx-robot] updated from transifex 2014-04-22 01:54:58 -04:00
Lukas Reschke e88731a477 Some more PHPDoc fixes 2014-04-21 15:44:54 +02:00
Lukas Reschke 51eee3dec1 Fix JSDoc 2014-04-21 14:42:50 +02:00
Lukas Reschke 8fcffae1e2 Reuse selector 2014-04-21 14:28:54 +02:00
Lukas Reschke 539cecbd63 Use proper JSDoc documentation 2014-04-21 13:46:33 +02:00
Jenkins for ownCloud 4fe5ca1908 [tx-robot] updated from transifex 2014-04-21 01:56:06 -04:00
Lukas Reschke 199ee18c0c Merge pull request #8229 from owncloud/menutoggle-mobile
do not show menu toggle on public share links as there is no menu
2014-04-20 01:13:24 +02:00
Jenkins for ownCloud 1abd9c1305 [tx-robot] updated from transifex 2014-04-19 01:56:06 -04:00
Morris Jobke fe654ece99 Merge pull request #8246 from Gared/master
Fix javascript error in calendar app
2014-04-17 15:37:35 +02:00
Morris Jobke 0b4431216d Merge pull request #8236 from owncloud/header-right-fix
remove duplication of header and 'header-right' element, also ellipsize when too wide
2014-04-17 15:18:40 +02:00
Jenkins for ownCloud a7d7ca2fb3 [tx-robot] updated from transifex 2014-04-17 01:56:06 -04:00
cbojar 4a541e38e0 Clean up js.js along suggestions from scrutinizer-ci, fixes #8204.
Also used JSHint.com to find a few other issues.

-Strict comparisons (===)
-Fixed regex escaping errors
-Refactored OC.buildQueryString to use jQuery.map
-Missing semicolons
-Braces around if block

Left some of the mixed spaces/tabs as they are for alignment in comments.
2014-04-16 22:51:09 -04:00
Morris Jobke 2f6eed4f9d Merge pull request #7994 from owncloud/fix-login-fields
Fix login fields
2014-04-16 23:17:49 +02:00
Stefan 1d8eb44677 Fix javascript error in calendar app
Fix owncloud/calendar#409
If you haven't allowed to share items per email the element "email" will never appear and you will get a null exception.

License: WTFPL
2014-04-16 22:41:57 +02:00
Jan-Christoph Borchardt 7178e39569 Merge pull request #8235 from owncloud/fix-error-mobile
fix error display on smaller screens, fix #8090
2014-04-16 21:35:43 +02:00
Jan-Christoph Borchardt 03ad908c30 fix overlapping infield labels 2014-04-16 17:49:46 +02:00
Jan-Christoph Borchardt 067a5cdee7 fix database infield label indentation 2014-04-16 17:44:05 +02:00
Jan-Christoph Borchardt 6a79b7f2b5 fix sizing for fields when password is shown 2014-04-16 17:43:15 +02:00
Jan-Christoph Borchardt e68006c0ce Merge pull request #8157 from owncloud/share-expiration-smooth-hide
Expiration date is hidden smoothly
2014-04-16 17:10:14 +02:00
Jan-Christoph Borchardt 9c6f8e59ae fix header code duplication, code style fixes 2014-04-16 16:26:41 +02:00
Jan-Christoph Borchardt 547ddf7775 remove duplication of 'header-right' element, also make it overflow when too wide 2014-04-16 15:53:38 +02:00
Jan-Christoph Borchardt 7110ecbf06 fix error display on smaller screens, fix #8090 2014-04-16 15:31:15 +02:00
Jan-Christoph Borchardt 9dabed04a4 do not show menu toggle on public share links as there is no menu 2014-04-16 10:49:16 +02:00
Jenkins for ownCloud 23f2c48a43 [tx-robot] updated from transifex 2014-04-16 01:57:34 -04:00
Thomas Müller 7f4fefd7ad Merge pull request #8211 from owncloud/flush-head-master
Flush the Buffer Early - right after head
2014-04-15 21:34:22 +02:00
Andreas Fischer 0a78fb49f5 Pass Connection instead of AbstractSchemaManager to clearSchema(). 2014-04-15 18:20:36 +02:00
Andreas Fischer f1d05d204e Use exceptions for in input validation. 2014-04-15 18:14:26 +02:00
Andreas Fischer 854dd8fa7c Do not block when nothing is passed via stdin. 2014-04-15 18:04:54 +02:00
Andreas Fischer d2c7a8ee59 Do not ask for password before input parameter validation. 2014-04-15 17:49:28 +02:00
Andreas Fischer 8e758513c8 Remove unnecessary sprintf. 2014-04-15 17:21:55 +02:00
Andreas Fischer 6b2876c64d Move (extended) input validation out into validateInput() method. 2014-04-15 17:20:31 +02:00
Andreas Fischer 5fe25868bc Add message for converting to SQLite being unsupported. 2014-04-15 17:14:26 +02:00
Thomas Müller d826f33fae Merge pull request #8127 from owncloud/searchresults-mobile
make search results work on mobile as well
2014-04-15 17:10:01 +02:00
Andreas Fischer 9823d54bb8 Use a variable for the DBMS tyoe we are converting to. 2014-04-15 17:06:13 +02:00
Thomas Müller 30168169b9 Flush the Buffer Early - right after head 2014-04-15 16:56:45 +02:00
Andreas Fischer bd37010f35 Merge remote-tracking branch 'owncloud/master' into db-convert-tool
* owncloud/master: (61 commits)
  [tx-robot] updated from transifex
  Make email display name change translatable again
  Ignore jquery.multiselect.js - it's 3rdparty
  javascript code cleanup + fixing syntax errors
  Revert "close-button for share_dropdown"
  close-button for share_dropdown
  [tx-robot] updated from transifex
  The latest developer manual link
  The latest developer manual link
  p() and print_unescaped() also take arrays as parameter
  Check whether the user has permissions to add personal storage backends
  [tx-robot] updated from transifex
  Fix a wrong WebDAV Warning with self-signed-certs
  fix translation link
  upda mailinglist address
  fix contribute link
  default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute
  Correctly process request parameters other than GET or POST, dont use globals in the class but inject it
  [tx-robot] updated from transifex
  use references for middleware to fix problems on 5.3
  ...
2014-04-15 15:44:44 +02:00
Thomas Müller 1fdd17b9b1 javascript code cleanup + fixing syntax errors 2014-04-14 19:29:00 +02:00
Julian Müller 463df08088 Revert "close-button for share_dropdown"
This reverts commit 3bc3d4c9f3.
2014-04-14 18:40:24 +02:00
Andreas Fischer 9cc41a2460 Move PostgreSQL sequence resynchronisation out into PgSqlTools class. 2014-04-14 18:37:47 +02:00
Andreas Fischer b0e6542dc2 Add error handling for --clear-schema on Oracle. 2014-04-14 18:37:47 +02:00
Julian Müller 3bc3d4c9f3 close-button for share_dropdown 2014-04-14 18:26:45 +02:00
Andreas Fischer e3b0b40779 Do not quote table names on Oracle. They appear to be already quoted.
Without this commit, Oracle complains as follows:
  [Doctrine\DBAL\DBALException]
  An exception occurred while executing 'INSERT INTO "oc_appconfig" ("""appid""",
  """configkey""", """configvalue""") VALUES (?, ?, ?)' with params ["core",
  "installedat", "1396972927.537"]:

  ORA-01741: illegal zero-length identifier
2014-04-14 17:52:34 +02:00
Lukas Reschke 6e424eb990 Also encode > and ' 2014-04-13 15:24:35 +02:00
Andreas Fischer f35eae6442 Remove unnecessary +1 from PostgreSQL sequence correction query. 2014-04-11 21:56:14 +02:00
Andreas Fischer 94522586c1 Better variable names for table arrays. 2014-04-11 21:46:02 +02:00
Andreas Fischer 731571491f Improve message about tables not going to be converted. Mention --all-apps option. 2014-04-11 21:40:45 +02:00
Jenkins for ownCloud 36107e1bad [tx-robot] updated from transifex 2014-04-11 01:55:15 -04:00
Thomas Müller dcca5f7bdd Merge pull request #5857 from owncloud/type-ahead-share-by-mail-master
introduce auto completion on share email - integrated with the contactsm...
2014-04-11 00:04:58 +02:00
Volkan Gezer 9e9c109390 Expiration date is hidden smoothly
From now on, it is hidden smoothly as the other fields do.
2014-04-10 21:54:25 +02:00
Jenkins for ownCloud 7c072510d3 [tx-robot] updated from transifex 2014-04-10 01:55:39 -04:00
jbtbnl b10bf72999 Vertically align public layout to better fit small mobile screens 2014-04-10 00:33:55 +02:00
Andreas Fischer 56b6504d59 Extract schema creation code into its own method. 2014-04-09 16:46:21 +02:00
Andreas Fischer 370593361b Add option to create all app schemas instead of just installed app. 2014-04-09 16:42:22 +02:00
Andreas Fischer 5ef7d69d41 Do not attempt to covert to the same DBMS. 2014-04-09 15:57:33 +02:00
Andreas Fischer 03a3f66867 Move schema clearing to extra method. 2014-04-09 15:45:30 +02:00
Vincent Petry f84d66a24f Moved SVGSupport call to use OC.Util.SVGSupport() 2014-04-09 15:23:09 +02:00
Andreas Fischer 3e0858e51f private -> protected 2014-04-09 15:21:57 +02:00
Andreas Fischer 78ee4c1327 Merge remote-tracking branch 'owncloud/master' into db-convert-tool
* owncloud/master: (137 commits)
  add comment to clearify when a skip in the foreach happens
  remove obsolete code
  Always define sendmail_is_available
  [tx-robot] updated from transifex
  Make hardcoded exception messages translatable
  Disable sharing in trashbin app
  class Test_Config is already declared
  [tx-robot] updated from transifex
  using array_key_exists() instead of isset() - required because in case the value is null isset is returning false
  fixing undefined exception classes
  unit test testSetAppValueIfSetToNull() added
  unit tests for dynamic backend registration
  ignore underscore.js in scrutinizer.yml
  adding ownCloud globals to jshintrc: OC, t, n
  Use git checkout on directory as some files may not be in git resulting in, e.g.:
  adding underscore.js
  reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085
  translations for oc-dialogs reside in code
  Fix copy conflict dialog translation
  [tx-robot] updated from transifex
  ...
2014-04-09 15:20:18 +02:00
Morris Jobke d8f56e3c00 Merge pull request #8049 from owncloud/filepickersvg
Fix file picker SVG issues
2014-04-09 15:05:40 +02:00
Jan-Christoph Borchardt 1258cde020 fix search box wrapping on very narrow screens 2014-04-09 13:20:46 +02:00
Jenkins for ownCloud 796f719548 [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
Jenkins for ownCloud 4ad4b9768c [tx-robot] updated from transifex 2014-04-08 01:57:51 -04:00
Thomas Müller c86bda0325 Merge pull request #8065 from owncloud/avatar-highdpi
use high resolution avatars on highdpi screens
2014-04-07 20:36:15 +02:00
Thomas Müller 1e559f7239 Merge pull request #8088 from owncloud/fix-personal.js
reduce code duplication, fix parse error, prevent page reload on hitting...
2014-04-07 16:59:32 +02:00
Thomas Müller b2f8490be2 adding underscore.js 2014-04-07 14:05:58 +02:00
Thomas Müller 647abe512b reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085 2014-04-07 14:04:16 +02:00
Jörn Friedrich Dreyer 779dff31c4 translations for oc-dialogs reside in code 2014-04-07 11:58:32 +02:00
Jörn Friedrich Dreyer c90b0ac00b Fix copy conflict dialog translation 2014-04-07 11:46:47 +02:00
Jenkins for ownCloud e295d48fd4 [tx-robot] updated from transifex 2014-04-07 01:56:11 -04:00
Jenkins for ownCloud a9d49de465 [tx-robot] updated from transifex 2014-04-06 01:56:11 -04:00
jbtbnl 86adee98bf Merge pull request #8072 from owncloud/slideshow-buttons
Fix slideshow buttons being invisible
2014-04-06 01:17:43 +02:00
Robin Appelman ceb6666e73 Fix slideshow buttons being invisible 2014-04-06 00:16:14 +02:00
Tom Needham 861394c88d Merge pull request #8061 from owncloud/remove-uneeded-file
Remove uneeded file
2014-04-05 00:13:33 +01:00
Robin Appelman 3c35e82a37 use high resolution avatars on highdpi screens 2014-04-04 23:35:32 +02:00
Lukas Reschke ce1b382905 Delete auth.css 2014-04-04 22:38:26 +02:00
Lukas Reschke 35ee1e902a Replace echo with `p` or `print_unescaped`
Using echo instead of `p` or `print_unescaped` is a bad style, to prevent people from copying it  I've adjusted it.
2014-04-04 22:23:23 +02:00
Robin Appelman 01d93f81f6 Show higher resolution previews for high dpi screens 2014-04-04 17:10:46 +02:00
Vincent Petry d4f9cc567a Fix SVG close button of file picker 2014-04-04 11:52:15 +02:00
Vincent Petry 05a7bfed71 Fix file picker to correctly show SVG file icons 2014-04-04 11:44:11 +02:00
Vincent Petry a4eafca77f Moved code to replace svg with png to OC.Util
- Moved code that replaces the "svg" extension for the given file to
core as OC.Util.replaceSVGIcon.
- Added unit test for OC.Util.replaceSVGIcon
- Moved "replaceSVG" to OC.Util.replaceSVG and deprecated the global
"replaceSVG" function.
- Added alias for SVGSupport() as OC.Util.hasSVGSupport() (for now)
2014-04-04 11:34:26 +02:00
Morris Jobke bf7624fb25 Merge pull request #6968 from owncloud/files-ajaxload
Ajaxify files list for files + trashbin + public page
2014-04-03 22:02:05 +02:00
Vincent Petry 2b8bb01211 Fixed mime type attribute access in file overwrite dialog 2014-04-03 16:55:01 +02:00
Jenkins for ownCloud 54783550e8 [tx-robot] updated from transifex 2014-04-03 01:56:12 -04:00
Vincent Petry 0be9de5df5 Files, trashbin, public apps use ajax/JSON for the file list
Files app:

- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
  arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
  full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
  Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only

Breadcrumbs are now JS only:

- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class

Public page now uses ajax to load the file list:

- Added Helper class in sharing app to make it easier to authenticate
  and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list

Core:

- Fixed file picker dialog to use the same list format as files app
2014-04-02 15:33:47 +02:00
Jan-Christoph Borchardt 5301056ab1 fix h3 style, move out from settings to apps CSS 2014-04-02 09:18:33 +02:00
Jenkins for ownCloud 73dd5ff26c [tx-robot] updated from transifex 2014-04-02 01:56:39 -04:00
Vincent Petry 268206cec5 Fixed parseQueryString to handle empty values and plus signs
- now correctly parse query strings with '+' signs
- empty values are now parsed either as null or empty string
- added unit test for parseQueryString()
2014-04-01 23:02:34 +02:00
Thomas Müller 86ab1cf476 typos fixed
PHPDoc comments added
2014-04-01 22:17:31 +02:00
Morris Jobke bd2cf6ee29 Merge pull request #7817 from owncloud/app-navigation-for-apps
Makes #app-navigation a part of app management.
2014-04-01 21:38:43 +02:00
Jan-Christoph Borchardt 0c441724bc make infield labels use less space so pasting in is easier 2014-04-01 17:21:05 +02:00
Jan-Christoph Borchardt c926e98ea9 fix log in input sizing caused by core input field switch to px 2014-04-01 17:18:03 +02:00
Vincent Petry be0660f84f Merge pull request #7943 from hjort/master
Correction: failure on sharing when user ID was prefixed by zero
2014-04-01 12:57:16 +02:00
Vincent Petry 5807681c09 Merge pull request #7975 from owncloud/fix-7973-master-2
remove pl_PL - fixes #7973
2014-04-01 12:38:47 +02:00
Vincent Petry 18acfa8bb3 Merge pull request #7915 from owncloud/replace-personalblock
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
Morris Jobke 0d2a81a095 apply proposed change 2014-04-01 10:48:55 +02:00
Jenkins for ownCloud 7a4a836abe [tx-robot] updated from transifex 2014-04-01 01:56:15 -04:00
Andreas Fischer 01141e1520 Type hinting. 2014-03-31 21:07:48 +02:00
Andreas Fischer b39a74ff6c Some more colors. 2014-03-31 20:51:30 +02:00
Andreas Fischer f9853b253c Deduplicate connection handling code into \OC\DB\ConnectionFactory 2014-03-31 20:09:07 +02:00
Andreas Fischer a585cec530 Remove unnecessary and incorrect comments. 2014-03-31 19:27:18 +02:00
Andreas Fischer e67cf99cef \InvalidArgumentException is in root namespace. 2014-03-31 18:20:24 +02:00
Andreas Fischer 5dbbe6d08b Doc blocks for properties do not repeat the property name. 2014-03-31 18:20:04 +02:00
Thomas Müller fe2c6f4e6d remove pl_PL - fixes #7973 2014-03-31 18:03:42 +02:00
Andreas Fischer b002f11771 Use question color. 2014-03-31 17:06:06 +02:00
Andreas Fischer e768ead820 Remove whitespace at end of lines. 2014-03-31 17:06:02 +02:00
Morris Jobke ab696edba6 Merge pull request #7916 from owncloud/fix-input-sizes
Fix input sizes
2014-03-31 15:56:19 +02:00
Andreas Fischer 2d69c4c2d3 Merge remote-tracking branch 'owncloud/master' into db-convert-tool
* owncloud/master: (663 commits)
  [tx-robot] updated from transifex
  [tx-robot] updated from transifex
  Sub-dir was prepended twice
  Sub-dir was prepended twice
  [tx-robot] updated from transifex
  Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
  Emit event after setting a new expiration for a share
  adding @method annotation to declare methods which can be called on the wrapped statement object
  Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
  don't write file if opening a stream to encrypt the data fails
  Do not retrieve storage stats for trash bin
  [tx-robot] updated from transifex
  prevent dimmed ocdialog div from scrolling
  fix breadcrumbs for IE8
  enable SVG->PNG fallback for 'New' menu
  enable SVG->PNG fallback for newly uploaded files and folders
  specify logo to not repeat when container is bigger
  fix SVG replacement for logo so it works in IE8, fix #7866
  Fix swift touch operation
  [tx-robot] updated from transifex
  ...

Conflicts:
	3rdparty
2014-03-31 15:33:01 +02:00
Morris Jobke 8bd308ffed merge CSS rules 2014-03-31 13:51:53 +02:00
Jan-Christoph Borchardt 2be2a5d2c5 external storage: fix merge conflict, indentation 2014-03-31 13:12:04 +02:00
Jan-Christoph Borchardt 615de6534f fix duplicate rules for button/input styles, em to px 2014-03-31 12:27:26 +02:00
raghunayyar 881c66df52 Removes highlighting of selected items, padding from apps management. 2014-03-30 15:48:47 +05:30
Jenkins for ownCloud bfb0b9a044 [tx-robot] updated from transifex 2014-03-30 01:55:42 -04:00
Rodrigo Hjort 51b727cfca Correction: failure on sharing when user ID was prefixed by zero 2014-03-28 15:08:59 -03:00
Morris Jobke 841069e8cb Merge pull request #7770 from jamesryanbell/master
SVG support detection
2014-03-28 15:14:12 +01:00
Vincent Petry 0436453353 Merge pull request #7720 from ideaship/autoconfig_fix
fix autoconfig
2014-03-28 10:41:46 +01:00
Thomas Müller 5fa8f7cf12 Merge pull request #7107 from owncloud/load-apps-proper-master
Load apps proper master
2014-03-28 10:33:55 +01:00
Thomas Müller e3b951f412 Merge pull request #7724 from owncloud/mobile
[WIP] Mobile optimization for base layout and Files app
2014-03-28 10:27:15 +01:00
Jenkins for ownCloud ccc55f40e6 [tx-robot] updated from transifex 2014-03-28 01:55:47 -04:00
Jörn Friedrich Dreyer 2561107b4e prevent dimmed ocdialog div from scrolling 2014-03-28 02:43:33 +01:00
Jan-Christoph Borchardt ec46a07195 convert input metrics to px 2014-03-27 17:13:36 +01:00
Jan-Christoph Borchardt 5b2abb32a6 remove CSS rules for personalblock, remove it from core 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt bf77c580c1 general styles for the content area 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt ba82175e11 specify logo to not repeat when container is bigger 2014-03-27 14:37:41 +01:00
Jan-Christoph Borchardt d2de6e7a66 fix SVG replacement for logo so it works in IE8, fix #7866 2014-03-27 14:31:24 +01:00
Jenkins for ownCloud 75d8de378c [tx-robot] updated from transifex 2014-03-26 01:56:21 -04:00
Thomas Müller a54260b517 use minimum-scale=1.0 2014-03-25 23:35:55 +01:00
Thomas Müller 1816f43722 Merge pull request #7864 from owncloud/routing-performance
Routing performance
2014-03-25 23:00:36 +01:00
Thomas Müller 4900ad9119 update type hint in PHPDoc 2014-03-25 22:59:42 +01:00
VicDeo 86356db044 Merge pull request #7772 from owncloud/filter_more_jsconsole
Also replace console.time/timeEnd when not in DEBUG mode
2014-03-25 20:29:26 +02:00
Thomas Müller f9279ac77a killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest() 2014-03-25 17:42:41 +01:00
Thomas Tanghus 0b4d879619 Fix copy/paste error :P 2014-03-25 15:38:11 +01:00
Thomas Tanghus aa5bba2bcc 'ID' => 'id' and check existence of EMAIL 2014-03-25 14:22:39 +01:00
Jenkins for ownCloud b92dad992f [tx-robot] updated from transifex 2014-03-25 01:55:34 -04:00
raghunayyar 3d8ce8104f Adds Style changes to app-navigation in core/css/apps.css 2014-03-24 17:59:53 +05:30
Jenkins for ownCloud abdc823bb6 [tx-robot] updated from transifex 2014-03-24 01:55:51 -04:00
Jenkins for ownCloud 4a19a97d67 [tx-robot] updated from transifex 2014-03-23 01:55:34 -04:00
Jenkins for ownCloud 0245e64cec [tx-robot] updated from transifex 2014-03-22 01:56:09 -04:00
Jan-Christoph Borchardt 89ee551158 mobile: adjust breakpoint in JS as well 2014-03-21 16:43:04 +01:00
Jan-Christoph Borchardt 9b9b6ec31e mobile: set a width for navigation popover to it's always 3 columns 2014-03-21 16:40:39 +01:00
Jan-Christoph Borchardt f2566e649f mobile: adjust break to 768, also fix min-widths 2014-03-21 16:36:45 +01:00
Morris Jobke 43313d120d Merge pull request #7820 from owncloud/core-macwarning
Added warning for Mac OS on setup page
2014-03-21 15:06:11 +01:00
Jan-Christoph Borchardt ecf52e05fb mobile: adjust width of app title, fix overlap 2014-03-21 14:30:11 +01:00
Thomas Müller 6ff96b34ad Merge branch 'master' into load-apps-proper-master
Conflicts:
	apps/files/ajax/rawlist.php
	cron.php
	ocs/v1.php
2014-03-21 14:05:08 +01:00
Jörn Friedrich Dreyer c9d97d2ef2 add top:45px to position:fixed controls, fixes alignment on android 4.0.4 browser 2014-03-21 11:56:47 +01:00
Jenkins for ownCloud bcf388d3c5 [tx-robot] updated from transifex 2014-03-21 01:55:35 -04:00
Vincent Petry 6de9033d86 Added warning for Mac OS on setup page 2014-03-20 12:57:55 +01:00
Jenkins for ownCloud 3aa8647634 [tx-robot] updated from transifex 2014-03-20 01:56:42 -04:00
jbtbnl 57cfff7d51 Fix #7758 2014-03-19 16:45:10 +01:00
Vincent Petry 6252c248c2 Merge pull request #7557 from owncloud/issue/7297
Do not allow setting an expiration date in the past
2014-03-19 15:53:08 +01:00
Joas Schilling 7ab2632085 Use tipsy to display error when selecting a date in the past 2014-03-19 12:11:14 +01:00
Thomas Müller 33e96597d1 Merge pull request #7790 from owncloud/fix/7788
drop file cache migration OC5 -> OC6
2014-03-19 11:29:50 +01:00
Jenkins for ownCloud 7b1d52f5b9 [tx-robot] updated from transifex 2014-03-19 01:55:39 -04:00
Thomas Tanghus 13f1f105c8 Set overflow-y to auto 2014-03-18 18:25:30 +01:00
Jan-Christoph Borchardt 59906fbb4d mobile: show caret indicator next to logo to make clear it is tappable 2014-03-18 17:48:28 +01:00
Thomas Müller 6b9ae27b90 drop file cache migration OC5 -> OC6 2014-03-18 17:14:38 +01:00
Vincent Petry 67b8cfedf9 Define _matchMedia wrapper earlier
The unit test stub didn't work because the _matchMedia wrapper
was defined too late.

This fix defines it earlier.
2014-03-18 16:02:13 +01:00
Vincent Petry cc6c152984 Fixed matchMedia usage to make unit tests work in PhantomJS
PhantomJS has a bug that makes it impossible to properly stub
window.matchMedia. This fix adds a wrapper as OC._matchMedia
that is used for unit tests
2014-03-18 15:52:06 +01:00
Vincent Petry fe04106e0f Add/remove main menu action when switching between desktop/mobile mode 2014-03-18 13:10:13 +01:00
Vincent Petry 872006da03 Only enable toggle for sidebar in mobile mode 2014-03-17 20:44:30 +01:00
Thomas Tanghus 413afab424 Replace console.time/timeEnd 2014-03-17 19:39:19 +01:00
jamesryanbell 4fc96ebb7b SVG support detection
The SVGSupport checkMimeType method was failing on my setup as the headers are all returned in lowercase. I have lowercase all the indexes and modified the if statement so that it doesn't matter what case the headers are returned in
2014-03-17 16:11:49 +00:00
icewind1991 4112d63a40 Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning
Added warning for trusted_domains after CLI upgrade
2014-03-17 13:21:54 +01:00
Jenkins for ownCloud 518903c6eb [tx-robot] updated from transifex 2014-03-17 01:56:06 -04:00
Jenkins for ownCloud b2e929d580 [tx-robot] updated from transifex 2014-03-15 02:14:22 -04:00
Vincent Petry 1a116828cf Added warning for trusted_domains after CLI upgrade
If trusted_domains is not set after a CLI upgrade, show a warning in the
output.
2014-03-14 11:16:45 +01:00
Jan-Christoph Borchardt 74eb9bea22 add 'body-public' ID to body in base layout so it can be identified via CSS 2014-03-14 11:08:16 +01:00
Jan-Christoph Borchardt ac48563efd add spans around replaced 'Shared' indicators to make text hide on mobile 2014-03-14 10:48:28 +01:00
Jan-Christoph Borchardt b37aae9925 mobile: menu togglable for mobile, use code by @PVince81 2014-03-14 10:33:19 +01:00
Jan-Christoph Borchardt eb7b125254 mobile: position share dropdown 2014-03-14 09:15:20 +01:00
Jan-Christoph Borchardt 84c96c2bf7 mobile: don't require a minimum width for controls bar 2014-03-14 09:14:52 +01:00
Jenkins for ownCloud 4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
ideaship a5425e84f2 fix autoconfig
In array_merge, $post overrides $opts (concerns data directory).
Always merge $post before calling display().
Default value for dbtype which may still be undefined in display().

Fixes several problems related to autoconfig:
- installation.php only showed $AUTOCONFIG data if it was called after
  install() had come back with errors
- if autoconfig.php was set, installation.php showed an editable field
  with the wrong data in it; then, regardless of any changes, the value
  from autoconfig.php was used
- installation.php used undefined indeces (dbtype, dbIsSet,
  directoryIsSet)
2014-03-13 20:05:11 +01:00
Jenkins for ownCloud 1295e54173 [tx-robot] updated from transifex 2014-03-13 01:55:50 -04:00
Jenkins for ownCloud 8320b8eb7a [tx-robot] updated from transifex 2014-03-12 01:57:17 -04:00
Vincent Petry a53df71b4a Merge pull request #7652 from owncloud/localStorage_remove
Add OC.localStorage.removeItem()
2014-03-11 12:40:14 +01:00
Vincent Petry 0e4d522dd9 Merge pull request #7659 from owncloud/fix-7596
Fix 7596
2014-03-11 11:36:22 +01:00
Jenkins for ownCloud b0ec38e202 [tx-robot] updated from transifex 2014-03-11 01:59:39 -04:00
Thomas Müller f1ecc758f5 send an individual email to each recipient 2014-03-10 21:54:23 +01:00
Thomas Tanghus 5e6f0dcc6d Fix copy/paste error 2014-03-10 16:26:07 +01:00
Thomas Tanghus 01bcdf5b53 Add function remove() to OC.localeStorage 2014-03-10 16:22:52 +01:00
Vincent Petry 23eeb898a9 Merge pull request #7600 from ideaship/fix_escaped_html
fix: use print_escaped for radio button "checked"
2014-03-10 16:12:39 +01:00
Jan-Christoph Borchardt 9a31e53313 Merge pull request #7567 from owncloud/apps-scroll-settings
restrict height of settings and make scrollable
2014-03-09 01:22:51 +01:00
Vincent Petry 536c33895f Merge pull request #7592 from owncloud/fixstoragefreespace
Fixed upload issue when free space is not known (ex: FTP)
2014-03-06 17:22:40 +01:00
ideaship e08dbf80dc fix: use print_escaped for radio button "checked"
use of p() results in escaped HTML code: checked="checked"
where it should be: checked="checked"
2014-03-06 16:03:00 +01:00
Morris Jobke 256dca935b Revert "adding new javascript function OC.generateUrl(url, params)"
This reverts commit 8e667d1934.
2014-03-06 15:10:32 +01:00
Morris Jobke 5f0a22586f Merge pull request #7579 from owncloud/introduce-generateUrl-master
Introduce OC.generateUrl() in master
2014-03-06 15:07:28 +01:00
Vincent Petry 6e4ea09d52 Merge pull request #7494 from owncloud/fix-7307
Replace OC.Router.generate() with OC.generateUrl()
2014-03-06 14:49:12 +01:00
Vincent Petry e129f6845b Added testArea for JS Unit tests
Added a testArea that is outside the viewport but still considered as
visible from the jQuery code.

The testArea is useful when:
- tested code tries to access DOM elements using global ids
- tested code is requiring some UI elements to be visible to activate
  themselves
2014-03-06 12:50:18 +01:00
Jan-Christoph Borchardt 0b0687c9fc fix noise not repeating 2014-03-06 12:38:11 +01:00
Thomas Müller b46517f012 adding js unit tests for OC.generateUrl() 2014-03-06 00:26:57 +01:00
Thomas Müller 8e667d1934 adding new javascript function OC.generateUrl(url, params) 2014-03-06 00:17:48 +01:00
Thomas Müller 32b29c9d73 Merge branch 'master' into fix-7307
Conflicts:
	core/js/router.js
	settings/js/admin.js
2014-03-06 00:15:08 +01:00
Jan-Christoph Borchardt 36fcb0fb4e Merge pull request #7569 from owncloud/scrutinizer-tabs
fix some spaces to tabs issues reported by Scrutinizer
2014-03-05 18:10:01 +01:00
Morris Jobke 8c1cd2b83e Merge pull request #7566 from owncloud/button-outlines
Adds 0 Outlines to Buttons
2014-03-05 16:50:22 +01:00
Jan-Christoph Borchardt 7ad7f94797 fix some spaces to tabs issues reported by Scrutinizer 2014-03-05 15:47:12 +01:00
Jan-Christoph Borchardt 4a4b32d325 restrict height of settings and make scrollable 2014-03-05 15:08:16 +01:00
raghunayyar 5a9689eb5c Adds 0 Outlines to Buttons 2014-03-05 19:36:36 +05:30
Jan-Christoph Borchardt 4d679de30b add hover/focus states for star icons to hint at action 2014-03-05 13:21:33 +01:00
Joas Schilling 80393d9c0f Do not allow setting an expiration date in the past
Fix #7297
2014-03-05 13:12:58 +01:00
Morris Jobke a8ae2f10b9 Merge pull request #7554 from owncloud/issue/7304
Fix position of eye icon on database password field
2014-03-05 11:13:43 +01:00
Vincent Petry 6de370b64c Removed obsolete OC.Router stubs in specHelper 2014-03-05 10:27:15 +01:00
Joas Schilling 4ee4f0c365 Fix position of eye icon on database password field
Fix #7304
2014-03-05 10:22:35 +01:00
Thomas Müller 33b798c3d6 fixing js unit tests 2014-03-05 01:10:39 +01:00
Vincent Petry 25251d4bf7 Fix mail template to use p() for colors
Now using p() instead of print_unescaped() for colors.
2014-03-03 17:36:12 +01:00
Frank Karlitschek 7983c90fdc Merge pull request #7500 from owncloud/theme-mailtemplate
Enable theming of the mail template header
2014-03-03 17:22:33 +01:00
jbtbnl e603164517 Do not override button background image 2014-03-03 14:07:44 +01:00
Jan-Christoph Borchardt b8d0fc9494 make mail notification header color themable 2014-03-03 12:43:22 +01:00
Jan-Christoph Borchardt eac9eebfdb compress mail notification logo 2014-03-03 12:42:58 +01:00
Jan-Christoph Borchardt 607f205bda mail template: remove off-white background color to better blend into mail client 2014-03-03 12:21:08 +01:00
Thomas Müller e1030c6b5f adding JSDoc + remove unused function 2014-03-02 23:15:37 +01:00
Thomas Müller 1291303c5a Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 22:30:24 +01:00
Raghu Nayyar e304809612 Merge pull request #7382 from jbtbnl/master
Remove necessity of icon class
2014-02-27 21:11:26 +05:30
Morris Jobke 7af846e656 Merge pull request #7452 from owncloud/icon-delete-hover
icons: automatically show delete hover instead of using explicit class
2014-02-27 14:44:29 +01:00
Morris Jobke 6fe1cf7ae4 Merge pull request #7449 from owncloud/remove-input-border
remove border from log in input fields, simpler and works better with themes
2014-02-27 13:24:44 +01:00
Jan-Christoph Borchardt 58bc6aee51 icons: automatically show delete hover instead of using explicit class 2014-02-27 12:48:25 +01:00
Jan-Christoph Borchardt af467d92f6 Installation: relabel 'Advanced' to more descriptive 'Storage & database' 2014-02-27 12:24:14 +01:00
Jan-Christoph Borchardt f0cd08ab5d remove border from log in input fields, simpler and works better with themes 2014-02-27 12:13:09 +01:00
Joas Schilling 922c1909f8 Translate string when an error occured while sending a forgot password mail
Fix #7423
2014-02-26 17:29:47 +01:00
Thomas Müller 2f0db9af07 Merge pull request #7409 from owncloud/issue/5361
Add owncloud version to JS scope
2014-02-26 14:44:12 +01:00
Jan-Christoph Borchardt d9a153dbe9 Merge pull request #7174 from owncloud/issue/7166
Add option to change email settings in admin section
2014-02-26 14:41:07 +01:00
Joas Schilling 9847912257 Remove unused variables, add doc blocks and break lines
Fix #7166
2014-02-26 13:10:46 +01:00
Joas Schilling cb14b1c58d Add owncloud version to JS scope
Fix #5361
2014-02-26 11:50:52 +01:00
jbtbnl d28fd8f64d Remove necessity of icon class
Only the icon specific class is needed
2014-02-24 22:37:19 +01:00
Morris Jobke 5fb1374b0f Merge pull request #7285 from owncloud/mimeicons-svg
Show svg mime icons when no preview is available
2014-02-24 14:12:10 +01:00
Morris Jobke 8d17f6d675 Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1
Update page title when navigating through directories (local)
2014-02-24 13:34:07 +01:00
icewind1991 ddb8cf32e9 Merge pull request #7344 from owncloud/add-js-config-vars
Allow apps to add/modify config js output via hook.
2014-02-24 13:29:54 +01:00
Robin Appelman 7c4f81bd78 rename url parameter 2014-02-24 13:24:10 +01:00
Vincent Petry 80c61d480c Added oc_defaults stub in specHelper.js
This is needed for JS Unit tests to run properly as they are expecting
the new "oc_default" map to exist.
2014-02-24 09:45:02 +01:00
Morris Jobke 079d64ce75 Merge pull request #7310 from owncloud/no-css-js-delivery-via-php
No css js delivery via php
2014-02-21 20:37:10 +01:00
icewind1991 9b9b2255b6 Merge pull request #7355 from owncloud/new-menu-svg
Use SVG icons in New file menu
2014-02-21 16:18:43 +01:00
Robin Appelman df35929ed2 Merge branch 'master' into add-js-config-vars 2014-02-21 16:07:21 +01:00
Robin Appelman 59ec61dc03 Merge branch 'master' into GuillaumeAmat-patch-1 2014-02-21 16:04:31 +01:00
Morris Jobke a5c70f16d2 Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs
fix thumbnail generation for subdirectories in the conflicts dialog
2014-02-21 15:33:13 +01:00
icewind1991 aa0bcf7ba4 Merge pull request #7336 from owncloud/IE-wipho-viewport
fix viewport size on windows phone
2014-02-21 15:13:20 +01:00
Jan-Christoph Borchardt 877cfb963a use SVG icons from icons.css for New file menu 2014-02-21 14:07:25 +01:00
Robin Appelman 4715fb12c8 Add url parameter to control whether previews should return 404 when the mimetype is unsupported 2014-02-21 14:06:15 +01:00
Jörn Friedrich Dreyer d9e333c0da use directory from original instead of current dir 2014-02-21 14:01:38 +01:00
Thomas Müller 27ad69eea5 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-21 14:01:24 +01:00
Robin Appelman 3f52eb073d Merge branch 'master' into mimeicons-svg 2014-02-21 14:00:17 +01:00
Robin Appelman 80481a1e41 Merge branch 'master' into mobile-header 2014-02-21 12:46:09 +01:00
Thomas Müller f19276f7bc Merge branch 'master' into no-css-js-delivery-via-php
Conflicts:
	config/config.sample.php
2014-02-21 09:51:51 +01:00
ringmaster 58be2eb955 Allow apps to add/modify config js output via hook. 2014-02-20 18:13:27 -05:00
Lukas Reschke 917a505af4 Merge pull request #7291 from owncloud/adminess-raghu
Move isadmin to template and rename it to oc_isadmin
2014-02-20 19:01:28 +01:00
Robin Appelman daf28225b7 fix viewport size on windows phone 2014-02-20 18:42:59 +01:00
Jan-Christoph Borchardt d5739e83d1 remove additional transition rule, reduce width of collapsed search bar 2014-02-20 18:40:08 +01:00
Robin Appelman d9bb21146f fix IE10 viewport sizeing 2014-02-20 18:14:40 +01:00
Jan-Christoph Borchardt d466458469 restrict zooming in to not mangle layout accidentally 2014-02-20 17:37:48 +01:00
Robin Appelman 0624476aa1 Merge branch 'master' into mimeicons-svg 2014-02-20 16:55:18 +01:00
Jan-Christoph Borchardt bfe6dfe5da Merge pull request #7056 from owncloud/users-scrollperformance
Improve users list scrolling performance
2014-02-20 16:45:36 +01:00
Jan-Christoph Borchardt 5cc4a47f4c Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix
remove fix for IE9 nav bar width
2014-02-20 16:25:08 +01:00
Lukas Reschke e4c3ef2ca6 Merge pull request #7289 from owncloud/fix-filetype-icons
Fix filetype icons
2014-02-20 14:53:41 +01:00
Vincent Petry 6cf83de60e Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1 2014-02-20 14:49:54 +01:00
Jörn Friedrich Dreyer 3f6d14be85 Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core
Conflicts:
	core/css/styles.css
2014-02-20 14:29:23 +01:00
Thomas Müller 31bab55847 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-20 13:52:53 +01:00
Jan-Christoph Borchardt 20b740f8e4 do not show display name on mobile when profile picture is present 2014-02-20 13:37:23 +01:00
Jan-Christoph Borchardt 92d57cb5a7 move avatar into clickable area of user menu 2014-02-20 13:36:52 +01:00