kondou
770382aea9
Some readability improvements
2014-06-02 21:09:41 +02:00
kondou
9bc3f3cf30
Scrutinizer cleanup
2014-06-02 21:09:41 +02:00
Morris Jobke
fbe42a771f
fix unit tests after introduction of animations - adds delays for click trigger
2014-06-02 18:09:41 +02:00
Vincent Petry
0944565f60
More unit tests and fixes for share
2014-06-02 18:08:56 +02:00
Morris Jobke
dd8b7b7af8
Merge pull request #8613 from owncloud/filesize-alignment
...
Improve aligment of file size
2014-06-02 17:37:53 +02:00
Vincent Petry
d677e3860d
Added unit tests for share.js and share icon
2014-06-02 15:59:06 +02:00
Morris Jobke
de23ae735b
add OC.menuSpeed to control the animation speed of menu toggle
2014-06-02 15:34:42 +02:00
Morris Jobke
5d457dafc1
display "<1 kB" for really small files
...
* added parameters for humanFileSize to trigger that behaviour
* add unit tests for that
2014-06-02 15:33:09 +02:00
raghunayyar
72ba396905
Adds Animation to Toggling Navigation on < 768px widths
2014-06-02 15:30:39 +02:00
Arthur Schiwon
7b63c2c036
cleanup
2014-06-02 12:53:59 +02:00
Arthur Schiwon
b3d68fc175
refactor delete handling and apply it to users and groups
2014-06-02 12:53:54 +02:00
Arthur Schiwon
57ffaddf26
add Last Login column
2014-06-02 12:53:51 +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
Morris Jobke
27c8c87e94
Merge pull request #8187 from owncloud/escape-more-character
...
Also encode > and '
2014-06-02 10:59:47 +02:00
Lukas Reschke
603b6c13b4
Fix typo
2014-05-31 21:11:29 +02: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
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
Lukas Reschke
360a79b8f4
Add unit tests for escapeHTML
2014-05-28 22:14:05 +02: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
9c5fdc5005
add title property to share dialog
2014-05-27 22:09:55 +02:00
Vincent Petry
146583a98d
Added update overview page
2014-05-27 14:53:08 +02:00
Bernhard Posselt
daecf4b2c1
disable dynamic slide toggle by default and offer a way to enable it
2014-05-26 18:06:47 +02:00
Bernhard Posselt
c2330e558e
rename to apps.js
2014-05-26 17:31:41 +02:00
Bernhard Posselt
9112386cbf
query buttons on every click to not worry about weird edge case scenarios
2014-05-24 14:28:24 +02:00
Bernhard Posselt
8a30fe8ce3
use different ns
2014-05-24 14:24:46 +02:00
Bernhard Posselt
11c5ded96c
allow apps to add buttons on runtime without negatively impacting performance
2014-05-24 14:23:44 +02:00
Bernhard Posselt
41b7e4b8b8
add ; to make jshint happy
2014-05-23 21:28:34 +02:00
Bernhard Posselt
044ba97263
remove unecessary parenths
2014-05-23 19:14:28 +02:00
Bernhard Posselt
db1511a11d
add a slideup mechanism
2014-05-23 18:49:16 +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
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
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
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
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
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +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
Thomas Müller
48ee72732e
Merge pull request #8567 from owncloud/test-ocshareunittests
...
Added ground work for OC.Share unit tests
2014-05-14 23:35:58 +02:00
Björn Schießle
dab3cb65cf
Merge pull request #8522 from owncloud/sharing_ux_improvements
...
Sharing ux improvements
2014-05-14 12:54:27 -04:00
Vincent Petry
1de068b5cb
Disable login button until the timezone is set
...
On slow computers it might happen that the user manages to login before
the timezone code has a chance to run, which then causes dates to appear
wrong in the UI.
This fix makes sure the login cannot happen until the timezone field is
set.
Note that it's not possible to run the timezone code outside of
document.ready() because at that time the DOM element doesn't exist yet.
2014-05-14 17:00:15 +02:00
icewind1991
4c19acf09b
Merge pull request #8403 from owncloud/fix-oc-dialog
...
fix oc dialog because the body isn't 100% x 100% in dimensions anymore
2014-05-14 13:34:55 +02:00
Thomas Müller
7babd44dd0
Merge pull request #8524 from owncloud/prompt-dialog
...
Add prompt dialog to OC.dialogs
2014-05-13 17:32:06 +02:00
Bjoern Schiessle
737be1a10f
move expire message to the bottom
2014-05-13 15:27:56 +02:00
Robin Appelman
c85e6d919e
Use jquery to get the window width
2014-05-13 13:00:46 +02:00
Bjoern Schiessle
b985021082
hide default expire message if user sets expire date
2014-05-13 11:56:04 +02:00
Robin Appelman
46d6cb739d
Don't set the dialog content height to a zero or negative value
2014-05-13 11:37:29 +02:00
Bjoern Schiessle
d56d03e230
add information about default expire date to the share dialog
2014-05-13 11:28:25 +02:00
Vincent Petry
627eba5348
Added ground work for OC.Share unit tests
2014-05-13 11:15:06 +02:00
Thomas Müller
1c731aacaf
fix style
2014-05-12 11:30:47 +02:00
Lukas Reschke
62364269c5
Fix Typo, define $ as global
2014-05-11 10:55:00 +02:00
Thomas Müller
78c0cc6089
escape display name and email
2014-05-09 23:12:26 +02:00
Robin Appelman
163a7a47f9
Add prompt dialog to OC.dialogs
2014-05-09 17:09:06 +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
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
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
Volkan Gezer
ce835a3247
add uncompressed jquery files - fixes #8294
2014-04-23 00:07:00 +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
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
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
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
e68006c0ce
Merge pull request #8157 from owncloud/share-expiration-smooth-hide
...
Expiration date is hidden smoothly
2014-04-16 17:10:14 +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
Julian Müller
3bc3d4c9f3
close-button for share_dropdown
2014-04-14 18:26:45 +02:00
Lukas Reschke
6e424eb990
Also encode > and '
2014-04-13 15:24:35 +02: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
Vincent Petry
f84d66a24f
Moved SVGSupport call to use OC.Util.SVGSupport()
2014-04-09 15:23:09 +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
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
Robin Appelman
3c35e82a37
use high resolution avatars on highdpi screens
2014-04-04 23:35:32 +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
Vincent Petry
2b8bb01211
Fixed mime type attribute access in file overwrite dialog
2014-04-03 16:55:01 +02: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
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
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
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
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
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
Jan-Christoph Borchardt
89ee551158
mobile: adjust breakpoint in JS as well
2014-03-21 16:43:04 +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
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
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
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
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
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
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
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
7ad7f94797
fix some spaces to tabs issues reported by Scrutinizer
2014-03-05 15:47:12 +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
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
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
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
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
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
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
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
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
Robin Appelman
daf28225b7
fix viewport size on windows phone
2014-02-20 18:42:59 +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
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
Lukas Reschke
169f4cf7ff
Fix typo
2014-02-20 12:51:15 +01:00
Thomas Müller
3ce77a35e5
fixing js syntax error
2014-02-20 10:42:54 +01:00
Lukas Reschke
ba7a79372a
Variable value is expected and not an echoed output
2014-02-20 10:28:11 +01:00
Lukas Reschke
b61f0f11c5
Move oc_isadmin to the config JS script
2014-02-20 10:26:05 +01:00
Lukas Reschke
16262e3fd2
Move isadmin to template and rename it to oc_isadmin
2014-02-19 17:56:12 +01:00
Joas Schilling
fdb0d2067f
Remove duplicated definition and move OC.msg to js/js.js
...
Fix issue #7166
2014-02-19 10:20:52 +01:00
Thomas Müller
92560c5b86
Merge pull request #7243 from owncloud/core-sessionlifetimedefault
...
Now using PHP session lifetime as default value for the JS config
2014-02-18 10:30:25 +01:00
Vincent Petry
f9763e1fc5
Now using PHP session lifetime as default value for the JS config
...
This will fix the heartbeat when the session_lifetime config parameter
hasn't been set explicitly.
2014-02-17 21:33:04 +01:00
Guillaume AMAT
01dee35ebe
Adds OC_Defaults values in javascript config
2014-02-13 10:47:03 +01:00
Joas Schilling
145d9a09ab
Do not select input for all text input fields
...
Fix issue #6920
2014-02-07 16:31:29 +01:00
Vincent Petry
3d88b10f20
Merge pull request #7067 from owncloud/core-sessionheartbeatconfig
...
Core sessionheartbeatconfig
2014-02-05 10:03:36 +01:00
Thomas Müller
ced80c6f27
Merge pull request #6969 from owncloud/tests-morecoverage
...
Fixed unit test scripts + coverage
2014-02-04 12:21:13 -08:00
Thomas Müller
45ab9810c5
fixing typos
2014-02-04 20:58:06 +01:00
Vincent Petry
e75f7e58e9
Added unit tests for session_keepalive / heartbeat
2014-02-04 13:56:41 +01:00
Vincent Petry
912da8d277
Added session_keepalive setting
...
When session_keepalive is true (default) the heartbeat will be send as
often as the half of the session timeout value.
2014-02-04 13:56:10 +01:00
Vincent Petry
63cca35baa
Added core unit tests for basename and dirname
...
Note that it doesn't work 100% like the PHP functions so the tests
have TODO comments to fix those core functions eventually.
2014-01-30 13:22:16 +01:00
Vincent Petry
f7ac9f8069
Fixed unit test scripts + coverage
...
Tried to add more apps (others break).
"preprocessors" is now populated automatically based on the tested apps.
2014-01-30 11:56:14 +01:00
Morris Jobke
cf2c061f1f
Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink
...
Sharing fixfiledownloadlink
2014-01-29 00:39:14 -08:00
Vincent Petry
3bea9b8ddd
Merge pull request #6905 from owncloud/add_expiredate_to_linkshare
...
add expire date to link share if possible
2014-01-24 07:44:33 -08:00
Vincent Petry
c6695bbd76
Fixed download URL in public page
...
- Refactored download URL building to make it overridable
- Added download URL override in public page
- Added JS unit tests for download URL
- Added OC.redirect() method to facilitate unit testing
2014-01-24 13:38:39 +01:00
Vincent Petry
41b6d4b702
Added OC.buidQueryString() utility function
...
Makes it possible to create query strings by passing a JavaScript hash
map and automatically encodes the keys and values.
2014-01-24 12:44:31 +01:00
Bjoern Schiessle
77de47858b
add expire date to link share if possible
2014-01-24 10:46:08 +01:00
Thomas Müller
9fa788c452
Merge pull request #6736 from owncloud/tests-jsunittests
...
Added Javascript unit tests
2014-01-23 12:43:05 -08:00
Morris Jobke
903b330ccc
Merge pull request #6721 from tsumi/patch-1
...
Added SVG fallback to apps settings popup
2014-01-18 08:34:45 -08:00
Vincent Petry
350214c609
Added Javascript unit tests
...
- added karma utility to run jasmine unit tests
- added Sinon library (for stubs/mocks/fakeserver)
- added a few unit tests for core and files
- added autotest-js.sh script
2014-01-16 17:12:29 +01:00
Morris Jobke
5c1a9f35f1
Indicate password strength using strengthify
...
* uses zxcvbn
* outsourced to separate jquery plugin
* async loading
* hide strength meter if input is empty
* feedback if user enters weakest password
* fade in and out
* show tipsy with strength
* Opera 12, IE8-10, FF 23, Chromium 29
2014-01-15 11:10:12 +01:00
tsumi
f41255f652
Useless else removed
...
As suggested by @PVince81 : https://github.com/owncloud/core/pull/6721#issuecomment-32289922
2014-01-15 09:39:21 +01:00
tsumi
7c1649fc24
Added SVG fallback to apps settings popup
...
This fix issue of calendar app with IE8, see issue report for details:
https://github.com/owncloud/calendar/issues/291
2014-01-10 21:19:30 +01:00
Vincent Petry
1042733634
Fixed various file name escaping issues in core apps
...
- Refactored file tr lookup into FileList.findFileEl that uses
filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
attributes
2014-01-10 15:02:26 +01:00
Morris Jobke
ce3df44699
Merge pull request #6031 from s0taka/master
...
No decimal points for Kilobyte and Byte #5371 .
2014-01-05 11:52:10 -08:00
Simon Könnecke
8fdc4585f7
spaces to tabs
2013-12-18 15:43:45 +01:00
Thomas Müller
f57c38df77
Merge pull request #6431 from owncloud/core-pluraltranslationsfix
...
Added plural translation fallback
2013-12-18 03:11:18 -08:00
Frank Karlitschek
753525c57f
Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb
...
always show 'Deleted Files' breadcrumb
2013-12-17 00:25:06 -08:00
Bjoern Schiessle
3e17fbe30d
always show home breadcrumb in files view
2013-12-16 17:40:35 +01:00
Vincent Petry
d8d11e3976
Fixed JS plural function to be per app
...
Some apps might not define the same "nplural" value.
To avoid conflicts, the plural function is now generated per app.
Fixes #6427
2013-12-16 16:00:23 +01:00
Vincent Petry
df1a404466
Fix webroot for update page
...
On the update page, config.js was missing which caused oc_webroot to not
be available. That would trigger the faulty oc_webroot fallback that
didn't take URLs like "/owncloud/index.php/files/apps" into account.
This fix adds config.js in the update page and also a fix for the
oc_webroot fallback, in case it is used elsewhere.
2013-12-13 12:56:48 +01:00
Morris Jobke
4c4c9096c4
fix plural translation - fixes #6226
2013-12-07 11:38:01 +01:00
unknown
853373348c
Slide duration set to 200ms for multiselect (same duration as user menu)
2013-12-05 15:46:13 -05:00
Morris Jobke
ec0aa6bb65
Revert "Merge pull request #6210 from owncloud/fix-5865"
...
This reverts commit f12363d90b
, reversing
changes made to eba35d28cd
.
2013-12-05 21:03:17 +01:00
unknown
fd3aae6691
Changed duration of slideDown, slideUp and fadeOut to 200ms
2013-12-05 13:15:52 -05:00
ganomi
33e77d34f4
Show stars as placeholder
2013-11-26 20:17:13 +01:00
Morris Jobke
81f6be92ef
Translate reload message after update
...
fixes #6064
2013-11-26 16:22:01 +01:00
Simon Könnecke
243f3f0c4c
No decimal points for Kilobyte and Byte #5371 .
2013-11-25 12:26:03 +01:00
Bjoern Schiessle
7f3d717037
Check which permissions are possible to re-share a file
2013-11-18 11:58:42 +01:00
Vincent Petry
55355ba28e
Fixed multiselect to not set the button's height on itself after select
...
Fixes #5841
2013-11-14 14:18:22 +01:00
Thomas Müller
d4c0ac7790
introduce auto completion on share email - integrated with the contactsmanager api
2013-11-14 09:38:55 +01:00
Thomas Müller
3488202f67
Merge pull request #5582 from owncloud/files-previewcaching
...
Append file etag to preview URLs
2013-11-05 01:21:51 -08:00