78e5410199
Merge branch 'master' into jshint-globals-oc-t-n
...
Conflicts:
.jshintrc
2014-04-07 17:10:45 +02:00
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
d3eee01190
Merge pull request #7599 from owncloud/public-pathinfo
...
Allow using pathinfo based public.php paths
2014-04-07 14:53:44 +02:00
d7bc23e16d
adding ownCloud globals to jshintrc: OC, t, n
2014-04-07 14:50:32 +02:00
0fe32eee13
Merge pull request #8083 from owncloud/fix-link-to-sync
...
Remove wrong whitespace from URL and use HTTPS
2014-04-07 14:38:47 +02:00
21a54ba50f
Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_js
...
Fix copy conflict dialog translation
2014-04-07 14:38:00 +02:00
de07f25bc2
Use git checkout on directory as some files may not be in git resulting in, e.g.:
...
error: pathspec 'tests/data/lorem-copy.txt' did not match any file(s) known to git.
error: pathspec 'tests/data/testimage-copy.png' did not match any file(s) known to git.
2014-04-07 14:06:20 +02:00
b2f8490be2
adding underscore.js
2014-04-07 14:05:58 +02:00
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
3c9f588449
Merge pull request #6221 from leo-b/ldap_get_all_groups
...
fix updateGroups background job for ldap servers with > 1000 groups
2014-04-07 13:00:32 +02:00
779dff31c4
translations for oc-dialogs reside in code
2014-04-07 11:58:32 +02:00
c90b0ac00b
Fix copy conflict dialog translation
2014-04-07 11:46:47 +02:00
0c444fb2fb
Merge pull request #8017 from Raydiation/master
...
Remove dependency on container, removing service locator antipattern
2014-04-07 10:19:18 +02:00
e295d48fd4
[tx-robot] updated from transifex
2014-04-07 01:56:11 -04:00
592371f367
Merge pull request #8064 from owncloud/remove-not-existing-functions
...
Removed two unused functions
2014-04-06 22:24:30 +02:00
6babf90175
Switch to HTTPS
2014-04-06 22:06:38 +02:00
5679f5c37e
Remove wrong whitespace from URL and use HTTPS
...
The whitespace caused the generated links to begin with a whitespace (e.g. `<a href=" http://owncloud.org/sync-clients/ " target="_blank">`)
Additionally I switched the link to HTTPS.
2014-04-06 22:04:14 +02:00
593977f016
Re-enable the sabredav browser plugin
2014-04-06 14:49:39 +02:00
d962f18e3f
Update README.md
...
Update to the correct link (version 6.0)
2014-04-06 14:01:02 +02:00
9043fdd772
Update README.md
2014-04-06 13:58:44 +02:00
7f553ee26c
Update README.md
...
Change version.
2014-04-06 13:58:06 +02:00
a9d49de465
[tx-robot] updated from transifex
2014-04-06 01:56:11 -04:00
86adee98bf
Merge pull request #8072 from owncloud/slideshow-buttons
...
Fix slideshow buttons being invisible
2014-04-06 01:17:43 +02:00
ceb6666e73
Fix slideshow buttons being invisible
2014-04-06 00:16:14 +02:00
2124eaba92
[tx-robot] updated from transifex
2014-04-05 01:56:08 -04:00
861394c88d
Merge pull request #8061 from owncloud/remove-uneeded-file
...
Remove uneeded file
2014-04-05 00:13:33 +01:00
3c35e82a37
use high resolution avatars on highdpi screens
2014-04-04 23:35:32 +02:00
797bb7b9cc
Merge pull request #8062 from owncloud/remove-echo
...
Replace echo with `p` or `print_unescaped`
2014-04-04 23:17:13 +02:00
ce1b382905
Delete auth.css
2014-04-04 22:38:26 +02:00
33a2aa8865
Delete oauth.css
2014-04-04 22:38:16 +02:00
1b55c312e5
Removed two unused functions
...
These two functions were actually not usable and only a todo since ages. I think it's better to remove it than having dead and unmaintained code.
2014-04-04 22:27:05 +02:00
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
b2f8e34388
Remove uneeded file
...
This file seems not to be actually used anywhere.
2014-04-04 22:14:51 +02:00
710bbd3491
Merge pull request #8058 from owncloud/preview-highdpi
...
Show higher resolution previews for high dpi screens
2014-04-04 18:45:49 +02:00
4028301dea
Merge pull request #8055 from owncloud/getfileinfo-exists
...
dont scan not existing files in View->getFileInfo
2014-04-04 18:07:29 +02:00
0597c5226a
Merge pull request #8039 from owncloud/chunking-removeexpireinhaskey
...
Do not expire chunks while checking for their existence
2014-04-04 17:18:54 +02:00
01d93f81f6
Show higher resolution previews for high dpi screens
2014-04-04 17:10:46 +02:00
b61ec7352b
dont scan not existing files in View->getFileInfo
2014-04-04 15:10:07 +02:00
e76c246718
Pass the correct root to the preview on post_write
2014-04-04 15:02:08 +02:00
09ac61f53b
Merge pull request #8047 from owncloud/jshint-line-length-120
...
extending javascript line length to 120
2014-04-04 12:00:01 +02:00
d4f9cc567a
Fix SVG close button of file picker
2014-04-04 11:52:15 +02:00
05a7bfed71
Fix file picker to correctly show SVG file icons
2014-04-04 11:44:11 +02:00
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
086eb71cfe
extending javascript line length to 120
...
adding xit to globals
2014-04-04 10:36:19 +02:00
8a10c44eb3
Merge pull request #8015 from owncloud/storageinfo-reuse
...
Allow reusing FileInfo for getStorageInfo
2014-04-04 10:18:02 +02:00
0805f678cc
[tx-robot] updated from transifex
2014-04-04 01:57:01 -04:00
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
ab56f69416
Do not expire chunks while checking for their existence
...
The expiration should be done by the gc() function on login, not while
isComplete() is calling hasKey() for every chunk.
2014-04-03 21:12:35 +02:00
388142ecc6
Exclude javascript specs from code analysis
2014-04-03 20:05:40 +02:00
20f26068e7
Merge pull request #7476 from owncloud/type-hinting
...
Type hinting
2014-04-03 20:02:27 +02:00
Thomas Müller
icewind1991
Andreas Fischer
blizzz
Jörn Friedrich Dreyer
Lukas Reschke
Robin Appelman
Volkan Gezer
jbtbnl
Tom Needham
Vincent Petry
Morris Jobke