Commit Graph

9245 Commits

Author SHA1 Message Date
Bernhard Posselt a8094abac7 load classpaths of apps before routes 2013-01-17 21:42:46 +01:00
tomneedham b4954c0c89 Correct spelling of 'Authorization' 2013-01-17 16:30:14 +00:00
Thomas Mueller 130c9cad03 relative storage info without decimals 2013-01-17 16:52:57 +01:00
Thomas Mueller b7d3bf5f81 rename space -> storage 2013-01-17 16:49:10 +01:00
Arthur Schiwon d8be83029b make sure port is used as backup port if not specified. documentation. determine connection error earlier. 2013-01-17 13:56:37 +01:00
Arthur Schiwon 59a6068246 fix undeclared variable 2013-01-17 13:46:32 +01:00
Arthur Schiwon 3d56cf3a5b LDAP: add support for backup/replica servers 2013-01-17 13:31:14 +01:00
Björn Schießle d5ee435253 rename "publicListView" option to "disableSharing", this is more meaningful also because it is not only useful for the public list view 2013-01-17 13:17:48 +01:00
Frank Karlitschek d85e440aa1 Merge pull request #1148 from seancomeau/topic/setup
Fix issue #108
2013-01-16 22:38:57 -08:00
Jan-Christoph Borchardt 09d3db5eb7 new settings menu for new design 2013-01-17 12:45:33 +07:00
Jan-Christoph Borchardt de41813792 new app icon style for new design 2013-01-17 11:54:31 +07:00
Jenkins for ownCloud 433fa19268 [tx-robot] updated from transifex 2013-01-17 00:27:40 +01:00
Bart Visscher d42214ef81 Merge pull request #1204 from Raydiation/master
Dont resize content div with javascript but use css box-sizing to do it
2013-01-16 13:53:38 -08:00
Tom Needham 9dc668740a Check that api methods return the correct result type 2013-01-16 21:46:00 +00:00
Robin Appelman 6871a150bd Cache: use a database transition for scanning each folder
gives a massive speed improvement while scanning files
2013-01-16 21:58:17 +01:00
Robin Appelman bb43cf378b Files: make sure keybinds js is loaded after files js 2013-01-16 21:36:25 +01:00
Robin Appelman f9c42a196f Cache: no longer using this file 2013-01-16 21:36:04 +01:00
Tom Needham 358671ac1d Fix incorrect indentation 2013-01-16 20:29:29 +00:00
Tom Needham 098c84a29c Return 401 headers when authentication is required for the api call 2013-01-16 20:27:43 +00:00
Bernhard Posselt b659072686 dont show horizontal scrollbar 2013-01-16 19:55:16 +01:00
Bernhard Posselt b7f507b925 dont resize content div with javascript but use css box-sizing to do it 2013-01-16 19:38:19 +01:00
Robin Appelman 29ec007979 Cache: dont migrate permissions, cache them on demain instead 2013-01-16 19:11:33 +01:00
Robin Appelman 5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher 1d57a2e2a9 Merge pull request #1180 from owncloud/whitespace-cleanup
Whitespace cleanup
2013-01-16 09:25:57 -08:00
Bart Visscher 5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Bart Visscher a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Björn Schießle c494eb79ab listen to post delete event to allow the trash bin to create a copy of the version first 2013-01-16 16:01:11 +01:00
Arthur Schiwon 6063ce9c8d LDAP: enable support for multiple LDAP/AD servers 2013-01-16 14:59:41 +01:00
Arthur Schiwon 4699f36e44 LDAP: fix read configuration, remove unnecessary debug output 2013-01-16 14:58:49 +01:00
Arthur Schiwon ad1113c2cb LDAP: fix parameter passed not as expected 2013-01-16 14:56:57 +01:00
Jan-Christoph Borchardt cb0fd30458 Merge pull request #1185 from owncloud/fixing-1162-master
handling proper display of files/folders with negative size
2013-01-16 05:18:53 -08:00
Björn Schießle 2b9c925a2b Merge pull request #1192 from schiesbn/versioning_history_issue_1189
fix for issue #1186, missing variables added
2013-01-16 01:26:43 -08:00
Björn Schießle 5935f6adff Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into versioning_history_issue_1189 2013-01-16 10:25:48 +01:00
Björn Schießle 73c4d0faff initialize $versionCreated 2013-01-16 10:20:09 +01:00
Björn Schießle f71a5dec99 initialize 2013-01-16 10:18:40 +01:00
Thomas Müller 1f7bf57ece Merge pull request #1195 from owncloud/cache_prepared
Cache prepared statements in OC_DB
2013-01-15 22:23:34 -08:00
Robin Appelman f18fc1c510 Clear cached prepared statements when switching between mdb2 and pdo 2013-01-16 01:12:13 +01:00
Jenkins for ownCloud 0398bfffca [tx-robot] updated from transifex 2013-01-16 00:21:21 +01:00
Thomas Müller 4668f8c86e Merge pull request #1178 from owncloud/return_true_because_of_ponies
Remove uneeded return
2013-01-15 14:01:48 -08:00
Daniel Molkentin 65ef780ed6 Fix regression caused by 31b1a73e1f 2013-01-15 22:44:40 +01:00
Björn Schießle 73d45e79a7 add trash button to web interface 2013-01-15 20:35:15 +01:00
Robin Appelman a08490364d Cache prepared statements in OC_DB 2013-01-15 20:21:06 +01:00
Robin Appelman 7debfac0dc Cache: more efficient upgrading 2013-01-15 19:11:12 +01:00
Robin Appelman 94068e5d08 Cache: show upgrade progress 2013-01-15 18:13:50 +01:00
Bart Visscher 0da06187f6 Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
Robin Appelman 9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Jan-Christoph Borchardt 6182b1353b merge master into navigation 2013-01-15 20:40:38 +07:00
Björn Schießle b2a3a8d73b Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into versioning_history_issue_1189 2013-01-15 14:35:48 +01:00
Björn Schießle 60d5d5f636 fix for issue #1186, missing variables added 2013-01-15 14:34:15 +01:00
Björn Schießle ef4e6f3d6c fix for issue #1189, missing variables added 2013-01-15 13:29:59 +01:00