Jan-Christoph Borchardt
|
4ee9d39422
|
change storage space 'none' to 'Unlimited' and capitalize Default
|
2012-12-14 23:22:55 +01:00 |
Jan-Christoph Borchardt
|
4acb2f70e1
|
change technical expression 'Quota' to simpler 'Storage'
|
2012-12-14 23:02:22 +01:00 |
Frank Karlitschek
|
2a55beab74
|
make it more readable as deepdiver suggested
|
2012-12-14 22:54:21 +01:00 |
Frank Karlitschek
|
b6b4c4c920
|
add curl proxy support. Fixes #504
https://github.com/owncloud/core/issues/504
|
2012-12-14 18:52:16 +01:00 |
Tom Needham
|
5fe6129698
|
Merge master into ocs_api, fix conflicts.
|
2012-12-14 15:15:05 +00:00 |
Tom Needham
|
4facd766e3
|
Remove 3rdparty repo from ocs_api branch
|
2012-12-14 14:58:31 +00:00 |
Tom Needham
|
c7a665a1e4
|
API: Tidy up routes.php, remove redundant call registration
|
2012-12-14 14:55:02 +00:00 |
Thomas Mueller
|
e7c288a719
|
fixing links docu/ ->doc/
|
2012-12-14 15:25:52 +01:00 |
Frank Karlitschek
|
cde74fe248
|
make it more readable
|
2012-12-14 14:41:09 +01:00 |
Frank Karlitschek
|
5689c78ee6
|
rename to doc
|
2012-12-14 14:39:05 +01:00 |
Frank Karlitschek
|
4b80e500a5
|
add pointer to the existing documentation. This will be replaced by the rel documentation during packaging
|
2012-12-14 14:38:22 +01:00 |
Arthur Schiwon
|
f0893fb8fe
|
Give also hint about possible conflicts in the user_webdavauth description
|
2012-12-14 12:03:46 +01:00 |
Arthur Schiwon
|
414b7e8e03
|
Also show a more prominent warning when php_ldap is not installed
|
2012-12-14 12:03:29 +01:00 |
Arthur Schiwon
|
b54390f432
|
Show conflict warning when user_ldap and user_webdavauth are enabled
|
2012-12-14 12:03:21 +01:00 |
Arthur Schiwon
|
5cbe8d637b
|
Show conflict warning when user_ldap and user_webdavauth are enabled
|
2012-12-14 12:03:15 +01:00 |
Frank Karlitschek
|
a871e300e2
|
Merge pull request #850 from owncloud/icons-for-login
Icons for login
|
2012-12-14 00:12:41 -08:00 |
Arthur Schiwon
|
627da205b3
|
implement getCurrentUser in Sabre Auth Connector, fixes #508
|
2012-12-14 01:06:09 +01:00 |
Arthur Schiwon
|
4466e06e7d
|
use username, not passed loginname, might differ
|
2012-12-14 01:06:00 +01:00 |
Jenkins for ownCloud
|
6d7ae463df
|
[tx-robot] updated from transifex
|
2012-12-14 00:17:42 +01:00 |
icewind1991
|
b156150b34
|
Merge pull request #876 from owncloud/mimicon_fix
fix mimetype icons for new files
|
2012-12-13 14:41:22 -08:00 |
Robin Appelman
|
1443d6c3ef
|
fix mimetype icons for new files
|
2012-12-13 22:31:43 +01:00 |
Robin Appelman
|
fda7d932ef
|
remove unneeded line
|
2012-12-13 22:12:27 +01:00 |
Jan-Christoph Borchardt
|
e0ada2c24f
|
bring back fixed multiselect bar so it’s visible when scrolled down, fix #746
|
2012-12-13 19:44:55 +01:00 |
Frank Karlitschek
|
79b8d67627
|
remove PgeNavi. It's no longer used
|
2012-12-13 19:26:05 +01:00 |
Jan-Christoph Borchardt
|
0bc2dc24cd
|
remove transitions for file rows and actions because it made everything seem sluggish
|
2012-12-13 19:12:09 +01:00 |
Jan-Christoph Borchardt
|
316a29f7ac
|
fix new button popup looking blurry
|
2012-12-13 19:04:27 +01:00 |
Robin Appelman
|
6a2b41e5e8
|
use json encoding when deleting multiply files instead of using ; as delimiter
|
2012-12-13 18:11:00 +01:00 |
blizzz
|
77c16b2933
|
Merge pull request #855 from owncloud/ungreenify
ungreenify new & upload buttons
|
2012-12-13 04:19:38 -08:00 |
Jan-Christoph Borchardt
|
2c41ae4372
|
small code reordering of inputs and buttons
|
2012-12-13 12:51:45 +01:00 |
Jan-Christoph Borchardt
|
7881bf1d4d
|
improve general button coloring
|
2012-12-13 12:49:59 +01:00 |
Frank Karlitschek
|
2330d6bcc7
|
show the link to the issue tracker only for Admins as discussed with Björn and Jan.
|
2012-12-13 11:08:12 +01:00 |
Frank Karlitschek
|
89bbabd77b
|
a bit more polish. We are getting there.
|
2012-12-13 09:26:25 +01:00 |
blizzz
|
680ff3a51b
|
Merge pull request #584 from wardragon/ldap_access_userExists_fix
Really fix OCP\Share::shareItem with LDAP users
|
2012-12-12 16:59:43 -08:00 |
Jenkins for ownCloud
|
8686a448c7
|
[tx-robot] updated from transifex
|
2012-12-13 00:18:20 +01:00 |
Jan-Christoph Borchardt
|
e7c4a2c8e1
|
ungreenify new & upload buttons
|
2012-12-13 00:12:21 +01:00 |
Thomas Müller
|
4018ba0654
|
Merge pull request #847 from owncloud/webdav-quota-fix-exception
throwing InsufficientStorage in case the quota is reached
|
2012-12-12 14:02:45 -08:00 |
Frank Karlitschek
|
f85106b6b5
|
first version of the new documentation system integration.
|
2012-12-12 22:41:12 +01:00 |
Jan-Christoph Borchardt
|
9d8bdff51b
|
tweak icons for username and password fields, now it’s good
|
2012-12-12 22:40:08 +01:00 |
Tom Needham
|
1475ff63dd
|
API: Add check to see if the user is authorised to run the api method
|
2012-12-12 21:04:23 +00:00 |
Tom Needham
|
228a75ebaa
|
API: Include totalitems and itemsperpage meta data when needed.
|
2012-12-12 20:58:40 +00:00 |
Thomas Mueller
|
84420035df
|
throwing InsufficientStorage in case the quota is reached
|
2012-12-12 20:09:57 +01:00 |
Tom Needham
|
3cc3405536
|
API: Remove old code. Move remaining methods to OC_OCS_Result.
|
2012-12-12 18:06:07 +00:00 |
Tom Needham
|
2a4b554ca6
|
API: OCS methods now use OC_OCS_Result to return data
|
2012-12-12 17:35:58 +00:00 |
Tom Needham
|
140141edf2
|
API: Further tidying, implement OC_OCS_Result object for api results.
|
2012-12-12 16:50:25 +00:00 |
Frank Karlitschek
|
4265419bbd
|
Try to fix #836
https://github.com/owncloud/core/issues/836
|
2012-12-12 16:27:37 +01:00 |
Thomas Mueller
|
b8b64d6ffc
|
set the session name to the instance id - which is unique
Conflicts:
lib/base.php
|
2012-12-12 16:07:51 +01:00 |
Thomas Müller
|
8b4aad73c7
|
Merge pull request #810 from owncloud/send-share-link-by-email
restoring feature to send sharing link via email
|
2012-12-12 04:54:51 -08:00 |
Thomas Mueller
|
e8897c2b7e
|
prevent keyboardshortcuts from catching events outside the main doc - e.g. the share popup
|
2012-12-12 12:55:29 +01:00 |
Thomas Müller
|
72fe339c10
|
Merge pull request #766 from btactic/language_autodetect
Improve autodetection of language.
|
2012-12-12 03:43:17 -08:00 |
Thomas Mueller
|
c938a4f791
|
feedback to the user while request is being processed
|
2012-12-12 12:34:28 +01:00 |