Tom Needham
6d74aa0d00
more code style
2013-02-10 12:46:41 +01:00
Tom Needham
28498e1af4
Code style and remove OAuth code
2013-02-10 12:44:59 +01:00
Tom Needham
e63c4e3ea8
Change capabilities exposure for files_versions since it extends files
2013-02-10 12:41:27 +01:00
Tom Needham
266ba2806d
Remove debug call, correct app identifier
2013-02-10 12:35:39 +01:00
Tom Needham
5ad1b63f76
Fix api result merging.
2013-02-09 12:50:19 +00:00
Tom Needham
5d14a2cc46
Merge in master
2013-02-09 12:05:48 +00:00
Tom Needham
eefaefe87d
Use OC_User::isAdminUser() in lib/api.php
2013-02-09 12:00:44 +00:00
Jörn Friedrich Dreyer
0c73cae77b
Merge pull request #1565 from owncloud/fix_replacing
...
remove code properly to make @DeepDiver1975 happy ;)
2013-02-09 03:58:06 -08:00
Tom Needham
ab8777a623
Merge branch 'ocs_capabilities' into ocs_multiple_methods
2013-02-09 11:56:30 +00:00
Tom Needham
5102596e6d
Add capabilities exposure to the versioning app
2013-02-09 11:53:54 +00:00
Georg Ehrke
2137bbe330
remove code properly
2013-02-09 12:38:40 +01:00
Tom Needham
675afbc213
Remove accidental inclusion of apps repo.
2013-02-09 11:30:33 +00:00
Bernhard Posselt
ab4ae2b952
Merge pull request #1560 from owncloud/fix_replacing
...
remove (comment out) old code to fix replacing of files
2013-02-09 03:28:40 -08:00
Thomas Müller
800609aaeb
Merge pull request #1545 from owncloud/fix-oc_webroot
...
fixup oc_webroot correctly before and after setup
2013-02-09 03:27:22 -08:00
Thomas Müller
c91334c54a
Merge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlers
...
attach handlers to document instead of filelist
2013-02-09 03:23:19 -08:00
Tom Needham
742cafb03a
Change strucutre of cloud/capabilities response
2013-02-09 11:22:29 +00:00
Bernhard Posselt
c5fd9cc0c2
Merge pull request #1562 from schiesbn/fix_naming
...
rename trash to trash bin
2013-02-09 03:21:30 -08:00
Björn Schießle
ca243f3fac
Merge pull request #1521 from schiesbn/label_fixed
...
don't call the delete button unshare, unshare operation no longer available
2013-02-09 03:14:25 -08:00
Björn Schießle
6e9f434bda
rename trash to trash bin
2013-02-09 12:01:49 +01:00
Georg Ehrke
8961e675c7
remove (comment out) old code to fix replacing of files
2013-02-09 11:28:13 +01:00
Jörn Friedrich Dreyer
5a15221910
Merge pull request #1550 from owncloud/fix-files-download-links
...
Fix files router download links
2013-02-09 01:28:25 -08:00
Jörn Friedrich Dreyer
3918325520
Merge pull request #1541 from owncloud/fixing-1540-master
...
remove undefined function FileList.finishDelete
2013-02-09 01:17:11 -08:00
Jenkins for ownCloud
e5c05e9674
[tx-robot] updated from transifex
2013-02-09 00:14:08 +01:00
Thomas Müller
f42ac97045
Merge pull request #1547 from owncloud/navigation-color
...
brighter grey for the navigation bar
2013-02-08 13:30:25 -08:00
Thomas Müller
84657cbdab
Merge pull request #1548 from owncloud/installation-improvements
...
Installation improvements
2013-02-08 13:27:15 -08:00
Bart Visscher
ed1dc3e064
Fix files router download links
2013-02-08 22:05:13 +01:00
Jan-Christoph Borchardt
bebdd113f5
use proper HTML for other security warning too
2013-02-08 19:59:42 +01:00
Jan-Christoph Borchardt
c73f525050
brighter grey for the navigation bar, hopefully solves the weird similarity to the header
2013-02-08 19:33:22 +01:00
Thomas Müller
12bdc6ddb6
Merge pull request #1439 from owncloud/fix-archive-tar-on-win32-master
...
quick fixing this require_once.
2013-02-08 10:18:49 -08:00
Bart Visscher
d5f98a82aa
fix-oc_webroot
2013-02-08 18:44:52 +01:00
Thomas Müller
ce8fc20e0b
remove unused code
2013-02-08 18:04:27 +01:00
Thomas Müller
1d3c1328fa
remove undefined function FileList.finishDelete
2013-02-08 15:51:28 +01:00
Thomas Mueller
4c3d4f7d36
quick fixing this require_once.
...
On windows the wrong file will be required: lib/archive/tar.php and not Archive/Tar.php.
Best would be to rename the lib/archive/tar.php or put it into a different folder
2013-02-08 15:23:07 +01:00
Bart Visscher
96042f1e5b
Merge pull request #1539 from owncloud/fixing-1508-master
...
missing comma in sql statement
2013-02-08 05:25:00 -08:00
Thomas Müller
1158447499
missing comma in sql statement
2013-02-08 13:49:26 +01:00
Jan-Christoph Borchardt
a26e66b232
improve and shorten security warning, add link to docs, fix #1342
2013-02-08 13:38:50 +01:00
Thomas Müller
40f6e1eba0
Merge pull request #1534 from owncloud/files_l10n
...
Add translation support back to move/rename
2013-02-08 03:58:17 -08:00
Robin Appelman
9bdc43e1fc
Files: explicitly define
2013-02-08 12:03:28 +01:00
Jörn Friedrich Dreyer
43ffb5945c
attach handlers to document instead of filelist, minor whitespace cleanups
2013-02-08 11:05:56 +01:00
Jenkins for ownCloud
59249ebc0c
[tx-robot] updated from transifex
2013-02-08 00:13:16 +01:00
Robin Appelman
5ef9d96d10
Files: rename 'space' to 'storage' in upload.php
2013-02-07 23:59:14 +01:00
Robin Appelman
b67251b0ff
Files: add translation support back to move/rename
2013-02-07 23:57:18 +01:00
icewind1991
3bd33b69a1
Merge pull request #1527 from owncloud/simplyfy_file_mimetype_parsing
...
simplyfy mimetype parsing of 'file' output
2013-02-07 14:47:10 -08:00
Lukas Reschke
217328e0e3
Merge pull request #1514 from owncloud/fix-setup
...
Fix setup
2013-02-07 13:48:44 -08:00
Thomas Müller
867650ee47
Merge pull request #1529 from owncloud/installation-login-fixes
...
Installation login fixes
2013-02-07 13:40:25 -08:00
Bart Visscher
a93282ab16
Merge pull request #1507 from tripflex/master
...
remove float left from actions div class
fixes #1504
2013-02-07 12:49:14 -08:00
Lukas Reschke
c0154558c7
Merge pull request #1526 from owncloud/l10n-support-master
...
L10n support master
2013-02-07 12:38:36 -08:00
Bart Visscher
a82d18d2f8
Fill oc_webroot with the expected value
2013-02-07 21:13:57 +01:00
blizzz
fc7230349b
Merge pull request #1530 from owncloud/fix-warning-displayname-layout
...
Fix warning with displayname in user layout template
2013-02-07 11:25:33 -08:00
blizzz
07f504812c
Merge pull request #1531 from owncloud/cron_no_routes
...
Fix router warnings when running as CLI
2013-02-07 11:22:58 -08:00
