2d12e52769
[tx-robot] updated from transifex
2013-09-24 12:59:48 -04:00
9851f0f4f2
Merge pull request #4896 from owncloud/sharing_allow_disable_password
...
sharing, allow user to disable password protection
2013-09-23 01:20:09 -07:00
28918d61d2
[tx-robot] updated from transifex
2013-09-22 12:58:42 -04:00
5b95e7aa0f
[tx-robot] updated from transifex
2013-09-20 10:50:14 -04:00
71e129f295
initialize variable
2013-09-20 15:47:33 +02:00
12b4e79201
calculate correct permissions while toggle the password protection
2013-09-20 13:11:05 +02:00
8e26f291a7
Merge pull request #4684 from owncloud/improved-console
...
Use more object oriented way for console commands
2013-09-19 14:22:32 -07:00
f9549a4465
Merge pull request #4908 from owncloud/fix_css_selector
...
css selectors never have a : before []
2013-09-19 10:59:45 -07:00
a9ea99e93d
Add copyright, remove starting blank line
2013-09-19 19:12:16 +02:00
7e0631b3b8
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/filelist.js
2013-09-19 17:00:54 +02:00
9f9eb1b08f
Merge pull request #4263 from owncloud/search_scrollto
...
initial scrollto implementation
2013-09-19 05:49:45 -07:00
078bf0df25
use {count} instead of 'One' for more versatile translation
2013-09-19 12:05:30 +02:00
a6933efce3
use n to translate title
2013-09-19 11:25:41 +02:00
cda58ae3df
css selectors never have a : before []
2013-09-19 10:14:07 +02:00
0d81a53e12
use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there
2013-09-19 10:00:42 +02:00
f7800cd63e
fix 'event is not defined' error
2013-09-19 09:47:51 +02:00
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
64cc13a8d3
allow passing classes to buttons
2013-09-18 17:13:07 +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
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
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
2e79aab0ce
Merge pull request #4871 from owncloud/add_exists_method_to_jquery
...
add exists method to jquery
2013-09-17 06:07:50 -07:00
5cf12888ad
[tx-robot] updated from transifex
2013-09-16 11:38:45 -04:00
afe4f6a794
add exists method to jquery
2013-09-16 13:47:37 +02:00
339c98e5e6
Merge pull request #4835 from owncloud/fix-apps-height
...
use lineheight instead of padding and height
2013-09-15 07:08:50 -07:00
58e6582056
Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter
...
Fixes #4465 - Added autoFocus to #shareWith autocomplete options
2013-09-15 03:07:11 -07:00
db7e1dd877
Merge pull request #4853 from owncloud/external-shared_mimetype-icons
...
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-15 02:42:14 -07:00
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
a0c2c2473a
Merge pull request #4501 from owncloud/ajaxfilelist
...
Ajax calls for "files" and "files_trashbin" apps
2013-09-14 12:51:16 -07:00
dcc899d0a0
Merge pull request #4806 from owncloud/oc-dialogs-pageleave
...
Don't popup meaningless alerts when dialog called on page leave
2013-09-14 10:35:39 -07:00
c117e719da
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-14 14:35:23 +02:00
86143beb6a
Remove superfluous $
2013-09-14 14:15:52 +02:00
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
1304b511e9
Ajax calls for "files" and "files_trashbin" apps
...
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list
Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
functions
- Fixed some file paths in trashbin app to be similar to the files app
2013-09-13 19:59:14 +02:00
666bbbe060
Use appinfo/register_command.php to add commands to the console command
2013-09-13 18:10:04 +02:00
5633291cef
use lineheight instead of padding and height
2013-09-13 15:53:03 +02:00
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
b7205d97d7
Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist
...
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
2013-09-11 17:18:04 -07:00
80bf1969f9
Merge pull request #4784 from owncloud/ocdialog_option_setter
...
Fix setting ocdialog options after initialization.
2013-09-11 12:20:17 -07:00
08225a60c8
Save two lines
2013-09-11 21:15:32 +02:00
1f8f0e61d8
Remove test error :P
2013-09-11 21:11:35 +02:00
7a2b23a036
Fix double destroy on escape.
2013-09-11 17:13:39 +02:00
15be3d85b6
no autoFocus if no users returned
2013-09-11 15:59:28 +01:00
037cf22c51
Add a comment to clear defaultavatar-functionality
2013-09-11 16:04:41 +02:00
799c5c2c9b
Don't popup meaningless alerts when dialog called on page leave
2013-09-11 16:02:12 +02:00
68015b2761
[tx-robot] updated from transifex
2013-09-11 06:50:06 -04:00
Jenkins for ownCloud
Björn Schießle
Bjoern Schiessle
Bart Visscher
Jörn Friedrich Dreyer
Bernhard Posselt
Morris Jobke
Thomas Tanghus
kondou
Vincent Petry
Bernhard Posselt
Pete McFarlane