Morris Jobke
|
16abc536c5
|
fix 3rdparty commit
|
2013-08-28 16:59:12 +02:00 |
|
Morris Jobke
|
ed2fa06a26
|
reviewers comments
|
2013-08-28 16:52:12 +02:00 |
kondou
|
67c5be9f19
|
Merge branch 'master' into oc_avatars
Conflicts:
3rdparty
|
2013-08-28 16:44:11 +02:00 |
|
kondou
|
8d8a57de7f
|
Continue work on cropper
|
2013-08-28 16:39:00 +02:00 |
|
Morris Jobke
|
4a00b26029
|
add visualize
|
2013-08-28 16:29:27 +02:00 |
raghunayyar
|
6b278c89b3
|
Adds Node Modules to build in gitignore for easy testing.
|
2013-08-28 19:30:49 +05:30 |
Bjoern Schiessle
|
aed71bb420
|
also move empty folders to the trash bin as discussed here #4590
|
2013-08-28 15:46:44 +02:00 |
Jan-Christoph Borchardt
|
0c02e1efef
|
Merge pull request #4563 from owncloud/use_personal-password
Use personal-password for the password name in personal.php
|
2013-08-28 06:23:13 -07:00 |
Bart Visscher
|
ada15a2b8e
|
Merge pull request #4489 from owncloud/clean-3rdparty-mess-master
Clean 3rdparty mess master
|
2013-08-28 06:12:58 -07:00 |
|
kondou
|
6bd0f3cba7
|
Reimplement filesummary in JS
Fix #993
|
2013-08-28 15:10:17 +02:00 |
|
Bart Visscher
|
45076edf4f
|
Merge pull request #3891 from owncloud/fix_loadAppScriptFile
Check if the app is enabled and the app path is found before trying to l...
|
2013-08-28 06:10:06 -07:00 |
|
Morris Jobke
|
b9a95af12c
|
Merge pull request #4610 from owncloud/password-toggle-login
Password toggle login
|
2013-08-28 06:04:15 -07:00 |
|
Jan-Christoph Borchardt
|
0c8ac241df
|
fix shadow style of username input box
|
2013-08-28 13:59:23 +02:00 |
|
Jan-Christoph Borchardt
|
c6eda25d50
|
remove show password toggle from log in page, ref #4577 #4580
|
2013-08-28 13:58:49 +02:00 |
|
Morris Jobke
|
5a03707184
|
Merge pull request #4601 from owncloud/fixing-4341-master
backport of #4357 to master
|
2013-08-28 04:42:50 -07:00 |
Thomas Tanghus
|
9843c8e838
|
Merge pull request #4434 from owncloud/fix_octemplate_escaping
Fix octemplate string escaping.
|
2013-08-28 03:59:43 -07:00 |
|
Thomas Tanghus
|
776d64f804
|
Cache Object.keys(this.vars)
|
2013-08-28 12:50:05 +02:00 |
Jenkins for ownCloud
|
3e7ddbc9d9
|
[tx-robot] updated from transifex
|
2013-08-28 06:24:14 -04:00 |
|
Thomas Müller
|
3eed060ec9
|
backport of #4357 to master
|
2013-08-27 23:53:04 +02:00 |
|
Morris Jobke
|
34a32d862c
|
Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement
Fix "select all" checkbox displacement when checked, fix #4571
|
2013-08-27 14:21:34 -07:00 |
Arthur Schiwon
|
321c514782
|
LDAP: case insensitive replace for more robustness
|
2013-08-27 22:23:48 +02:00 |
|
Jenkins for ownCloud
|
d5062b9e0e
|
[tx-robot] updated from transifex
|
2013-08-27 11:23:18 -04:00 |
|
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 |