Morris Jobke
abc23f7128
Merge pull request #3208 from owncloud/api_capabilities_quota
...
Add the quota to the external API for use with the mobile and desktop clients
2013-08-27 08:07:47 -07:00
Morris Jobke
e91edabe0f
add documentation
2013-08-27 16:07:25 +02:00
Björn Schießle
38084aba2a
Merge pull request #4596 from owncloud/fix_isEmpty_trash
...
trash bin: fix isEmpty() function
2013-08-27 06:40:39 -07:00
Tom Needham
273f162b26
Code style
2013-08-27 15:39:47 +02:00
Tom Needham
f14ce1efdc
Add quota to core api
2013-08-27 15:39:43 +02:00
Bjoern Schiessle
316d9bfed6
the trash bin can also contain empty files. Don't use the trash bin size as indicator to decide if the trash bin is empty or not
2013-08-27 14:39:43 +02:00
Jörn Friedrich Dreyer
13514fd1ad
Merge pull request #4348 from owncloud/fixing-4343-master
...
fixes #4343
2013-08-27 04:26:51 -07:00
kondou
1b45683168
Translate "Permission denied" & use class-autoloader
2013-08-27 12:50:21 +02:00
blizzz
163269805a
Merge pull request #4507 from owncloud/existingusersfromgroup
...
return only existing users in group
2013-08-27 03:47:56 -07:00
Morris Jobke
ea446544ef
Merge pull request #4586 from owncloud/fixing-3431-master
...
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00
Morris Jobke
6e8bc13aa3
fix weird logical behaviour
2013-08-27 10:58:17 +02:00
Thomas Müller
d3d91ce347
revert debugging code which accidentially entered this pull request
2013-08-27 10:49:10 +02:00
Morris Jobke
c09cfe4fb9
Merge pull request #4585 from owncloud/fixing-4385-master
...
Fixing 4385 master
2013-08-27 01:40:50 -07:00
Morris Jobke
02b4ceed3c
Merge pull request #4584 from owncloud/fixing-4575-master
...
adding translations to update events
2013-08-27 01:26:16 -07:00
Thomas Müller
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
Thomas Müller
8cf9336bcb
storage information is path specific
2013-08-27 00:59:58 +02:00
Thomas Müller
1e4ebf47e2
webdav quota now displays the same values as the web interface does
2013-08-27 00:57:28 +02:00
Thomas Müller
9909b8b726
adding translations to update events
2013-08-27 00:26:44 +02:00
Thomas Müller
d1a6d2bc8f
lacy initialization of fileView - in case basic auth is used FileSystem is not yet initialized during the initialize() call
2013-08-26 20:21:16 +02:00
Morris Jobke
7d141656ee
Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso-xsendfile_complete_zip_fix from pull request #3307
...
Conflicts:
lib/helper.php
2013-08-26 18:04:49 +02:00
Arthur Schiwon
1f5a55ddff
consolidate validity check for users in group class
2013-08-26 17:46:31 +02:00
kondou
e6473e6d49
Clean up some cruft
2013-08-26 17:41:19 +02:00
kondou
31736a1df3
Have a controller instead ofo avatar.php and fix some cropper-design
2013-08-26 16:46:55 +02:00
Georg Ehrke
b16a018da9
use random string as id for checkbox
2013-08-26 16:33:51 +02:00
Stephane Martin
81a45cfcf1
fixes #4574
2013-08-26 15:16:41 +02:00
Georg Ehrke
d538a566ac
fix background size in filelist.js
2013-08-26 14:36:18 +02:00
Bart Visscher
29c28a45ca
Merge pull request #4292 from owncloud/add_appconfig_unittest
...
Add \OC_Appconfig Unittest
2013-08-26 04:07:18 -07:00
Georg Ehrke
6f0c1e8d45
Merge master into oc_preview
2013-08-26 12:24:33 +02:00
Georg Ehrke
46cbd7cd3b
fix preview issue when uploading a file with parentheses
2013-08-26 12:16:51 +02:00
Morris Jobke
653bc9a477
Merge pull request #4281 from owncloud/ie8-multiselect
...
Better ie8 multiselect
2013-08-26 02:59:31 -07:00
Morris Jobke
a5873a96fa
Merge pull request #4542 from owncloud/fixing-4504-master
...
remove duplicate code
2013-08-26 02:19:32 -07:00
Morris Jobke
438e816941
Merge pull request #4519 from owncloud/style-fixes
...
fix minor style issue in the app navigation
2013-08-26 00:47:34 -07:00
Morris Jobke
ec0808ce75
fix reviewers concerns
2013-08-26 09:44:21 +02:00
Pellaeon Lin
cd41de839f
Fix "select all" checkbox displacement when checked
2013-08-26 10:57:14 +08:00
Jenkins for ownCloud
d587146a5a
[tx-robot] updated from transifex
2013-08-25 19:21:52 -04:00
kondou
9a8908b643
Use Jcrop, have inline errormsg, work on cropping, clean up, WIP
2013-08-25 21:06:44 +02:00
kondou
f19f8d1088
Fix avatar-unittest
2013-08-25 21:06:02 +02:00
kondou
5eb17aadb3
Fix spacing, have remove() and return JSON for custom-default-avatars
2013-08-25 21:06:02 +02:00
kondou
81cadd5ea3
Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff
2013-08-25 21:06:02 +02:00
kondou
960262bbb4
Fix testDefaultAvatar
2013-08-25 21:06:01 +02:00
kondou
0a4febf1eb
Integrate newavatar.php into avatar.php by using GET, POST & DELETE
2013-08-25 21:06:01 +02:00
kondou
4a9c89fb33
Clean up and prepare a bit for custom default avatars
2013-08-25 21:06:01 +02:00
kondou
cd2f7bdaef
Deny access for non-users and add a (not-working) override button
2013-08-25 21:06:01 +02:00
kondou
9c12da6a94
Several improvements
...
- Don't use gravatars default avatars
- Use "profile image" instead of "avatar"
- Use <p> instead of tables
- Ease updateAvatar()
- Actually return something in \OCP\Avatar
2013-08-25 21:05:40 +02:00
kondou
d7e6c77e20
Have a fancy uploadavatar button
2013-08-25 21:05:40 +02:00
kondou
9500109349
Refactor newavatar.php and show (for now) an alert on problems when setting new avatars
2013-08-25 21:05:40 +02:00
kondou
33827d690e
Use avatar.php in user-management
2013-08-25 21:05:38 +02:00
kondou
131d0edab6
Show avatar on personal.php always (except if avatars are disabled)
2013-08-25 21:04:49 +02:00
kondou
4521b54c67
Have /avatar.php as a central avatar-point
2013-08-25 21:04:49 +02:00
kondou
252548c62c
Improve styling & enable avatar-upload at personal page
2013-08-25 21:04:45 +02:00
