wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14428 commits 157 branches 562 tags 714 MiB
Commit graph

14428 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
e98ea06890 File actions are now updated after create/upload file 
The file actions must explicitly be updated by calling
FileActions.display() on the file element after creating or uploading a
file.

Fixes #4971 and #4993
 2013-10-11 17:07:48 +02:00
Bjoern Schiessle
9baedb4102 remove debug output 2013-10-11 17:06:43 +02:00
Bjoern Schiessle
c32c5979d8 Merge branch 'master' into versioning_preview_shared 2013-10-11 17:00:21 +02:00
Björn Schießle
5c664704a3 Merge pull request #5261 from owncloud/versioning_no_glob 
versioning: don't use glob() and getLocalFile()
 2013-10-11 07:57:14 -07:00
Björn Schießle
9a15aa8ee9 Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines 
fix setting dialog headlines for the encryption app
 2013-10-11 07:15:58 -07:00
Vincent Petry
1a05ed2f38 Fixed table grid styles for IE8 
The selector :not() isn't supported in IE8, replaced it with the "grid"
class.

- Fixes the log table style in IE8 (#5057)
- Fixes the users table layout bug in IE8
 2013-10-11 15:58:15 +02:00
Bjoern Schiessle
57beef1e36 fix setting dialog headlines for the encryption app 2013-10-11 15:56:08 +02:00
Björn Schießle
034968c612 Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing 
encryption: block file access if share keys are missing
 2013-10-11 06:37:53 -07:00
Victor Dubiniuk
8ce3ae50f0 Improve expand/collapse logic 2013-10-11 16:35:59 +03:00
Bjoern Schiessle
3ee7711284 fix another typo 2013-10-11 15:26:30 +02:00
Bjoern Schiessle
2d79a79202 change error code to 403 2013-10-11 15:24:49 +02:00
Bjoern Schiessle
83c78bc7a8 fix typo in error message and change error code to 403 2013-10-11 15:23:12 +02:00
raghunayyar
02c7f95687 Includes <optgroup> tag 2013-10-11 18:52:27 +05:30
raghunayyar
7c2f1fd580 Puts the language divider in place. thanks @Kondou-ger ;) 2013-10-11 18:46:59 +05:30
raghunayyar
4b2bb11716 Removes the Bogus Label 2013-10-11 18:42:02 +05:30
Raghu Nayyar
eb36ec7544 Merge pull request #5294 from owncloud/personal-multiselect 
Uniform Styles and Indentation Fixes for Personal Settings
 2013-10-11 06:07:43 -07:00
Morris Jobke
b846661a93 Merge pull request #5293 from owncloud/files-ie8-datemisaligned 
Fixed IE8 misaligned date
 2013-10-11 05:38:08 -07:00
raghunayyar
e27bb660bd Uniform Styles and Indentation Fixes for Personal Block 2013-10-11 18:03:53 +05:30
Vincent Petry
2b2a548610 Fixed IE8 misaligned date 
Removed display: block to let the element be displayed inline and let
itself aligned by vertical-align: middle of the parent

This works in IE8 and other browsers.

Fixes #5288
 2013-10-11 14:23:37 +02:00
Bjoern Schiessle
39d710e737 block file access if share keys are missing 2013-10-11 14:20:46 +02:00
Vincent Petry
39b150921d Moved IE8 inline styles in files.css 2013-10-11 14:10:00 +02:00
Victor Dubiniuk
a2445888e8 Show advanced section on error. Fixes #5191 2013-10-11 14:48:31 +03:00
Morris Jobke
b9bfe31981 Merge pull request #5281 from owncloud/settings-ie8-changedisplaynamefix 
Fixed display name change for IE8
 2013-10-11 04:46:26 -07:00
Thomas Tanghus
31714f8871 Merge pull request #5133 from owncloud/js_vcategories_to_tags 
Js vcategories to tags
 2013-10-11 04:17:59 -07:00
