72d53008cc
indentation
2013-09-18 17:58:15 +02:00
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
7bd5e89f8c
simplify conflict template handling, fix reopen after ESC
2013-09-18 17:22:29 +02:00
12ff268e60
move upload dialog css to separate file
2013-09-18 17:20:14 +02:00
64cc13a8d3
allow passing classes to buttons
2013-09-18 17:13:07 +02:00
817b8d151b
Merge pull request #4745 from owncloud/split_personal-user_passwordchange
...
Split personal and user-mgmt password change logic
2013-09-18 07:53:11 -07:00
18a2c48ceb
Translate errormsgs in settings/changepassword/controller
2013-09-18 16:47:27 +02:00
4edd8b8303
remove debug output
2013-09-18 16:08:29 +02:00
5fb0e257a4
let user repeat the recovery key password to prevent typos
2013-09-18 16:03:53 +02:00
09d043729a
Note to self 2: Do as you preach. Test!
2013-09-18 15:02:25 +02:00
79cd655920
Note to self: Test before pushing!!!
2013-09-18 14:50:21 +02:00
715846626e
hide excessive logging with a trace flag
2013-09-18 14:39:39 +02:00
2ef0b58ff6
Don't try to be clever
2013-09-18 14:25:12 +02:00
17337b22af
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/file-upload.js
2013-09-18 14:19:58 +02:00
ec1949f5ed
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-18 14:15:28 +02:00
1eb42626f5
Merge pull request #4769 from owncloud/gitignore_apps_fix
...
add slash so inverts are triggered
2013-09-18 04:58:05 -07:00
c531b4ef5b
Merge pull request #4872 from owncloud/refactor_upload_progress
...
refactor upload progress
2013-09-18 04:55:10 -07:00
dd62ccdb4e
Merge branch 'appframework-master' into public_cache
...
Conflicts:
lib/public/iservercontainer.php
lib/server.php
2013-09-18 13:20:07 +02:00
534933ee9b
Use new emitter system
2013-09-18 13:15:38 +02:00
20a43d1982
remove file action elements before recreating them
2013-09-18 13:09:47 +02:00
6ed2df11fc
store the permissions retrieved via ajax within the dom element
2013-09-18 13:09:04 +02:00
442a2e074c
Update to adhere to the coding guidelines.
2013-09-18 12:35:46 +02:00
6ba23912a7
Add getUserFolder/getAppFolder to Server.
2013-09-18 12:34:10 +02:00
415a27c1ae
Merge pull request #4888 from owncloud/public_session
...
Public session
2013-09-18 03:10:42 -07:00
d3f88ceeb4
Add some docs to the sessions interface.
2013-09-18 12:01:01 +02:00
1a60aa2b6a
only remember password if the user changes the permissions, otherwise the user disabled the password protection
2013-09-18 11:49:02 +02:00
b54e9be0ac
Merge pull request #4889 from owncloud/disable_avatar_loading_on_public_upload_page
...
disable avatar loading on public guest page
2013-09-18 02:33:44 -07:00
370ed814f7
add permissions of the file to the json response
2013-09-18 11:22:29 +02:00
ce58c32c90
using OC_Config::$object->setValue in order to get the underlying exception thrown up to the caller
2013-09-18 11:07:19 +02:00
5ae4d67540
in case the cache cannot be initialized within the autoloader we just shoul not use it
2013-09-18 11:06:00 +02:00
e0f18ec72b
Merge pull request #4708 from owncloud/encryption_fixes
...
make sure that initial encryption also starts for a fresh installation
2013-09-18 01:33:52 -07:00
171b7ebffe
remove debug output
2013-09-18 10:11:20 +02:00
b0762ad3bf
OC_VCategories=>OC\Tags. Public interface + getter in server container
2013-09-18 00:37:00 +02:00
e760343b98
Merge branch 'appframework-master' into vcategories_public
2013-09-17 20:04:51 +02:00
8b4f4a79e2
Still some session leftovers.
2013-09-17 19:46:08 +02:00
342a420eba
disable avatar loading on public guest page
2013-09-17 19:25:03 +02:00
e43e961dcb
we cannot load avatar on guest page
2013-09-17 19:20:16 +02:00
3f7f6434d1
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-17 19:11:47 +02:00
86c4c83b86
use exists
2013-09-17 19:11:18 +02:00
b59ce403d8
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/css/files.css
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files_sharing/js/public.js
core/js/jquery.ocdialog.js
core/js/oc-dialogs.js
2013-09-17 19:10:46 +02:00
c2e413e852
add fixme
2013-09-17 18:45:38 +02:00
8bdafaf4e0
make 'open in folder' action default for files
2013-09-17 18:40:52 +02:00
00772a8470
use correct doublequotes in template, remove container
2013-09-17 18:40:52 +02:00
b40925ae17
initial scrollto implementation:
...
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
2013-09-17 18:40:51 +02:00
5bddb5377a
Purge session from Request - and fix some styles
2013-09-17 18:38:18 +02:00
5c19b995db
Add interface for Session and add getter in server container.
2013-09-17 18:31:14 +02:00
642b064c5b
we can leave the loop if the permission of the link share was checked
2013-09-17 18:18:23 +02:00
d6771502f2
check only permission from link-share to decide if public upload is enabled or disabled
2013-09-17 18:11:43 +02:00
1a13062701
Add legacy wrapper
2013-09-17 18:02:37 +02:00
fe86182dac
OC_Cache namespace changes and add UserCache to server container.
...
Refs #4863
2013-09-17 17:46:33 +02:00
Jörn Friedrich Dreyer
Jenkins for ownCloud
Bart Visscher
kondou
Bjoern Schiessle
Thomas Tanghus
Morris Jobke
Björn Schießle