aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch '1.12RC'"redmatrix2016-08-2257-18450/+17576
* Merge branch '1.12RC'redmatrix2016-08-2257-17576/+18450
|\
| * Spanish and Dutch stringsjeroenpraat2016-08-224-11185/+11251
| * Updating Spanish and Dutch stringsjeroenpraat2016-08-174-12928/+13136
| * Update DE translation stringsphellmes2016-08-172-6815/+7040
| * Use double quotes for strings passed via templates to javascript. Some transl...redmatrix2016-08-151-5/+5
| * Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RCMario Vavti2016-08-151-24/+30
| |\
| | * btn/dropdown rendering issueMario Vavti2016-08-141-24/+30
| * | fix javascript error if not logged inMario Vavti2016-08-151-2/+2
| |/
| * remove js debuggingMario Vavti2016-08-131-1/+0
| * fix #480, enable bbcode autocomplete for photo comments and remove some redun...Mario Vavti2016-08-134-16/+3
| * possible quickfix for multi-acl not honoring jotnetsMario Vavti2016-08-121-0/+6
| * implement acl for folder creationMario Vavti2016-08-101-7/+19
| * open editor or comment window when linkdropping to a closed window. We probab...redmatrix2016-08-101-4/+18
| * allow dropping links on comments as well as postsredmatrix2016-08-092-2/+4
| * You can drag links to the editor (which will be parsed and inserted); as well...redmatrix2016-08-092-2/+2
| * diaspora vcard updatesredmatrix2016-08-071-5/+11
| * use config system.server_role and deprecate 'UNO'redmatrix2016-08-0710-20/+74
| * bring back acl for cloud file uploadsMario Vavti2016-08-062-17/+28
| * Revert "Revert "remove some logging""Mario Vavti2016-08-051-10/+1
| * Revert "remove some logging"Mario Vavti2016-08-051-1/+10
| * remove some loggingMario Vavti2016-08-051-10/+1
| * multi acl: port /settingsMario Vavti2016-08-052-4/+2
| * multi acl: port /thingMario Vavti2016-08-053-7/+5
| * multi acl: port /rpostMario Vavti2016-08-056-15/+13
| * multi acl: provide a acl-form-trigger class which comes handy in certain situ...Mario Vavti2016-08-043-6/+7
| * multi acl: port /wikiMario Vavti2016-08-041-7/+7
| * multi acl: port /webpages and /mitemMario Vavti2016-08-041-2/+2
| * multi acl: port /chatMario Vavti2016-08-041-1/+1
| * multi acl: port /cloud and /filestorageMario Vavti2016-08-044-21/+5
| * multi acl: port photosMario Vavti2016-08-042-7/+4
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-041-11/+13
| |\
| | * issue #474redmatrix2016-08-031-11/+13
| * | multi acl: port eventsMario Vavti2016-08-033-7/+9
| * | multiple acl: store new data in update_view()Mario Vavti2016-08-031-19/+23
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-0311-11/+445
| |\|
| | * belongs to previous commitjeroenpraat2016-08-031-0/+1
| | * Improved a few schemas - context help fix - dark schemas now have dark text a...jeroenpraat2016-08-034-4/+141
| | * allow individual permissions on atokensredmatrix2016-07-312-7/+39
| | * Remove scanned element column for existing element information which we are n...Andrew Manning2016-07-311-3/+9
| | * Improved UI. Removed logger statements.Andrew Manning2016-07-312-28/+36
| | * Import element selection page added to allow selective importing.Andrew Manning2016-07-303-72/+216
| | * Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-3012-10198/+10982
| | |\
| | * \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-201-1/+1
| | |\ \
| | * | | Starting to make the import selection page after element scan.Andrew Manning2016-07-202-0/+78
| | * | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-174-20/+47
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-1615-558/+102
| | |\ \ \ \
| | * | | | | Stash changes to merge from devAndrew Manning2016-07-161-13/+6
| | * | | | | Postpone remote folder import until filesystem mirroring matures.Andrew Manning2016-07-161-3/+14
| | * | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-143-3/+3
| | |\ \ \ \ \