Jörn Friedrich Dreyer
|
9f9eb1b08f
|
Merge pull request #4263 from owncloud/search_scrollto
initial scrollto implementation
|
2013-09-19 05:49:45 -07:00 |
|
Jörn Friedrich Dreyer
|
98ff847830
|
fix race condition in lazy preview loading
|
2013-09-19 14:46:33 +02:00 |
Bjoern Schiessle
|
8cf8c0b161
|
remove some unused variables
|
2013-09-19 14:42:34 +02:00 |
|
Bjoern Schiessle
|
b947aab802
|
some unit test for the new ocs share api
|
2013-09-19 14:39:51 +02:00 |
Thomas Tanghus
|
de81210bec
|
Add another test.
|
2013-09-19 13:55:45 +02:00 |
|
Thomas Tanghus
|
9e4d13858c
|
Fix syntax error
|
2013-09-19 13:27:41 +02:00 |
|
Thomas Tanghus
|
d5126dd6b4
|
Merge branch 'appframework-master' into server_folder_methods
|
2013-09-19 12:32:32 +02:00 |
|
Jörn Friedrich Dreyer
|
078bf0df25
|
use {count} instead of 'One' for more versatile translation
|
2013-09-19 12:05:30 +02:00 |
Thomas Müller
|
4344c62f7e
|
Merge branch 'master' into fixing-4488-master
|
2013-09-19 11:43:38 +02:00 |
|
Jörn Friedrich Dreyer
|
1bba800e47
|
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
|
2013-09-19 11:33:34 +02:00 |
|
Jörn Friedrich Dreyer
|
ae97fad632
|
fix double translation of error message
|
2013-09-19 11:32:56 +02:00 |
|
Thomas Tanghus
|
314ca843e8
|
Updated method names and added a few more tests.
|
2013-09-19 11:27:13 +02:00 |
|
Jörn Friedrich Dreyer
|
a6933efce3
|
use n to translate title
|
2013-09-19 11:25:41 +02:00 |
|
Thomas Müller
|
eea02cee2f
|
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/file-upload.js
|
2013-09-19 11:15:20 +02:00 |
|
Thomas Müller
|
c30c153ea5
|
fixing typos and l10n
|
2013-09-19 11:13:11 +02:00 |
|
Jörn Friedrich Dreyer
|
89ed0007c0
|
jsdoc types should go into {}
|
2013-09-19 11:11:22 +02:00 |
|
Bjoern Schiessle
|
199121134f
|
return error if wrong shareType is given
|
2013-09-19 10:33:04 +02:00 |
|
Jörn Friedrich Dreyer
|
cda58ae3df
|
css selectors never have a : before []
|
2013-09-19 10:14:07 +02:00 |
|
Bjoern Schiessle
|
bc3b147396
|
remove spaces
|
2013-09-19 10:13:21 +02:00 |
|
Jörn Friedrich Dreyer
|
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 |
|
Jörn Friedrich Dreyer
|
f7800cd63e
|
fix 'event is not defined' error
|
2013-09-19 09:47:51 +02:00 |
Christopher
|
ae4775a683
|
Merge pull request #4906 from owncloud/wtf-broken-code-was-merged-again-master
fixing syntax error - it it that hard to test own code?
|
2013-09-18 22:17:04 -07:00 |
|
Thomas Müller
|
de8d0783ed
|
fixing syntax error - it it that hard to test own code?
|
2013-09-18 23:46:58 +02:00 |
|
Thomas Müller
|
43a96621ea
|
adding comma to get cleaner diffs in the future
|
2013-09-18 23:42:36 +02:00 |
|
Thomas Müller
|
3c0e93e220
|
no file actions during upload
|
2013-09-18 23:06:48 +02:00 |
|
Thomas Müller
|
76f8be3b7a
|
fixing namespaces and rename hasCategory to hasTag
|
2013-09-18 22:49:09 +02:00 |
|
Thomas Müller
|
690e98d45a
|
Merge branch 'appframework-master' into vcategories_public
Conflicts:
lib/server.php
|
2013-09-18 22:36:25 +02:00 |
|
Thomas Müller
|
69c28400b4
|
Merge pull request #4886 from owncloud/public_cache
Public cache etc.
|
2013-09-18 13:29:35 -07:00 |
|
Thomas Müller
|
1274d6116d
|
updating php docs
|
2013-09-18 22:22:51 +02:00 |
|
Jörn Friedrich Dreyer
|
72d53008cc
|
indentation
|
2013-09-18 17:58:15 +02:00 |
|
Jenkins for ownCloud
|
6b1843d91b
|
[tx-robot] updated from transifex
|
2013-09-18 11:50:02 -04:00 |
|
Jörn Friedrich Dreyer
|
7bd5e89f8c
|
simplify conflict template handling, fix reopen after ESC
|
2013-09-18 17:22:29 +02:00 |
|
Jörn Friedrich Dreyer
|
12ff268e60
|
move upload dialog css to separate file
|
2013-09-18 17:20:14 +02:00 |
|
Jörn Friedrich Dreyer
|
64cc13a8d3
|
allow passing classes to buttons
|
2013-09-18 17:13:07 +02:00 |
Bart Visscher
|
817b8d151b
|
Merge pull request #4745 from owncloud/split_personal-user_passwordchange
Split personal and user-mgmt password change logic
|
2013-09-18 07:53:11 -07:00 |
|
kondou
|
18a2c48ceb
|
Translate errormsgs in settings/changepassword/controller
|
2013-09-18 16:47:27 +02:00 |
|
Bjoern Schiessle
|
4edd8b8303
|
remove debug output
|
2013-09-18 16:08:29 +02:00 |
|
Bjoern Schiessle
|
5fb0e257a4
|
let user repeat the recovery key password to prevent typos
|
2013-09-18 16:03:53 +02:00 |
|
Thomas Tanghus
|
09d043729a
|
Note to self 2: Do as you preach. Test!
|
2013-09-18 15:02:25 +02:00 |
|
Thomas Tanghus
|
79cd655920
|
Note to self: Test before pushing!!!
|
2013-09-18 14:50:21 +02:00 |
|
Jörn Friedrich Dreyer
|
715846626e
|
hide excessive logging with a trace flag
|
2013-09-18 14:39:39 +02:00 |
|
Thomas Tanghus
|
2ef0b58ff6
|
Don't try to be clever
|
2013-09-18 14:25:12 +02:00 |
|
Jörn Friedrich Dreyer
|
17337b22af
|
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/file-upload.js
|
2013-09-18 14:19:58 +02:00 |
|
Jörn Friedrich Dreyer
|
ec1949f5ed
|
Merge branch 'master' into fix_3728_with_file_exists_dialog
|
2013-09-18 14:15:28 +02:00 |
|
Jörn Friedrich Dreyer
|
1eb42626f5
|
Merge pull request #4769 from owncloud/gitignore_apps_fix
add slash so inverts are triggered
|
2013-09-18 04:58:05 -07:00 |
|
Jörn Friedrich Dreyer
|
c531b4ef5b
|
Merge pull request #4872 from owncloud/refactor_upload_progress
refactor upload progress
|
2013-09-18 04:55:10 -07:00 |
|
Thomas Tanghus
|
dd62ccdb4e
|
Merge branch 'appframework-master' into public_cache
Conflicts:
lib/public/iservercontainer.php
lib/server.php
|
2013-09-18 13:20:07 +02:00 |
|
Thomas Tanghus
|
534933ee9b
|
Use new emitter system
|
2013-09-18 13:15:38 +02:00 |
|
Thomas Müller
|
20a43d1982
|
remove file action elements before recreating them
|
2013-09-18 13:09:47 +02:00 |
|
Thomas Müller
|
6ed2df11fc
|
store the permissions retrieved via ajax within the dom element
|
2013-09-18 13:09:04 +02:00 |