Vincent Petry
f8c865993f Fixed viewport layout using commas instead of semicolons 
Fixes #5285
 2013-10-11 12:52:34 +02:00
Vincent Petry
bced346c3b Now using smaller spinner image for status indicator 
To make the status indicator appear smaller, even in IE8 that doesn't
support background-size, there is no a smaller animated gif
"loading-small" for that purpose.
 2013-10-11 12:36:30 +02:00
Georg Ehrke
e28f7f8a33 remove php and js previews 2013-10-11 11:43:26 +02:00
Vincent Petry
6970774776 Fixed display name change for IE8 
After saving the display name, the oldDisplayName field's value was
wrongly set with text(), which would append the text inside the input
element which is considered as an invalid operation in IE8.

This fix for #5054 correctly puts the old value into the field with a val() call.
 2013-10-11 10:48:30 +02:00
Björn Schießle
4336d42ab0 Merge pull request #5233 from owncloud/enc_filter_users 
only encrypt file to users with encryption keys
 2013-10-11 01:48:02 -07:00
Bjoern Schiessle
a0de5dd325 some small fixes 2013-10-11 10:34:34 +02:00
Bjoern Schiessle
7a1705d28e fix api tests 2013-10-11 10:28:01 +02:00
Thomas Tanghus
d75d80ba13 OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller 2013-10-11 10:07:57 +02:00
Jenkins for ownCloud
44a5b0bad0 [tx-robot] updated from transifex 2013-10-10 22:30:58 -04:00
Thomas Müller
51e6565aab only text/plain is now used to generate text previews 
blacklist implementation remove because no longer needed
 2013-10-11 00:25:34 +02:00
Vincent Petry
75629a1f00 Fixed delete icon alignment in IE8 
Removed old inline CSS that forced every td to have position:static in
the files app. (#5056)
 2013-10-11 00:16:41 +02:00
Thomas Müller
19ea4f79da resize svg without loosing quality 2013-10-11 00:12:37 +02:00
Felix Niklas
01d3536a76 fix checkbox <-> label binding 
clicking the label will trigger the checkbox
 2013-10-10 23:10:06 +02:00
Bjoern Schiessle
f4e86045de make files versions root a class constant 2013-10-10 20:09:38 +02:00
Bjoern Schiessle
87cccb2e32 some small changes/fixes 2013-10-10 20:06:42 +02:00
Bjoern Schiessle
3dd313dca2 add "received_from" and "received_from_displayname" field in case of a reshared file to the output 2013-10-10 19:46:45 +02:00
VicDeo
26c0007a5f Merge pull request #5263 from owncloud/fixing-5255-master 
Proper behavior of resolvePath()
 2013-10-10 09:27:45 -07:00
Bjoern Schiessle
4c2e3919de make previews work for shared files in the versions drop-down 2013-10-10 17:23:27 +02:00
Bjoern Schiessle
92009c5d8e fix getVersions() for sub directories 2013-10-10 16:58:11 +02:00
Morris Jobke
0641365a10 Merge pull request #4780 from AxelRb/master 
On an auth failure the uid and the IP address should be logged to the st...
 2013-10-10 07:21:36 -07:00
Thomas Müller
bc6e352ccd the path need to be normalized before putting it into resolvePath() 
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
 2013-10-10 16:06:26 +02:00
Vincent Petry
e2a4417079 Fixed conflict dialog in IE8 
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
 2013-10-10 15:54:00 +02:00
icewind1991
4c166fa361 Merge pull request #5247 from owncloud/hooks-view-same-start 
ensure the view's root is a subfolder of the the default root, not only ...
 2013-10-10 06:27:07 -07:00
Bjoern Schiessle
909af2b62e don't cache if the encryption is enabled, this can lead to problems during unit testing 2013-10-10 15:02:52 +02:00
Bjoern Schiessle
bb3b38947d add missing preview link 2013-10-10 14:57:25 +02:00
Bjoern Schiessle
e56947255e don't use glob() and getLocalFile(), this can lead to problems on windows servers 2013-10-10 14:43:40 +02:00